64c4bb30 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 83522ac7 77b4c474
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
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",
13 "axios": "^0.21.1", 14 "axios": "^0.21.1",
14 "bpmn-js": "^7.4.0", 15 "bpmn-js": "^7.4.0",
15 "bpmn-js-properties-panel": "^0.37.2", 16 "bpmn-js-properties-panel": "^0.37.2",
......
1 { 1 {
2 "TITLE": "不动产登记系统", 2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "/bdcdj", 3 "SERVERAPI": "/bdcdj-ssq",
4 "ip": "http://192.168.2.38",
4 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0" 5 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
5 } 6 }
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <el-row> 33 <el-row>
34 <el-col :span="8"> 34 <el-col :span="8">
35 <el-form-item label="证件号" prop="zjh"> 35 <el-form-item label="证件号" prop="zjh">
36 <el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input> 36 <el-input v-model="ruleForm.zjh" maxlength="15" oninput="value=value.replace(/[^\X0-9]/g,'')"></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">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-25 08:59:02 4 * @LastEditTime: 2023-06-25 15:52:42
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="120px" 16 label-width="127px">
17 >
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 17 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 18 <div class="slxx_title title-block">
20 补录信息 19 补录信息
...@@ -93,32 +92,22 @@ ...@@ -93,32 +92,22 @@
93 </el-form-item> 92 </el-form-item>
94 </el-col> 93 </el-col>
95 <el-col :span="8"> 94 <el-col :span="8">
96 <el-form-item label="土地用途:"> 95 <!-- 下拉框 -->
97 <el-input v-model="ruleForm.qlxx.ywh"></el-input> 96 <el-form-item label="土地性质:" style="margin-bottom:3px">
98 </el-form-item> 97 <treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
99 </el-col> 98 :normalizer="normalizer"
100 <el-col :span="8"> 99 :show-count="true" :options="dictData['A45']" />
101 <el-form-item label="土地使用起始时间:">
102 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
103 </el-form-item>
104 </el-col>
105 <el-col :span="8">
106 <el-form-item label="土地使用结束时间:">
107 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
108 </el-form-item>
109 </el-col>
110 <el-col :span="8">
111 <el-form-item label="土地使用期限:">
112 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
113 </el-form-item> 100 </el-form-item>
114 </el-col> 101 </el-col>
115 <el-col :span="8"> 102 <el-col :span="8">
116 <el-form-item label="房地产交易价格:"> 103 <el-form-item label="房地产交易价格:">
117 <el-input v-model="ruleForm.fdcq2.qjjg"></el-input> 104 <div style="display:flex">
105 <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
118 <el-select v-model="ruleForm.fdcq2.jedw"> 106 <el-select v-model="ruleForm.fdcq2.jedw">
119 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 107 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
120 </el-option> 108 </el-option>
121 </el-select> 109 </el-select>
110 </div>
122 </el-form-item> 111 </el-form-item>
123 </el-col> 112 </el-col>
124 <el-col :span="8"> 113 <el-col :span="8">
...@@ -231,11 +220,9 @@ ...@@ -231,11 +220,9 @@
231 <div class="triangle"></div> 220 <div class="triangle"></div>
232 </div> 221 </div>
233 <tdytTable 222 <tdytTable
234 :tableData="ruleForm.tdxxList" 223 :tableData="ruleForm.tdytqxList"
235 @upDateQlrxxList="upDateQlrxxList" 224 @upDateQlrxxList="upDateTdytxxList"
236 :viewtype="$route.query.viewtype" 225 :viewtype="$route.query.viewtype" />
237 :gyfs="ruleForm.qlxx.gyfs"
238 />
239 <div class="slxx_title title-block"> 226 <div class="slxx_title title-block">
240 权利人信息 227 权利人信息
241 <div class="triangle"></div> 228 <div class="triangle"></div>
...@@ -245,8 +232,7 @@ ...@@ -245,8 +232,7 @@
245 <el-form-item label="共有方式:"> 232 <el-form-item label="共有方式:">
246 <el-radio-group 233 <el-radio-group
247 :disabled="$route.query.viewtype == 0" 234 :disabled="$route.query.viewtype == 0"
248 v-model="ruleForm.qlxx.gyqk" 235 v-model="ruleForm.qlxx.gyqk">
249 >
250 <el-radio label="0">单独所有</el-radio> 236 <el-radio label="0">单独所有</el-radio>
251 <el-radio label="1">共同共有</el-radio> 237 <el-radio label="1">共同共有</el-radio>
252 <el-radio label="2">按份所有</el-radio> 238 <el-radio label="2">按份所有</el-radio>
...@@ -276,8 +262,7 @@ ...@@ -276,8 +262,7 @@
276 @upDateQlrxxList="upDateQlrxxList" 262 @upDateQlrxxList="upDateQlrxxList"
277 :key="key" 263 :key="key"
278 :viewtype="$route.query.viewtype" 264 :viewtype="$route.query.viewtype"
279 :gyfs="ruleForm.qlxx.gyfs" 265 :gyfs="ruleForm.qlxx.gyfs" />
280 />
281 266
282 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0"> 267 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
283 <div class="slxx_title title-block"> 268 <div class="slxx_title title-block">
...@@ -289,8 +274,7 @@ ...@@ -289,8 +274,7 @@
289 :tableData="ruleForm.ywrList" 274 :tableData="ruleForm.ywrList"
290 :key="key" 275 :key="key"
291 @upDateQlrxxList="upDateYwrxxList" 276 @upDateQlrxxList="upDateYwrxxList"
292 :viewtype="$route.query.viewtype" 277 :viewtype="$route.query.viewtype" />
293 />
294 </div> 278 </div>
295 </div> 279 </div>
296 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> 280 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
...@@ -302,18 +286,33 @@ ...@@ -302,18 +286,33 @@
302 </div> 286 </div>
303 </template> 287 </template>
304 <script> 288 <script>
305 import { mapGetters } from "vuex"; 289 import { mapGetters } from "vuex";
306 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"; 290 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
307 import { init } from "@/api/djbbl.js"; 291 import { init } from "@/api/djbbl.js";
308 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 292 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
309 import tdytTable from "@/views/workflow/components/tdytTable"; 293 import tdytTable from "@/views/workflow/components/tdytTable";
310 export default { 294 // import the component
311 components: { qlrCommonTable,tdytTable }, 295 import Treeselect from '@riophae/vue-treeselect'
296 // import the styles
297 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
298
299 export default {
300 components: { qlrCommonTable, tdytTable, Treeselect },
312 computed: { 301 computed: {
313 ...mapGetters(["dictData", "flag"]), 302 ...mapGetters(["dictData", "flag"]),
314 }, 303 },
315 data() { 304 data () {
305 return {
306 // 键名转换,方法默认是label和children进行树状渲染
307 normalizer (node) { //方法
308 if (node.children == null || node.children == 'null') {
309 delete node.children;
310 }
316 return { 311 return {
312 id: node.dcode,
313 label: node.dname
314 }
315 },
317 //表单是否可操作 316 //表单是否可操作
318 propsParam: this.$attrs, 317 propsParam: this.$attrs,
319 ableOperation: true, 318 ableOperation: true,
...@@ -326,13 +325,13 @@ export default { ...@@ -326,13 +325,13 @@ export default {
326 rules: {}, 325 rules: {},
327 }; 326 };
328 }, 327 },
329 created() { 328 created () {
330 this.loadData(); 329 this.loadData();
331 }, 330 },
332 mounted() {}, 331 mounted () { },
333 methods: { 332 methods: {
334 loadData() { 333 loadData () {
335 console.log("房地产权",this.propsParam); 334 console.log("房地产权", this.propsParam);
336 init(this.propsParam.bsmRepair).then((res) => { 335 init(this.propsParam.bsmRepair).then((res) => {
337 if (res.code == 200) { 336 if (res.code == 200) {
338 337
...@@ -348,18 +347,25 @@ export default { ...@@ -348,18 +347,25 @@ export default {
348 } 347 }
349 }); 348 });
350 }, 349 },
350 // 更新土地用途信息
351 upDateTdytxxList (val) {
352 console.log("VAL", val);
353 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
354 this.key++;
355 },
351 // 更新权利人信息 356 // 更新权利人信息
352 upDateQlrxxList(val) { 357 upDateQlrxxList (val) {
353 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)); 358 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
354 this.czrOptions = this.ruleForm.qlrList; 359 this.czrOptions = this.ruleForm.qlrList;
355 this.key++; 360 this.key++;
356 }, 361 },
357 // 更新义务人信息 362 // 更新义务人信息
358 upDateYwrxxList(val) { 363 upDateYwrxxList (val) {
359 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val)); 364 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
360 this.key++; 365 this.key++;
361 }, 366 },
362 onSubmit() { 367 onSubmit () {
368 console.log("this.ruleForm大信息", this.ruleForm);
363 if (this.ruleForm.qlrList.length == 0) { 369 if (this.ruleForm.qlrList.length == 0) {
364 this.$message({ 370 this.$message({
365 showClose: true, 371 showClose: true,
...@@ -415,9 +421,12 @@ export default { ...@@ -415,9 +421,12 @@ export default {
415 }); 421 });
416 }, 422 },
417 }, 423 },
418 }; 424 };
419 </script> 425 </script>
420 <style scoped lang="scss"> 426 <style scoped lang="scss">
421 @import "~@/styles/public.scss"; 427 @import "~@/styles/public.scss";
422 @import "~@/styles/slxx/slxx.scss"; 428 @import "~@/styles/slxx/slxx.scss";
429 /deep/.vue-treeselect__menu-container {
430 transition: 0.3s !important;
431 }
423 </style> 432 </style>
......
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,19 +5,19 @@ ...@@ -5,19 +5,19 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150" 8 <lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
9 :data="tableDataList"> 9 :data="tableDataList">
10 </lb-table> 10 </lb-table>
11 <addQlr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" /> 11 <addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
12 </div> 12 </div>
13 </template> 13 </template>
14 <script> 14 <script>
15 import { mapGetters } from 'vuex' 15 import { mapGetters } from 'vuex'
16 import { getIdCardInfo } from '@/utils/operation.js' 16 import { getIdCardInfo } from '@/utils/operation.js'
17 import addQlr from './dialog/addQlr.vue' 17 import addTdyt from './dialog/addTdyt.vue'
18 export default { 18 export default {
19 components: { 19 components: {
20 addQlr 20 addTdyt
21 }, 21 },
22 computed: { 22 computed: {
23 ...mapGetters(["dictData"]), 23 ...mapGetters(["dictData"]),
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
29 return [] 29 return []
30 } 30 }
31 }, 31 },
32 gyfs: {
33 type: String,
34 default: '1'
35 }
36 }, 32 },
37 data () { 33 data () {
38 return { 34 return {
...@@ -67,37 +63,60 @@ ...@@ -67,37 +63,60 @@
67 label: '土地用途', 63 label: '土地用途',
68 align: 'center', 64 align: 'center',
69 render: (h, scope) => { 65 render: (h, scope) => {
70 return <el-input v-model={scope.row.zjzl} ></el-input> 66 return (
67 <el-select value={scope.row.yt}
68 onChange={(val) => { scope.row.yt = val }} clearable>
69 {
70 this.dictData['tdyt'].map(option => {
71 return (
72 <el-option label={option.dname} value={option.dcode}></el-option>
73 )
74 })
75 }
76 </el-select>
77 )
71 } 78 }
72 }, 79 },
73 { 80 {
74 prop: "sqrmc", 81 prop: "sqrmc",
75 label: "土地使用起始时间", 82 label: "土地使用起始时间",
76 render: (h, scope) => { 83 render: (h, scope) => {
77 return <el-input v-model={scope.row.zjzl} ></el-input> 84 return (
85 <el-date-picker
86 v-model={scope.row.qssj}
87 type="date"
88 placeholder="选择日期"
89 ></el-date-picker>
90 );
78 } 91 }
79 }, 92 },
80 { 93 {
81 prop: "zjzl", 94 prop: "zjzl",
82 label: "土地使用结束时间", 95 label: "土地使用结束时间",
83 render: (h, scope) => { 96 render: (h, scope) => {
84 return <el-input v-model={scope.row.zjzl} ></el-input> 97 return (
98 <el-date-picker
99 v-model={scope.row.jssj}
100 type="date"
101 placeholder="选择日期"
102 ></el-date-picker>
103 );
85 } 104 }
86 }, 105 },
87 { 106 {
88 prop: "zjh", 107 prop: "zjh",
89 label: "土地使用期限", 108 label: "土地使用期限",
90 render: (h, scope) => { 109 render: (h, scope) => {
91 return <el-input v-model={scope.row.zjzl} ></el-input> 110 return <el-input v-model={scope.row.syqx} ></el-input>
92 } 111 }
93 } 112 }
94 ], 113 ],
95 column: []
96 } 114 }
97 }, 115 },
98 watch: { 116 watch: {
99 tableData: { 117 tableData: {
100 handler: function (val, oldVal) { 118 handler: function (val, oldVal) {
119 console.log("什么事件111",val);
101 let that = this 120 let that = this
102 this.$nextTick(() => { 121 this.$nextTick(() => {
103 if (val.length == 0 || !val) { 122 if (val.length == 0 || !val) {
...@@ -115,29 +134,28 @@ ...@@ -115,29 +134,28 @@
115 immediate: true, 134 immediate: true,
116 deep: true 135 deep: true
117 }, 136 },
118 gyfs: { 137 // gyfs: {
119 handler (newVal, oldValue) { 138 // handler (newVal, oldValue) {
120 let dataList = _.cloneDeep(this.InformationTable) 139 // console.log("什么事件222",newVal);
121 if (newVal == 0) { 140 // let dataList = _.cloneDeep(this.InformationTable)
122 // this.column = _.cloneDeep(dataList).slice(1, dataList.length) 141 // let dataList = _.cloneDeep(this.InformationTable)
123 this.column = _.cloneDeep(dataList) 142 // if (newVal == 0) {
143 // // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
144 // this.column = _.cloneDeep(dataList)
124 145
125 } else if ((newVal == '1' || newVal == '3')) { 146 // } else if ((newVal == '1' || newVal == '3')) {
126 this.column = dataList 147 // this.column = dataList
127 } else { 148 // } else {
128 this.column = _.cloneDeep(dataList) 149 // this.column = _.cloneDeep(dataList)
129 this.column.splice( 150 // }
130 2, 0, { 151 // },
131 prop: "fs", 152 // immediate: true
132 label: "份数" 153 // }
133 })
134 }
135 },
136 immediate: true
137 }
138 }, 154 },
139 methods: { 155 methods: {
156 // 新增提交事件
140 handleupdateDetail (value) { 157 handleupdateDetail (value) {
158 console.log("什么事件33",this.tableData);
141 if (this.isaddupdate) { 159 if (this.isaddupdate) {
142 if (!_.isEqual(value, this.tableData)) { 160 if (!_.isEqual(value, this.tableData)) {
143 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value); 161 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
...@@ -154,7 +172,7 @@ ...@@ -154,7 +172,7 @@
154 // 新增 172 // 新增
155 addClick () { 173 addClick () {
156 if (this.gyfs == '0' && this.tableDataList.length > 0) { 174 if (this.gyfs == '0' && this.tableDataList.length > 0) {
157 this.$message.warning("当前共有方式为单独所有,无法添加多个权利人") 175 this.$message.warning("1")
158 } else { 176 } else {
159 this.dialog = true 177 this.dialog = true
160 this.isaddupdate = true 178 this.isaddupdate = true
...@@ -172,36 +190,12 @@ ...@@ -172,36 +190,12 @@
172 }).catch(() => { 190 }).catch(() => {
173 }); 191 });
174 }, 192 },
175
176 // 身份证读取
177 readClick (row) {
178 getIdCardInfo().then(res => {
179 if (res.data.code == 0) {
180 let data = res.data.IDCardInfo
181 row.sqrmc = data.name
182 row.zjzl = '1'
183 row.zjh = data.cardID
184 row.xb = data.sexCode
185 row.txdz = data.address
186 row.fzjg = data.issueOrgan
187 this.$message({
188 message: '读取成功!',
189 type: 'success'
190 })
191 } else {
192 this.$message({
193 message: res.data.message,
194 type: 'warning'
195 })
196 }
197 })
198 },
199 // 修改 193 // 修改
200 editClick (index, row) { 194 editClick (index, row) {
201 // popupDialog("申请人信息", "workflow/components/addQlr", { 195 // popupDialog("申请人信息", "workflow/components/addQlr", {
202 // showButton: this.$route.query.viewtype ? false : true, 196 // showButton: this.$route.query.viewtype ? false : true,
203 // dataIndex :index, 197 // dataIndex :index,
204 // details :row, 198 // details :row,/[^\d]/g
205 // isaddupdate :false 199 // isaddupdate :false
206 // }); 200 // });
207 this.dataIndex = index 201 this.dataIndex = index
......
...@@ -314,6 +314,7 @@ export default { ...@@ -314,6 +314,7 @@ export default {
314 async created() { 314 async created() {
315 this.propsParam = this.$attrs; 315 this.propsParam = this.$attrs;
316 this.ableEdit = this.$parent.showBatch; 316 this.ableEdit = this.$parent.showBatch;
317 this.ableOperation = this.$parent.currentSelectTab.ableOperation
317 if (this.propsParam.djlx == "400") { 318 if (this.propsParam.djlx == "400") {
318 this.isJfOperation = true; 319 this.isJfOperation = true;
319 } 320 }
......
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
191 <el-col> 191 <el-col>
192 <el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy"> 192 <el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy">
193 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" 193 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
194 v-model="ruleForm.sldy.djyy"> 194 v-model="ruleForm.fdcq2.djyy">
195 </el-input> 195 </el-input>
196 </el-form-item> 196 </el-form-item>
197 </el-col> 197 </el-col>
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 <el-row :gutter="10"> 111 <el-row :gutter="10">
112 <el-col :span="14" v-if="ruleForm.qlxx"> 112 <el-col :span="14" v-if="ruleForm.qlxx">
113 <el-form-item label="共有方式:"> 113 <el-form-item label="共有方式:">
114 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs"> 114 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
115 <el-radio label="0">单独所有</el-radio> 115 <el-radio label="0">单独所有</el-radio>
116 <el-radio label="1">共同共有</el-radio> 116 <el-radio label="1">共同共有</el-radio>
117 <el-radio label="2">按份所有</el-radio> 117 <el-radio label="2">按份所有</el-radio>
...@@ -155,8 +155,9 @@ ...@@ -155,8 +155,9 @@
155 import { Init, saveData } from "@/api/workflow/ygdjFlow.js"; 155 import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
156 import { mapGetters } from "vuex"; 156 import { mapGetters } from "vuex";
157 export default { 157 export default {
158 mounted () { 158 created () {
159 this.ableOperation = this.$parent.currentSelectTab.ableOperation 159 this.ableOperation = this.$parent.currentSelectTab.ableOperation
160 this.propsParam = this.$attrs;
160 this.$startLoading(); 161 this.$startLoading();
161 var formdata = new FormData(); 162 var formdata = new FormData();
162 formdata.append("bsmSldy", this.propsParam.bsmSldy); 163 formdata.append("bsmSldy", this.propsParam.bsmSldy);
...@@ -164,8 +165,9 @@ ...@@ -164,8 +165,9 @@
164 formdata.append("isEdit", this.ableOperation); 165 formdata.append("isEdit", this.ableOperation);
165 Init(formdata).then(res => { 166 Init(formdata).then(res => {
166 if (res.code === 200 && res.result) { 167 if (res.code === 200 && res.result) {
167 this.$endLoading(); 168 console.log(res.result.ygdj.ygdjzlmc);
168 this.ruleForm = res.result; 169 this.ruleForm = res.result;
170 this.$endLoading();
169 } 171 }
170 }) 172 })
171 }, 173 },
...@@ -180,7 +182,13 @@ ...@@ -180,7 +182,13 @@
180 disabled: true, 182 disabled: true,
181 tdytOption: [], 183 tdytOption: [],
182 czrOptions: [], 184 czrOptions: [],
183 ruleForm: {}, 185 ruleForm: {
186 qlxx:{}
187 ,sldy:{}
188 ,slsq:{}
189 ,ygdj:{}
190 ,zdjbxx:{}
191 },
184 //传递参数 192 //传递参数
185 propsParam: this.$attrs, 193 propsParam: this.$attrs,
186 rules: {}, 194 rules: {},
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 <el-row :gutter="10"> 114 <el-row :gutter="10">
115 <el-col :span="14" v-if="ruleForm.qlxx"> 115 <el-col :span="14" v-if="ruleForm.qlxx">
116 <el-form-item label="共有方式:"> 116 <el-form-item label="共有方式:">
117 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs"> 117 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
118 <el-radio label="0">单独所有</el-radio> 118 <el-radio label="0">单独所有</el-radio>
119 <el-radio label="1">共同共有</el-radio> 119 <el-radio label="1">共同共有</el-radio>
120 <el-radio label="2">按份所有</el-radio> 120 <el-radio label="2">按份所有</el-radio>
......
...@@ -54,12 +54,12 @@ ...@@ -54,12 +54,12 @@
54 </el-col> 54 </el-col>
55 <el-col :span="8"> 55 <el-col :span="8">
56 <el-form-item label="不动产权证号:"> 56 <el-form-item label="不动产权证号:">
57 <el-input disabled v-model="ruleForm.qlxxold.bdcqzh"></el-input> 57 <el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
58 </el-form-item> 58 </el-form-item>
59 </el-col> 59 </el-col>
60 <el-col :span="8"> 60 <el-col :span="8">
61 <el-form-item label="不动产单元号:"> 61 <el-form-item label="不动产单元号:">
62 <el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input> 62 <el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input>
63 </el-form-item> 63 </el-form-item>
64 </el-col> 64 </el-col>
65 </el-row> 65 </el-row>
...@@ -132,10 +132,10 @@ ...@@ -132,10 +132,10 @@
132 </el-form-item> 132 </el-form-item>
133 </el-col> 133 </el-col>
134 </el-row> 134 </el-row>
135 <el-row> 135 <el-row :gutter="10">
136 <el-col :span="8"> 136 <el-col :span="16">
137 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定:"> 137 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定:">
138 <el-input v-model="ruleForm.ygdj.dbfw" 138 <el-input v-model="ruleForm.ygdj.sfczjzhxz"
139 :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input> 139 :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input>
140 </el-form-item> 140 </el-form-item>
141 </el-col> 141 </el-col>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
161 <el-row :gutter="10"> 161 <el-row :gutter="10">
162 <el-col :span="14" v-if="ruleForm.qlxx"> 162 <el-col :span="14" v-if="ruleForm.qlxx">
163 <el-form-item label="共有方式:"> 163 <el-form-item label="共有方式:">
164 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs"> 164 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
165 <el-radio label="0">单独所有</el-radio> 165 <el-radio label="0">单独所有</el-radio>
166 <el-radio label="1">共同共有</el-radio> 166 <el-radio label="1">共同共有</el-radio>
167 <el-radio label="2">按份所有</el-radio> 167 <el-radio label="2">按份所有</el-radio>
......