Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
cb1faf8e by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 864cd412 599955af
Inline Side-by-side
Showing 6 changed files with 43 additions and 90 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-24 16:53:30 4 * @LastEditTime: 2023-10-24 17:15:25
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 import Sortable from 'sortablejs' 19 import Sortable from 'sortablejs'
20 import store from '@/store/index.js' 20 import store from '@/store/index.js'
21 import { ywPopupCacel } from "@/utils/popup.js"; 21 import { ywPopupCacel } from "@/utils/popup.js";
22 import { InitClml, updateClml } from "@/api/clxx.js"; 22 import { updateClml } from "@/api/clxx.js";
23 export default { 23 export default {
24 props: { 24 props: {
25 formData: { 25 formData: {
...@@ -202,31 +202,6 @@ ...@@ -202,31 +202,6 @@
202 }) 202 })
203 }, 203 },
204 /** 204 /**
205 * @description: 材料目录明细初始化
206 * @author: renchao
207 */
208 clmlInitList () {
209 return new Promise(resolve => {
210 this.unitData = this.$parent.unitData;
211 var formdata = new FormData();
212 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
213 formdata.append("bsmSldy", this.formData.bsmRepair);
214 formdata.append("clfl", 3);
215 InitClml(formdata).then((res) => {
216 if (res.code == 200) {
217 resolve(res.code)
218 if (res.result && res.result.length > 0) {
219 this.tableData = res.result;
220 } else {
221 this.tableData = []
222 }
223 } else {
224 this.$message.error(res.message)
225 }
226 })
227 })
228 },
229 /**
230 * @description: 材料目录删除 205 * @description: 材料目录删除
231 * @param {*} index 206 * @param {*} index
232 * @param {*} row 207 * @param {*} row
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-24 16:55:26 4 * @LastEditTime: 2023-10-24 17:17:46
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -297,14 +297,12 @@ ...@@ -297,14 +297,12 @@
297 }, 297 },
298 //查看明细 298 //查看明细
299 async viewDetail () { 299 async viewDetail () {
300 let res = await this.clmlInitList(); 300 await this.clmlInitList();
301 if (res == 200) { 301 store.dispatch("user/reWorkFresh", false);
302 store.dispatch("user/reWorkFresh", false); 302 ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", {
303 ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", { 303 data: this.tableData,
304 data: this.tableData, 304 ableOperation: this.$parent.ableOperation
305 ableOperation: this.$parent.ableOperation 305 }, "60%", true, false)
306 }, "60%", true, false)
307 }
308 }, 306 },
309 //设置tableData 307 //设置tableData
310 setTableData (tableData) { 308 setTableData (tableData) {
......
...@@ -305,23 +305,21 @@ ...@@ -305,23 +305,21 @@
305 }, 305 },
306 //查看明细 306 //查看明细
307 async viewDetail () { 307 async viewDetail () {
308 let res = await this.clmlInitList(); 308 await this.clmlInitList();
309 if (res == 200) { 309 this.$store.dispatch("user/reWorkFresh", false);
310 this.$store.dispatch("user/reWorkFresh", false); 310 this.$popupDialog(
311 this.$popupDialog( 311 "申请材料目录",
312 "申请材料目录", 312 "workflow/components/dialog/clxxDetailDialog",
313 "workflow/components/dialog/clxxDetailDialog", 313 {
314 { 314 data: this.tableData,
315 data: this.tableData, 315 bsmSldy: this.$parent.currentSelectProps.bsmSldy,
316 bsmSldy: this.$parent.currentSelectProps.bsmSldy, 316 unitData: this.$parent.unitData,
317 unitData: this.$parent.unitData, 317 ableOperation: this.$parent.ableOperation,
318 ableOperation: this.$parent.ableOperation, 318 bsmRepair: this.$parent.bsmRepair
319 bsmRepair: this.$parent.bsmRepair 319 },
320 }, 320 "60%",
321 "60%", 321 true
322 true 322 )
323 )
324 }
325 }, 323 },
326 //设置tableData 324 //设置tableData
327 setTableData (tableData) { 325 setTableData (tableData) {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-24 16:08:59 4 * @LastEditTime: 2023-10-24 17:16:18
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 import Vue from 'vue' 18 import Vue from 'vue'
19 import Sortable from 'sortablejs' 19 import Sortable from 'sortablejs'
20 import store from '@/store/index.js' 20 import store from '@/store/index.js'
21 import { InitClml, updateClml } from "@/api/clxx.js"; 21 import { updateClml } from "@/api/clxx.js";
22 export default { 22 export default {
23 props: { 23 props: {
24 formData: { 24 formData: {
...@@ -197,30 +197,6 @@ ...@@ -197,30 +197,6 @@
197 }) 197 })
198 }, 198 },
199 /** 199 /**
200 * @description: 材料目录明细初始化
201 * @author: renchao
202 */
203 clmlInitList () {
204 return new Promise(resolve => {
205 this.unitData = this.$parent.unitData;
206 var formdata = new FormData();
207 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
208 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
209 InitClml(formdata).then((res) => {
210 if (res.code == 200) {
211 resolve(res.code)
212 if (res.result && res.result.length > 0) {
213 this.tableData = res.result;
214 } else {
215 this.tableData = []
216 }
217 } else {
218 this.$message.error(res.message)
219 }
220 })
221 })
222 },
223 /**
224 * @description: 材料目录删除 200 * @description: 材料目录删除
225 * @param {*} index 201 * @param {*} index
226 * @param {*} row 202 * @param {*} row
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-24 16:13:19 4 * @LastEditTime: 2023-10-24 17:18:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -288,14 +288,12 @@ ...@@ -288,14 +288,12 @@
288 }, 288 },
289 //查看明细 289 //查看明细
290 async viewDetail () { 290 async viewDetail () {
291 let res = await this.clmlInitList(); 291 await this.clmlInitList();
292 if (res == 200) { 292 store.dispatch("user/reWorkFresh", false);
293 store.dispatch("user/reWorkFresh", false); 293 ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
294 ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", { 294 data: this.tableData,
295 data: this.tableData, 295 bsmCompany: this.formData.bsmCompany
296 bsmCompany: this.formData.bsmCompany 296 }, "60%", true, false)
297 }, "60%", true, false)
298 }
299 }, 297 },
300 //设置tableData 298 //设置tableData
301 setTableData (tableData) { 299 setTableData (tableData) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-10-10 14:24:08 5 * @LastEditTime: 2023-10-24 17:29:28
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -85,7 +85,15 @@ ...@@ -85,7 +85,15 @@
85 </el-col> 85 </el-col>
86 <el-col :span="8"> 86 <el-col :span="8">
87 <el-form-item label="土地用途："> 87 <el-form-item label="土地用途：">
88 <el-input :disabled="!viewEdit" v-model="ruleForm.qlxx.ytmc"></el-input> 88 <treeselect
89 v-model="ruleForm.qlxx.ytmc"
90 noOptionsText="暂无数据"
91 :default-expand-level="1"
92 :disabled="!viewEdit"
93 placeholder=""
94 :normalizer="normalizer"
95 :show-count="true"
96 :options="dictData['tdyt']" />
89 </el-form-item> 97 </el-form-item>
90 </el-col> 98 </el-col>
91 <el-col :span="8"> 99 <el-col :span="8">
......