36d104a2 by 单帅旗

Merge remote-tracking branch 'origin/dev' into dev

2 parents 5decaa34 99463226
...@@ -135,10 +135,22 @@ export function getZtQlxx (params) { ...@@ -135,10 +135,22 @@ export function getZtQlxx (params) {
135 * @author: renchao 135 * @author: renchao
136 */ 136 */
137 export function getShList (data) { 137 export function getShList (data) {
138 console.log(data);
139 return request({ 138 return request({
140 url: SERVER.SERVERAPI + '/rest/djbRepair/getShList?bsmRepair='+data.bsmRepair, 139 url: SERVER.SERVERAPI + '/rest/djbRepair/getShList?bsmRepair='+data.bsmRepair,
141 method: 'post', 140 method: 'post',
142 data 141 data
143 }) 142 })
144 } 143 }
144
145 /**
146 * @description:初始化内容
147 * @param {*} data
148 * @author: renchao
149 */
150 export function getQlxxByQlxxBsm (params) {
151 return request({
152 url: SERVER.SERVERAPI + '/rest/djbRepair/getQlxxByQlxxBsm',
153 method: 'get',
154 params
155 })
156 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 16:08:30 4 * @LastEditTime: 2023-08-03 14:50:08
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
136 } 136 }
137 137
138 .ls-mask-window { 138 .ls-mask-window {
139 background: white;
140 position: relative; 139 position: relative;
141 left: 50%; 140 left: 50%;
142 top: 50%; 141 top: 50%;
...@@ -162,6 +161,7 @@ ...@@ -162,6 +161,7 @@
162 } 161 }
163 162
164 .mask-content { 163 .mask-content {
164 background: #ffffff;
165 padding: 20px; 165 padding: 20px;
166 width: 100%; 166 width: 100%;
167 min-height: 30%; 167 min-height: 30%;
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-28 09:34:54
5 -->
6 <template>
7 <div class="clmlmx-box">
8 <div class="title">申请材料目录</div>
9 <lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
10 </lb-table>
11 <div class="text-center">
12 <el-button @click="$popupCacel">取消</el-button>
13 </div>
14 </div>
15 </template>
16 <script>
17 import store from '@/store/index.js'
18 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
19 export default {
20 props: {
21 formData: {
22 type: Object,
23 default: () => {
24 return {}
25 }
26 }
27 },
28 data () {
29 return {
30 column: [
31 {
32 width: "50",
33 label: '序号',
34 type: 'index'
35 },
36 {
37 prop: "isrequired",
38 label: "是否必选",
39 width: "80",
40 render: (h, scope) => {
41 if (scope.row.sfxjcl === "1") {
42 return (
43 <div>
44 <span>可选</span>
45 </div>
46 );
47 }
48 else {
49 return (
50 <div>
51 <span>必选</span>
52 </div>
53 );
54 }
55 },
56 },
57 {
58 prop: "sjmc",
59 label: "材料名称",
60 },
61 {
62 prop: "sjlx",
63 label: "材料类型",
64 width: "80",
65 render: (h, scope) => {
66 return (
67 <div>
68 <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
69 </div>
70 );
71 },
72 },
73 {
74 prop: "sjsl",
75 label: "份数",
76 width: "50"
77 },
78 {
79 prop: "smzt",
80 label: "扫描状态",
81 width: "80",
82 render: (h, scope) => {
83 if (scope.row.children && scope.row.children.length > 0) {
84 return (
85 <div>
86 <span>已扫描</span>
87 </div>
88 );
89 } else {
90 return (
91 <div>
92 <span>未扫描</span>
93 </div>
94 );
95 }
96 },
97 },
98 {
99 label: "扫描页数",
100 width: "80",
101 render: (h, scope) => {
102 if (scope.row.children && scope.row.children.length > 0) {
103 return (
104 <div>
105 <span>{scope.row.children.length}</span>
106 </div>
107 );
108 } else {
109 return (
110 <div>
111 <span>0</span>
112 </div>
113 );
114 }
115 },
116 },
117 {
118 label: "操作",
119 width: "80",
120 render: (h, scope) => {
121 return (
122 <div>
123 <el-button
124 type="text"
125 disabled={scope.$index == 0}
126 onClick={() => {
127 this.moveUpward(scope.$index, scope.row);
128 }}
129 >
130 上移
131 </el-button>
132 <el-button
133 type="text"
134 disabled={scope.$index + 1 == this.tableData.length}
135 onClick={() => {
136 this.moveDown(scope.$index, scope.row);
137 }}
138 >
139 下移
140 </el-button>
141 </div>
142 );
143 },
144 },
145 ],
146 key: 0,
147 tableData: []
148 }
149 },
150 created () {
151 console.log(this.formData.data, 'formData');
152 },
153 methods: {
154 // 材料目录明细初始化
155 /**
156 * @description: 材料目录明细初始化
157 * @author: renchao
158 */
159 clmlInitList () {
160 return new Promise(resolve => {
161 this.unitData = this.$parent.unitData;
162 var formdata = new FormData();
163 formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
164 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
165 formdata.append("clfl", 2);
166 InitClml(formdata).then((res) => {
167 if (res.code == 200) {
168 resolve(res.code)
169 if (res.result && res.result.length > 0) {
170 this.data = res.result;
171 } else {
172 this.data = []
173 }
174 } else {
175 this.$message.error(res.message)
176 }
177 })
178 })
179 },
180 // 上移
181 /**
182 * @description: 上移
183 * @param {*} index
184 * @param {*} row
185 * @author: renchao
186 */
187 moveUpward (index, row) {
188 let obj = {
189 xh: row.xh,
190 bsmSlsq: row.bsmSlsq,
191 moveDirection: "UP",
192 };
193 // 接口待调
194 /**
195 * @description: 接口待调
196 * @param {*} obj
197 * @author: renchao
198 */
199 moveClml(obj).then(async (res) => {
200 if (res.code == 200) {
201 let res = await this.clmlInitList()
202 if (res == 200) {
203 this.$message({
204 message: '上移成功',
205 type: 'success'
206 })
207 this.$parent.setTableData(this.data)
208 }
209 } else {
210 this.$message.error(res.message);
211 }
212 })
213 },
214 // 下移
215 /**
216 * @description: 下移
217 * @param {*} index
218 * @param {*} row
219 * @author: renchao
220 */
221 moveDown (index, row) {
222 let obj = {
223 xh: row.xh,
224 bsmSlsq: row.bsmSlsq,
225 moveDirection: "DOWN",
226 }
227 // 接口待调
228 /**
229 * @description: 接口待调
230 * @param {*} obj
231 * @author: renchao
232 */
233 moveClml(obj).then(async (res) => {
234 if (res.code == 200) {
235 let res = await this.clmlInitList()
236 if (res == 200) {
237 this.$message({
238 message: '下移成功',
239 type: 'success'
240 })
241 }
242 } else {
243 this.$message.error(res.message);
244 }
245 })
246 },
247 // 材料目录删除
248 /**
249 * @description: 材料目录删除
250 * @param {*} index
251 * @param {*} row
252 * @author: renchao
253 */
254 handleDelete (index, row) {
255 let that = this
256 this.$confirm('此操作将永久删除该 是否继续?', '提示', {
257 confirmButtonText: '确定',
258 cancelButtonText: '取消',
259 type: 'warning'
260 }).then(() => {
261 deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => {
262 if (res.code == 200) {
263 let res = await that.clmlInitList()
264 if (res == 200) {
265 that.$message({
266 message: "删除成功",
267 type: "success",
268 })
269 // this.$parent.setTableData(this.data)
270 }
271 }
272 })
273 }).catch(() => {
274 this.$message({
275 type: 'info',
276 message: '已取消删除'
277 })
278 })
279 },
280 // 字典
281 /**
282 * @description: 字典
283 * @param {*} val
284 * @param {*} code
285 * @author: renchao
286 */
287 dicStatus (val, code) {
288 let data = store.getters.dictData[code],
289 name = "暂无";
290 if (data) {
291 data.map((item) => {
292 if (item.dcode == val) {
293 name = item.dname;
294 }
295 });
296 return name;
297 }
298 }
299 }
300 }
301 </script>
302 <style scoped lang='scss'>
303 @import "~@/styles/mixin.scss";
304 .clmlmx-box {
305 margin: 0 auto;
306
307 .title {
308 text-align: center;
309 height: 60px;
310 line-height: 60px;
311 border: 1px solid #dfe6ec;
312 font-size: 20px;
313 background: #81d3f81a;
314 margin-bottom: -1px;
315 }
316 }
317 </style>
1 export function deleteCollectBiz (bsmSqyw) {
2 return request({
3 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
4 method: 'post'
5 })
6 }
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
71 </el-col> 71 </el-col>
72 72
73 <el-col :span="8" v-if="ssqlxxshow"> 73 <el-col :span="8" v-if="ssqlxxshow">
74 <el-form-item label="上手权利信息:"> 74 <el-form-item label="上手权利信息:" prop="ssQlxx.bdcqzh" :rules="rules.ssQlxxrules">
75 <select-table 75 <select-table
76 v-model="ruleForm.ssQlxx" 76 v-model="ruleForm.ssQlxx"
77 :table-width="550" 77 :table-width="550"
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
433 <script> 433 <script>
434 import { mapGetters } from "vuex"; 434 import { mapGetters } from "vuex";
435 import ywmix from "@/views/ywbl/mixin/index" 435 import ywmix from "@/views/ywbl/mixin/index"
436 import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbRepair.js"; 436 import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm,save } from "@/api/djbRepair.js";
437 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 437 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
438 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 438 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
439 import tdytTable from "@/views/workflow/components/tdytTable"; 439 import tdytTable from "@/views/workflow/components/tdytTable";
...@@ -510,6 +510,9 @@ ...@@ -510,6 +510,9 @@
510 ableOperation: false, 510 ableOperation: false,
511 //传递参数\ 511 //传递参数\
512 rules: { 512 rules: {
513 ssQlxxrules: [
514 { required: true, message: "上手权利信息", trigger: "blur" },
515 ],
513 ztQlxxrules: [ 516 ztQlxxrules: [
514 { required: true, message: "抵押不动产信息", trigger: "blur" }, 517 { required: true, message: "抵押不动产信息", trigger: "blur" },
515 ], 518 ],
...@@ -546,6 +549,64 @@ ...@@ -546,6 +549,64 @@
546 ssQlxxchange (val) { 549 ssQlxxchange (val) {
547 this.ruleForm.ssQlxx = val; 550 this.ruleForm.ssQlxx = val;
548 this.ruleForm.qlxx.ssywh = val.ywh; 551 this.ruleForm.qlxx.ssywh = val.ywh;
552 this.ssQlxxchangediolog (val)
553 },
554 // 弹框事件
555 ssQlxxchangediolog (val) {
556 console.log("确定了",this.ruleForm)
557 this.$confirm("是否将上手权利信息同步到表单", "提示", {
558 iconClass: "el-icon-question", //自定义图标样式
559 confirmButtonText: "确认", //确认按钮文字更换
560 cancelButtonText: "取消", //取消按钮文字更换
561 showClose: true, //是否显示右上角关闭按钮
562 type: "warning",
563 }).then(() => {
564 getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
565 if (res.code == 200) {
566 this.nowlist = res.result;
567 console.log("his.nowlist", this.nowlist);
568 console.log("this.ruleForm", this.ruleForm);
569 for (var key in this.ruleForm.dyiq) {
570 if (
571 this.ruleForm.dyiq[key] == "" ||
572 this.ruleForm.dyiq[key] == null
573 ) {
574 this.ruleForm.dyiq[key] = this.nowlist.dyiq[key];
575 }
576 }
577 for (var key in this.ruleForm.qlxx) {
578 if (
579 (this.ruleForm.qlxx[key] == null && key != "ywh") ||
580 this.ruleForm.qlxx[key] == null
581 ) {
582 console.log("this.ruleForm.qlxx[key]", key);
583 if (key != "ywh") {
584 this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
585 }
586 }
587 }
588 if (!this.ruleForm.tdytqxList.length) {
589 this.ruleForm.tdytqxList = this.nowlist.tdytqxList;
590 }
591 if (!this.ruleForm.qlrData.length) {
592 this.ruleForm.qlrData = this.nowlist.qlrData;
593 }
594 if (!this.ruleForm.ywrData.length) {
595 this.ruleForm.ywrData = this.nowlist.ywrData;
596 }
597 console.log("this.ruleForm", this.ruleForm);
598 this.$message({
599 type: "success",
600 message: "同步成功!",
601 });
602 }
603 });
604 }).catch(() => {
605 this.$message({
606 type: "info",
607 message: "已取消同步",
608 });
609 });
549 }, 610 },
550 /** 611 /**
551 * @description: djlxchange 612 * @description: djlxchange
...@@ -576,23 +637,28 @@ ...@@ -576,23 +637,28 @@
576 } 637 }
577 this.$endLoading(); 638 this.$endLoading();
578 this.isShow = true; 639 this.isShow = true;
579 } 640
580 });
581 //获取主体信息 641 //获取主体信息
582 getSsQlxx({ 642 getSsQlxx({
583 bdcdyid: this.propsParam.bdcdyid, 643 bdcdyid: this.propsParam.bdcdyid,
584 qllx: this.propsParam.qllx, 644 qllx: this.propsParam.qllx,
645 bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
585 }).then((res) => { 646 }).then((res) => {
586 if (res.code == 200) { 647 if (res.code == 200) {
587 this.ssQlxxList = res.result; 648 this.ssQlxxList = res.result;
588 } 649 }
589 }); 650 });
590 //获取上手信息 651 //获取上手信息
591 getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { 652 getZtQlxx({
653 bdcdyid: this.propsParam.bdcdyid,
654 bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
655 }).then((res) => {
592 if (res.code == 200) { 656 if (res.code == 200) {
593 this.ztQlxxList = res.result; 657 this.ztQlxxList = res.result;
594 } 658 }
595 }); 659 });
660 }
661 });
596 }, 662 },
597 // 更新土地用途信息 663 // 更新土地用途信息
598 /** 664 /**
......
...@@ -97,6 +97,8 @@ export default { ...@@ -97,6 +97,8 @@ export default {
97 yjsqOptions: { 97 yjsqOptions: {
98 handler(val) { 98 handler(val) {
99 console.log("val", val); 99 console.log("val", val);
100 console.log("this.tableData[this.currentindex]",this.tableData[this.currentindex]);
101
100 this.add(val); 102 this.add(val);
101 }, 103 },
102 deep: true, 104 deep: true,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-28 15:46:24 4 * @LastEditTime: 2023-08-03 14:13:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -202,10 +202,9 @@ ...@@ -202,10 +202,9 @@
202 width: 300px; 202 width: 300px;
203 margin-top: 10px; 203 margin-top: 10px;
204 margin-right: 10px; 204 margin-right: 10px;
205 205 // .szxx_body {
206 .szxx_body { 206 // height: 240px;
207 height: 240px; 207 // }
208 }
209 } 208 }
210 } 209 }
211 210
......