Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
5a2c6599 by renchao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 5fdebc35 a962a195
Inline Side-by-side
Showing 14 changed files with 149 additions and 71 deletions
......@@ -206,7 +206,7 @@
} else {
this.column = _.cloneDeep(dataList);
this.column.splice(2, 0, {
prop: "fs",
prop: "qlbl",
label: "份数",
});
}
......
......@@ -206,7 +206,7 @@
} else {
this.column = _.cloneDeep(dataList);
this.column.splice(2, 0, {
prop: "fs",
prop: "qlbl",
label: "份数",
});
}
......
......@@ -209,6 +209,9 @@
box-sizing: border-box;
width: 70px;
margin: 0 5px;
.icon{
font-size: 10px;
}
}
li:hover {
......
......@@ -114,7 +114,7 @@
this.column = _.cloneDeep(dataList)
this.column.splice(
2, 0, {
prop: "fs",
prop: "qlbl",
label: "份数"
})
}
......
......@@ -42,8 +42,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="份数" prop="fs">
<el-input v-model="ruleForm.fs" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<el-form-item label="份数" prop="qlbl">
<el-input v-model="ruleForm.qlbl" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
......
......@@ -104,7 +104,7 @@
this.column = _.cloneDeep(dataList)
this.column.splice(
2, 0, {
prop: "fs",
prop: "qlbl",
label: "份数"
})
}
......
......@@ -150,7 +150,7 @@
this.column = _.cloneDeep(dataList)
this.column.splice(
2, 0, {
prop: "fs",
prop: "qlbl",
label: "份数"
})
}
......
......@@ -14,7 +14,7 @@
<el-form
:model="tableData[index]"
label-width="120px"
ref="ruleFormRef'"
ref="ruleForm'"
>
<div class="spyj_form">
<div class="item_left">
......@@ -23,7 +23,10 @@
<div class="item_right">
<el-row>
<el-col :span="24">
<el-form-item label-width="0" class="opinion_item">
<el-form-item
label-width="0"
class="opinion_item"
>
<el-input
:disabled="!viewEdit || item.show"
type="textarea"
......@@ -35,7 +38,7 @@
<el-button
class="opinion_btn"
@click="commonOpinion(index)"
v-if="viewEdit"
:disabled="!viewEdit|| item.show"
>常用意见</el-button
>
</el-form-item>
......@@ -58,7 +61,9 @@
</el-form>
</div>
<div class="submit_button" v-if="viewEdit">
<el-button type="primary" :disabled="shows" @click="onSubmit()">保存</el-button>
<el-button type="primary" :disabled="shows" @click="onSubmit()"
>保存</el-button
>
</div>
</div>
<!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
......@@ -87,7 +92,7 @@ export default {
falg1: false,
jdmc: "",
indexdqlc: 0,
shows:false
shows: false,
};
},
......@@ -137,40 +142,39 @@ export default {
this.$endLoading();
if (res.code === 200 && res.result) {
this.$nextTick(() => {
this.tableData = res.result;
if(this.shows){
this.shows=false
}
var index = this.tableData.findIndex(
(item) => item.jddm === this.$parent.dqhj
);
if (index == -1) {
switch (this.$parent.dqhj) {
case "cs":
this.tableData.push({ jdmc: "初审", jddm: "cs", sxh: 1 });
break;
case "fs":
this.tableData.push({ jdmc: "复审", jddm: "fs", sxh: 2 });
break;
case "hd":
this.tableData.push({ jdmc: "核定", jddm: "hd", sxh: 3 });
break;
this.tableData = res.result;
if (this.shows) {
this.shows = false;
}
}
this.tableData.forEach((item) => {
item.show = true;
if (this.$parent.dqhj == item.jddm) {
item["stepid"] = this.$route.query.bestepid;
item.shjssj = getNewDatesh();
item.shkssj = getNewDatesh();
item["shryxm"] = this.userInfo.name;
item["userid"] = this.userInfo.id;
item.show = false;
var index = this.tableData.findIndex(
(item) => item.jddm === this.$parent.dqhj
);
if (index == -1) {
switch (this.$parent.dqhj) {
case "cs":
this.tableData.push({ jdmc: "初审", jddm: "cs", sxh: 1 });
break;
case "fs":
this.tableData.push({ jdmc: "复审", jddm: "fs", sxh: 2 });
break;
case "hd":
this.tableData.push({ jdmc: "核定", jddm: "hd", sxh: 3 });
break;
}
}
this.tableData.forEach((item) => {
item.show = true;
if (this.$parent.dqhj == item.jddm) {
item["stepid"] = this.$route.query.bestepid;
item.shjssj = getNewDatesh();
item.shkssj = getNewDatesh();
item["shryxm"] = this.userInfo.name;
item["userid"] = this.userInfo.id;
item.show = false;
}
});
});
})
}
});
},
......@@ -185,23 +189,29 @@ export default {
* @author: renchao
*/
onSubmit() {
this.shows=true
this.tableData.forEach((item, index) => {
item["bsmBusiness"] = this.propsParam.bsmBusiness;
item["czjg"] = "1";
});
saveSpyjBySlsq(this.tableData).then((res) => {
if (res.code === 200) {
this.$message.success("保存成功");
this.refresh += 1;
this.getShList();
} else {
this.$message.error(res.message);
}
});
// } else {
// return false;
// }
this.tableData.forEach((item, index) => {
item["bsmBusiness"] = this.propsParam.bsmBusiness;
item["czjg"] = "1";
});
var index = this.tableData.findIndex(
(item) => item.shyj === null||item.shyj === ""
);
if(index==-1){
this.shows = true;
saveSpyjBySlsq(this.tableData).then((res) => {
if (res.code === 200) {
this.$message.success("保存成功");
this.refresh += 1;
this.getShList();
} else {
this.$message.error(res.message);
}
});
}else{
this.$message.error("意见不能为空");
}
},
//打开常用意见列表弹窗
/**
......
......@@ -121,7 +121,7 @@
this.column = _.cloneDeep(dataList)
this.column.splice(
2, 0, {
prop: "fs",
prop: "qlbl",
label: "份数"
})
}
......
......@@ -208,6 +208,9 @@
box-sizing: border-box;
width: 70px;
margin: 0 5px;
.icon{
font-size: 10px;
}
}
li:hover {
......@@ -225,4 +228,4 @@
position: absolute;
left: 0;
bottom: 0;
}
\ No newline at end of file
}
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-17 15:56:25
* @LastEditTime: 2023-08-18 15:48:43
-->
<template>
<div class="slxx">
......@@ -87,7 +87,14 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="林地所有权性质：">
<el-input v-model="ruleForm.lq.ldsyqxz"></el-input>
<el-select v-model="ruleForm.lq.ldsyqxz">
<el-option
v-for="item in dictData['A45']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -109,12 +116,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="林种：">
<el-input v-model="ruleForm.lq.lz"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A26']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="起源：">
<el-input v-model="ruleForm.lq.qy"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A52']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
......
......@@ -87,7 +87,14 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="林地所有权性质：">
<el-input v-model="ruleForm.lq.ldsyqxz"></el-input>
<el-select v-model="ruleForm.lq.ldsyqxz">
<el-option
v-for="item in dictData['A45']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -109,12 +116,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="林种：">
<el-input v-model="ruleForm.lq.lz"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A26']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="起源：">
<el-input v-model="ruleForm.lq.qy"></el-input>
<el-select v-model="ruleForm.lq.lz">
<el-option
v-for="item in dictData['A52']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
......
......@@ -212,7 +212,27 @@
this.$popup("登记簿详情", "registerBook/djbFrame", {
formData: param
})
}
},
/**
* @description: handleLpbClick
* @param {*} row
* @author: miaofang
*/
handleLpbClick (item) {
console.log("item",item);
console.log("this.sqywInfo",this.sqywInfo);
this.$popup('楼盘表', 'lpb/index', {
width: '85%',
formData: {
bsm: item.bsm,
zrzbsm: item.bsm,
zdbsm: item.zdbsm,
bsmSqyw: this.sqywInfo.bsmSqyw,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
}
})
},
}
}
</script>
......
......@@ -97,7 +97,7 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
<el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
<el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表1</el-button>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
</div>
)
......