24661287 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents c8d4e109 9205d969
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-30 17:20:50 4 * @LastEditTime: 2023-08-31 08:51:09
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
......
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
21 <div class="menu-con"> 21 <div class="menu-con">
22 <p>{{ item.bdcdyh }}</p> 22 <p>{{ item.bdcdyh }}</p>
23 <el-tooltip effect="dark" :content="item.zl" placement="top"> 23 <el-tooltip effect="dark" :content="item.zl" placement="top">
24 <p class="title-detail">{{ item.zl }}</p> 24 <p v-if="item.sqfl=='1'" class="title-detail">{{ item.zl }}</p>
25 <p v-else class="title-detail">{{ item.qllxmc }}</p>
25 </el-tooltip> 26 </el-tooltip>
26 </div> 27 </div>
27 <i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i> 28 <i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1'" @click.stop="handleDel(item)"></i>
28 </el-menu-item> 29 </el-menu-item>
29 </el-menu> 30 </el-menu>
30 </div> 31 </div>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-30 16:54:26 4 * @LastEditTime: 2023-08-30 17:31:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -109,7 +109,6 @@ ...@@ -109,7 +109,6 @@
109 this.viewEdit = this.$parent.currentSelectTab.ableOperation 109 this.viewEdit = this.$parent.currentSelectTab.ableOperation
110 }, 110 },
111 methods: { 111 methods: {
112 //初始化列表
113 /** 112 /**
114 * @description: 初始化列表 113 * @description: 初始化列表
115 * @author: renchao 114 * @author: renchao
...@@ -125,7 +124,6 @@ ...@@ -125,7 +124,6 @@
125 } 124 }
126 }); 125 });
127 }, 126 },
128 //打开证书预览弹窗
129 /** 127 /**
130 * @description: 打开证书预览弹窗 128 * @description: 打开证书预览弹窗
131 * @param {*} item 129 * @param {*} item
...@@ -134,6 +132,7 @@ ...@@ -134,6 +132,7 @@
134 */ 132 */
135 openZsylDialog (item, type) { 133 openZsylDialog (item, type) {
136 store.dispatch('user/reWorkFresh', false) 134 store.dispatch('user/reWorkFresh', false)
135
137 if (type == 1) { 136 if (type == 1) {
138 //证书预览 137 //证书预览
139 this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); 138 this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
...@@ -141,13 +140,13 @@ ...@@ -141,13 +140,13 @@
141 this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); 140 this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
142 } 141 }
143 }, 142 },
144 //再次打印
145 /** 143 /**
146 * @description: 再次打印 144 * @description: 再次打印
147 * @param {*} item 145 * @param {*} item
148 * @author: renchao 146 * @author: renchao
149 */ 147 */
150 openInvalidDiglog (item) { 148 openInvalidDiglog (item) {
149 this.bdcqz = item
151 this.ysxlh = item.ysxlh 150 this.ysxlh = item.ysxlh
152 this.bsmSz = item.bsmSz; 151 this.bsmSz = item.bsmSz;
153 this.invalidDiglog = true; 152 this.invalidDiglog = true;
...@@ -162,7 +161,6 @@ ...@@ -162,7 +161,6 @@
162 this.bsmSz = ""; 161 this.bsmSz = "";
163 this.zfyy = ""; 162 this.zfyy = "";
164 }, 163 },
165 //作废缮证信息
166 /** 164 /**
167 * @description: 作废缮证信息 165 * @description: 作废缮证信息
168 * @author: renchao 166 * @author: renchao
...@@ -178,7 +176,7 @@ ...@@ -178,7 +176,7 @@
178 } else { 176 } else {
179 this.$message.error(res.message); 177 this.$message.error(res.message);
180 } 178 }
181 }); 179 })
182 }, 180 },
183 /** 181 /**
184 * @description: openRecordPop 182 * @description: openRecordPop
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 118
119 <el-row :gutter="10"> 119 <el-row :gutter="10">
120 <el-col :span="8" > 120 <el-col :span="8" >
121 <el-form-item label="原不动产证号:"> 121 <el-form-item label="原不动产证号:">
122 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input> 122 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
123 </el-form-item> 123 </el-form-item>
124 </el-col> 124 </el-col>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 </div> 54 </div>
55 <el-row :gutter="10" v-if="ruleForm.qlxx"> 55 <el-row :gutter="10" v-if="ruleForm.qlxx">
56 <el-col :span="8"> 56 <el-col :span="8">
57 <el-form-item label="原不动产登记证明号:"> 57 <el-form-item label="原不动产号:">
58 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input> 58 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
61 <el-col :span="8"> 61 <el-col :span="8">
62 <el-form-item label="不动产权证号:"> 62 <el-form-item label="不动产登记证明号:">
63 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input> 63 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 </div> 121 </div>
122 <el-row :gutter="10"> 122 <el-row :gutter="10">
123 <el-col :span="8"> 123 <el-col :span="8">
124 <el-form-item label="原不动产登记证明号:"> 124 <el-form-item label="原不动产号:">
125 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input> 125 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
126 </el-form-item> 126 </el-form-item>
127 </el-col> 127 </el-col>
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
195 </el-col> 195 </el-col>
196 </el-row> 196 </el-row>
197 <div class="slxx_title title-block"> 197 <div class="slxx_title title-block">
198 权利人信息 198 抵押权人信息
199 <div class="triangle"></div> 199 <div class="triangle"></div>
200 </div> 200 </div>
201 <el-row :gutter="10"> 201 <el-row :gutter="10">
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
245 :disabled="viewEdit" 245 :disabled="viewEdit"
246 :gyfs="ruleForm.sldy.gyfs" /> 246 :gyfs="ruleForm.sldy.gyfs" />
247 <div class="slxx_title title-block"> 247 <div class="slxx_title title-block">
248 义务人信息 248 抵押人信息
249 <div class="triangle"></div> 249 <div class="triangle"></div>
250 </div> 250 </div>
251 <qlrCommonTable 251 <qlrCommonTable
......