6aad4a91 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 0f7f530a c47d1fe2
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-22 16:27:35 4 * @LastEditTime: 2023-08-30 15:52:11
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
12 :class="{ readonly: editDisabled }" 12 :class="{ readonly: editDisabled }"
13 class="loadingtext"
14 ref="ruleForm" 13 ref="ruleForm"
15 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
16 :inline="flag" 15 :inline="flag"
...@@ -313,20 +312,6 @@ ...@@ -313,20 +312,6 @@
313 <el-input v-model="ruleForm.qlxx.zl"></el-input> 312 <el-input v-model="ruleForm.qlxx.zl"></el-input>
314 </el-form-item> 313 </el-form-item>
315 </el-col> 314 </el-col>
316 <!-- <el-col :span="8">
317 <el-form-item label="不动产登记证明号:" prop="bdcqzh">
318 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
319 </el-form-item>
320 </el-col> -->
321 <!-- <el-col :span="8">
322 <el-form-item
323 label="区县代码:"
324 prop="qlxx.qxdm"
325 :rules="rules.qxdmrules"
326 >
327 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
328 </el-form-item>
329 </el-col> -->
330 <el-col :span="8"> 315 <el-col :span="8">
331 <el-form-item label="在建建筑物抵押范围:"> 316 <el-form-item label="在建建筑物抵押范围:">
332 <el-input v-model="ruleForm.diyaq.zjjzwdyfw"></el-input> 317 <el-input v-model="ruleForm.diyaq.zjjzwdyfw"></el-input>
...@@ -401,24 +386,6 @@ ...@@ -401,24 +386,6 @@
401 </el-date-picker> 386 </el-date-picker>
402 </el-form-item> 387 </el-form-item>
403 </el-col> 388 </el-col>
404
405 <!-- <el-col :span="8">
406 <el-form-item label="是否预告登记:">
407 <el-select v-model="ruleForm.diyaq.sfygdj">
408 <el-option
409 v-for="item in dictData['A6']"
410 :key="item.dcode"
411 :label="item.dname"
412 :value="item.dcode"></el-option>
413 </el-select>
414 </el-form-item>
415 </el-col> -->
416 <!-- <el-col :span="8">
417 <el-form-item label="在建建筑物坐落:">
418 <el-input v-model="ruleForm.diyaq.zjzzwzl"></el-input>
419 </el-form-item>
420 </el-col> -->
421
422 <el-col :span="24"> 389 <el-col :span="24">
423 <el-form-item label="登记原因:"> 390 <el-form-item label="登记原因:">
424 <el-input v-model="ruleForm.diyaq.djyy"></el-input> 391 <el-input v-model="ruleForm.diyaq.djyy"></el-input>
......
1 /* 1 /*
2 * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 2 * @Description:workFramezu.vue组件的方法 头部按钮弹框方法
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-08-10 14:13:32 4 * @LastEditTime: 2023-08-30 16:15:41
5 */ 5 */
6 import { getPrintTemplateByCode } from "@/api/print"; 6 import { getPrintTemplateByCode } from "@/api/print";
7 import { getQllxByBdcdyid } from "@/api/djbDetail.js"; 7 import { getQllxByBdcdyid } from "@/api/djbDetail.js";
...@@ -43,7 +43,6 @@ export default { ...@@ -43,7 +43,6 @@ export default {
43 this.flowInitParam(); 43 this.flowInitParam();
44 }, 44 },
45 methods: { 45 methods: {
46 //加载流程初始参数
47 /** 46 /**
48 * @description: 加载流程初始参数 47 * @description: 加载流程初始参数
49 * @author: renchao 48 * @author: renchao
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-28 08:44:31 4 * @LastEditTime: 2023-08-30 13:59:09
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -194,7 +194,6 @@ ...@@ -194,7 +194,6 @@
194 }); 194 });
195 }); 195 });
196 }, 196 },
197 //批量按钮点击事件
198 /** 197 /**
199 * @description: 批量按钮点击事件 198 * @description: 批量按钮点击事件
200 * @author: renchao 199 * @author: renchao
...@@ -203,9 +202,7 @@ ...@@ -203,9 +202,7 @@
203 this.currentSelectProps.batchOperation = true; 202 this.currentSelectProps.batchOperation = true;
204 this.activeIndex = "-1"; 203 this.activeIndex = "-1";
205 this.$parent.stepForm(0); 204 this.$parent.stepForm(0);
206
207 }, 205 },
208 //批量操作
209 /** 206 /**
210 * @description: 批量操作 207 * @description: 批量操作
211 * @author: renchao 208 * @author: renchao
...@@ -216,7 +213,6 @@ ...@@ -216,7 +213,6 @@
216 dataList: this.unitData, 213 dataList: this.unitData,
217 }, '50%', true) 214 }, '50%', true)
218 }, 215 },
219 //申请单元点击事件
220 /** 216 /**
221 * @description: 申请单元点击事件 217 * @description: 申请单元点击事件
222 * @param {*} index 218 * @param {*} index
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-25 09:53:27 4 * @LastEditTime: 2023-08-30 16:03:09
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -66,13 +66,13 @@ ...@@ -66,13 +66,13 @@
66 ) 66 )
67 } 67 }
68 }, 68 },
69 { 69 // {
70 label: '身份证读卡器', 70 // label: '身份证读卡器',
71 align: 'center', 71 // align: 'center',
72 render: (h, scope) => { 72 // render: (h, scope) => {
73 return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button> 73 // return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button>
74 } 74 // }
75 }, 75 // },
76 { 76 {
77 prop: "sqrmc", 77 prop: "sqrmc",
78 label: "姓名/名称" 78 label: "姓名/名称"
...@@ -124,12 +124,12 @@ ...@@ -124,12 +124,12 @@
124 let that = this 124 let that = this
125 this.$nextTick(() => { 125 this.$nextTick(() => {
126 if (val.length == 0 || !val) { 126 if (val.length == 0 || !val) {
127 that.tableDataList = _.cloneDeep([{ 127 // that.tableDataList = _.cloneDeep([{
128 sqrmc: '', 128 // sqrmc: '',
129 dlrzjlx: '', 129 // dlrzjlx: '',
130 dlrzjh: '', 130 // dlrzjh: '',
131 fr: '' 131 // fr: ''
132 }]) 132 // }])
133 } else { 133 } else {
134 that.tableDataList = _.cloneDeep(val) 134 that.tableDataList = _.cloneDeep(val)
135 } 135 }
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 * @param {*} value 164 * @param {*} value
165 * @author: renchao 165 * @author: renchao
166 */ 166 */
167 handleupdateDetail (value) { 167 handleupdateDetail (value) {
168 let arr = this.tableData.map(item => item.zjh) 168 let arr = this.tableData.map(item => item.zjh)
169 if (this.isaddupdate) { 169 if (this.isaddupdate) {
170 if (!arr.includes(value.zjh)) { 170 if (!arr.includes(value.zjh)) {
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
174 this.$message.error('证件号不能重复'); 174 this.$message.error('证件号不能重复');
175 } 175 }
176 } else { 176 } else {
177 if (!arr.includes(value.zjh)||this.tableData[this.dataIndex].zjh==value.zjh) { 177 if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
178 this.tableDataList[this.dataIndex] = _.cloneDeep(value); 178 this.tableDataList[this.dataIndex] = _.cloneDeep(value);
179 this.$emit('upDateQlrxxList', this.tableDataList) 179 this.$emit('upDateQlrxxList', this.tableDataList)
180 } else { 180 } else {
...@@ -205,9 +205,8 @@ ...@@ -205,9 +205,8 @@
205 * @author: renchao 205 * @author: renchao
206 */ 206 */
207 deleClick (index, row) { 207 deleClick (index, row) {
208 this.tableData.splice(index, 1) 208 this.tableData.splice(index, 1)
209 }, 209 },
210
211 /** 210 /**
212 * @description: 身份证读取 211 * @description: 身份证读取
213 * @param {*} row 212 * @param {*} row
...@@ -244,7 +243,7 @@ ...@@ -244,7 +243,7 @@
244 */ 243 */
245 editClick (index, row) { 244 editClick (index, row) {
246 this.details = row 245 this.details = row
247 this.details.gyfs=this.gyfs 246 this.details.gyfs = this.gyfs
248 this.dataIndex = index 247 this.dataIndex = index
249 this.dialog = true 248 this.dialog = true
250 249
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 09:17:44 4 * @LastEditTime: 2023-08-30 14:13:47
5 */ 5 */
6 import { getPrintTemplateByCode } from "@/api/print"; 6 import { getPrintTemplateByCode } from "@/api/print";
7 import { uploadUndo } from "@/api/clxx"; 7 import { uploadUndo } from "@/api/clxx";
...@@ -14,9 +14,9 @@ import { ...@@ -14,9 +14,9 @@ import {
14 getWorkFlowImage, 14 getWorkFlowImage,
15 getPrintApplicationInfo, 15 getPrintApplicationInfo,
16 deleteFlow, 16 deleteFlow,
17 unClaimTask 17 unClaimTask,
18 getZdInfo
18 } from "@/api/workFlow.js"; 19 } from "@/api/workFlow.js";
19 import { mapGetters } from 'vuex'
20 import { getZrzbsmList } from "@/api/search.js"; 20 import { getZrzbsmList } from "@/api/search.js";
21 import { ywPopupDialog } from "@/utils/popup.js"; 21 import { ywPopupDialog } from "@/utils/popup.js";
22 export default { 22 export default {
...@@ -43,7 +43,6 @@ export default { ...@@ -43,7 +43,6 @@ export default {
43 this.flowInitParam(); 43 this.flowInitParam();
44 }, 44 },
45 methods: { 45 methods: {
46 //加载流程初始参数
47 /** 46 /**
48 * @description: 加载流程初始参数 47 * @description: 加载流程初始参数
49 * @author: renchao 48 * @author: renchao
...@@ -174,7 +173,10 @@ export default { ...@@ -174,7 +173,10 @@ export default {
174 break; 173 break;
175 // 图形定位 174 // 图形定位
176 case "B-TXDW": 175 case "B-TXDW":
177 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '85%', true) 176 getZdInfo(this.currentSelectProps.bdcdyid).then(res => {
177 this.bsmZd = res?.result[0]?.bsmZd
178 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '85%', true)
179 })
178 break; 180 break;
179 case "back": //退回按钮 181 case "back": //退回按钮
180 this.$popupDialog("退回", "workflow/components/th", { 182 this.$popupDialog("退回", "workflow/components/th", {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-09 14:54:20 4 * @LastEditTime: 2023-08-30 14:14:55
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -132,11 +132,7 @@ ...@@ -132,11 +132,7 @@
132 * @author: renchao 132 * @author: renchao
133 */ 133 */
134 getCurrentSelectProps (val) { 134 getCurrentSelectProps (val) {
135 console.log(val, 'valvalvalval');
136 this.currentSelectProps = val 135 this.currentSelectProps = val
137 getZdInfo(val.bdcdyid).then(res => {
138 this.bsmZd = res?.result[0]?.bsmZd
139 })
140 }, 136 },
141 /** 137 /**
142 * @description: beforeunloadHandler 138 * @description: beforeunloadHandler
...@@ -158,7 +154,6 @@ ...@@ -158,7 +154,6 @@
158 unClaimTask(this.bsmSlsq, this.bestepid); 154 unClaimTask(this.bsmSlsq, this.bestepid);
159 } 155 }
160 }, 156 },
161 //申请单元点击事件
162 /** 157 /**
163 * @description: 申请单元点击事件 158 * @description: 申请单元点击事件
164 * @param {*} index 159 * @param {*} index
...@@ -167,7 +162,7 @@ ...@@ -167,7 +162,7 @@
167 stepForm (index) { 162 stepForm (index) {
168 getStepFormInfo(this.currentSelectProps).then((res) => { 163 getStepFormInfo(this.currentSelectProps).then((res) => {
169 if (res.code === 200) { 164 if (res.code === 200) {
170 this.fresh++; 165 // this.fresh++;
171 //获取单元对应的所有表单信息 166 //获取单元对应的所有表单信息
172 this.tabList = res.result; 167 this.tabList = res.result;
173 //默认加载第一个表单信息 168 //默认加载第一个表单信息
......
...@@ -2,13 +2,9 @@ ...@@ -2,13 +2,9 @@
2 /* 2 /*
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-08-02 14:08:27 5 * @LastEditTime: 2023-08-30 13:51:05
6 */ 6 */
7 export default { 7 export default {
8 data () {
9 return {
10 }
11 },
12 watch: { 8 watch: {
13 'ruleForm.sldy.gyfs': { 9 'ruleForm.sldy.gyfs': {
14 handler: function (val, oldVal) { 10 handler: function (val, oldVal) {
...@@ -22,5 +18,5 @@ export default { ...@@ -22,5 +18,5 @@ export default {
22 }, 18 },
23 immediate: true 19 immediate: true
24 } 20 }
25 }, 21 }
26 } 22 }
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-30 11:08:19 4 * @LastEditTime: 2023-08-30 16:15:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
8 <el-form 8 <el-form
9 :model="ruleForm" 9 :model="ruleForm"
10 :rules="rules" 10 :rules="rules"
11 v-Loading="loading"
11 ref="ruleForm" 12 ref="ruleForm"
12 :label-position="flag ? 'top' : ''" 13 :label-position="flag ? 'top' : ''"
13 :inline="flag" 14 :inline="flag"
...@@ -167,7 +168,7 @@ ...@@ -167,7 +168,7 @@
167 <el-input v-model="ruleForm.lq.xdm"></el-input> 168 <el-input v-model="ruleForm.lq.xdm"></el-input>
168 </el-form-item> 169 </el-form-item>
169 </el-col> 170 </el-col>
170 <el-col :span="8"> 171 <el-col :span="16">
171 <el-form-item label="附记:"> 172 <el-form-item label="附记:">
172 <el-input 173 <el-input
173 v-model="ruleForm.lq.fj" 174 v-model="ruleForm.lq.fj"
...@@ -285,6 +286,7 @@ ...@@ -285,6 +286,7 @@
285 export default { 286 export default {
286 mixins: [ywmix], 287 mixins: [ywmix],
287 mounted () { 288 mounted () {
289 this.loading = true
288 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 290 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
289 this.propsParam = this.$attrs; 291 this.propsParam = this.$attrs;
290 var formdata = new FormData(); 292 var formdata = new FormData();
...@@ -307,15 +309,19 @@ ...@@ -307,15 +309,19 @@
307 ? (this.ruleForm.slsq.fzfs = "1") 309 ? (this.ruleForm.slsq.fzfs = "1")
308 : this.ruleForm.slsq.fzfs; 310 : this.ruleForm.slsq.fzfs;
309 this.czrOptions = this.ruleForm.qlrList; 311 this.czrOptions = this.ruleForm.qlrList;
312 setTimeout(() => {
313 this.loading = false
314 }, 200)
310 } 315 }
311 }); 316 })
312 }, 317 },
313 components: { qlrCommonTable, tdytTable }, 318 components: { qlrCommonTable, tdytTable },
314 computed: { 319 computed: {
315 ...mapGetters(["dictData", "flag"]), 320 ...mapGetters(["dictData", "flag"])
316 }, 321 },
317 data () { 322 data () {
318 return { 323 return {
324 loading: false,
319 disabled: true, 325 disabled: true,
320 tdytOption: [], 326 tdytOption: [],
321 czrOptions: [], 327 czrOptions: [],
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-30 10:34:54 4 * @LastEditTime: 2023-08-30 14:57:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
167 <el-input v-model="ruleForm.lq.xdm"></el-input> 167 <el-input v-model="ruleForm.lq.xdm"></el-input>
168 </el-form-item> 168 </el-form-item>
169 </el-col> 169 </el-col>
170 <el-col :span="8"> 170 <el-col :span="16">
171 <el-form-item label="附记:"> 171 <el-form-item label="附记:">
172 <el-input 172 <el-input
173 v-model="ruleForm.lq.fj" 173 v-model="ruleForm.lq.fj"
......