8a926264 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents d1019468 5e8ac822
...@@ -35,6 +35,20 @@ export function loadQlrxx (bsmSldy) { ...@@ -35,6 +35,20 @@ export function loadQlrxx (bsmSldy) {
35 } 35 }
36 }) 36 })
37 } 37 }
38 /**
39 * @description: 读取义务人信息
40 * @param {*} bsmSldy
41 * @author: renchao
42 */
43 export function loadYwrxx (bsmSldy) {
44 return request({
45 url: SERVER.SERVERAPI + '/rest/ywbl/swhtxx/loadYwrxx',
46 method: 'get',
47 params: {
48 bsmSldy: bsmSldy
49 }
50 })
51 }
38 52
39 /** 53 /**
40 * @description: 查询房产交易合同信息 54 * @description: 查询房产交易合同信息
...@@ -60,4 +74,17 @@ export function querySwwsxx (data) { ...@@ -60,4 +74,17 @@ export function querySwwsxx (data) {
60 method: 'post', 74 method: 'post',
61 data 75 data
62 }) 76 })
77 }
78
79 /**
80 * @description: 契税完税信息共享
81 * @param {*} bsmSldy
82 * @author: renchao
83 */
84 export function saveDlxx (data) {
85 return request({
86 url: SERVER.SERVERAPI + '/rest/ywbl/swhtxx/saveDlxx',
87 method: 'post',
88 data
89 })
63 } 90 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-03-19 13:21:40 4 * @LastEditTime: 2024-05-14 16:25:51
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox 7 <dialogBox
...@@ -104,10 +104,20 @@ ...@@ -104,10 +104,20 @@
104 </el-col> 104 </el-col>
105 <el-col :span="12"> 105 <el-col :span="12">
106 <el-form-item label="国家/地区" prop="gj"> 106 <el-form-item label="国家/地区" prop="gj">
107 <el-input 107 <el-select
108 clearable
108 v-model="ruleForm.gj" 109 v-model="ruleForm.gj"
109 maxlength="3" 110 :disabled="!showButton"
110 :disabled="!showButton"></el-input> 111 class="width100"
112 placeholder="请选择">
113 <el-option
114 v-for="item in dictData['A35']"
115 :key="item.dcode"
116 :label="item.dname"
117 :value="item.dcode">
118 </el-option>
119 </el-select>
120
111 </el-form-item> 121 </el-form-item>
112 </el-col> 122 </el-col>
113 </el-row> 123 </el-row>
...@@ -152,10 +162,11 @@ ...@@ -152,10 +162,11 @@
152 <el-row> 162 <el-row>
153 <el-col :span="8"> 163 <el-col :span="8">
154 <el-form-item label="户籍所在省市" prop="hjszss"> 164 <el-form-item label="户籍所在省市" prop="hjszss">
155 <el-input 165 <el-cascader
156 v-model="ruleForm.hjszss" 166 v-model="ruleForm.hjszss"
157 maxlength="3" 167 :props="treeProps"
158 :disabled="!showButton"></el-input> 168 class="width100"
169 :options="dictData['A38']" :disabled="!showButton"></el-cascader>
159 </el-form-item> 170 </el-form-item>
160 </el-col> 171 </el-col>
161 <el-col :span="16"> 172 <el-col :span="16">
...@@ -367,6 +378,11 @@ ...@@ -367,6 +378,11 @@
367 }, 378 },
368 data () { 379 data () {
369 return { 380 return {
381 treeProps: {
382 value: 'dcode',
383 label: 'dname',
384 children: 'children'
385 },
370 avatar: require('../../../../image/user.png'), 386 avatar: require('../../../../image/user.png'),
371 isShow: false, 387 isShow: false,
372 isBz: false, 388 isBz: false,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-03-29 13:26:04 4 * @LastEditTime: 2024-03-29 16:09:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="jtfccx-edit-con"> 7 <div class="jtfccx-edit-con dydjbInfo">
8 <b class="title"></b> 8 <h3>不动产档案明细</h3>
9 <b class="title">房屋状况</b> 9 <div class="dydjbInfo-item">
10 <lb-table :column="fwColumns" key="fwzk" :data="resultData.hdetailList" 10 <b class="title">土地信息</b>
11 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25' 11 <lb-table :column="tdColumns" key="tdzk" :data="resultData.zdjbxxDetail"
12 :pagination="false"> 12 :heightNumSetting="true" :minHeight="115" :rowStyleHeight='25' :maxHeight="115"
13 </lb-table> 13 :pagination="false">
14 <b class="title">土地状况</b> 14 </lb-table>
15 <lb-table :column="tdColumns" key="tdzk" :data="resultData.zdjbxxDetail" 15 </div>
16 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25' 16 <div class="dydjbInfo-item">
17 :pagination="false"> 17 <b class="title">房屋信息</b>
18 </lb-table> 18 <lb-table :column="fwColumns" key="fwzk" :data="resultData.hdetailList"
19 <b class="title">权属状况</b> 19 :heightNumSetting="true" :minHeight="115" :rowStyleHeight='25' :maxHeight="115"
20 <lb-table :column="qszkColumns" key="qszk" :data="resultData.qsxxDetail" 20 :pagination="false">
21 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25' 21 </lb-table>
22 :pagination="false"> 22 </div>
23 </lb-table> 23 <div class="dydjbInfo-item">
24 <b class="title">抵押登记</b> 24 <b class="title">权属状况</b>
25 <lb-table :column="diyaColumns" key="dydj" :data="resultData.dyaqDetail" 25 <lb-table :column="qszkColumns" key="qszk" :data="resultData.qsxxDetail"
26 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25' 26 :heightNumSetting="true" :minHeight="115" :rowStyleHeight='25' :maxHeight="115"
27 :pagination="false"> 27 :pagination="false">
28 </lb-table> 28 </lb-table>
29 <b class="title">预告登记</b> 29 </div>
30 <lb-table :column="ygdjColumns" key="ygdj" :data="resultData.ygdjDetail" 30 <div class="dydjbInfo-item">
31 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25' 31 <b class="title">抵押登记</b>
32 :pagination="false"> 32 <lb-table :column="diyaColumns" key="dydj" :data="resultData.dyaqDetail"
33 </lb-table> 33 :heightNumSetting="true" :minHeight="115" :rowStyleHeight='25' :maxHeight="115"
34 <b class="title">查封状况</b> 34 :pagination="false">
35 <lb-table :column="cfdjColumns" key="cfdj" :data="resultData.cfdjDetail" 35 </lb-table>
36 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25' 36 </div>
37 :pagination="false"> 37 <div class="dydjbInfo-item">
38 </lb-table> 38 <b class="title">预告登记</b>
39 <b class="title">异议登记</b> 39 <lb-table :column="ygdjColumns" key="ygdj" :data="resultData.ygdjDetail"
40 <lb-table :column="yydjColumns" key="yydj" :data="resultData.yydjDetail" 40 :heightNumSetting="true" :minHeight="115" :rowStyleHeight='25' :maxHeight="115"
41 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25' 41 :pagination="false">
42 :pagination="false"> 42 </lb-table>
43 </lb-table> 43 </div>
44 <div class="dydjbInfo-item">
45 <b class="title">查封状况</b>
46 <lb-table :column="cfdjColumns" key="cfdj" :data="resultData.cfdjDetail"
47 :heightNumSetting="true" :minHeight="115" :rowStyleHeight='25' :maxHeight="115"
48 :pagination="false">
49 </lb-table>
50 </div>
51 <div class="dydjbInfo-item">
52 <b class="title" style="border-bottom: 1px solid #dfe6ec;">异议登记</b>
53 <lb-table :column="yydjColumns" key="yydj" :data="resultData.yydjDetail"
54 :heightNumSetting="true" :minHeight="115" :rowStyleHeight='25' :maxHeight="115"
55 :pagination="false">
56 </lb-table>
57 </div>
44 </div> 58 </div>
45 </template> 59 </template>
46 60
...@@ -87,4 +101,37 @@ ...@@ -87,4 +101,37 @@
87 border: 1px solid #acbed1; 101 border: 1px solid #acbed1;
88 height: 30px; 102 height: 30px;
89 } 103 }
104 /deep/.lb-table {
105 height: 0;
106 }
107 /deep/.lb-table .el-table {
108 border-radius: 0;
109 }
110 .dydjbInfo {
111 overflow-x: hidden;
112 h3 {
113 text-align: center;
114 }
115 &-item {
116 display: flex;
117 }
118 .title {
119 writing-mode: vertical-rl; /* 从右向左垂直排列 */
120 text-orientation: upright; /* 文字直立 */
121 white-space: nowrap;
122 border: 1px solid #dfe6ec;
123 color: #4a4a4a;
124 width: 80px;
125 display: inline-block;
126 height: 115px;
127 display: flex;
128 align-items: center;
129 justify-content: center;
130 border-right: none;
131 border-bottom: none;
132 }
133 /deep/.lb-table {
134 width: 100%;
135 }
136 }
90 </style> 137 </style>
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 dydjbClick (scope) { 115 dydjbClick (scope) {
116 this.$popupDialog("明细详情", "sqcx/dydjb/components/addDydjb", { 116 this.$popupDialog("明细详情", "sqcx/dydjb/components/addDydjb", {
117 sqcxBsm: scope.row.bsmSqcx, 117 sqcxBsm: scope.row.bsmSqcx,
118 }) 118 }, "80%")
119 }, 119 },
120 /** 120 /**
121 * @description: handleSort 121 * @description: handleSort
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
134 this.$popupDialog("房屋明细查询", "sqcx/dydjb/components/addDydjb", { 134 this.$popupDialog("房屋明细查询", "sqcx/dydjb/components/addDydjb", {
135 sqcxBsm: '', 135 sqcxBsm: '',
136 isAdd: true 136 isAdd: true
137 }) 137 }, "80%")
138 } 138 }
139 }, 139 },
140 }; 140 };
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
21 查询证明编号: {{ form.djSqcxDO.cxbh }} 21 查询证明编号: {{ form.djSqcxDO.cxbh }}
22 </h5> 22 </h5>
23 <p 23 <p
24 v-if="form.cxjgList.length > 0"
25 style=" 24 style="
26 text-indent: 2em; 25 text-indent: 2em;
27 margin-top: 15px; 26 margin-top: 15px;
...@@ -31,12 +30,12 @@ ...@@ -31,12 +30,12 @@
31 > 30 >
32 根据《不动产登记暂行条例》和《不动产登记资料查询暂行办法》 31 根据《不动产登记暂行条例》和《不动产登记资料查询暂行办法》
33 有关规定,经线上查询不动产登记信息系统,权利人: 32 有关规定,经线上查询不动产登记信息系统,权利人:
34 {{ form.cxjgList[0].qlrmc }} ,证件号:{{ form.cxjgList[0].zjhm }},截止{{ 33 {{ form.sqrList[0].sqrxm }} ,证件号:{{ form.sqrList[0].sqrzjhm }},截止{{
35 newDatez 34 newDatez
36 }} 35 }}
37 ,名下不动产登记信息查询结果如下: 36 ,名下不动产登记信息查询结果如下:
38 </p> 37 </p>
39 <table 38 <table v-if="form.cxjgList.length > 0"
40 style=" 39 style="
41 border-collapse: collapse; 40 border-collapse: collapse;
42 width: 100%; 41 width: 100%;
...@@ -158,6 +157,7 @@ ...@@ -158,6 +157,7 @@
158 </tr> 157 </tr>
159 </tbody> 158 </tbody>
160 </table> 159 </table>
160 <p style="text-align: center;font-size: 18px;" v-else> 无任何房产信息</p>
161 <h6 style="font-size: 28px; margin-top: 20px; font-weight: 100"> 161 <h6 style="font-size: 28px; margin-top: 20px; font-weight: 100">
162 特此证明。 162 特此证明。
163 </h6> 163 </h6>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-03-29 14:12:16 4 * @LastEditTime: 2024-05-14 16:26:10
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox 7 <dialogBox
...@@ -109,10 +109,19 @@ ...@@ -109,10 +109,19 @@
109 </el-col> 109 </el-col>
110 <el-col :span="12"> 110 <el-col :span="12">
111 <el-form-item label="国家/地区" prop="gj"> 111 <el-form-item label="国家/地区" prop="gj">
112 <el-input 112 <el-select
113 clearable
113 v-model="ruleForm.gj" 114 v-model="ruleForm.gj"
114 maxlength="3" 115 :disabled="!showButton"
115 :disabled="!showButton"></el-input> 116 class="width100"
117 placeholder="请选择">
118 <el-option
119 v-for="item in dictData['A35']"
120 :key="item.dcode"
121 :label="item.dname"
122 :value="item.dcode">
123 </el-option>
124 </el-select>
116 </el-form-item> 125 </el-form-item>
117 </el-col> 126 </el-col>
118 </el-row> 127 </el-row>
...@@ -138,10 +147,11 @@ ...@@ -138,10 +147,11 @@
138 </el-col> 147 </el-col>
139 <el-col :span="8"> 148 <el-col :span="8">
140 <el-form-item label="户籍所在省市" prop="hjszss"> 149 <el-form-item label="户籍所在省市" prop="hjszss">
141 <el-input 150 <el-cascader
142 v-model="ruleForm.hjszss" 151 v-model="ruleForm.hjszss"
143 maxlength="3" 152 :props="treeProps"
144 :disabled="!showButton"></el-input> 153 class="width100"
154 :options="dictData['A38']" :disabled="!showButton"></el-cascader>
145 </el-form-item> 155 </el-form-item>
146 </el-col> 156 </el-col>
147 <el-col :span="8"> 157 <el-col :span="8">
...@@ -367,6 +377,11 @@ ...@@ -367,6 +377,11 @@
367 }, 377 },
368 data () { 378 data () {
369 return { 379 return {
380 treeProps: {
381 value: 'dcode',
382 label: 'dname',
383 children: 'children'
384 },
370 avatar: require('../../../../image/user.png'), 385 avatar: require('../../../../image/user.png'),
371 isShow: false, 386 isShow: false,
372 isBz: false, 387 isBz: false,
......
1 <template> 1 <template>
2 <div class='jyht'> 2 <div class='jyht'>
3 <el-form :model="queryForm"> 3 <el-form :model="formData" ref="formData">
4 <el-row :gutter="10"> 4 <el-row :gutter="10">
5 <el-col :span="8"> 5 <el-col :span="8">
6 <el-form-item label="行政区"> 6 <el-form-item label="行政区">
7 <el-input v-model="queryForm.sfzjhm"></el-input> 7 <el-input disabled v-model="formData.areaCode"></el-input>
8 </el-form-item> 8 </el-form-item>
9 </el-col> 9 </el-col>
10 <el-col :span="8"> 10 <el-col :span="8">
11 <el-form-item label="业务号"> 11 <el-form-item label="业务号">
12 <el-input v-model="queryForm.ywh"></el-input> 12 <el-input disabled v-model="formData.ywh"></el-input>
13 </el-form-item> 13 </el-form-item>
14 </el-col> 14 </el-col>
15 <el-col :span="8"> 15 <el-col :span="8">
16 <el-form-item label="用户编号"> 16 <el-form-item label="用户编号" prop="cons_no" :rules="[{ required: true, message: '请输入用户编号', trigger: 'blur' }]">
17 <el-input v-model="queryForm.ywh"></el-input> 17 <el-input v-model="formData.cons_no"></el-input>
18 </el-form-item> 18 </el-form-item>
19 </el-col> 19 </el-col>
20 </el-row> 20 </el-row>
21 <el-row :gutter="10"> 21 <el-row :gutter="10">
22 <el-col :span="8"> 22 <el-col :span="8">
23 <el-form-item label="房产证编号"> 23 <el-form-item label="房产证编号">
24 <el-input v-model="queryForm.ywh"></el-input> 24 <el-input disabled v-model="formData.fczbh"></el-input>
25 </el-form-item> 25 </el-form-item>
26 </el-col> 26 </el-col>
27 <el-col :span="16"> 27 <el-col :span="16">
28 <el-form-item label="房屋坐落(地址)"> 28 <el-form-item label="房屋坐落(地址)">
29 <el-input v-model="queryForm.sfzjhm"></el-input> 29 <el-input disabled v-model="formData.fwzl"></el-input>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
32 </el-row> 32 </el-row>
33 </el-form> 33 </el-form>
34 <div class="slxx_title title-block">
35 原户主信息
36 <div class="triangle"></div>
37 </div>
38 <lb-table ref="table" @row-click="handleRowClick" :pagination="false" :key="key"
39 :column="tableData.columns"
40 :data="ywrData">
41 </lb-table>
42 <div class="slxx_title title-block">
43 新户主信息
44 <div class="triangle"></div>
45 </div>
34 <lb-table ref="table" @row-click="handleRowClick" :pagination="false" :key="key" 46 <lb-table ref="table" @row-click="handleRowClick" :pagination="false" :key="key"
35 :column="tableData.columns" 47 :column="tableData.columns"
36 :data="tableData.data"> 48 :data="tableData.data">
37 </lb-table> 49 </lb-table>
50
38 <div class="text-center"> 51 <div class="text-center">
39 <el-button @click="$popupCacel">取消</el-button> 52 <el-button @click="$popupCacel">取消</el-button>
40 <el-button type="primary" @click="handleSearch">保存</el-button> 53 <el-button type="primary" @click="saveDlxx">保存</el-button>
41 </div> 54 </div>
42 </div> 55 </div>
43 </template> 56 </template>
44 <script> 57 <script>
45 import store from '@/store/index.js' 58 import store from '@/store/index.js'
46 import { loadQlrxx,queryTransactionDetails } from "@/api/workflow/swhtxx.js"; 59 import { loadQlrxx,loadYwrxx,saveDlxx } from "@/api/workflow/swhtxx.js";
47 export default { 60 export default {
48 props: { 61 props: {
49 formData: { 62 formData: {
...@@ -94,7 +107,8 @@ ...@@ -94,7 +107,8 @@
94 label: '联系电话' 107 label: '联系电话'
95 } 108 }
96 ] 109 ]
97 } 110 },
111 ywrData:[]
98 } 112 }
99 }, 113 },
100 mounted () { 114 mounted () {
...@@ -106,12 +120,25 @@ ...@@ -106,12 +120,25 @@
106 this.queryForm.nsrmc= row.sqrmc; 120 this.queryForm.nsrmc= row.sqrmc;
107 this.queryForm.sfzjhm= row.zjh; 121 this.queryForm.sfzjhm= row.zjh;
108 }, 122 },
109 handleSearch () { 123 saveDlxx () {
110 queryTransactionDetails(this.queryForm).then(res => { 124 this.$refs['formData'].validate((valid) => {
111 if (res.code === 200 && res.result){ 125 if (valid) {
126 saveDlxx(this.formData).then(res => {
127 if (res.code === 200 && res.result){
112 128
129 }else{
130 this.$message({
131 showClose: true,
132 message: res.message,
133 type: "error"
134 })
135 }
136 })
137 } else {
138 return false
113 } 139 }
114 }) 140 })
141
115 }, 142 },
116 handleChange (row) { 143 handleChange (row) {
117 this.radioVal = row.bsmSqr; 144 this.radioVal = row.bsmSqr;
...@@ -125,10 +152,7 @@ ...@@ -125,10 +152,7 @@
125 }); 152 });
126 153
127 return foundItem ? foundItem.dname : undefined; 154 return foundItem ? foundItem.dname : undefined;
128 } 155 }
129 this.queryForm.htbh=this.formData.htbh;
130 this.queryForm.qxdm=this.formData.qxdm;
131 this.queryForm.bsmQlxx=this.formData.bsmQlxx;
132 loadQlrxx(this.formData.bsmSldy).then(res => { 156 loadQlrxx(this.formData.bsmSldy).then(res => {
133 let arr = store.getters.dictData['A30'] 157 let arr = store.getters.dictData['A30']
134 this.tableData.data = res.result 158 this.tableData.data = res.result
...@@ -138,6 +162,16 @@ ...@@ -138,6 +162,16 @@
138 } 162 }
139 }) 163 })
140 this.key++ 164 this.key++
165 });
166 loadYwrxx(this.formData.bsmSldy).then(res => {
167 let arr = store.getters.dictData['A30']
168 this.ywrData = res.result
169 this.ywrData.forEach(item => {
170 if (item.zjzl) {
171 item.zjzlmc = findValueByKey(arr, item.zjzl);
172 }
173 })
174 this.key++
141 }) 175 })
142 } 176 }
143 } 177 }
......
...@@ -215,14 +215,26 @@ export default { ...@@ -215,14 +215,26 @@ export default {
215 handleDlxx() { 215 handleDlxx() {
216 let formData = { 216 let formData = {
217 bsmSldy: this.propsParam.bsmSldy, 217 bsmSldy: this.propsParam.bsmSldy,
218 qxdm: this.ruleForm.qlxx.qxdm,
219 bsmQlxx: this.ruleForm.qlxx.bsmQlxx, 218 bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
219 areaCode: this.ruleForm.qlxx.qxdm,
220 ywh: this.ruleForm.qlxx.ywh,
221 mcOld:'',
222 zjhmOld:'',
223 lxdhOld:'',
224 mcNew:'',
225 zjhmNew:'',
226 lxdhNew:'',
227 fczbh:this.ruleForm.qlxx.bdcqzh,
228 fwzl:this.ruleForm.qlxx.zl,
220 }; 229 };
221 if(this.ruleForm.wqht==null){ 230 if(this.ruleForm.wqht!=null){
222 formData.htbh=''; 231 formData.cons_no=this.ruleForm.wqht.consNo;
223 }else{ 232 if(this.ruleForm.wqht.dlnr!=null&&this.ruleForm.wqht.dlnr!=''){
224 formData.htbh=this.ruleForm.wqht.wqhth; 233 formData.ZJHM_OLD=this.ruleForm.wqht.dlnr.ZJHM_OLD;
234 formData.ZJHM_NEW=this.ruleForm.wqht.dlnr.ZJHM_NEW;
235 }
225 } 236 }
237 console.log(formData)
226 this.$popupDialog('房产电力过户详情', 'workflow/main/sdqxx/dlxx', formData, '60%', true) 238 this.$popupDialog('房产电力过户详情', 'workflow/main/sdqxx/dlxx', formData, '60%', true)
227 }, 239 },
228 }, 240 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-03-19 13:22:39 4 * @LastEditTime: 2024-05-14 16:24:39
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox 7 <dialogBox
...@@ -108,10 +108,20 @@ ...@@ -108,10 +108,20 @@
108 </el-col> 108 </el-col>
109 <el-col :span="12"> 109 <el-col :span="12">
110 <el-form-item label="国家/地区" prop="gj"> 110 <el-form-item label="国家/地区" prop="gj">
111 <el-input 111 <el-select
112 clearable
112 v-model="ruleForm.gj" 113 v-model="ruleForm.gj"
113 maxlength="3" 114 :disabled="!showButton"
114 :disabled="!showButton"></el-input> 115 class="width100"
116 placeholder="请选择">
117 <el-option
118 v-for="item in dictData['A35']"
119 :key="item.dcode"
120 :label="item.dname"
121 :value="item.dcode">
122 </el-option>
123 </el-select>
124
115 </el-form-item> 125 </el-form-item>
116 </el-col> 126 </el-col>
117 </el-row> 127 </el-row>
...@@ -137,10 +147,11 @@ ...@@ -137,10 +147,11 @@
137 </el-col> 147 </el-col>
138 <el-col :span="8"> 148 <el-col :span="8">
139 <el-form-item label="户籍所在省市" prop="hjszss"> 149 <el-form-item label="户籍所在省市" prop="hjszss">
140 <el-input 150 <el-cascader
141 v-model="ruleForm.hjszss" 151 v-model="ruleForm.hjszss"
142 maxlength="3" 152 :props="treeProps"
143 :disabled="!showButton"></el-input> 153 class="width100"
154 :options="dictData['A38']" :disabled="!showButton"></el-cascader>
144 </el-form-item> 155 </el-form-item>
145 </el-col> 156 </el-col>
146 <el-col :span="8"> 157 <el-col :span="8">
...@@ -366,6 +377,11 @@ ...@@ -366,6 +377,11 @@
366 }, 377 },
367 data () { 378 data () {
368 return { 379 return {
380 treeProps: {
381 value: 'dcode',
382 label: 'dname',
383 children: 'children'
384 },
369 avatar: require('@/image/user.png'), 385 avatar: require('@/image/user.png'),
370 isShow: false, 386 isShow: false,
371 isBz: false, 387 isBz: false,
......
...@@ -32,23 +32,23 @@ class data extends filter { ...@@ -32,23 +32,23 @@ class data extends filter {
32 label: "业务来源", 32 label: "业务来源",
33 width: '100', 33 width: '100',
34 }, 34 },
35 { 35 // { 青海2.0提出 (受理完成的业务,在已办箱中,流程状态显示“进行中”,与数据实际状态不符,已容易误导别人,因改为“完结”。) 因此取消
36 label: "流程状态", 36 // label: "流程状态",
37 width: '80', 37 // width: '80',
38 render: (h, scope) => { 38 // render: (h, scope) => {
39 if (scope.row.cfgqzt == '1') { 39 // if (scope.row.cfgqzt == '1') {
40 return <div class='suspend'>查封挂起</div> 40 // return <div class='suspend'>查封挂起</div>
41 } 41 // }
42 if (scope.row.yygqzt == '1') { 42 // if (scope.row.yygqzt == '1') {
43 return <div class='suspend'>异议挂起</div> 43 // return <div class='suspend'>异议挂起</div>
44 } 44 // }
45 if (scope.row.jssj == null) { 45 // if (scope.row.jssj == null) {
46 return <div class='allow'>进行中</div> 46 // return <div class='allow'>进行中</div>
47 }else{ 47 // }else{
48 return <div class='prohibit'>已结束</div> 48 // return <div class='prohibit'>已结束</div>
49 } 49 // }
50 } 50 // }
51 }, 51 // },
52 { 52 {
53 label: "业务号", 53 label: "业务号",
54 width: '110', 54 width: '110',
......
...@@ -205,7 +205,7 @@ class data extends filter { ...@@ -205,7 +205,7 @@ class data extends filter {
205 render: (h, scope) => { 205 render: (h, scope) => {
206 return ( 206 return (
207 <div> 207 <div>
208 {(scope.row.zdmj) + (' / ') + (scope.row.dzmj)} 208 {(scope.row.zdmj) + (' / ') + (scope.row.fwmj)}
209 </div> 209 </div>
210 ) 210 )
211 } 211 }
......