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 @@ ...@@ -206,7 +206,7 @@
206 } else { 206 } else {
207 this.column = _.cloneDeep(dataList); 207 this.column = _.cloneDeep(dataList);
208 this.column.splice(2, 0, { 208 this.column.splice(2, 0, {
209 prop: "fs", 209 prop: "qlbl",
210 label: "份数", 210 label: "份数",
211 }); 211 });
212 } 212 }
......
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
206 } else { 206 } else {
207 this.column = _.cloneDeep(dataList); 207 this.column = _.cloneDeep(dataList);
208 this.column.splice(2, 0, { 208 this.column.splice(2, 0, {
209 prop: "fs", 209 prop: "qlbl",
210 label: "份数", 210 label: "份数",
211 }); 211 });
212 } 212 }
......
...@@ -209,6 +209,9 @@ ...@@ -209,6 +209,9 @@
209 box-sizing: border-box; 209 box-sizing: border-box;
210 width: 70px; 210 width: 70px;
211 margin: 0 5px; 211 margin: 0 5px;
212 .icon{
213 font-size: 10px;
214 }
212 } 215 }
213 216
214 li:hover { 217 li:hover {
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 this.column = _.cloneDeep(dataList) 114 this.column = _.cloneDeep(dataList)
115 this.column.splice( 115 this.column.splice(
116 2, 0, { 116 2, 0, {
117 prop: "fs", 117 prop: "qlbl",
118 label: "份数" 118 label: "份数"
119 }) 119 })
120 } 120 }
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 <el-col :span="8"> 44 <el-col :span="8">
45 <el-form-item label="份数" prop="fs"> 45 <el-form-item label="份数" prop="qlbl">
46 <el-input v-model="ruleForm.fs" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 46 <el-input v-model="ruleForm.qlbl" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 49
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 this.column = _.cloneDeep(dataList) 104 this.column = _.cloneDeep(dataList)
105 this.column.splice( 105 this.column.splice(
106 2, 0, { 106 2, 0, {
107 prop: "fs", 107 prop: "qlbl",
108 label: "份数" 108 label: "份数"
109 }) 109 })
110 } 110 }
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 this.column = _.cloneDeep(dataList) 150 this.column = _.cloneDeep(dataList)
151 this.column.splice( 151 this.column.splice(
152 2, 0, { 152 2, 0, {
153 prop: "fs", 153 prop: "qlbl",
154 label: "份数" 154 label: "份数"
155 }) 155 })
156 } 156 }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <el-form 14 <el-form
15 :model="tableData[index]" 15 :model="tableData[index]"
16 label-width="120px" 16 label-width="120px"
17 ref="ruleFormRef'" 17 ref="ruleForm'"
18 > 18 >
19 <div class="spyj_form"> 19 <div class="spyj_form">
20 <div class="item_left"> 20 <div class="item_left">
...@@ -23,7 +23,10 @@ ...@@ -23,7 +23,10 @@
23 <div class="item_right"> 23 <div class="item_right">
24 <el-row> 24 <el-row>
25 <el-col :span="24"> 25 <el-col :span="24">
26 <el-form-item label-width="0" class="opinion_item"> 26 <el-form-item
27 label-width="0"
28 class="opinion_item"
29 >
27 <el-input 30 <el-input
28 :disabled="!viewEdit || item.show" 31 :disabled="!viewEdit || item.show"
29 type="textarea" 32 type="textarea"
...@@ -35,7 +38,7 @@ ...@@ -35,7 +38,7 @@
35 <el-button 38 <el-button
36 class="opinion_btn" 39 class="opinion_btn"
37 @click="commonOpinion(index)" 40 @click="commonOpinion(index)"
38 v-if="viewEdit" 41 :disabled="!viewEdit|| item.show"
39 >常用意见</el-button 42 >常用意见</el-button
40 > 43 >
41 </el-form-item> 44 </el-form-item>
...@@ -58,7 +61,9 @@ ...@@ -58,7 +61,9 @@
58 </el-form> 61 </el-form>
59 </div> 62 </div>
60 <div class="submit_button" v-if="viewEdit"> 63 <div class="submit_button" v-if="viewEdit">
61 <el-button type="primary" :disabled="shows" @click="onSubmit()">保存</el-button> 64 <el-button type="primary" :disabled="shows" @click="onSubmit()"
65 >保存</el-button
66 >
62 </div> 67 </div>
63 </div> 68 </div>
64 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> --> 69 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
...@@ -87,7 +92,7 @@ export default { ...@@ -87,7 +92,7 @@ export default {
87 falg1: false, 92 falg1: false,
88 jdmc: "", 93 jdmc: "",
89 indexdqlc: 0, 94 indexdqlc: 0,
90 shows:false 95 shows: false,
91 }; 96 };
92 }, 97 },
93 98
...@@ -137,40 +142,39 @@ export default { ...@@ -137,40 +142,39 @@ export default {
137 this.$endLoading(); 142 this.$endLoading();
138 if (res.code === 200 && res.result) { 143 if (res.code === 200 && res.result) {
139 this.$nextTick(() => { 144 this.$nextTick(() => {
140 this.tableData = res.result; 145 this.tableData = res.result;
141 if(this.shows){ 146 if (this.shows) {
142 this.shows=false 147 this.shows = false;
143 }
144
145 var index = this.tableData.findIndex(
146 (item) => item.jddm === this.$parent.dqhj
147 );
148 if (index == -1) {
149 switch (this.$parent.dqhj) {
150 case "cs":
151 this.tableData.push({ jdmc: "初审", jddm: "cs", sxh: 1 });
152 break;
153 case "fs":
154 this.tableData.push({ jdmc: "复审", jddm: "fs", sxh: 2 });
155 break;
156 case "hd":
157 this.tableData.push({ jdmc: "核定", jddm: "hd", sxh: 3 });
158 break;
159 } 148 }
160 } 149
161 this.tableData.forEach((item) => { 150 var index = this.tableData.findIndex(
162 item.show = true; 151 (item) => item.jddm === this.$parent.dqhj
163 if (this.$parent.dqhj == item.jddm) { 152 );
164 item["stepid"] = this.$route.query.bestepid; 153 if (index == -1) {
165 item.shjssj = getNewDatesh(); 154 switch (this.$parent.dqhj) {
166 item.shkssj = getNewDatesh(); 155 case "cs":
167 item["shryxm"] = this.userInfo.name; 156 this.tableData.push({ jdmc: "初审", jddm: "cs", sxh: 1 });
168 item["userid"] = this.userInfo.id; 157 break;
169 item.show = false; 158 case "fs":
159 this.tableData.push({ jdmc: "复审", jddm: "fs", sxh: 2 });
160 break;
161 case "hd":
162 this.tableData.push({ jdmc: "核定", jddm: "hd", sxh: 3 });
163 break;
164 }
170 } 165 }
166 this.tableData.forEach((item) => {
167 item.show = true;
168 if (this.$parent.dqhj == item.jddm) {
169 item["stepid"] = this.$route.query.bestepid;
170 item.shjssj = getNewDatesh();
171 item.shkssj = getNewDatesh();
172 item["shryxm"] = this.userInfo.name;
173 item["userid"] = this.userInfo.id;
174 item.show = false;
175 }
176 });
171 }); 177 });
172 })
173
174 } 178 }
175 }); 179 });
176 }, 180 },
...@@ -185,23 +189,29 @@ export default { ...@@ -185,23 +189,29 @@ export default {
185 * @author: renchao 189 * @author: renchao
186 */ 190 */
187 onSubmit() { 191 onSubmit() {
188 this.shows=true 192
189 this.tableData.forEach((item, index) => { 193 this.tableData.forEach((item, index) => {
190 item["bsmBusiness"] = this.propsParam.bsmBusiness; 194 item["bsmBusiness"] = this.propsParam.bsmBusiness;
191 item["czjg"] = "1"; 195 item["czjg"] = "1";
192 }); 196 });
193 saveSpyjBySlsq(this.tableData).then((res) => { 197 var index = this.tableData.findIndex(
194 if (res.code === 200) { 198 (item) => item.shyj === null||item.shyj === ""
195 this.$message.success("保存成功"); 199 );
196 this.refresh += 1; 200 if(index==-1){
197 this.getShList(); 201 this.shows = true;
198 } else { 202 saveSpyjBySlsq(this.tableData).then((res) => {
199 this.$message.error(res.message); 203 if (res.code === 200) {
200 } 204 this.$message.success("保存成功");
201 }); 205 this.refresh += 1;
202 // } else { 206 this.getShList();
203 // return false; 207 } else {
204 // } 208 this.$message.error(res.message);
209 }
210 });
211 }else{
212 this.$message.error("意见不能为空");
213 }
214
205 }, 215 },
206 //打开常用意见列表弹窗 216 //打开常用意见列表弹窗
207 /** 217 /**
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 this.column = _.cloneDeep(dataList) 121 this.column = _.cloneDeep(dataList)
122 this.column.splice( 122 this.column.splice(
123 2, 0, { 123 2, 0, {
124 prop: "fs", 124 prop: "qlbl",
125 label: "份数" 125 label: "份数"
126 }) 126 })
127 } 127 }
......
...@@ -208,6 +208,9 @@ ...@@ -208,6 +208,9 @@
208 box-sizing: border-box; 208 box-sizing: border-box;
209 width: 70px; 209 width: 70px;
210 margin: 0 5px; 210 margin: 0 5px;
211 .icon{
212 font-size: 10px;
213 }
211 } 214 }
212 215
213 li:hover { 216 li:hover {
...@@ -225,4 +228,4 @@ ...@@ -225,4 +228,4 @@
225 position: absolute; 228 position: absolute;
226 left: 0; 229 left: 0;
227 bottom: 0; 230 bottom: 0;
228 }
...\ No newline at end of file ...\ No newline at end of file
231 }
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-17 15:56:25 4 * @LastEditTime: 2023-08-18 15:48:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -87,7 +87,14 @@ ...@@ -87,7 +87,14 @@
87 <el-row :gutter="10"> 87 <el-row :gutter="10">
88 <el-col :span="8"> 88 <el-col :span="8">
89 <el-form-item label="林地所有权性质："> 89 <el-form-item label="林地所有权性质：">
90 <el-input v-model="ruleForm.lq.ldsyqxz"></el-input> 90 <el-select v-model="ruleForm.lq.ldsyqxz">
91 <el-option
92 v-for="item in dictData['A45']"
93 :key="item.dcode"
94 :label="item.dname"
95 :value="item.dcode">
96 </el-option>
97 </el-select>
91 </el-form-item> 98 </el-form-item>
92 </el-col> 99 </el-col>
93 <el-col :span="8"> 100 <el-col :span="8">
...@@ -109,12 +116,26 @@ ...@@ -109,12 +116,26 @@
109 </el-col> 116 </el-col>
110 <el-col :span="8"> 117 <el-col :span="8">
111 <el-form-item label="林种："> 118 <el-form-item label="林种：">
112 <el-input v-model="ruleForm.lq.lz"></el-input> 119 <el-select v-model="ruleForm.lq.lz">
120 <el-option
121 v-for="item in dictData['A26']"
122 :key="item.dcode"
123 :label="item.dname"
124 :value="item.dcode">
125 </el-option>
126 </el-select>
113 </el-form-item> 127 </el-form-item>
114 </el-col> 128 </el-col>
115 <el-col :span="8"> 129 <el-col :span="8">
116 <el-form-item label="起源："> 130 <el-form-item label="起源：">
117 <el-input v-model="ruleForm.lq.qy"></el-input> 131 <el-select v-model="ruleForm.lq.lz">
132 <el-option
133 v-for="item in dictData['A52']"
134 :key="item.dcode"
135 :label="item.dname"
136 :value="item.dcode">
137 </el-option>
138 </el-select>
118 </el-form-item> 139 </el-form-item>
119 </el-col> 140 </el-col>
120 </el-row> 141 </el-row>
......
...@@ -87,7 +87,14 @@ ...@@ -87,7 +87,14 @@
87 <el-row :gutter="10"> 87 <el-row :gutter="10">
88 <el-col :span="8"> 88 <el-col :span="8">
89 <el-form-item label="林地所有权性质："> 89 <el-form-item label="林地所有权性质：">
90 <el-input v-model="ruleForm.lq.ldsyqxz"></el-input> 90 <el-select v-model="ruleForm.lq.ldsyqxz">
91 <el-option
92 v-for="item in dictData['A45']"
93 :key="item.dcode"
94 :label="item.dname"
95 :value="item.dcode">
96 </el-option>
97 </el-select>
91 </el-form-item> 98 </el-form-item>
92 </el-col> 99 </el-col>
93 <el-col :span="8"> 100 <el-col :span="8">
...@@ -109,12 +116,26 @@ ...@@ -109,12 +116,26 @@
109 </el-col> 116 </el-col>
110 <el-col :span="8"> 117 <el-col :span="8">
111 <el-form-item label="林种："> 118 <el-form-item label="林种：">
112 <el-input v-model="ruleForm.lq.lz"></el-input> 119 <el-select v-model="ruleForm.lq.lz">
120 <el-option
121 v-for="item in dictData['A26']"
122 :key="item.dcode"
123 :label="item.dname"
124 :value="item.dcode">
125 </el-option>
126 </el-select>
113 </el-form-item> 127 </el-form-item>
114 </el-col> 128 </el-col>
115 <el-col :span="8"> 129 <el-col :span="8">
116 <el-form-item label="起源："> 130 <el-form-item label="起源：">
117 <el-input v-model="ruleForm.lq.qy"></el-input> 131 <el-select v-model="ruleForm.lq.lz">
132 <el-option
133 v-for="item in dictData['A52']"
134 :key="item.dcode"
135 :label="item.dname"
136 :value="item.dcode">
137 </el-option>
138 </el-select>
118 </el-form-item> 139 </el-form-item>
119 </el-col> 140 </el-col>
120 </el-row> 141 </el-row>
......
...@@ -212,7 +212,27 @@ ...@@ -212,7 +212,27 @@
212 this.$popup("登记簿详情", "registerBook/djbFrame", { 212 this.$popup("登记簿详情", "registerBook/djbFrame", {
213 formData: param 213 formData: param
214 }) 214 })
215 } 215 },
216 /**
217 * @description: handleLpbClick
218 * @param {*} row
219 * @author: miaofang
220 */
221 handleLpbClick (item) {
222 console.log("item",item);
223 console.log("this.sqywInfo",this.sqywInfo);
224 this.$popup('楼盘表', 'lpb/index', {
225 width: '85%',
226 formData: {
227 bsm: item.bsm,
228 zrzbsm: item.bsm,
229 zdbsm: item.zdbsm,
230 bsmSqyw: this.sqywInfo.bsmSqyw,
231 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
232 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
233 }
234 })
235 },
216 } 236 }
217 } 237 }
218 </script> 238 </script>
......
...@@ -97,7 +97,7 @@ class data extends filter { ...@@ -97,7 +97,7 @@ class data extends filter {
97 render: (h, scope) => { 97 render: (h, scope) => {
98 return ( 98 return (
99 <div> 99 <div>
100 <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button> 100 <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表1</el-button>
101 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button> 101 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
102 </div> 102 </div>
103 ) 103 )
......