Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
93564734 by tianhaohao@pashanhoo.com
Options

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

2 parents 9400b940 ba4ae044
Inline Side-by-side
Showing 7 changed files with 208 additions and 365 deletions
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
10 "dependencies": { 10 "dependencies": {
11 "@antv/g2": "^4.2.8", 11 "@antv/g2": "^4.2.8",
12 "@babel/polyfill": "^7.12.1", 12 "@babel/polyfill": "^7.12.1",
13 "@riophae/vue-treeselect": "^0.4.0",
14 "axios": "^0.21.1", 13 "axios": "^0.21.1",
15 "bpmn-js": "^7.4.0", 14 "bpmn-js": "^7.4.0",
16 "bpmn-js-properties-panel": "^0.37.2", 15 "bpmn-js-properties-panel": "^0.37.2",
......
1 { 1 {
2 "TITLE": "不动产登记系统", 2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "/bdcdj-ssq", 3 "SERVERAPI": "/bdcdj",
4 "ip": "http://192.168.2.38",
5 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0" 4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
6 } 5 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -76,22 +76,22 @@ ...@@ -76,22 +76,22 @@
76 <el-input v-model="ruleForm.qlxx.zl"></el-input> 76 <el-input v-model="ruleForm.qlxx.zl"></el-input>
77 </el-form-item> 77 </el-form-item>
78 </el-col> 78 </el-col>
79 <el-col :span="8"> 79 <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
80 <el-form-item label="土地使用权人："> 80 <el-form-item label="土地使用权人：">
81 <el-input v-model="ruleForm.fdcq2.tdsyqr"></el-input> 81 <el-input v-model="ruleForm.fdcq2.tdsyqr"></el-input>
82 </el-form-item> 82 </el-form-item>
83 </el-col> 83 </el-col>
84 <el-col :span="8"> 84 <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
85 <el-form-item label="独用土地面积："> 85 <el-form-item label="独用土地面积：">
86 <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input> 86 <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
87 </el-form-item> 87 </el-form-item>
88 </el-col> 88 </el-col>
89 <el-col :span="8"> 89 <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
90 <el-form-item label="分摊土地面积："> 90 <el-form-item label="分摊土地面积：">
91 <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input> 91 <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 <el-col :span="8"> 94 <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
95 <!-- 下拉框 --> 95 <!-- 下拉框 -->
96 <el-form-item label="土地性质：" style="margin-bottom:3px"> 96 <el-form-item label="土地性质：" style="margin-bottom:3px">
97 <treeselect v-model="ruleForm.fdcq2.jedw" placeholder="" 97 <treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
99 :show-count="true" :options="dictData['A45']" /> 99 :show-count="true" :options="dictData['A45']" />
100 </el-form-item> 100 </el-form-item>
101 </el-col> 101 </el-col>
102 <el-col :span="8"> 102 <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
103 <el-form-item label="房地产交易价格："> 103 <el-form-item label="房地产交易价格：">
104 <div style="display:flex"> 104 <div style="display:flex">
105 <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input> 105 <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 <el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input> 164 <el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input>
165 </el-form-item> 165 </el-form-item>
166 </el-col> 166 </el-col>
167 <el-col :span="8"> 167 <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
168 <el-form-item label="分摊建筑面积："> 168 <el-form-item label="分摊建筑面积：">
169 <el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input> 169 <el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input>
170 </el-form-item> 170 </el-form-item>
...@@ -221,8 +221,8 @@ ...@@ -221,8 +221,8 @@
221 </div> 221 </div>
222 <tdytTable 222 <tdytTable
223 :tableData="ruleForm.tdytqxList" 223 :tableData="ruleForm.tdytqxList"
224 @upDateQlrxxList="upDateTdytxxList" 224 @upDateTdytxxList="upDateTdytxxList"
225 :viewtype="$route.query.viewtype" /> 225 />
226 <div class="slxx_title title-block"> 226 <div class="slxx_title title-block">
227 权利人信息 227 权利人信息
228 <div class="triangle"></div> 228 <div class="triangle"></div>
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
258 </el-col> 258 </el-col>
259 </el-row> 259 </el-row>
260 <qlrCommonTable 260 <qlrCommonTable
261 :tableData="ruleForm.qlrList" 261 :tableData="ruleForm.qlrData"
262 @upDateQlrxxList="upDateQlrxxList" 262 @upDateQlrxxList="upDateQlrxxList"
263 :key="key" 263 :key="key"
264 :viewtype="$route.query.viewtype" 264 :viewtype="$route.query.viewtype"
...@@ -286,33 +286,18 @@ ...@@ -286,33 +286,18 @@
286 </div> 286 </div>
287 </template> 287 </template>
288 <script> 288 <script>
289 import { mapGetters } from "vuex"; 289 import { mapGetters } from "vuex";
290 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"; 290 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
291 import { init } from "@/api/djbbl.js"; 291 import { init } from "@/api/djbbl.js";
292 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 292 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
293 import tdytTable from "@/views/workflow/components/tdytTable"; 293 import tdytTable from "@/views/workflow/components/tdytTable";
294 // import the component 294 export default {
295 import Treeselect from '@riophae/vue-treeselect' 295 components: { qlrCommonTable,tdytTable },
296 // import the styles
297 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
298
299 export default {
300 components: { qlrCommonTable, tdytTable, Treeselect },
301 computed: { 296 computed: {
302 ...mapGetters(["dictData", "flag"]), 297 ...mapGetters(["dictData", "flag"]),
303 }, 298 },
304 data () { 299 data() {
305 return { 300 return {
306 // 键名转换，方法默认是label和children进行树状渲染
307 normalizer (node) { //方法
308 if (node.children == null || node.children == 'null') {
309 delete node.children;
310 }
311 return {
312 id: node.dcode,
313 label: node.dname
314 }
315 },
316 //表单是否可操作 301 //表单是否可操作
317 propsParam: this.$attrs, 302 propsParam: this.$attrs,
318 ableOperation: true, 303 ableOperation: true,
...@@ -325,47 +310,40 @@ ...@@ -325,47 +310,40 @@
325 rules: {}, 310 rules: {},
326 }; 311 };
327 }, 312 },
328 created () { 313 created() {
329 this.loadData(); 314 this.loadData();
330 }, 315 },
331 mounted () { }, 316 mounted() {},
332 methods: { 317 methods: {
333 loadData () { 318 loadData() {
334 console.log("房地产权", this.propsParam); 319 console.log("房地产权",this.propsParam);
335 init(this.propsParam.bsmRepair).then((res) => { 320 init(this.propsParam.bsmRepair).then((res) => {
336 if (res.code == 200) { 321 if (res.code == 200) {
337
338 this.ruleForm = res.result; 322 this.ruleForm = res.result;
323 console.log("this.ruleForm",this.ruleForm);
339 this.isShow = true; 324 this.isShow = true;
340 // this.tableData = res.result;
341 // if (this.tableData.length < datas.columns().emptycolNum) {
342 // this.emptycolNum =
343 // datas.columns().emptycolNum - this.tableData.length;
344 // } else {
345 // this.emptycolNum = 0;
346 // }
347 } 325 }
348 }); 326 });
349 }, 327 },
350 // 更新土地用途信息 328 // 更新土地用途信息
351 upDateTdytxxList (val) { 329 upDateTdytxxList(val) {
352 console.log("VAL", val); 330 console.log("VAL",val);
353 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 331 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
354 this.key++; 332 this.key++;
355 }, 333 },
356 // 更新权利人信息 334 // 更新权利人信息
357 upDateQlrxxList (val) { 335 upDateQlrxxList(val) {
358 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)); 336 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
359 this.czrOptions = this.ruleForm.qlrList; 337 this.czrOptions = this.ruleForm.qlrList;
360 this.key++; 338 this.key++;
361 }, 339 },
362 // 更新义务人信息 340 // 更新义务人信息
363 upDateYwrxxList (val) { 341 upDateYwrxxList(val) {
364 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val)); 342 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
365 this.key++; 343 this.key++;
366 }, 344 },
367 onSubmit () { 345 onSubmit() {
368 console.log("this.ruleForm大信息", this.ruleForm); 346 console.log("this.ruleForm大信息",this.ruleForm);
369 if (this.ruleForm.qlrList.length == 0) { 347 if (this.ruleForm.qlrList.length == 0) {
370 this.$message({ 348 this.$message({
371 showClose: true, 349 showClose: true,
...@@ -421,12 +399,9 @@ ...@@ -421,12 +399,9 @@
421 }); 399 });
422 }, 400 },
423 }, 401 },
424 }; 402 };
425 </script> 403 </script>
426 <style scoped lang="scss"> 404 <style scoped lang="scss">
427 @import "~@/styles/public.scss"; 405 @import "~@/styles/public.scss";
428 @import "~@/styles/slxx/slxx.scss"; 406 @import "~@/styles/slxx/slxx.scss";
429 /deep/.vue-treeselect__menu-container {
430 transition: 0.3s !important;
431 }
432 </style> 407 </style>
......
...@@ -79,20 +79,16 @@ export default { ...@@ -79,20 +79,16 @@ export default {
79 }) 79 })
80 break; 80 break;
81 case "B2": //材料分屏按钮 81 case "B2": //材料分屏按钮
82 this.splitScreen = this.splitScreen ? false : true; 82
83 this.$store.dispatch("app/set1tScreen", this.splitScreen); 83 this.closefp()
84 if (this.splitScreen) { 84
85 //如果当前选项卡为材料信息内容，递减到上一个选项卡内容 85 // if (this.splitScreen) {
86 if (this.tabName == this.clxxTab.value) { 86 // //如果当前选项卡为材料信息内容，递减到上一个选项卡内容
87 this.tabName = this.tabList[this.clxxIndex - 1].value; 87 // if (this.tabName == this.clxxTab.value) {
88 this.getFromRouter(this.tabList[this.clxxIndex - 1].value); 88 // this.tabName = this.tabList[0].value;
89 } 89 // this.getFromRouter(this.tabList[0].value);
90 //删除材料信息选项卡数据 90 // }
91 this.tabList.splice(this.clxxIndex, 1); 91 // }
92 } else {
93 //新增材料信息选项卡数据
94 this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
95 }
96 break; 92 break;
97 case "B3": //材料导入 93 case "B3": //材料导入
98 document.getElementById("cldr").click(); 94 document.getElementById("cldr").click();
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 <script> 73 <script>
74 import WorkFlow from "./mixin/index"; 74 import WorkFlow from "./mixin/index";
75 import { getForm } from "./flowform"; 75 import { getForm } from "./flowform";
76 import { getStepFormInfo } from "@/api/fqsq.js" 76 import { getStepFormInfo } from "@/api/fqsq.js";
77 import NoticeBar from "@/components/NoticeBar/index"; 77 import NoticeBar from "@/components/NoticeBar/index";
78 import ProcessViewer from "./components/processViewer.vue"; 78 import ProcessViewer from "./components/processViewer.vue";
79 // 引入左侧菜单 79 // 引入左侧菜单
...@@ -118,12 +118,9 @@ export default { ...@@ -118,12 +118,9 @@ export default {
118 //设置表单传递数据 118 //设置表单传递数据
119 currentSelectProps: {}, 119 currentSelectProps: {},
120 // 首次拿到的业务信息 120 // 首次拿到的业务信息
121 oneSelectProps:{}, 121 oneSelectProps: {},
122 //材料信息选择卡索引 122 //材料信息选择卡索引
123 clxxIndex: "", 123 oneget: true,
124 //材料信息选项卡对象
125 clxxTab: {},
126 oneget:true,
127 //页面监听时间 124 //页面监听时间
128 _beforeUnload_time: "", 125 _beforeUnload_time: "",
129 treedata: {}, 126 treedata: {},
...@@ -132,21 +129,20 @@ export default { ...@@ -132,21 +129,20 @@ export default {
132 }; 129 };
133 }, 130 },
134 mounted() { 131 mounted() {
135 // this.getleftMenubl() 132 // this.getleftMenubl()
136 }, 133 },
137 134
138 methods: { 135 methods: {
139 136 stepForm(qllx) {
140 stepForm (qllx) { 137 this.oneSelectProps.qllx = qllx;
141 this.oneSelectProps.qllx=qllx 138 if (this.$refs.Menu.supplementarylist.length) {
142 if(this.$refs.Menu.supplementarylist.length){
143 getStepFormInfo(this.oneSelectProps).then((res) => { 139 getStepFormInfo(this.oneSelectProps).then((res) => {
144 this.$nextTick(function () { 140 this.$nextTick(function () {
145 this.tabList=res.result 141 this.tabList = res.result;
146 this.tabName =this.tabList[0].value; 142 this.tabName = this.tabList[0].value;
147 this.getFromRouter(this.tabName) 143 this.getFromRouter(this.tabName);
144 });
148 }); 145 });
149 })
150 } 146 }
151 }, 147 },
152 // 获取右侧菜单 148 // 获取右侧菜单
...@@ -156,7 +152,7 @@ export default { ...@@ -156,7 +152,7 @@ export default {
156 // }) 152 // })
157 // }, 153 // },
158 getQllxByBdcdyid() { 154 getQllxByBdcdyid() {
159 if(this.currentSelectProps.bdcdyid){ 155 if (this.currentSelectProps.bdcdyid) {
160 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 156 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
161 (res) => { 157 (res) => {
162 if (res.code === 200) { 158 if (res.code === 200) {
...@@ -166,26 +162,22 @@ export default { ...@@ -166,26 +162,22 @@ export default {
166 } 162 }
167 ); 163 );
168 } 164 }
169
170 }, 165 },
171 // 获取右侧选项卡 166 // 获取右侧选项卡
172 getCurrentSelectProps(val) { 167 getCurrentSelectProps(val) {
173 if(val.bdcdyid){ 168 if (val.bdcdyid) {
174 this.oneSelectProps = val; 169 this.oneSelectProps = val;
175 } 170 }
176 this.currentSelectProps = val; 171 this.currentSelectProps = val;
177 if (this.currentSelectProps.bsmRepair) { 172 if (this.currentSelectProps.bsmRepair) {
178 this.stepForm (this.currentSelectProps.qllx) 173 this.stepForm(this.currentSelectProps.qllx);
179 } else if(!this.oneget){ 174 } else if (!this.oneget) {
180 this.getdjblist(); 175 this.getdjblist();
181
182 } 176 }
183 if(this.oneget){ 177 if (this.oneget) {
184 this.oneget=false 178 this.oneget = false;
185 this.stepForm (this.currentSelectProps.qllx) 179 this.stepForm(this.currentSelectProps.qllx);
186
187 } 180 }
188
189 }, 181 },
190 // 获取渲染登记簿列表 182 // 获取渲染登记簿列表
191 getdjblist() { 183 getdjblist() {
...@@ -196,10 +188,11 @@ export default { ...@@ -196,10 +188,11 @@ export default {
196 if (res.code === 200) { 188 if (res.code === 200) {
197 this.treedata = loadTreeData(res.result, this.bdcdyh); 189 this.treedata = loadTreeData(res.result, this.bdcdyh);
198 this.$nextTick(function () { 190 this.$nextTick(function () {
199 this.defaultNode = getNode( 191 this.defaultNode = getNode(this.currentSelectProps.qllx, {
200 this.currentSelectProps.qllx, 192 linShi: 0,
201 { linShi: 0, xianShi: 0, liShi: 0 }, 193 xianShi: 0,
202 ); 194 liShi: 0,
195 });
203 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点 196 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
204 }); 197 });
205 let settree = JSON.parse(JSON.stringify(this.treedata)); 198 let settree = JSON.parse(JSON.stringify(this.treedata));
...@@ -221,11 +214,18 @@ export default { ...@@ -221,11 +214,18 @@ export default {
221 }, 214 },
222 //切换选项卡内容组件 215 //切换选项卡内容组件
223 getFromRouter(tabname) { 216 getFromRouter(tabname) {
217 console.log("tabname", tabname);
224 this.componentTag = getForm(tabname); 218 this.componentTag = getForm(tabname);
225 }, 219 },
226 220 closefp() {
221 console.log("点击分屏");
222 this.splitScreen = this.splitScreen ? false : true;
223 this.$store.dispatch("app/set1tScreen", this.splitScreen);
224 this.getFromRouter(this.tabList[0].value);
225 this.clxxForm = getForm(this.tabList[1].value);
226 },
227 // 增加补录记录 227 // 增加补录记录
228 addRepairRecord(row,del) { 228 addRepairRecord(row, del) {
229 let from = { 229 let from = {
230 bsmQlxx: "", 230 bsmQlxx: "",
231 bsmSlsq: this.bsmSlsq, 231 bsmSlsq: this.bsmSlsq,
...@@ -235,15 +235,16 @@ export default { ...@@ -235,15 +235,16 @@ export default {
235 }; 235 };
236 if (row) { 236 if (row) {
237 from.bsmQlxx = row.bsmQlxx; 237 from.bsmQlxx = row.bsmQlxx;
238 if(del){ 238 if (del) {
239 from.operate = del; 239 from.operate = del;
240 }else{ 240 } else {
241 from.operate = row.bsmQlxx ? "U" : "C"; 241 from.operate = row.bsmQlxx ? "U" : "C";
242 } 242 }
243 from.qllx = row.qllx; 243 from.qllx = row.qllx;
244 } 244 }
245 addRepairRecord(from).then((res) => { 245 addRepairRecord(from)
246 if(res.code=='200'){ 246 .then((res) => {
247 if (res.code == "200") {
247 this.$refs.qllxlist.dialogVisible = false; 248 this.$refs.qllxlist.dialogVisible = false;
248 this.$nextTick(() => { 249 this.$nextTick(() => {
249 this.$refs.Menu.getleftMenubl(res.result); 250 this.$refs.Menu.getleftMenubl(res.result);
...@@ -252,16 +253,16 @@ export default { ...@@ -252,16 +253,16 @@ export default {
252 message: "补录成功!", 253 message: "补录成功!",
253 }); 254 });
254 }); 255 });
255 }else{ 256 } else {
256 this.$alert(res.message, '提示', { 257 this.$alert(res.message, "提示", {
257 confirmButtonText: '确定', 258 confirmButtonText: "确定",
258 type: 'warning' 259 type: "warning",
259 }); 260 });
260 } 261 }
261 }).catch((res) => { 262 })
262 263 .catch((res) => {
263 console.log("错",res); 264 console.log("错", res);
264 });; 265 });
265 }, 266 },
266 }, 267 },
267 }; 268 };
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:39:47
5 -->
6 <template>
7 <dialogBox title="土地用途信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
8 @closeDialog="closeDialog" :isButton="showButton">
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="138px">
10 <el-row>
11 <el-col :span="12">
12 <el-form-item label="土地用途" prop="tdyt">
13 <el-input v-model="ruleForm.tdyt"></el-input>
14 </el-form-item>
15 </el-col>
16 <el-col :span="12">
17 <el-form-item label="土地使用权限" prop="syqx">
18 <el-input v-model="ruleForm.syqx"></el-input>
19 </el-form-item>
20 </el-col>
21 </el-row>
22 <el-row>
23 <el-col :span="12">
24 <el-form-item label="土地使用结束时间" prop="jssj">
25 <el-date-picker
26 v-model="ruleForm.jssj"
27 type="daterange"
28 range-separator="至"
29 start-placeholder="开始日期"
30 end-placeholder="结束日期"
31 value-format="yyyy-MM-dd">>
32 </el-date-picker>
33 </el-form-item>
34 </el-col>
35 <el-col :span="12">
36 <el-form-item label="土地使用起止时间" prop="qzsj">
37 <el-date-picker
38 v-model="ruleForm.qzsj"
39 type="daterange"
40 range-separator="至"
41 start-placeholder="开始日期"
42 end-placeholder="结束日期"
43 value-format="yyyy-MM-dd">>
44 </el-date-picker>
45 </el-form-item>
46 </el-col>
47 </el-row>
48 </el-form>
49 </dialogBox>
50 </template>z x addTdyt
51 <script>
52 import { mapGetters } from "vuex";
53 export default {
54 props: {
55 value: { type: Boolean, default: false },
56 details: { type: Object, default: {} },
57 showButton: { type: Boolean, default: false }
58 },
59 data () {
60 return {
61 myValue: this.value,
62 ruleForm: {
63 tdyt:"",
64 syqx:"",
65 jssj:"",
66 qzsj:""
67 },
68 rules: {
69 tdyt: [{ required: true, message: "土地用途", trigger: "blur" }],
70 syqx: [{ required: true, message: "土地使用权限", trigger: "blur" }],
71 jssj: [{ required: true, message: "土地使用结束时间", trigger: "blur" }],
72 qzsj: [{ required: true, message: "土地使用起止时间", trigger: "blur" }],
73 },
74 };
75 },
76 watch: {
77 value (val) {
78 console.log("val",val);
79 this.myValue = _.cloneDeep(val);
80 },
81 details: {
82 handler: function (val, oldVal) {
83 console.log("val2",val);
84 this.ruleForm = val;
85 },
86 deep: true,
87 },
88 },
89 methods: {
90 closeDialog () {
91 this.$emit("input", false);
92 this.$refs["ruleForm"].resetFields();
93 },
94 submitForm () {
95 console.log("this.ruleForm",this.ruleForm);
96 this.$refs.ruleForm.validate((valid) => {
97 if (valid) {
98 this.$emit("input", false);
99 this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
100 } else {
101 return false;
102 }
103 });
104 },
105 },
106 };
107 </script>
108 <style scoped lang="scss">
109 @import "~@/styles/dialogBoxheader.scss";
110 .submit-button {
111 text-align: center;
112 height: 52px;
113 padding-top: 10px;
114 background-color: #fff;
115 }
116 </style>
...@@ -5,20 +5,20 @@ ...@@ -5,20 +5,20 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150" 8 <lb-table
9 :data="tableDataList"> 9 :column="InformationTable"
10 :pagination="false"
11 :key="key"
12 :heightNumSetting="true"
13 :minHeight="150"
14 :data="tableDataList"
15 >
10 </lb-table> 16 </lb-table>
11 <addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
12 </div> 17 </div>
13 </template> 18 </template>
14 <script> 19 <script>
15 import { mapGetters } from 'vuex' 20 import { mapGetters } from "vuex";
16 import { getIdCardInfo } from '@/utils/operation.js' 21 export default {
17 import addTdyt from './dialog/addTdyt.vue'
18 export default {
19 components: {
20 addTdyt
21 },
22 computed: { 22 computed: {
23 ...mapGetters(["dictData"]), 23 ...mapGetters(["dictData"]),
24 }, 24 },
...@@ -26,59 +26,85 @@ ...@@ -26,59 +26,85 @@
26 tableData: { 26 tableData: {
27 type: Array, 27 type: Array,
28 default: function () { 28 default: function () {
29 return [] 29 return [];
30 }
31 }, 30 },
32 }, 31 },
33 data () { 32 },
33 data() {
34 return { 34 return {
35 key: 0, 35 key: 0,
36 dataIndex: 0, 36 newdata: {
37 dialog: false, 37 yt: "",
38 isaddupdate: false, 38 qssj: "",
39 showButton: this.$route.query.viewtype ? false : true, 39 jssj: "",
40 details: {}, 40 syqx: "",
41 },
41 tableDataList: [], 42 tableDataList: [],
42 InformationTable: [ 43 InformationTable: [
43 { 44 {
44 width: '50', 45 width: "50",
45 renderHeader: (h, scope) => { 46 renderHeader: (h, scope) => {
46 return <div> { 47 return (
47 this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i> 48 <div>
48 } 49 {" "}
50 {this.$route.query.viewtype == 1 ? (
51 "序号"
52 ) : (
53 <i
54 class="el-icon-plus pointer"
55 onClick={() => {
56 this.addClick();
57 }}
58 ></i>
59 )}
49 </div> 60 </div>
61 );
50 }, 62 },
51 render: (h, scope) => { 63 render: (h, scope) => {
52 return ( 64 return (
53 <div> 65 <div>
54 { 66 {this.$route.query.viewtype == 1 ? (
55 this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> : 67 <span>{scope.$index + 1}</span>
56 <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i> 68 ) : (
57 } 69 <i
70 class="el-icon-minus pointer"
71 onClick={() => {
72 this.deleClick(scope.$index, scope.row);
73 }}
74 ></i>
75 )}
58 </div> 76 </div>
59 ) 77 );
60 } 78 },
61 }, 79 },
62 { 80 {
63 label: '土地用途', 81 label: "土地用途",
64 align: 'center', 82 align: "center",
65 render: (h, scope) => { 83 render: (h, scope) => {
66 return ( 84 return (
67 <el-select value={scope.row.yt} 85 <el-select
68 onChange={(val) => { scope.row.yt = val }} clearable> 86 value={scope.row.yt}
69 { 87 onChange={(val) => {
70 this.dictData['tdyt'].map(option => { 88 scope.row.yt = val;
89 }}
90 clearable
91 onblur={() => {
92 this.addrow(scope);
93 }}
94 >
95 {this.dictData["tdyt"].map((option) => {
71 return ( 96 return (
72 <el-option label={option.dname} value={option.dcode}></el-option> 97 <el-option
73 ) 98 label={option.dname}
74 }) 99 value={option.dcode}
75 } 100 ></el-option>
101 );
102 })}
76 </el-select> 103 </el-select>
77 ) 104 );
78 } 105 },
79 }, 106 },
80 { 107 {
81 prop: "sqrmc",
82 label: "土地使用起始时间", 108 label: "土地使用起始时间",
83 render: (h, scope) => { 109 render: (h, scope) => {
84 return ( 110 return (
...@@ -86,12 +112,15 @@ ...@@ -86,12 +112,15 @@
86 v-model={scope.row.qssj} 112 v-model={scope.row.qssj}
87 type="date" 113 type="date"
88 placeholder="选择日期" 114 placeholder="选择日期"
115 value-format="yyyy-MM-dd"
116 onblur={() => {
117 this.addrow(scope.row);
118 }}
89 ></el-date-picker> 119 ></el-date-picker>
90 ); 120 );
91 } 121 },
92 }, 122 },
93 { 123 {
94 prop: "zjzl",
95 label: "土地使用结束时间", 124 label: "土地使用结束时间",
96 render: (h, scope) => { 125 render: (h, scope) => {
97 return ( 126 return (
...@@ -99,120 +128,80 @@ ...@@ -99,120 +128,80 @@
99 v-model={scope.row.jssj} 128 v-model={scope.row.jssj}
100 type="date" 129 type="date"
101 placeholder="选择日期" 130 placeholder="选择日期"
131 value-format="yyyy-MM-dd"
132 onblur={() => {
133 this.addrow(scope.row);
134 }}
102 ></el-date-picker> 135 ></el-date-picker>
103 ); 136 );
104 } 137 },
105 }, 138 },
106 { 139 {
107 prop: "zjh",
108 label: "土地使用期限", 140 label: "土地使用期限",
109 render: (h, scope) => { 141 render: (h, scope) => {
110 return <el-input v-model={scope.row.syqx} ></el-input> 142 return (
111 } 143 <el-input
112 } 144 v-model={scope.row.syqx}
145 onblur={() => {
146 this.addrow(scope.row);
147 }}
148 ></el-input>
149 );
150 },
151 },
113 ], 152 ],
114 } 153 };
115 }, 154 },
116 watch: { 155 watch: {
117 tableData: { 156 tableData: {
118 handler: function (val, oldVal) { 157 handler: function (val, oldVal) {
119 console.log("什么事件111",val); 158 console.log("什么事件111", val);
120 let that = this 159 let that = this;
121 this.$nextTick(() => { 160 this.$nextTick(() => {
122 if (val.length == 0 || !val) { 161 if (val.length == 0 || !val) {
123 that.tableDataList = _.cloneDeep([{ 162 that.tableDataList = _.cloneDeep([
124 sqrmc: '', 163 {
125 dlrzjlx: '', 164 yt: "",
126 dlrzjh: '', 165 qssj: "",
127 fr: '' 166 jssj: "",
128 }]) 167 syqx: "",
168 },
169 ]);
129 } else { 170 } else {
130 that.tableDataList = _.cloneDeep(val) 171 that.tableDataList = _.cloneDeep(val);
131 } 172 }
132 }) 173 });
133 }, 174 },
134 immediate: true, 175 immediate: true,
135 deep: true 176 deep: true,
136 }, 177 },
137 // gyfs: {
138 // handler (newVal, oldValue) {
139 // console.log("什么事件222",newVal);
140 // let dataList = _.cloneDeep(this.InformationTable)
141 // let dataList = _.cloneDeep(this.InformationTable)
142 // if (newVal == 0) {
143 // // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
144 // this.column = _.cloneDeep(dataList)
145
146 // } else if ((newVal == '1' || newVal == '3')) {
147 // this.column = dataList
148 // } else {
149 // this.column = _.cloneDeep(dataList)
150 // }
151 // },
152 // immediate: true
153 // }
154 }, 178 },
155 methods: { 179 methods: {
156 // 新增提交事件 180 // 修改事件
157 handleupdateDetail (value) { 181 addrow() {
158 console.log("什么事件33",this.tableData); 182 this.$emit("upDateTdytxxList", this.tableDataList);
159 if (this.isaddupdate) {
160 if (!_.isEqual(value, this.tableData)) {
161 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
162 this.$emit('upDateQlrxxList', this.tableDataList)
163 }
164 } else {
165 if (!_.isEqual(value, this.tableData)) {
166 this.tableDataList[this.dataIndex] = _.cloneDeep(value);
167 this.$emit('upDateQlrxxList', this.tableDataList)
168 }
169 }
170 this.key++
171 }, 183 },
172 // 新增 184 // 新增
173 addClick () { 185 addClick() {
174 if (this.gyfs == '0' && this.tableDataList.length > 0) { 186 this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
175 this.$message.warning("1") 187 this.$emit("upDateTdytxxList", this.tableDataList);
176 } else {
177 this.dialog = true
178 this.isaddupdate = true
179 }
180 }, 188 },
181 189
182 // 删除 190 // 删除
183 deleClick (index, row) { 191 deleClick(index, row) {
184 this.$confirm('确定要删除吗, 是否继续?', '提示', { 192 console.log("删除");
185 confirmButtonText: '确定', 193 this.$confirm("确定要删除吗, 是否继续?", "提示", {
186 cancelButtonText: '取消', 194 confirmButtonText: "确定",
187 type: 'warning' 195 cancelButtonText: "取消",
188 }).then(() => { 196 type: "warning",
189 this.tableData.splice(index, 1) 197 })
190 }).catch(() => { 198 .then(() => {
191 }); 199 this.tableData.splice(index, 1);
200 })
201 .catch(() => {});
192 }, 202 },
193 // 修改 203 },
194 editClick (index, row) { 204 };
195 // popupDialog("申请人信息", "workflow/components/addQlr", {
196 // showButton: this.$route.query.viewtype ? false : true,
197 // dataIndex :index,
198 // details :row,/[^\d]/g
199 // isaddupdate :false
200 // });
201 this.dataIndex = index
202 this.dialog = true
203 this.details = row
204 this.isaddupdate = false
205 },
206 queryViewClick (index, row) {
207 // popupDialog("申请人信息", "workflow/components/addQlr", {
208 // showButton: this.$route.query.viewtype ? false : true,
209 // details: row,
210 // });
211 this.dialog = true
212 this.details = row
213 }
214 }
215 }
216 </script> 205 </script>
217 <style scoped lang="scss"> 206 <style scoped lang="scss">
218 .el-input { 207 .el-input {
......