Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
ca78c913 by yangwei
Options

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

2 parents 5389708c 3edaaf1d
Inline Side-by-side
Showing 15 changed files with 263 additions and 173 deletions
1 /* 1 /*
2 * @Description: 材料信息 2 * @Description: 材料信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 11:09:48 4 * @LastEditTime: 2023-09-13 15:39:37
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -115,6 +115,22 @@ export function deleteClmx (bsmClmx) { ...@@ -115,6 +115,22 @@ export function deleteClmx (bsmClmx) {
115 } 115 }
116 116
117 /** 117 /**
118 * @description: 材料移动
119 * @param {*} data
120 * @author: renchao
121 */
122 export function move (direction, clmxBsm) {
123 return request({
124 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/move',
125 method: 'post',
126 params: {
127 direction: direction,
128 clmxBsm: clmxBsm
129 }
130 })
131 }
132
133 /**
118 * @description: 材料导入 134 * @description: 材料导入
119 * @param {*} data 135 * @param {*} data
120 * @author: renchao 136 * @author: renchao
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 09:10:29 4 * @LastEditTime: 2023-09-13 15:36:42
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <script> 53 <script>
54 import PhotoZoom from '@/components/PhotoZoom' 54 import PhotoZoom from '@/components/PhotoZoom'
55 import { getAltimeterInfo, getUuid } from '@/utils/operation.js' 55 import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
56 import { uploadBatch, deleteClmx } from "@/api/clxx.js"; 56 import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
57 import publicPicture from '@/components/publicPicture/index.vue' 57 import publicPicture from '@/components/publicPicture/index.vue'
58 export default { 58 export default {
59 name: 'PreviewImage', 59 name: 'PreviewImage',
...@@ -141,7 +141,22 @@ ...@@ -141,7 +141,22 @@
141 }, 141 },
142 // 左右移动 142 // 左右移动
143 handleMove (direction) { 143 handleMove (direction) {
144 144 move(direction, this.previewImg.imgList[this.previewImg.index].bsmClmx).then(res => {
145 if (res.code == 200) {
146 if (direction == 'left') {
147 this.previewImg.index = this.previewImg.index - 1
148 } else {
149 this.previewImg.index = this.previewImg.index + 1
150 }
151 this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
152 this.$message({
153 message: '移动成功!',
154 type: 'success'
155 })
156 } else {
157 this.$message.error(res.message);
158 }
159 })
145 }, 160 },
146 /** 161 /**
147 * @description: 拍照 162 * @description: 拍照
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 11:10:27 4 * @LastEditTime: 2023-09-13 13:48:47
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 label: "材料名称", 58 label: "材料名称",
59 render: (h, scope) => { 59 render: (h, scope) => {
60 return ( 60 return (
61 (this.formData.ableOperation && scope.row.isrequired != '1') ? 61 (this.formData.ableOperation && scope.row.sfxjcl == '1') ?
62 <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span> 62 <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
63 ) 63 )
64 } 64 }
...@@ -143,19 +143,16 @@ ...@@ -143,19 +143,16 @@
143 width: "100", 143 width: "100",
144 render: (h, scope) => { 144 render: (h, scope) => {
145 return ( 145 return (
146 <div> 146 <el-button
147 <el-button 147 type="text"
148 type="text" 148 icon="el-icon-delete"
149 icon="el-icon-delete" 149 disabled={!(scope.row.ys == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
150 disabled={!(scope.row.ys == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation} 150 onClick={() => {
151 onClick={() => { 151 this.handleDelete(scope.$index, scope.row);
152 this.handleDelete(scope.$index, scope.row); 152 }}
153 }} 153 >
154 > 154 删除
155 删除 155 </el-button>
156 </el-button>
157
158 </div >
159 ) 156 )
160 } 157 }
161 } 158 }
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 13:29:54 4 * @LastEditTime: 2023-09-13 14:21:14
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 that.currentSelectProps = res.result[0]; 104 that.currentSelectProps = res.result[0];
105 that.$emit('getCurrentSelectProps', this.currentSelectProps); 105 that.$emit('getCurrentSelectProps', this.currentSelectProps);
106 that.judgeBatchShow(); 106 that.judgeBatchShow();
107 if (sessionStorage.getItem('keyPath')) { 107 if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
108 that.unitClick(sessionStorage.getItem('keyPath') - 0) 108 that.unitClick(sessionStorage.getItem('keyPath') - 0)
109 } else { 109 } else {
110 that.unitClick(0) 110 that.unitClick(0)
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
123 this.currentSelectProps = res.result[0]; 123 this.currentSelectProps = res.result[0];
124 this.$emit('getCurrentSelectProps', this.currentSelectProps); 124 this.$emit('getCurrentSelectProps', this.currentSelectProps);
125 this.judgeBatchShow(); 125 this.judgeBatchShow();
126 if (sessionStorage.getItem('keyPath')) { 126 if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
127 that.unitClick(sessionStorage.getItem('keyPath') - 0) 127 that.unitClick(sessionStorage.getItem('keyPath') - 0)
128 } else { 128 } else {
129 that.unitClick(0) 129 that.unitClick(0)
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
208 this.currentSelectProps.batchOperation = true; 208 this.currentSelectProps.batchOperation = true;
209 this.activeIndex = "-1"; 209 this.activeIndex = "-1";
210 this.$parent.stepForm(0); 210 this.$parent.stepForm(0);
211 sessionStorage.setItem('keyPath', this.activeIndex);
211 }, 212 },
212 /** 213 /**
213 * @description: 批量操作 214 * @description: 批量操作
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 16:39:53 4 * @LastEditTime: 2023-09-13 13:57:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -258,6 +258,9 @@ ...@@ -258,6 +258,9 @@
258 } else { 258 } else {
259 this.tabName = res.result[0].value; 259 this.tabName = res.result[0].value;
260 } 260 }
261 if (sessionStorage.getItem('activeName') == this.tabName) {
262 this.fresh++;
263 }
261 this.ableOperation = this.tabList[0].ableOperation; 264 this.ableOperation = this.tabList[0].ableOperation;
262 //批量操作无分屏按钮 265 //批量操作无分屏按钮
263 if (index != null) { 266 if (index != null) {
...@@ -298,7 +301,6 @@ ...@@ -298,7 +301,6 @@
298 true 301 true
299 ); 302 );
300 }, 303 },
301 //选项卡切换事件
302 /** 304 /**
303 * @description: 右侧表单选项卡事件 305 * @description: 右侧表单选项卡事件
304 * @param {*} handleClick 306 * @param {*} handleClick
...@@ -311,8 +313,8 @@ ...@@ -311,8 +313,8 @@
311 if (p) { 313 if (p) {
312 this.ableOperation = this.tabList[a.index].ableOperation; 314 this.ableOperation = this.tabList[a.index].ableOperation;
313 } 315 }
314 }, 316 }
315 }, 317 }
316 }; 318 };
317 </script> 319 </script>
318 <style scoped lang="scss"> 320 <style scoped lang="scss">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 09:18:13 4 * @LastEditTime: 2023-09-13 13:46:03
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
8 <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="500" :pagination="false" :data="tableData"> 8 <lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false"
9 :data="tableData">
9 </lb-table> 10 </lb-table>
10 <div class="text-center"> 11 <div class="text-center">
11 <el-button @click="handleCancel">取消</el-button> 12 <el-button @click="handleCancel">取消</el-button>
...@@ -30,23 +31,27 @@ ...@@ -30,23 +31,27 @@
30 data () { 31 data () {
31 return { 32 return {
32 loading: false, 33 loading: false,
34 sortable: null,
33 column: [ 35 column: [
34 { 36 {
35 width: '50', 37 prop: "isrequired",
36 renderHeader: (h, scope) => { 38 label: "是否必选",
37 return <div> { 39 width: "80",
38 <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
39 }
40 </div>
41 },
42 render: (h, scope) => { 40 render: (h, scope) => {
43 return ( 41 if (scope.row.isrequired === "1") {
44 <div> 42 return (
45 { 43 <div>
46 <i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i> 44 <span>必选</span>
47 } 45 </div>
48 </div> 46 );
49 ) 47 }
48 else {
49 return (
50 <div>
51 <span>可选</span>
52 </div>
53 )
54 }
50 } 55 }
51 }, 56 },
52 { 57 {
...@@ -85,6 +90,15 @@ ...@@ -85,6 +90,15 @@
85 } 90 }
86 }, 91 },
87 { 92 {
93 label: "扫描时间",
94 width: "140",
95 render: (h, scope) => {
96 return (
97 <span>{scope.row.sjsj}</span>
98 )
99 }
100 },
101 {
88 label: "页数", 102 label: "页数",
89 width: "80", 103 width: "80",
90 render: (h, scope) => { 104 render: (h, scope) => {
...@@ -104,30 +118,35 @@ ...@@ -104,30 +118,35 @@
104 }, 118 },
105 }, 119 },
106 { 120 {
121 label: "是否新建材料",
122 width: "80",
123 render: (h, scope) => {
124 if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
125 return (
126 <span>是</span>
127 );
128 } else {
129 return (
130 <span>否</span>
131 );
132 }
133 },
134 },
135 {
107 label: "操作", 136 label: "操作",
108 width: "100", 137 width: "100",
109 render: (h, scope) => { 138 render: (h, scope) => {
110 return ( 139 return (
111 <div> 140 <el-button
112 <el-button 141 type="text"
113 type="text" 142 icon="el-icon-delete"
114 disabled={scope.$index == 0} 143 disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
115 onClick={() => { 144 onClick={() => {
116 this.moveUpward(scope.$index, scope.row); 145 this.handleDelete(scope.$index, scope.row);
117 }} 146 }}
118 > 147 >
119 上移 148 删除
120 </el-button> 149 </el-button>
121 <el-button
122 type="text"
123 disabled={scope.$index + 1 == this.tableData.length}
124 onClick={() => {
125 this.moveDown(scope.$index, scope.row);
126 }}
127 >
128 下移
129 </el-button>
130 </div >
131 ) 150 )
132 } 151 }
133 } 152 }
...@@ -136,6 +155,14 @@ ...@@ -136,6 +155,14 @@
136 tableData: [] 155 tableData: []
137 } 156 }
138 }, 157 },
158 mounted () {
159 this.initSort()
160 },
161 beforeDestroy () {
162 if (this.sortable) {
163 this.sortable.destroy();
164 }
165 },
139 watch: { 166 watch: {
140 'formData.data': { 167 'formData.data': {
141 handler: function (val, oldVal) { 168 handler: function (val, oldVal) {
...@@ -160,6 +187,7 @@ ...@@ -160,6 +187,7 @@
160 }, 187 },
161 handleSubmit () { 188 handleSubmit () {
162 this.loading = true 189 this.loading = true
190 store.dispatch('user/reWorkFresh', false)
163 updateClml(this.tableData).then(res => { 191 updateClml(this.tableData).then(res => {
164 this.loading = false 192 this.loading = false
165 if (res.code == 200) { 193 if (res.code == 200) {
...@@ -198,60 +226,6 @@ ...@@ -198,60 +226,6 @@
198 }) 226 })
199 }, 227 },
200 /** 228 /**
201 * @description: 上移
202 * @param {*} index
203 * @param {*} row
204 * @author: renchao
205 */
206 moveUpward (index, row) {
207 let obj = {
208 xh: row.xh,
209 bsmSlsq: row.bsmSlsq,
210 moveDirection: "UP",
211 };
212 // 接口待调
213 moveClml(obj).then(async (res) => {
214 if (res.code == 200) {
215 let res = await this.clmlInitList()
216 if (res == 200) {
217 this.$message({
218 message: '上移成功',
219 type: 'success'
220 })
221 }
222 } else {
223 this.$message.error(res.message);
224 }
225 })
226 },
227 /**
228 * @description: 下移
229 * @param {*} index
230 * @param {*} row
231 * @author: renchao
232 */
233 moveDown (index, row) {
234 let obj = {
235 xh: row.xh,
236 bsmSlsq: row.bsmSlsq,
237 moveDirection: "DOWN",
238 }
239 // 接口待调
240 moveClml(obj).then(async (res) => {
241 if (res.code == 200) {
242 let res = await this.clmlInitList()
243 if (res == 200) {
244 this.$message({
245 message: '下移成功',
246 type: 'success'
247 })
248 }
249 } else {
250 this.$message.error(res.message);
251 }
252 })
253 },
254 /**
255 * @description: 材料目录删除 229 * @description: 材料目录删除
256 * @param {*} index 230 * @param {*} index
257 * @param {*} row 231 * @param {*} row
...@@ -281,6 +255,19 @@ ...@@ -281,6 +255,19 @@
281 message: '已取消删除' 255 message: '已取消删除'
282 }) 256 })
283 }) 257 })
258 },
259 initSort () {
260 const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
261 this.sortable = Sortable.create(el, {
262 ghostClass: 'sortable-ghost',
263 setData: function (dataTransfer) {
264 dataTransfer.setData('Text', '')
265 },
266 onEnd: evt => {
267 const targetRow = this.tableData.splice(evt.oldIndex, 1)[0];
268 this.tableData.splice(evt.newIndex, 0, targetRow);
269 }
270 })
284 } 271 }
285 } 272 }
286 } 273 }
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-12 09:55:25 4 * @LastEditTime: 2023-09-13 14:41:34
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </el-col> 69 </el-col>
70 <el-col :span="8"> 70 <el-col :span="8">
71 <el-form-item label="坐落："> 71 <el-form-item label="坐落：">
72 <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input> 72 <el-input maxlength="100" disabled v-model="ruleForm.sldy.zl"></el-input>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 </el-row> 75 </el-row>
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 09:56:07 4 * @LastEditTime: 2023-09-13 14:16:46
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -410,9 +410,19 @@ ...@@ -410,9 +410,19 @@
410 * @author: renchao 410 * @author: renchao
411 */ 411 */
412 upDateQlrxxList (val) { 412 upDateQlrxxList (val) {
413 this.ruleForm.qlrList = _.cloneDeep(val); 413 if (!_.isEqual(val, this.ruleForm.qlrList)) {
414 this.czrOptions = this.ruleForm.qlrList; 414 this.ruleForm.qlrList = _.cloneDeep(val);
415 this.key++; 415 this.czrOptions = this.ruleForm.qlrList;
416 }
417 this.num = 0
418 this.ruleForm.qlrList.forEach(item => {
419 if (item.zjh == this.czr) {
420 this.num++
421 }
422 })
423 if (this.num == 0) {
424 this.czr = ''
425 }
416 }, 426 },
417 // 更新权利人信息 427 // 更新权利人信息
418 /** 428 /**
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-17 14:14:53 4 * @LastEditTime: 2023-09-13 14:17:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -336,11 +336,20 @@ ...@@ -336,11 +336,20 @@
336 * @author: renchao 336 * @author: renchao
337 */ 337 */
338 upDateQlrxxList (val) { 338 upDateQlrxxList (val) {
339 this.ruleForm.qlrList = _.cloneDeep(val); 339 if (!_.isEqual(val, this.ruleForm.qlrList)) {
340 this.czrOptions = this.ruleForm.qlrList; 340 this.ruleForm.qlrList = _.cloneDeep(val);
341 this.czrOptions = this.ruleForm.qlrList;
342 }
343 this.num = 0
344 this.ruleForm.qlrList.forEach(item => {
345 if (item.zjh == this.czr) {
346 this.num++
347 }
348 })
349 if (this.num == 0) {
350 this.czr = ''
351 }
341 }, 352 },
342
343
344 // 是否持证人变化 353 // 是否持证人变化
345 /** 354 /**
346 * @description: 是否持证人变化 355 * @description: 是否持证人变化
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-17 13:38:12 4 * @LastEditTime: 2023-09-13 14:05:26
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
12 ref="ruleForm" 12 ref="ruleForm"
13 v-Loading="loading"
13 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
14 :inline="flag" 15 :inline="flag"
15 label-width="120px"> 16 label-width="120px">
...@@ -243,11 +244,13 @@ ...@@ -243,11 +244,13 @@
243 export default { 244 export default {
244 mixins: [ywmix], 245 mixins: [ywmix],
245 mounted () { 246 mounted () {
247 this.loading = true
246 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 248 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
247 this.propsParam = this.$attrs; 249 this.propsParam = this.$attrs;
248 var formdata = new FormData(); 250 var formdata = new FormData();
249 formdata.append("bsmSldy", this.propsParam.bsmSldy); 251 formdata.append("bsmSldy", this.propsParam.bsmSldy);
250 Init(formdata).then((res) => { 252 Init(formdata).then((res) => {
253 this.loading = false
251 if (res.code === 200 && res.result) { 254 if (res.code === 200 && res.result) {
252 this.ruleForm = { 255 this.ruleForm = {
253 ...res.result, 256 ...res.result,
...@@ -262,7 +265,9 @@ ...@@ -262,7 +265,9 @@
262 }); 265 });
263 this.czrOptions = this.ruleForm.qlrList; 266 this.czrOptions = this.ruleForm.qlrList;
264 } 267 }
265 }); 268 }).catch(() => {
269 this.loading = false
270 })
266 }, 271 },
267 components: { qlrCommonTable, tdytTable }, 272 components: { qlrCommonTable, tdytTable },
268 computed: { 273 computed: {
...@@ -270,6 +275,7 @@ ...@@ -270,6 +275,7 @@
270 }, 275 },
271 data () { 276 data () {
272 return { 277 return {
278 loading: false,
273 //表单是否可操作 279 //表单是否可操作
274 viewEdit: false, 280 viewEdit: false,
275 disabled: true, 281 disabled: true,
...@@ -314,7 +320,6 @@ ...@@ -314,7 +320,6 @@
314 }; 320 };
315 }, 321 },
316 methods: { 322 methods: {
317 // 更新土地用途信息
318 /** 323 /**
319 * @description: 更新土地用途信息 324 * @description: 更新土地用途信息
320 * @param {*} val 325 * @param {*} val
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 16:28:26 4 * @LastEditTime: 2023-09-13 14:06:17
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
12 :class="{ readonly: editDisabled }" 12 :class="{ readonly: editDisabled }"
13 class="loadingtext" 13 v-Loading="loading"
14 ref="ruleForm" 14 ref="ruleForm"
15 :label-position="flag ? 'top' : ''" 15 :label-position="flag ? 'top' : ''"
16 :inline="flag" 16 :inline="flag"
...@@ -252,14 +252,14 @@ ...@@ -252,14 +252,14 @@
252 this.propsParam = this.$attrs; 252 this.propsParam = this.$attrs;
253 var formdata = new FormData(); 253 var formdata = new FormData();
254 let that = this; 254 let that = this;
255 this.$startLoading(); 255 this.loading = true
256 formdata.append("bsmSldy", this.propsParam.bsmSldy); 256 formdata.append("bsmSldy", this.propsParam.bsmSldy);
257 formdata.append("djlx", this.propsParam.djlx); 257 formdata.append("djlx", this.propsParam.djlx);
258 formdata.append("isEdit", this.viewEdit); 258 formdata.append("isEdit", this.viewEdit);
259 Init(formdata).then((res) => { 259 Init(formdata).then((res) => {
260 this.loading = false
260 this.$nextTick(() => { 261 this.$nextTick(() => {
261 that.ruleForm = res.result; 262 that.ruleForm = res.result;
262 that.$endLoading();
263 that.isShow = true; 263 that.isShow = true;
264 this.czrOptions = this.ruleForm.qlrList; 264 this.czrOptions = this.ruleForm.qlrList;
265 this.ruleForm.qlrList.forEach((item) => { 265 this.ruleForm.qlrList.forEach((item) => {
...@@ -267,9 +267,11 @@ ...@@ -267,9 +267,11 @@
267 this.czr = item.zjh 267 this.czr = item.zjh
268 console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr); 268 console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr);
269 } 269 }
270 }); 270 })
271 }); 271 })
272 }); 272 }).catch(() => {
273 this.loading = false
274 })
273 }, 275 },
274 components: { qlrCommonTable, tdytTable, ywrCommonTable }, 276 components: { qlrCommonTable, tdytTable, ywrCommonTable },
275 computed: { 277 computed: {
...@@ -285,6 +287,7 @@ ...@@ -285,6 +287,7 @@
285 }, 287 },
286 data () { 288 data () {
287 return { 289 return {
290 loading: false,
288 mjdw: "1", 291 mjdw: "1",
289 //表单是否可操作 292 //表单是否可操作
290 viewEdit: true, 293 viewEdit: true,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-08-22 16:25:54 5 * @LastEditTime: 2023-09-13 14:17:49
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -286,9 +286,19 @@ ...@@ -286,9 +286,19 @@
286 * @author: renchao 286 * @author: renchao
287 */ 287 */
288 upDateQlrxxList (val) { 288 upDateQlrxxList (val) {
289 this.ruleForm.qlrList = _.cloneDeep(val); 289 if (!_.isEqual(val, this.ruleForm.qlrList)) {
290 this.czrOptions = this.ruleForm.qlrList; 290 this.ruleForm.qlrList = _.cloneDeep(val);
291 this.key++; 291 this.czrOptions = this.ruleForm.qlrList;
292 }
293 this.num = 0
294 this.ruleForm.qlrList.forEach(item => {
295 if (item.zjh == this.czr) {
296 this.num++
297 }
298 })
299 if (this.num == 0) {
300 this.czr = ''
301 }
292 }, 302 },
293 // 是否持证人变化 303 // 是否持证人变化
294 /** 304 /**
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-form 4 <el-form
5 :model="ruleForm" 5 :model="ruleForm"
6 :rules="rules" 6 :rules="rules"
7 class="loadingtext" 7 v-Loading="loading"
8 ref="ruleForm" 8 ref="ruleForm"
9 :label-position="flag ? 'top' : ''" 9 :label-position="flag ? 'top' : ''"
10 :inline="flag" 10 :inline="flag"
...@@ -324,21 +324,23 @@ ...@@ -324,21 +324,23 @@
324 mounted () { 324 mounted () {
325 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 325 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
326 this.propsParam = this.$attrs; 326 this.propsParam = this.$attrs;
327 this.$startLoading(); 327 this.loading = true
328 var formdata = new FormData(); 328 var formdata = new FormData();
329 formdata.append("bsmSldy", this.propsParam.bsmSldy); 329 formdata.append("bsmSldy", this.propsParam.bsmSldy);
330 formdata.append("djlx", this.propsParam.djlx); 330 formdata.append("djlx", this.propsParam.djlx);
331 formdata.append("isEdit", this.viewEdit); 331 formdata.append("isEdit", this.viewEdit);
332 Init(formdata).then((res) => { 332 Init(formdata).then((res) => {
333 this.loading = false
333 this.ruleForm = res.result; 334 this.ruleForm = res.result;
334 this.czrOptions = this.ruleForm.qlrList; 335 this.czrOptions = this.ruleForm.qlrList;
335 this.ruleForm.qlrList.forEach((item) => { 336 this.ruleForm.qlrList.forEach((item) => {
336 if (item.sfczr == 1) { 337 if (item.sfczr == 1) {
337 this.czr = item.zjh 338 this.czr = item.zjh
338 } 339 }
339 }); 340 })
340 this.$endLoading(); 341 }).catch(() => {
341 }); 342 this.loading = false
343 })
342 }, 344 },
343 components: { qlrCommonTable, JtcyTable }, 345 components: { qlrCommonTable, JtcyTable },
344 computed: { 346 computed: {
...@@ -346,6 +348,7 @@ ...@@ -346,6 +348,7 @@
346 }, 348 },
347 data () { 349 data () {
348 return { 350 return {
351 loading: false,
349 disabled: true, 352 disabled: true,
350 //持证人选项 353 //持证人选项
351 czrOptions: [], 354 czrOptions: [],
...@@ -446,10 +449,20 @@ ...@@ -446,10 +449,20 @@
446 * @author: renchao 449 * @author: renchao
447 */ 450 */
448 upDateQlrxxList (val) { 451 upDateQlrxxList (val) {
449 this.ruleForm.qlrList = _.cloneDeep(val); 452 if (!_.isEqual(val, this.ruleForm.qlrList)) {
450 this.czrOptions = this.ruleForm.qlrList; 453 this.ruleForm.qlrList = _.cloneDeep(val);
454 this.czrOptions = this.ruleForm.qlrList;
455 }
456 this.num = 0
457 this.ruleForm.qlrList.forEach(item => {
458 if (item.zjh == this.czr) {
459 this.num++
460 }
461 })
462 if (this.num == 0) {
463 this.czr = ''
464 }
451 }, 465 },
452 // 是否持证人变化
453 /** 466 /**
454 * @description: 是否持证人变化 467 * @description: 是否持证人变化
455 * @param {*} val 468 * @param {*} val
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 受理信息 --> 2 <!-- 受理信息 -->
3 <div class="slxx"> 3 <div class="slxx">
4 <el-form 4 <el-form
5 class="loadingtext" 5 v-Loading="loading"
6 :label-position="flag ? 'top' : ''" 6 :label-position="flag ? 'top' : ''"
7 :inline="flag" 7 :inline="flag"
8 label-width="140px"> 8 label-width="140px">
...@@ -211,8 +211,8 @@ ...@@ -211,8 +211,8 @@
211 v-model="ruleForm.sldyList[0].sqfbcz" 211 v-model="ruleForm.sldyList[0].sqfbcz"
212 :disabled="!viewEdit" 212 :disabled="!viewEdit"
213 @input="updaterow()"> 213 @input="updaterow()">
214 <el-radio label="1">是</el-radio> 214 <el-radio :label="1">是</el-radio>
215 <el-radio label="0">否</el-radio> 215 <el-radio :label="0">否</el-radio>
216 </el-radio-group> 216 </el-radio-group>
217 </el-form-item> 217 </el-form-item>
218 </el-col> 218 </el-col>
...@@ -229,9 +229,9 @@ ...@@ -229,9 +229,9 @@
229 :disabled="!viewEdit"> 229 :disabled="!viewEdit">
230 <el-option 230 <el-option
231 v-for="item in czrOptions" 231 v-for="item in czrOptions"
232 :key="item.value" 232 :key="item.zjh"
233 :label="item.label" 233 :label="item.sqrmc"
234 :value="item.value"> 234 :value="item.zjh">
235 </el-option> 235 </el-option>
236 </el-select> 236 </el-select>
237 </el-form-item> 237 </el-form-item>
...@@ -303,12 +303,12 @@ ...@@ -303,12 +303,12 @@
303 this.propsParam = this.$attrs; 303 this.propsParam = this.$attrs;
304 var formdata = new FormData(); 304 var formdata = new FormData();
305 305
306 this.$startLoading(); 306 this.loading = true
307 formdata.append("bsmSlsq", this.$route.query.bsmSlsq); 307 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
308 formdata.append("djlx", this.propsParam.djlx); 308 formdata.append("djlx", this.propsParam.djlx);
309 formdata.append("isEdit", this.viewEdit); 309 formdata.append("isEdit", this.viewEdit);
310 bacthInit(formdata).then((res) => { 310 bacthInit(formdata).then((res) => {
311 this.$endLoading(); 311 this.loading = false
312 if (res.code === 200 && res.result) { 312 if (res.code === 200 && res.result) {
313 this.ruleForm = res.result; 313 this.ruleForm = res.result;
314 this.czrOptions = this.ruleForm.qlrList; 314 this.czrOptions = this.ruleForm.qlrList;
...@@ -316,11 +316,13 @@ ...@@ -316,11 +316,13 @@
316 if (item.sfczr == 1) { 316 if (item.sfczr == 1) {
317 this.czr = item.zjh 317 this.czr = item.zjh
318 } 318 }
319 }); 319 })
320 } else { 320 } else {
321 this.$message.error(res.message); 321 this.$message.error(res.message)
322 } 322 }
323 }); 323 }).catch(() => {
324 this.loading = false
325 })
324 }, 326 },
325 components: { qlrCommonTable, qjhTable }, 327 components: { qlrCommonTable, qjhTable },
326 computed: { 328 computed: {
...@@ -328,6 +330,7 @@ ...@@ -328,6 +330,7 @@
328 }, 330 },
329 data () { 331 data () {
330 return { 332 return {
333 loading: false,
331 //表单是否可操作 334 //表单是否可操作
332 viewEdit: true, 335 viewEdit: true,
333 disabled: true, 336 disabled: true,
...@@ -355,7 +358,7 @@ ...@@ -355,7 +358,7 @@
355 }); 358 });
356 return false; 359 return false;
357 } 360 }
358 if (ruleForm.sldyList[0].gyfs == "0") { 361 if (this.ruleForm.sldyList[0].gyfs == "0") {
359 if (this.ruleForm.qlrList.length > 1) { 362 if (this.ruleForm.qlrList.length > 1) {
360 this.$message({ 363 this.$message({
361 showClose: true, 364 showClose: true,
...@@ -379,8 +382,8 @@ ...@@ -379,8 +382,8 @@
379 if (this.ruleForm.sldyList[0].sqfbcz == "1") { 382 if (this.ruleForm.sldyList[0].sqfbcz == "1") {
380 //是 383 //是
381 this.ruleForm.qlrList.forEach((item, index) => { 384 this.ruleForm.qlrList.forEach((item, index) => {
382 item.sfczr = "1"; 385 item.sfczr = "1"
383 }); 386 })
384 } else { 387 } else {
385 if (!that.czr) { 388 if (!that.czr) {
386 that.$message({ 389 that.$message({
...@@ -416,7 +419,6 @@ ...@@ -416,7 +419,6 @@
416 } 419 }
417 }); 420 });
418 }, 421 },
419 // 是否持证人变化
420 /** 422 /**
421 * @description: 是否持证人变化 423 * @description: 是否持证人变化
422 * @param {*} val 424 * @param {*} val
...@@ -435,6 +437,15 @@ ...@@ -435,6 +437,15 @@
435 this.ruleForm.qlrList = _.cloneDeep(val); 437 this.ruleForm.qlrList = _.cloneDeep(val);
436 this.czrOptions = this.ruleForm.qlrList; 438 this.czrOptions = this.ruleForm.qlrList;
437 } 439 }
440 this.num = 0
441 this.ruleForm.qlrList.forEach(item => {
442 if (item.zjh == this.czr) {
443 this.num++
444 }
445 })
446 if (this.num == 0) {
447 this.czr = ''
448 }
438 }, 449 },
439 /** 450 /**
440 * @description: 更新义务人信息 451 * @description: 更新义务人信息
...@@ -445,9 +456,9 @@ ...@@ -445,9 +456,9 @@
445 if (!_.isEqual(val, this.ruleForm.ywrList)) { 456 if (!_.isEqual(val, this.ruleForm.ywrList)) {
446 this.ruleForm.ywrList = _.cloneDeep(val); 457 this.ruleForm.ywrList = _.cloneDeep(val);
447 } 458 }
448 }, 459 }
449 }, 460 }
450 }; 461 }
451 </script> 462 </script>
452 <style scoped lang="scss"> 463 <style scoped lang="scss">
453 @import "~@/styles/public.scss"; 464 @import "~@/styles/public.scss";
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-form 4 <el-form
5 :model="ruleForm" 5 :model="ruleForm"
6 :rules="rules" 6 :rules="rules"
7 class="loadingtext" 7 v-Loading="loading"
8 ref="ruleForm" 8 ref="ruleForm"
9 :label-position="flag ? 'top' : ''" 9 :label-position="flag ? 'top' : ''"
10 :inline="flag" 10 :inline="flag"
...@@ -331,11 +331,12 @@ ...@@ -331,11 +331,12 @@
331 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 331 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
332 this.propsParam = this.$attrs; 332 this.propsParam = this.$attrs;
333 var formdata = new FormData(); 333 var formdata = new FormData();
334 this.$startLoading(); 334 this.loading = true
335 formdata.append("bsmSldy", this.propsParam.bsmSldy); 335 formdata.append("bsmSldy", this.propsParam.bsmSldy);
336 formdata.append("djlx", this.propsParam.djlx); 336 formdata.append("djlx", this.propsParam.djlx);
337 formdata.append("isEdit", this.viewEdit); 337 formdata.append("isEdit", this.viewEdit);
338 Init(formdata).then((res) => { 338 Init(formdata).then((res) => {
339 this.loading = false
339 if (res.code === 200 && res.result) { 340 if (res.code === 200 && res.result) {
340 this.ruleForm = res.result; 341 this.ruleForm = res.result;
341 this.czrOptions = this.ruleForm.qlrList; 342 this.czrOptions = this.ruleForm.qlrList;
...@@ -343,10 +344,11 @@ ...@@ -343,10 +344,11 @@
343 if (item.sfczr == 1) { 344 if (item.sfczr == 1) {
344 this.czr = item.zjh 345 this.czr = item.zjh
345 } 346 }
346 }); 347 })
347 this.$endLoading();
348 } 348 }
349 }); 349 }).catch(() => {
350 this.loading = false
351 })
350 }, 352 },
351 components: { qlrCommonTable }, 353 components: { qlrCommonTable },
352 computed: { 354 computed: {
...@@ -354,6 +356,7 @@ ...@@ -354,6 +356,7 @@
354 }, 356 },
355 data () { 357 data () {
356 return { 358 return {
359 loading: false,
357 //表单是否可操作 360 //表单是否可操作
358 viewEdit: true, 361 viewEdit: true,
359 disabled: true, 362 disabled: true,
...@@ -453,7 +456,6 @@ ...@@ -453,7 +456,6 @@
453 } 456 }
454 }); 457 });
455 }, 458 },
456
457 /** 459 /**
458 * @description: 更新权利人信息 460 * @description: 更新权利人信息
459 * @param {*} val 461 * @param {*} val
...@@ -464,6 +466,15 @@ ...@@ -464,6 +466,15 @@
464 this.ruleForm.qlrList = _.cloneDeep(val); 466 this.ruleForm.qlrList = _.cloneDeep(val);
465 this.czrOptions = this.ruleForm.qlrList; 467 this.czrOptions = this.ruleForm.qlrList;
466 } 468 }
469 this.num = 0
470 this.ruleForm.qlrList.forEach(item => {
471 if (item.zjh == this.czr) {
472 this.num++
473 }
474 })
475 if (this.num == 0) {
476 this.czr = ''
477 }
467 }, 478 },
468 // 是否持证人变化 479 // 是否持证人变化
469 /** 480 /**
......