b8ac6827 by renchao@pashanhoo.com

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

2 parents a091d663 cb39a6c3
...@@ -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,147 +286,122 @@ ...@@ -286,147 +286,122 @@
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 296 computed: {
297 import '@riophae/vue-treeselect/dist/vue-treeselect.css' 297 ...mapGetters(["dictData", "flag"]),
298 298 },
299 export default { 299 data() {
300 components: { qlrCommonTable, tdytTable, Treeselect }, 300 return {
301 computed: { 301 //表单是否可操作
302 ...mapGetters(["dictData", "flag"]), 302 propsParam: this.$attrs,
303 ableOperation: true,
304 key: 0,
305 isShow: false,
306 disabled: true,
307 czrOptions: [],
308 ruleForm: {},
309 //传递参数\
310 rules: {},
311 };
312 },
313 created() {
314 this.loadData();
315 },
316 mounted() {},
317 methods: {
318 loadData() {
319 console.log("房地产权",this.propsParam);
320 init(this.propsParam.bsmRepair).then((res) => {
321 if (res.code == 200) {
322 this.ruleForm = res.result;
323 console.log("this.ruleForm",this.ruleForm);
324 this.isShow = true;
325 }
326 });
303 }, 327 },
304 data () { 328 // 更新土地用途信息
305 return { 329 upDateTdytxxList(val) {
306 // 键名转换,方法默认是label和children进行树状渲染 330 console.log("VAL",val);
307 normalizer (node) { //方法 331 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
308 if (node.children == null || node.children == 'null') { 332 this.key++;
309 delete node.children;
310 }
311 return {
312 id: node.dcode,
313 label: node.dname
314 }
315 },
316 //表单是否可操作
317 propsParam: this.$attrs,
318 ableOperation: true,
319 key: 0,
320 isShow: false,
321 disabled: true,
322 czrOptions: [],
323 ruleForm: {},
324 //传递参数\
325 rules: {},
326 };
327 }, 333 },
328 created () { 334 // 更新权利人信息
329 this.loadData(); 335 upDateQlrxxList(val) {
336 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
337 this.czrOptions = this.ruleForm.qlrList;
338 this.key++;
330 }, 339 },
331 mounted () { }, 340 // 更新义务人信息
332 methods: { 341 upDateYwrxxList(val) {
333 loadData () { 342 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
334 console.log("房地产权", this.propsParam); 343 this.key++;
335 init(this.propsParam.bsmRepair).then((res) => { 344 },
336 if (res.code == 200) { 345 onSubmit() {
337 346 console.log("this.ruleForm大信息",this.ruleForm);
338 this.ruleForm = res.result; 347 if (this.ruleForm.qlrList.length == 0) {
339 this.isShow = true; 348 this.$message({
340 // this.tableData = res.result; 349 showClose: true,
341 // if (this.tableData.length < datas.columns().emptycolNum) { 350 message: "请确认权利人信息",
342 // this.emptycolNum = 351 type: "error",
343 // datas.columns().emptycolNum - this.tableData.length;
344 // } else {
345 // this.emptycolNum = 0;
346 // }
347 }
348 }); 352 });
349 }, 353 return false;
350 // 更新土地用途信息 354 }
351 upDateTdytxxList (val) { 355
352 console.log("VAL", val); 356 if (this.ruleForm.qlxx.gyfs == "0") {
353 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 357 if (this.ruleForm.qlrList.length > 1) {
354 this.key++;
355 },
356 // 更新权利人信息
357 upDateQlrxxList (val) {
358 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
359 this.czrOptions = this.ruleForm.qlrList;
360 this.key++;
361 },
362 // 更新义务人信息
363 upDateYwrxxList (val) {
364 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
365 this.key++;
366 },
367 onSubmit () {
368 console.log("this.ruleForm大信息", this.ruleForm);
369 if (this.ruleForm.qlrList.length == 0) {
370 this.$message({ 358 this.$message({
371 showClose: true, 359 showClose: true,
372 message: "请确认权利人信息", 360 message: "共有方式:单独所有,权利人只能是一个人",
373 type: "error", 361 type: "error",
374 }); 362 });
375 return false; 363 return false;
376 } 364 }
377 365 this.ruleForm.qlrList[0].sfczr = "1";
378 if (this.ruleForm.qlxx.gyfs == "0") { 366 }
379 if (this.ruleForm.qlrList.length > 1) { 367 if (this.ruleForm.qlxx.gyfs == "1") {
380 this.$message({ 368 //是否分别持证
381 showClose: true, 369 if (this.ruleForm.qlxx.sqfbcz == "1") {
382 message: "共有方式:单独所有,权利人只能是一个人", 370 //是
383 type: "error", 371 this.ruleForm.qlrList.forEach((item, index) => {
384 }); 372 item.sfczr = "1";
385 return false; 373 });
386 } 374 } else {
387 this.ruleForm.qlrList[0].sfczr = "1"; 375 this.ruleForm.qlrList.forEach((item, index) => {
388 } 376 if (item.zjh == this.ruleForm.czr) {
389 if (this.ruleForm.qlxx.gyfs == "1") {
390 //是否分别持证
391 if (this.ruleForm.qlxx.sqfbcz == "1") {
392 //是
393 this.ruleForm.qlrList.forEach((item, index) => {
394 item.sfczr = "1"; 377 item.sfczr = "1";
395 }); 378 } else {
396 } else { 379 item.sfczr = "0";
397 this.ruleForm.qlrList.forEach((item, index) => { 380 }
398 if (item.zjh == this.ruleForm.czr) { 381 });
399 item.sfczr = "1";
400 } else {
401 item.sfczr = "0";
402 }
403 });
404 }
405 } 382 }
406 saveData(this.ruleForm).then((res) => { 383 }
407 if (res.code === 200) { 384 saveData(this.ruleForm).then((res) => {
408 this.$message({ 385 if (res.code === 200) {
409 showClose: true, 386 this.$message({
410 message: "保存成功!", 387 showClose: true,
411 type: "success", 388 message: "保存成功!",
412 }); 389 type: "success",
413 this.$store.dispatch("user/refreshPage", true); 390 });
414 } else { 391 this.$store.dispatch("user/refreshPage", true);
415 this.$message({ 392 } else {
416 showClose: true, 393 this.$message({
417 message: res.message, 394 showClose: true,
418 type: "error", 395 message: res.message,
419 }); 396 type: "error",
420 } 397 });
421 }); 398 }
422 }, 399 });
423 }, 400 },
424 }; 401 },
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>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 :visible.sync="dialogVisible" 11 :visible.sync="dialogVisible"
12 custom-class="insetDialog" 12 custom-class="insetDialog"
13 append-to-body 13 append-to-body
14 width="60%" 14 width="50%"
15 > 15 >
16 <!-- <el-radio-group v-model="radio"> 16 <!-- <el-radio-group v-model="radio">
17 <el-radio-button 17 <el-radio-button
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 </el-radio-group> --> 23 </el-radio-group> -->
24 <el-button class="gettypebutton" v-for="(value, key) in qllxlistdata" 24 <el-button class="gettypebutton" v-for="(value, key) in qllxlistdata"
25 :key="key" 25 :key="key"
26 :label="value" @click="clicksss(key)" plain>确定{{value}}</el-button> 26 :label="value" @click="clicksss(key)" plain>{{value}}</el-button>
27 <div class="btn"> 27 <div class="btn">
28 <el-button type="primary" @click="handleSubmit">确定</el-button> 28 <el-button type="primary" @click="handleSubmit">确定</el-button>
29 <el-button type="primary" @click="closeDialog">取消</el-button> 29 <el-button type="primary" @click="closeDialog">取消</el-button>
......
...@@ -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,60 +129,55 @@ export default { ...@@ -132,60 +129,55 @@ 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){ 139 getStepFormInfo(this.oneSelectProps).then((res) => {
143 getStepFormInfo(this.oneSelectProps).then((res) => { 140 this.$nextTick(function () {
144 this.$nextTick(function () { 141 this.tabList = res.result;
145 this.tabList=res.result 142 this.tabName = this.tabList[0].value;
146 this.tabName =this.tabList[0].value; 143 this.getFromRouter(this.tabName);
147 this.getFromRouter(this.tabName)
148 }); 144 });
149 }) 145 });
150 } 146 }
151 }, 147 },
152 // 获取右侧菜单 148 // 获取右侧菜单
153 // getleftMenubl() { 149 // getleftMenubl() {
154 // leftMenubl(this.bsmSlsq).then((res) => { 150 // leftMenubl(this.bsmSlsq).then((res) => {
155 // this.supplementarylist = res.result; 151 // this.supplementarylist = res.result;
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) {
163 this.$refs.qllxlist.qllxlistdata = res.result; 159 this.$refs.qllxlist.qllxlistdata = res.result;
164 this.$refs.qllxlist.dialogVisible = true; 160 this.$refs.qllxlist.dialogVisible = true;
161 }
165 } 162 }
166 } 163 );
167 );
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,22 +188,23 @@ export default { ...@@ -196,22 +188,23 @@ 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));
206 this.tabdata = [ 199 this.tabdata = [
207 ...settree, 200 ...settree,
208 ...settree[1].children[0].children[0].children, 201 ...settree[1].children[0].children[0].children,
209 ]; 202 ];
210 this.tabdata.forEach((item, index, arr) => { 203 this.tabdata.forEach((item, index, arr) => {
211 arr[index].name = item.label; 204 arr[index].name = item.label;
212 arr[index].value = item.id; 205 arr[index].value = item.id;
213 }); 206 });
214 this.tabList = this.tabdata; 207 this.tabList = this.tabdata;
215 } 208 }
216 }); 209 });
217 }, 210 },
...@@ -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,33 +235,34 @@ export default { ...@@ -235,33 +235,34 @@ 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 this.$refs.qllxlist.dialogVisible = false; 247 if (res.code == "200") {
248 this.$nextTick(() => { 248 this.$refs.qllxlist.dialogVisible = false;
249 this.$refs.Menu.getleftMenubl(res.result); 249 this.$nextTick(() => {
250 this.$message({ 250 this.$refs.Menu.getleftMenubl(res.result);
251 type: "success", 251 this.$message({
252 message: "补录成功!", 252 type: "success",
253 }); 253 message: "补录成功!",
254 }); 254 });
255 }else{ 255 });
256 this.$alert(res.message, '提示', { 256 } else {
257 confirmButtonText: '确定', 257 this.$alert(res.message, "提示", {
258 type: 'warning' 258 confirmButtonText: "确定",
259 type: "warning",
260 });
261 }
262 })
263 .catch((res) => {
264 console.log("错", res);
259 }); 265 });
260 }
261 }).catch((res) => {
262
263 console.log("错",res);
264 });;
265 }, 266 },
266 }, 267 },
267 }; 268 };
......
...@@ -110,8 +110,8 @@ class data extends filter { ...@@ -110,8 +110,8 @@ class data extends filter {
110 label: "土地使用期限", 110 label: "土地使用期限",
111 }, 111 },
112 { 112 {
113 prop: "qdjg", 113 prop: "qdjgmc",
114 label: "取得价格(万元)", 114 label: "取得价格",
115 }, 115 },
116 { 116 {
117 prop: "djyy", 117 prop: "djyy",
...@@ -667,7 +667,7 @@ class data extends filter { ...@@ -667,7 +667,7 @@ class data extends filter {
667 label: "数据类型", 667 label: "数据类型",
668 }, 668 },
669 { 669 {
670 prop: "ygdjzl", 670 prop: "ygdjzlmc",
671 label: "预告登记种类", 671 label: "预告登记种类",
672 }, 672 },
673 { 673 {
......
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>
...@@ -16,34 +16,34 @@ ...@@ -16,34 +16,34 @@
16 <el-row :gutter="10"> 16 <el-row :gutter="10">
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="业务号:"> 18 <el-form-item label="业务号:">
19 <el-input disabled v-model="ruleForm.slsq.ywh"></el-input> 19 <el-input disabled v-model="ruleForm.flow.ywh"></el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="8"> 22 <el-col :span="8">
23 <el-form-item label="受理人员:"> 23 <el-form-item label="受理人员:">
24 <el-input disabled v-model="ruleForm.slsq.slry"></el-input> 24 <el-input disabled v-model="ruleForm.slsq1.slry"></el-input>
25 </el-form-item> 25 </el-form-item>
26 </el-col> 26 </el-col>
27 <el-col :span="8"> 27 <el-col :span="8">
28 <el-form-item label="受理时间:"> 28 <el-form-item label="受理时间:">
29 <el-input disabled v-model="ruleForm.slsq.slsj"></el-input> 29 <el-input disabled v-model="ruleForm.slsq1.slsj"></el-input>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
32 </el-row> 32 </el-row>
33 <el-row :gutter="10"> 33 <el-row :gutter="10">
34 <el-col :span="8"> 34 <el-col :span="8">
35 <el-form-item label="权利类型:"> 35 <el-form-item label="权利类型:">
36 <el-input disabled v-model="ruleForm.slsq.qllxmc"></el-input> 36 <el-input disabled v-model="ruleForm.sldy.qllxmc"></el-input>
37 </el-form-item> 37 </el-form-item>
38 </el-col> 38 </el-col>
39 <el-col :span="8"> 39 <el-col :span="8">
40 <el-form-item label="登记类型:"> 40 <el-form-item label="登记类型:">
41 <el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input> 41 <el-input disabled v-model="ruleForm.sldy.djlxmc"></el-input>
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="登记情形:"> 45 <el-form-item label="登记情形:">
46 <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input> 46 <el-input disabled v-model="ruleForm.slsq1.djqxmc"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 </el-row> 49 </el-row>
......