56ab0c7f by xiaomiao

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

2 parents ce70133c 12df1038
Showing 37 changed files with 417 additions and 317 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 16:09:44 4 * @LastEditTime: 2023-08-15 10:01:26
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
...@@ -148,8 +148,8 @@ ...@@ -148,8 +148,8 @@
148 148
149 .ls-title { 149 .ls-title {
150 padding: 16px; 150 padding: 16px;
151 color: #4a4e56; 151 color: #ffffff;
152 // background: linear-gradient(3deg, #edf0f7, #f4f5f6); 152 background: linear-gradient(3deg, #409eff, #a7cbee);
153 font-size: 16px; 153 font-size: 16px;
154 } 154 }
155 155
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
185 right: 26px; 185 right: 26px;
186 font-size: 24px; 186 font-size: 24px;
187 cursor: pointer; 187 cursor: pointer;
188 color: #4a4e56; 188 color: #ffffff;
189 } 189 }
190 190
191 /deep/.el-loading-mask { 191 /deep/.el-loading-mask {
......
...@@ -54,7 +54,9 @@ service.interceptors.response.use( ...@@ -54,7 +54,9 @@ service.interceptors.response.use(
54 */ 54 */
55 if (response.status == 200) { 55 if (response.status == 200) {
56 return response.data; 56 return response.data;
57 } else { 57 }else if (response.status == 2002){
58 Message.error(response.message);
59 }else {
58 handleErrorData(response.data); 60 handleErrorData(response.data);
59 } 61 }
60 return response; 62 return response;
......
1 import { log } from "bpmn-js-token-simulation"; 1 /*
2 2 * @Description:
3 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-15 11:02:38
5 */
4 var qlxxPage = [ 6 var qlxxPage = [
5 { qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" }, 7 { qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" },
6 { qllx: "A02", id: "tdsyq", form: "tdsyq.vue", label: "国家土地所有权" }, 8 { qllx: "A02", id: "tdsyq", form: "tdsyq.vue", label: "国家土地所有权" },
...@@ -41,7 +43,7 @@ var qlxxPage = [ ...@@ -41,7 +43,7 @@ var qlxxPage = [
41 ]; 43 ];
42 44
43 //组装登记簿树形结构 45 //组装登记簿树形结构
44 export function loadTreeData(qlxxData) { 46 export function loadTreeData (qlxxData, index) {
45 let treedata = []; 47 let treedata = [];
46 //加载封面 48 //加载封面
47 treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" }); 49 treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" });
...@@ -74,19 +76,19 @@ export function loadTreeData(qlxxData) { ...@@ -74,19 +76,19 @@ export function loadTreeData(qlxxData) {
74 * @param {*} bdcdylx 76 * @param {*} bdcdylx
75 * @author: renchao 77 * @author: renchao
76 */ 78 */
77 export function getNode(qllx, qlxx, bdcdylx) { 79 export function getNode (qllx, qlxx, bdcdylx) {
78 let node; 80 let node;
79 for (var i = 0; i < qlxxPage.length; i++) { 81 for (var i = 0; i < qlxxPage.length; i++) {
80 if (qlxxPage[i].qllx == qllx) { 82 if (qlxxPage[i].qllx == qllx) {
81 if (qllx == "A04" || qllx == "A06" || qllx == "A08") { 83 if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
82 if (bdcdylx == "4") { 84 if (bdcdylx == "4") {
83 node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label}; 85 node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label };
84 } else { 86 } else {
85 87
86 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label}; 88 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label };
87 } 89 }
88 } else { 90 } else {
89 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label}; 91 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label };
90 } 92 }
91 break; 93 break;
92 } 94 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 09:51:37 4 * @LastEditTime: 2023-08-15 10:39:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="bdcqldjml"> 7 <div class="bdcqldjml">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </tr> 18 </tr>
19 <tr v-for="(item, index) in bdcqlml" :key="index"> 19 <tr v-for="(item, index) in bdcqlml" :key="index">
20 <td>{{ index + 1 }}</td> 20 <td>{{ index + 1 }}</td>
21 <td>{{ item.bdcdyh }}</td> 21 <td><el-link type="primary" @click="handleSelectBdcdyh(item.bdcdyh)" :underline="false">{{ item.bdcdyh }} </el-link></td>
22 <td>{{ item.bdclx }}</td> 22 <td>{{ item.bdclx }}</td>
23 <td>{{ item.szbs }}</td> 23 <td>{{ item.szbs }}</td>
24 <td>{{ item.bz }}</td> 24 <td>{{ item.bz }}</td>
...@@ -30,19 +30,25 @@ ...@@ -30,19 +30,25 @@
30 <script> 30 <script>
31 import { getBdcqldjmlByBdcdyid } from "@/api/djbDetail.js"; 31 import { getBdcqldjmlByBdcdyid } from "@/api/djbDetail.js";
32 export default { 32 export default {
33 props: ["formData"],
33 data () { 34 data () {
34 return { 35 return {
35 bdcqlml: [], 36 bdcqlml: [],
36 propsParam: this.$attrs, 37 propsParam: this.$attrs
37 }; 38 }
38 }, 39 },
39 mounted () { 40 mounted () {
40 getBdcqldjmlByBdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { 41 getBdcqldjmlByBdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
41 if (res.code === 200) { 42 if (res.code === 200) {
42 this.bdcqlml = res.result; 43 this.bdcqlml = res.result;
43 } 44 }
44 }); 45 })
45 }, 46 },
47 methods: {
48 handleSelectBdcdyh (val) {
49 this.$emit('getBdcdyh', val);
50 }
51 }
46 }; 52 };
47 </script> 53 </script>
48 54
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-10 16:28:55 4 * @LastEditTime: 2023-08-15 10:57:30
5 --> 5 -->
6 <template> 6 <template>
7 <div class="content"> 7 <div class="content">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </el-tree> 11 </el-tree>
12 </div> 12 </div>
13 <div class="right"> 13 <div class="right">
14 <component :is="componentTag" v-bind="currentSelectProps" /> 14 <component :is="componentTag" @getBdcdyh="getBdcdyh" v-bind="currentSelectProps" />
15 </div> 15 </div>
16 </div> 16 </div>
17 </template> 17 </template>
...@@ -42,17 +42,21 @@ ...@@ -42,17 +42,21 @@
42 }, 42 },
43 props: ["formData"], 43 props: ["formData"],
44 mounted () { 44 mounted () {
45 this.loadData(); 45 this.loadData(this.formData.bdcdyh);
46 }, 46 },
47 methods: { 47 methods: {
48 getBdcdyh (val) {
49 console.log(val, ';222222222222');
50 // this.loadData(val);
51 },
48 /** 52 /**
49 * @description: loadData 53 * @description: loadData
50 * @author: renchao 54 * @author: renchao
51 */ 55 */
52 loadData () { 56 loadData (val) {
53 getBdcqljqtsx({ 57 getBdcqljqtsx({
54 bdcdyid: this.formData.bdcdyid, 58 bdcdyid: this.formData.bdcdyid,
55 bdcdyh: this.formData.bdcdyh, 59 bdcdyh: val,
56 }).then((res) => { 60 }).then((res) => {
57 if (res.code === 200) { 61 if (res.code === 200) {
58 this.treedata = loadTreeData(res.result, this.formData.bdcdyh); 62 this.treedata = loadTreeData(res.result, this.formData.bdcdyh);
...@@ -60,15 +64,15 @@ ...@@ -60,15 +64,15 @@
60 this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, this.formData.bdcdylx || ""); 64 this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, this.formData.bdcdylx || "");
61 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 65 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
62 this.loadComponent(this.defaultNode.form); 66 this.loadComponent(this.defaultNode.form);
63 }); 67 })
64 } 68 }
65 }); 69 })
66 this.currentSelectProps = { 70 this.currentSelectProps = {
67 bdcdyid: this.formData.bdcdyid, 71 bdcdyid: this.formData.bdcdyid,
68 bdcdyh: this.formData.bdcdyh, 72 bdcdyh: this.formData.bdcdyh,
69 qllx: this.formData.qllx, 73 qllx: this.formData.qllx,
70 bsmQlxx: this.formData.bsmQlxx, 74 bsmQlxx: this.formData.bsmQlxx
71 }; 75 }
72 }, 76 },
73 /** 77 /**
74 * @description: handleNodeClick 78 * @description: handleNodeClick
...@@ -86,12 +90,11 @@ ...@@ -86,12 +90,11 @@
86 * @author: renchao 90 * @author: renchao
87 */ 91 */
88 loadComponent (form) { 92 loadComponent (form) {
89 console.log(form, 'formformformform');
90 this.componentTag = (r) => 93 this.componentTag = (r) =>
91 require.ensure([], () => r(require("@/views/registerBook/" + form))); 94 require.ensure([], () => r(require("@/views/registerBook/" + form)))
92 }, 95 }
96 }
93 } 97 }
94 };
95 </script> 98 </script>
96 <style scoped lang="scss"> 99 <style scoped lang="scss">
97 /deep/.rollTable { 100 /deep/.rollTable {
......
...@@ -10,7 +10,11 @@ ...@@ -10,7 +10,11 @@
10 {{ title }} 10 {{ title }}
11 <div class="checkbox"> 11 <div class="checkbox">
12 <el-checkbox-group v-model="checkList" @change="checkChange"> 12 <el-checkbox-group v-model="checkList" @change="checkChange">
13 <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox> 13 <el-checkbox
14 v-for="item in qsztList"
15 :key="item.value"
16 :label="item.value"
17 >{{ item.label }}</el-checkbox>
14 </el-checkbox-group> 18 </el-checkbox-group>
15 </div> 19 </div>
16 </div> 20 </div>
...@@ -18,10 +22,11 @@ ...@@ -18,10 +22,11 @@
18 <!-- 固定前三个 --> 22 <!-- 固定前三个 -->
19 <table class="xxTable"> 23 <table class="xxTable">
20 <tr v-for="(item, colindex) in columns" :key="colindex"> 24 <tr v-for="(item, colindex) in columns" :key="colindex">
21 <td> 25 <td>{{ item.label }}</td>
22 {{ item.label }} 26 <td
23 </td> 27 v-for="(row, index) in tableData"
24 <td v-for="(row, index) in tableData" :key="index" :class="[ 28 :key="index"
29 :class="[
25 row.qszt == '2' ? 'lishi' : '', 30 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 31 row.qszt == '0' ? 'linshi' : '',
27 row.qlzt == '4' ? 'linshi' : '', 32 row.qlzt == '4' ? 'linshi' : '',
...@@ -30,28 +35,19 @@ ...@@ -30,28 +35,19 @@
30 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 35 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
31 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 36 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
32 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '' 37 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
33 ]"> 38 ]"
39 >
34 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 40 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
35 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 41 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
36 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 42 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
37 </div> 43 </div>
38 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 44 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">有效</div>
39 有效 45 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
40 </div> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
41 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'"> 47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
42 正在补录 48 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
43 </div>
44 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
45 正在申请
46 </div>
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
48 正在注销
49 </div>
50 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }}
52 </span>
53 49
54 <span v-else> {{ row[item.prop] }}</span> 50 <span v-else>{{ row[item.prop] }}</span>
55 </td> 51 </td>
56 <td v-for="count in emptycolNum" :key="~count"></td> 52 <td v-for="count in emptycolNum" :key="~count"></td>
57 </tr> 53 </tr>
...@@ -59,16 +55,16 @@ ...@@ -59,16 +55,16 @@
59 </div> 55 </div>
60 </div> 56 </div>
61 </div> 57 </div>
62 </template> 58 </template>
63 59
64 <script> 60 <script>
65 import { datas } from "./qlxxFormData.js"; 61 import { datas } from "./qlxxFormData.js";
66 import { getSjlx } from "@/utils/dictionary.js"; 62 import { getSjlx } from "@/utils/dictionary.js";
67 import { getLqList } from "@/api/djbDetail.js"; 63 import { getLqList } from "@/api/djbDetail.js";
68 export default { 64 export default {
69 data () { 65 data() {
70 return { 66 return {
71 title: "林地使用权登记信息", 67 title: "林权登记信息",
72 qsztList: datas.columns().qsztList, 68 qsztList: datas.columns().qsztList,
73 checkList: datas.columns().checkList, 69 checkList: datas.columns().checkList,
74 //传递参数 70 //传递参数
...@@ -81,7 +77,7 @@ ...@@ -81,7 +77,7 @@
81 columns: datas.columns().LDSYQ, 77 columns: datas.columns().LDSYQ,
82 }; 78 };
83 }, 79 },
84 created () { 80 created() {
85 this.loadData(); 81 this.loadData();
86 }, 82 },
87 methods: { 83 methods: {
...@@ -89,13 +85,12 @@ ...@@ -89,13 +85,12 @@
89 * @description: loadData 85 * @description: loadData
90 * @author: renchao 86 * @author: renchao
91 */ 87 */
92 loadData () { 88 loadData() {
93
94 if (this.$parent.addRepairRecord) { 89 if (this.$parent.addRepairRecord) {
95 this.columns.unshift({ 90 this.columns.unshift({
96 prop: "cz", 91 prop: "cz",
97 label: "操作" 92 label: "操作",
98 }) 93 });
99 } 94 }
100 getLqList({ 95 getLqList({
101 bdcdyid: this.propsParam.bdcdyid, 96 bdcdyid: this.propsParam.bdcdyid,
...@@ -104,9 +99,9 @@ ...@@ -104,9 +99,9 @@
104 }).then((res) => { 99 }).then((res) => {
105 if (res.code === 200) { 100 if (res.code === 200) {
106 this.tableData = res.result; 101 this.tableData = res.result;
107 this.tableData.forEach(item => { 102 this.tableData.forEach((item) => {
108 item.sjlx = getSjlx(item.sjlx) 103 item.sjlx = getSjlx(item.sjlx);
109 }) 104 });
110 if (this.tableData.length < datas.columns().emptycolNum) { 105 if (this.tableData.length < datas.columns().emptycolNum) {
111 this.emptycolNum = 106 this.emptycolNum =
112 datas.columns().emptycolNum - this.tableData.length; 107 datas.columns().emptycolNum - this.tableData.length;
...@@ -120,7 +115,7 @@ ...@@ -120,7 +115,7 @@
120 * @description: checkChange 115 * @description: checkChange
121 * @author: renchao 116 * @author: renchao
122 */ 117 */
123 checkChange () { 118 checkChange() {
124 if (this.checkList.length === 0) { 119 if (this.checkList.length === 0) {
125 this.tableData = []; 120 this.tableData = [];
126 this.emptycolNum = datas.columns().emptycolNum; 121 this.emptycolNum = datas.columns().emptycolNum;
...@@ -133,7 +128,7 @@ ...@@ -133,7 +128,7 @@
133 * @param {*} code 128 * @param {*} code
134 * @author: renchao 129 * @author: renchao
135 */ 130 */
136 getQsztName (code) { 131 getQsztName(code) {
137 let name = ""; 132 let name = "";
138 for (let item of this.qsztList) { 133 for (let item of this.qsztList) {
139 if (item.value == code) { 134 if (item.value == code) {
...@@ -150,31 +145,32 @@ ...@@ -150,31 +145,32 @@
150 * @param {*} del 145 * @param {*} del
151 * @author: renchao 146 * @author: renchao
152 */ 147 */
153 editDialog (row, del) { 148 editDialog(row, del) {
154 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 149 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
155 confirmButtonText: '确定', 150 confirmButtonText: "确定",
156 cancelButtonText: '取消', 151 cancelButtonText: "取消",
157 type: 'warning' 152 type: "warning",
158 }).then(() => { 153 })
159 this.$parent.addRepairRecord(row, del) 154 .then(() => {
155 this.$parent.addRepairRecord(row, del);
160 156
161 this.$message({ 157 this.$message({
162 type: 'success', 158 type: "success",
163 message: '补录成功!' 159 message: "补录成功!",
164 }); 160 });
165 }).catch(() => { 161 })
162 .catch(() => {
166 this.$message({ 163 this.$message({
167 type: 'info', 164 type: "info",
168 message: '取消编辑' 165 message: "取消编辑",
169 }); 166 });
170 }); 167 });
171
172 }, 168 },
173 }, 169 },
174 }; 170 };
175 </script> 171 </script>
176 172
177 <style lang="scss" scoped> 173 <style lang="scss" scoped>
178 @import "./qlxxCommon.scss"; 174 @import "./qlxxCommon.scss";
179 </style> 175 </style>
180 176
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -24,6 +24,116 @@ class data extends filter { ...@@ -24,6 +24,116 @@ class data extends filter {
24 label: "历史", 24 label: "历史",
25 }, 25 },
26 ], 26 ],
27 TDSYQ: [
28 {
29 prop: "qszt",
30 label: "权属状态",
31 },
32 {
33 prop: "sjlx",
34 label: "数据类型",
35 },
36 {
37 prop: "qllxmc",
38 label: "权利类型",
39 },
40 {
41 prop: "djlxmc",
42 label: "登记类型",
43 },
44 {
45 prop: "ssywh",
46 label: "上手业务号",
47 },
48 {
49 prop: "dah",
50 label: "档案号",
51 },
52 {
53 prop: "ywh",
54 label: "业务号",
55 },
56 {
57 prop: "bdcdyh",
58 label: "不动产单元号",
59 },
60 {
61 prop: "zl",
62 label: "坐落",
63 },
64 {
65 prop: "gyqk",
66 label: "共有情况",
67 },
68 {
69 prop: "qlrlx",
70 label: "权利人类型",
71 },
72 {
73 prop: "qlrmc",
74 label: "权利人",
75 },
76 {
77 prop: "qlrzjzl",
78 label: "证件种类",
79 },
80 {
81 prop: "qlrzjhm",
82 label: "证件号",
83 },
84 {
85 prop: "ytmc",
86 label: "土地用途",
87 },
88 {
89 prop: "mjdw",
90 label: "面积单位",
91 },
92 {
93 prop: "gdmj",
94 label: "耕地面积",
95 },
96 {
97 prop: "ldmj",
98 label: "林地面积",
99 },
100 {
101 prop: "cdmj",
102 label: "草地面积",
103 },
104 {
105 prop: "qtnydmj",
106 label: "其他农用地面积",
107 },
108 {
109 prop: "jsydmj",
110 label: "建设用地面积",
111 },
112 {
113 prop: "wlydmj",
114 label: "未利用地面积",
115 },
116 {
117 prop: "djyy",
118 label: "登记原因",
119 },
120 {
121 prop: "bdcqzh",
122 label: "不动产权证号",
123 },
124 {
125 prop: "djsj",
126 label: "登记时间",
127 },
128 {
129 prop: "dbr",
130 label: "登簿人",
131 },
132 {
133 prop: "fj",
134 label: "附记",
135 },
136 ],
27 JSYDSYQ: [ 137 JSYDSYQ: [
28 { 138 {
29 prop: "qszt", 139 prop: "qszt",
...@@ -1174,12 +1284,12 @@ class data extends filter { ...@@ -1174,12 +1284,12 @@ class data extends filter {
1174 label: "共有情况", 1284 label: "共有情况",
1175 }, 1285 },
1176 { 1286 {
1177 prop: "qlrlx", 1287 prop: "sllmsyq1",
1178 label: "权利人类型", 1288 label: "森林林木所有权人",
1179 }, 1289 },
1180 { 1290 {
1181 prop: "qlrmc", 1291 prop: "sllmsyq2",
1182 label: "权利人", 1292 label: "森林林木使用权人",
1183 }, 1293 },
1184 { 1294 {
1185 prop: "qlrzjzl", 1295 prop: "qlrzjzl",
...@@ -1190,24 +1300,68 @@ class data extends filter { ...@@ -1190,24 +1300,68 @@ class data extends filter {
1190 label: "证件号", 1300 label: "证件号",
1191 }, 1301 },
1192 { 1302 {
1193 prop: "qlxzmc", 1303 prop: "ldsyqxz",
1194 label: "权利性质", 1304 label: "林地所有权性质",
1195 }, 1305 },
1196 { 1306 {
1197 prop: "ytmc", 1307 prop: "fbf",
1198 label: "土地用途", 1308 label: "发包方",
1199 }, 1309 },
1200 { 1310 {
1201 prop: "fbfdm", 1311 prop: "fbfdm",
1202 label: "发包方代码", 1312 label: "发包方代码",
1203 }, 1313 },
1204 { 1314 {
1205 prop: "fbfmc", 1315 prop: "syqmj",
1206 label: "发包方名称", 1316 label: "使用权面积",
1207 }, 1317 },
1208 { 1318 {
1209 prop: "mjmc", 1319 prop: "ldsyqssj",
1210 label: "使用权面积", 1320 label: "林地使用(承包)起始时间",
1321 },
1322 {
1323 prop: "ldsyjssj",
1324 label: "林地使用(承包)结束时间",
1325 },
1326 {
1327 prop: "ldsyqx",
1328 label: "林地使用(承包)期限",
1329 },
1330 {
1331 prop: "sllb",
1332 label: "森林类别",
1333 },
1334 {
1335 prop: "zylz",
1336 label: "主要树种",
1337 },
1338 {
1339 prop: "zs",
1340 label: "株数",
1341 },
1342 {
1343 prop: "lz",
1344 label: "林种",
1345 },
1346 {
1347 prop: "qy",
1348 label: "起源",
1349 },
1350 {
1351 prop: "zlnd",
1352 label: "造林年度",
1353 },
1354 {
1355 prop: "lb",
1356 label: "林班",
1357 },
1358 {
1359 prop: "xb",
1360 label: "小班",
1361 },
1362 {
1363 prop: "xdm",
1364 label: "小地名",
1211 }, 1365 },
1212 { 1366 {
1213 prop: "djjg", 1367 prop: "djjg",
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 //空列值个数 78 //空列值个数
79 emptycolNum: datas.columns().emptycolNum, 79 emptycolNum: datas.columns().emptycolNum,
80 //列名称对象 80 //列名称对象
81 columns: datas.columns().JSYDSYQ, 81 columns: datas.columns().TDSYQ,
82 }; 82 };
83 }, 83 },
84 created () { 84 created () {
......
...@@ -15,57 +15,57 @@ ...@@ -15,57 +15,57 @@
15 <el-form :model="form" v-show="n == 0" label-width="135px" ref="ruleForm"> 15 <el-form :model="form" v-show="n == 0" label-width="135px" ref="ruleForm">
16 <el-row> 16 <el-row>
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="申请分类" v-if="form.ywDetail && form.ywDetail.sqfl"> 18 <el-form-item label="申请分类" v-if="form.sqdjyw">
19 <el-select v-model="form.ywDetail.sqfl" disabled placeholder="请选择" class="width100"> 19 <el-select v-model="form.sqdjyw.sqfl" disabled placeholder="请选择" class="width100">
20 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 20 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
21 </el-option> 21 </el-option>
22 </el-select> 22 </el-select>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <el-col :span="8"> 25 <el-col :span="8">
26 <el-form-item label="登记业务编码" v-if="form.ywDetail && form.ywDetail.djywbm"> 26 <el-form-item label="登记业务编码" v-if="form.sqdjyw">
27 <el-input v-model="form.ywDetail.djywbm" disabled></el-input> 27 <el-input v-model="form.sqdjyw.djywbm" disabled></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="8"> 30 <el-col :span="8">
31 <el-form-item label="登记业务名称" v-if="form.ywDetail && form.ywDetail.djywmc"> 31 <el-form-item label="登记业务名称" v-if="form.sqdjyw">
32 <el-input v-model="form.ywDetail.djywmc" disabled></el-input> 32 <el-input v-model="form.sqdjyw.djywmc" disabled></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
36 <el-row> 36 <el-row>
37 <el-col :span="8"> 37 <el-col :span="8">
38 <el-form-item label="发起业务单元类型" v-if="form.ywDetail && form.ywDetail.fqywdylx"> 38 <el-form-item label="发起业务单元类型" v-if="form.sqdjyw">
39 <el-select v-model="form.ywDetail.fqywdylx" disabled placeholder="请选择" class="width100"> 39 <el-select v-model="form.sqdjyw.sqywdylx" disabled placeholder="请选择" class="width100">
40 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 40 <el-option v-for="item in sqywdylx" :key="item.dcode" :label="item.dname" :value="item.dcode">
41 </el-option> 41 </el-option>
42 </el-select> 42 </el-select>
43 </el-form-item> 43 </el-form-item>
44 </el-col> 44 </el-col>
45 <el-col :span="8"> 45 <el-col :span="8">
46 <el-form-item label="是否启用" prop="enabled"> 46 <el-form-item label="是否启用" prop="enabled" v-if="form.sqdjyw">
47 <el-radio-group v-model="form.ywDetail.enabled"> 47 <el-radio-group v-model="form.sqdjyw.enabled">
48 <el-radio label="1">启用</el-radio> 48 <el-radio label="1">启用</el-radio>
49 <el-radio label="0">禁用</el-radio> 49 <el-radio label="0">禁用</el-radio>
50 </el-radio-group> 50 </el-radio-group>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="8"> 53 <el-col :span="8">
54 <el-form-item label="业务流程ID" prop="flowid"> 54 <el-form-item label="业务流程ID" prop="flowid" v-if="form.sqdjyw">
55 <el-input v-model="form.ywDetail.flowid"></el-input> 55 <el-input v-model="form.sqdjyw.flowid"></el-input>
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
58 <el-col :span="8"> 58 <el-col :span="24">
59 <el-form-item label="流程参数" prop="flowparams"> 59 <el-form-item label="流程参数" prop="flowparams" v-if="form.sqdjyw">
60 <el-input v-model="form.ywDetail.flowparams"></el-input> 60 <el-input v-model="form.sqdjyw.flowparams"></el-input>
61 </el-form-item> 61 </el-form-item>
62 </el-col> 62 </el-col>
63 </el-row> 63 </el-row>
64 64
65 <el-row> 65 <el-row>
66 <el-col :span="8"> 66 <el-col :span="8">
67 <el-form-item label="登记原因设置" prop="sfqydjyymb"> 67 <el-form-item label="登记原因设置" prop="sfqydjyymb" v-if="form.sqdjyw">
68 <el-radio-group v-model="form.ywDetail.sfqydjyymb"> 68 <el-radio-group v-model="form.sqdjyw.sfqydjyymb">
69 <el-radio label="1">启用</el-radio> 69 <el-radio label="1">启用</el-radio>
70 <el-radio label="0">禁用</el-radio> 70 <el-radio label="0">禁用</el-radio>
71 </el-radio-group> 71 </el-radio-group>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 </el-col> 73 </el-col>
74 <el-col :span="8"> 74 <el-col :span="8">
75 <el-form-item label="登记情形及材料"> 75 <el-form-item label="登记情形及材料">
76 <el-input v-model="form.ywDetail.djqxcl" placeholder="仅支持execl文件导入"></el-input> 76 <el-input v-model="form.fileUrl" placeholder="仅支持execl文件导入"></el-input>
77 </el-form-item> 77 </el-form-item>
78 </el-col> 78 </el-col>
79 <el-col :span="1"> 79 <el-col :span="1">
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
85 </el-row> 85 </el-row>
86 <el-row> 86 <el-row>
87 <el-col :span="24"> 87 <el-col :span="24">
88 <el-form-item label="登记原因模板" prop="djyy"> 88 <el-form-item label="登记原因模板" prop="djyy" v-if="form.sqdjyw">
89 <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.ywDetail.djyy"> 89 <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.sqdjyw.djyy">
90 </el-input> 90 </el-input>
91 </el-form-item> 91 </el-form-item>
92 </el-col> 92 </el-col>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 :pagination="false" :data="form.clxx"> 102 :pagination="false" :data="form.clxx">
103 </lb-table> 103 </lb-table>
104 </el-collapse-item> 104 </el-collapse-item>
105 <el-collapse-item title="刷选权利设置" name="3" v-if="form.ywDetail.sfsxql == '1'"> 105 <el-collapse-item title="刷选权利设置" name="3" v-if="form.sqdjyw && form.sqdjyw.sfsxql == '1'">
106 <div class="dyztsd-title"> 106 <div class="dyztsd-title">
107 <b>请勾选需要查询的权利信息</b> 107 <b>请勾选需要查询的权利信息</b>
108 <div> 108 <div>
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
143 import { upward, down } from "@/utils/operation"; 143 import { upward, down } from "@/utils/operation";
144 import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/sysSqdjyw.js"; 144 import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/sysSqdjyw.js";
145 import { datas, sendThis } from "./sqywDetail"; 145 import { datas, sendThis } from "./sqywDetail";
146 import store from '@/store/index.js'
146 export default { 147 export default {
147 name: "componentDialog", 148 name: "componentDialog",
148 props: { 149 props: {
...@@ -151,21 +152,27 @@ ...@@ -151,21 +152,27 @@
151 default: () => { } 152 default: () => { }
152 } 153 }
153 }, 154 },
155
154 data () { 156 data () {
155 return { 157 return {
156 key: 0, 158 key: 0,
157 tn: 0, 159 tn: 0,
158 n: 0, 160 n: 0,
159 djlxList: [], 161 djlxList: [],
160 options: [], 162 sqywdylx:store.getters.dictData['sqywdylx'],
163 options: [
164 {label:"正常申请",value:"1"},
165 {label:"一并申请",value:"2"},
166 {label:"补录申请",value:"3"}
167 ],
161 imgUploadUrl: uploadUrl(), 168 imgUploadUrl: uploadUrl(),
162 title: "", 169 title: "",
163 activeName: "1", 170 activeName: "1",
164 form: { 171 form: {
165 bsmSqyw: '', 172 // bsmSqyw: '',
166 ywDetail: {}, 173 // ywDetail: {},
167 djqx: [], 174 // djqx: [],
168 clxx: [] 175 // clxx: []
169 }, 176 },
170 djqxCol: datas.djqxCol(), 177 djqxCol: datas.djqxCol(),
171 clxxCol: datas.clxxCol(), 178 clxxCol: datas.clxxCol(),
...@@ -248,13 +255,16 @@ ...@@ -248,13 +255,16 @@
248 let _this = this 255 let _this = this
249 getSqdjywDetail(bsmSqyw).then((res) => { 256 getSqdjywDetail(bsmSqyw).then((res) => {
250 if (res.code === 200) { 257 if (res.code === 200) {
251 _this.form.bsmSqyw = res.result.bsmSqyw 258 _this.form=res.result;
252 _this.form.ywDetail = res.result.ywDetail 259 // _this.form.bsmSqyw = res.result.bsmSqyw;
253 _this.$set(_this.form, 'djqx', res.result.djqx) 260 // _this.form.ywDetail = res.result.ywDetail;
254 _this.$set(_this.form, 'sxql', res.result.sxql) 261 // _this.$set(_this.form, 'djqx', res.result.djqx);
255 _this.$set(_this.form, 'clxx', res.result.clxx) 262 // _this.$set(_this.form, 'sxql', res.result.sxql);
256 _this.$set(_this.form, 'sxzt', res.result.sxzt) 263 // _this.$set(_this.form, 'clxx', res.result.clxx);
257 _this.$set(_this.form, 'ywDetail', res.result.ywDetail) 264 // _this.$set(_this.form, 'sxzt', res.result.sxzt);
265 // _this.$set(_this.form, 'ywDetail', res.result.ywDetail);
266 // _this.$set(_this.form, 'sqdjyw', res.result.sqdjyw);
267 // _this.$set(_this.form, 'parentRule', res.result.parentRule);
258 } else { 268 } else {
259 this.$alert(res.message) 269 this.$alert(res.message)
260 } 270 }
......
...@@ -61,11 +61,11 @@ class data extends filter { ...@@ -61,11 +61,11 @@ class data extends filter {
61 61
62 }, 62 },
63 { 63 {
64 prop: "czsj", 64 prop: "updatetime",
65 label: "最近操作时间" 65 label: "最近操作时间"
66 }, 66 },
67 { 67 {
68 prop: "czr", 68 prop: "updater",
69 label: "最近操作人" 69 label: "最近操作人"
70 }, 70 },
71 71
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-01 15:19:13 4 * @LastEditTime: 2023-08-15 09:43:21
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
13 type="primary" 13 type="primary"
14 native-type="submit" 14 native-type="submit"
15 @click="viewDetail" 15 @click="viewDetail"
16 style="width: 100%; margin-top: 10px" 16 style="width: 100%; margin-top: 10px">申请材料目录</el-button>
17 >查看明细</el-button
18 >
19 <div class="item"> 17 <div class="item">
20 材料目录({{ tableData.length }}) 18 材料目录({{ tableData.length }})
21 <div style="margin-top: 10px"> 19 <div style="margin-top: 10px">
...@@ -26,21 +24,17 @@ ...@@ -26,21 +24,17 @@
26 color: black; 24 color: black;
27 font-size: 14px; 25 font-size: 14px;
28 " 26 "
29 v-if="tableData.length == 0" 27 v-if="tableData.length == 0">
30 >
31 暂无数据 28 暂无数据
32 </div> 29 </div>
33 <div 30 <div
34 v-for="(item, index) in tableData" 31 v-for="(item, index) in tableData"
35 :key="item.bsmSj" 32 :key="item.bsmSj"
36 :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" 33 :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']"
37 @click="treeClick(item, index)" 34 @click="treeClick(item, index)">
38 >
39 <span v-if="item.isrequired == 1" class="required">必选</span> 35 <span v-if="item.isrequired == 1" class="required">必选</span>
40 {{ item.sjmc }} 36 {{ item.sjmc }}
41 <span class="cl_number" 37 <span class="cl_number">({{ item.children ? item.children.length : 0 }})</span>
42 >({{ item.children ? item.children.length : 0 }})</span
43 >
44 </div> 38 </div>
45 </div> 39 </div>
46 </div> 40 </div>
...@@ -49,9 +43,7 @@ ...@@ -49,9 +43,7 @@
49 native-type="submit" 43 native-type="submit"
50 style="width: 100%" 44 style="width: 100%"
51 @click="handleAdd()" 45 @click="handleAdd()"
52 v-if="ableOperation" 46 v-if="ableOperation">新增</el-button>
53 >新增</el-button
54 >
55 </div> 47 </div>
56 <image-preview 48 <image-preview
57 ref="imageRef" 49 ref="imageRef"
...@@ -60,22 +52,21 @@ ...@@ -60,22 +52,21 @@
60 :ableOperation="ableOperation" 52 :ableOperation="ableOperation"
61 @updateList="updateList" 53 @updateList="updateList"
62 @nextPriview="nextPriview" 54 @nextPriview="nextPriview"
63 @prevPriview="prevPriview" 55 @prevPriview="prevPriview" />
64 />
65 </div> 56 </div>
66 </div> 57 </div>
67 <clxxAddDialog v-model="isDialog" /> 58 <clxxAddDialog v-model="isDialog" />
68 </div> 59 </div>
69 </template> 60 </template>
70 <script> 61 <script>
71 import { mapGetters } from "vuex"; 62 import { mapGetters } from "vuex";
72 import clxxAddDialog from "../dialog/clxxAddDialog.vue"; 63 import clxxAddDialog from "../dialog/clxxAddDialog.vue";
73 import clxxDetailDialog from "../dialog/clxxDetailDialog.vue"; 64 import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
74 import imagePreview from "@/views/components/imagePreview.vue"; 65 import imagePreview from "@/views/components/imagePreview.vue";
75 import { InitClml, saveClml } from "@/api/clxx.js"; 66 import { InitClml, saveClml } from "@/api/clxx.js";
76 export default { 67 export default {
77 components: { clxxAddDialog, imagePreview, clxxDetailDialog }, 68 components: { clxxAddDialog, imagePreview, clxxDetailDialog },
78 data() { 69 data () {
79 return { 70 return {
80 //表单是否可操作 71 //表单是否可操作
81 ableOperation: true, 72 ableOperation: true,
...@@ -99,7 +90,7 @@ export default { ...@@ -99,7 +90,7 @@ export default {
99 computed: { 90 computed: {
100 ...mapGetters(["dictData"]), 91 ...mapGetters(["dictData"]),
101 }, 92 },
102 created() { 93 created () {
103 this.clmlInitList(1); 94 this.clmlInitList(1);
104 }, 95 },
105 computed: { 96 computed: {
...@@ -107,12 +98,12 @@ export default { ...@@ -107,12 +98,12 @@ export default {
107 }, 98 },
108 watch: { 99 watch: {
109 workFresh: { 100 workFresh: {
110 handler(newVal, oldVal) { 101 handler (newVal, oldVal) {
111 if (newVal) this.clmlInitList(1); 102 if (newVal) this.clmlInitList(1);
112 }, 103 },
113 }, 104 },
114 }, 105 },
115 mounted() { 106 mounted () {
116 this.ableOperation = this.$parent.ableOperation; 107 this.ableOperation = this.$parent.ableOperation;
117 }, 108 },
118 methods: { 109 methods: {
...@@ -121,7 +112,7 @@ export default { ...@@ -121,7 +112,7 @@ export default {
121 * @description: 自动预览 112 * @description: 自动预览
122 * @author: renchao 113 * @author: renchao
123 */ 114 */
124 nextPriview() { 115 nextPriview () {
125 if (this.treeCheckIndex < this.tableData.length) { 116 if (this.treeCheckIndex < this.tableData.length) {
126 this.treeCheckIndex++; 117 this.treeCheckIndex++;
127 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj; 118 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
...@@ -134,7 +125,7 @@ export default { ...@@ -134,7 +125,7 @@ export default {
134 * @description: prevPriview 125 * @description: prevPriview
135 * @author: renchao 126 * @author: renchao
136 */ 127 */
137 prevPriview() { 128 prevPriview () {
138 if (this.treeCheckIndex >= 1) { 129 if (this.treeCheckIndex >= 1) {
139 this.treeCheckIndex--; 130 this.treeCheckIndex--;
140 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj; 131 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
...@@ -149,7 +140,7 @@ export default { ...@@ -149,7 +140,7 @@ export default {
149 * @param {*} type 140 * @param {*} type
150 * @author: renchao 141 * @author: renchao
151 */ 142 */
152 clmlInitList(type) { 143 clmlInitList (type) {
153 //type 1:列表初始化 2:新增材料 144 //type 1:列表初始化 2:新增材料
154 return new Promise((resolve) => { 145 return new Promise((resolve) => {
155 this.unitData = this.$parent.unitData; 146 this.unitData = this.$parent.unitData;
...@@ -189,7 +180,7 @@ export default { ...@@ -189,7 +180,7 @@ export default {
189 * @param {*} item 180 * @param {*} item
190 * @author: renchao 181 * @author: renchao
191 */ 182 */
192 setChecked(item) { 183 setChecked (item) {
193 this.treeCheckId = item.bsmSj; 184 this.treeCheckId = item.bsmSj;
194 this.title = item.sjmc; 185 this.title = item.sjmc;
195 this.titleYs = 1; 186 this.titleYs = 1;
...@@ -202,7 +193,7 @@ export default { ...@@ -202,7 +193,7 @@ export default {
202 * @param {*} val 193 * @param {*} val
203 * @author: renchao 194 * @author: renchao
204 */ 195 */
205 updateList(val) { 196 updateList (val) {
206 let that = this; 197 let that = this;
207 if (val.children.length != 0) { 198 if (val.children.length != 0) {
208 //删除最后一张图片时 val=null 199 //删除最后一张图片时 val=null
...@@ -230,7 +221,7 @@ export default { ...@@ -230,7 +221,7 @@ export default {
230 * @description: 添加材料目录 221 * @description: 添加材料目录
231 * @author: renchao 222 * @author: renchao
232 */ 223 */
233 handleAdd() { 224 handleAdd () {
234 this.isDialog = true; 225 this.isDialog = true;
235 }, 226 },
236 // 新增弹窗保存 227 // 新增弹窗保存
...@@ -239,7 +230,7 @@ export default { ...@@ -239,7 +230,7 @@ export default {
239 * @param {*} data 230 * @param {*} data
240 * @author: renchao 231 * @author: renchao
241 */ 232 */
242 addSave(data) { 233 addSave (data) {
243 let obj = { 234 let obj = {
244 bsmSlsq: this.$parent.bsmSlsq, 235 bsmSlsq: this.$parent.bsmSlsq,
245 isrequired: "1", 236 isrequired: "1",
...@@ -251,7 +242,7 @@ export default { ...@@ -251,7 +242,7 @@ export default {
251 sfxjcl: "1", // 是否必选 242 sfxjcl: "1", // 是否必选
252 }; 243 };
253 if (this.$route.query.sqywbm == "DJBBL") { 244 if (this.$route.query.sqywbm == "DJBBL") {
254 obj.bsmSldy=this.$parent.bsmRepair 245 obj.bsmSldy = this.$parent.bsmRepair
255 } 246 }
256 saveClml(obj).then(async (res) => { 247 saveClml(obj).then(async (res) => {
257 if (res.code == 200) { 248 if (res.code == 200) {
...@@ -271,7 +262,7 @@ export default { ...@@ -271,7 +262,7 @@ export default {
271 * @param {*} index 262 * @param {*} index
272 * @author: renchao 263 * @author: renchao
273 */ 264 */
274 treeClick(item, index) { 265 treeClick (item, index) {
275 this.previewImg.index = 0; 266 this.previewImg.index = 0;
276 this.treeCheckId = item?.bsmSj; 267 this.treeCheckId = item?.bsmSj;
277 this.treeCheckIndex = index; 268 this.treeCheckIndex = index;
...@@ -285,7 +276,7 @@ export default { ...@@ -285,7 +276,7 @@ export default {
285 * @param {*} index 276 * @param {*} index
286 * @author: renchao 277 * @author: renchao
287 */ 278 */
288 imgClick(item, index) { 279 imgClick (item, index) {
289 this.showImg = item; 280 this.showImg = item;
290 this.titleYs = index + 1; 281 this.titleYs = index + 1;
291 }, 282 },
...@@ -296,7 +287,7 @@ export default { ...@@ -296,7 +287,7 @@ export default {
296 * @param {*} code 287 * @param {*} code
297 * @author: renchao 288 * @author: renchao
298 */ 289 */
299 dicStatus(val, code) { 290 dicStatus (val, code) {
300 let data = this.$store.getters.dictData[code], 291 let data = this.$store.getters.dictData[code],
301 name = "暂无"; 292 name = "暂无";
302 if (data) { 293 if (data) {
...@@ -309,49 +300,49 @@ export default { ...@@ -309,49 +300,49 @@ export default {
309 } 300 }
310 }, 301 },
311 //查看明细 302 //查看明细
312 viewDetail() { 303 viewDetail () {
313 this.$store.dispatch("user/reWorkFresh", false); 304 this.$store.dispatch("user/reWorkFresh", false);
314 this.$popupDialog( 305 this.$popupDialog(
315 "查看明细", 306 "申请材料目录",
316 "workflow/components/dialog/clxxDetailDialog", 307 "workflow/components/dialog/clxxDetailDialog",
317 { 308 {
318 data: this.tableData, 309 data: this.tableData,
319 unitData: this.$parent.unitData, 310 unitData: this.$parent.unitData,
320 ableOperation: this.$parent.ableOperation, 311 ableOperation: this.$parent.ableOperation,
321 bsmRepair:this.$parent.bsmRepair 312 bsmRepair: this.$parent.bsmRepair
322 }, 313 },
323 "60%", 314 "60%",
324 true 315 true
325 ); 316 );
326 }, 317 },
327 //设置tableData 318 //设置tableData
328 setTableData(tableData) { 319 setTableData (tableData) {
329 this.$nextTick((res) => { 320 this.$nextTick((res) => {
330 this.tableData = tableData; 321 this.tableData = tableData;
331 }); 322 });
332 }, 323 },
333 }, 324 },
334 }; 325 };
335 </script> 326 </script>
336 <style scoped lang="scss"> 327 <style scoped lang="scss">
337 @import "~@/styles/mixin.scss"; 328 @import "~@/styles/mixin.scss";
338 329
339 .active { 330 .active {
340 background: $light-blue !important; 331 background: $light-blue !important;
341 color: #fff; 332 color: #fff;
342 } 333 }
343 334
344 .required { 335 .required {
345 font-size: 12px; 336 font-size: 12px;
346 color: $pink; 337 color: $pink;
347 float: left; 338 float: left;
348 } 339 }
349 340
350 .cl_number { 341 .cl_number {
351 float: right; 342 float: right;
352 } 343 }
353 344
354 .clxx { 345 .clxx {
355 width: 100%; 346 width: 100%;
356 display: flex; 347 display: flex;
357 padding-left: 5px; 348 padding-left: 5px;
...@@ -457,5 +448,5 @@ export default { ...@@ -457,5 +448,5 @@ export default {
457 } 448 }
458 } 449 }
459 } 450 }
460 } 451 }
461 </style> 452 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 09:53:05 4 * @LastEditTime: 2023-08-15 09:43:46
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
8 <div class="title">申请材料目录</div>
9 <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData"> 8 <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
10 </lb-table> 9 </lb-table>
11 <div class="text-center"> 10 <div class="text-center">
...@@ -61,7 +60,7 @@ ...@@ -61,7 +60,7 @@
61 label: "材料名称", 60 label: "材料名称",
62 render: (h, scope) => { 61 render: (h, scope) => {
63 return ( 62 return (
64 this.formData.ableOperation ? 63 (this.formData.ableOperation && scope.row.isrequired != '1') ?
65 <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span> 64 <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
66 ) 65 )
67 } 66 }
......
...@@ -34,6 +34,10 @@ export function getForm(tabName, djywbm) { ...@@ -34,6 +34,10 @@ export function getForm(tabName, djywbm) {
34 case "fwsyqslxx300": 34 case "fwsyqslxx300":
35 form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue"); 35 form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue");
36 break; 36 break;
37 //林地使用权
38 case "lqslxx":
39 form = require("@/views/ywbl/slsqxx/lqslxx");
40 break;
37 case "plfdcq2": 41 case "plfdcq2":
38 form = require("@/views/ywbl/slsqxx/fdcq2/slxxOverview.vue"); 42 form = require("@/views/ywbl/slsqxx/fdcq2/slxxOverview.vue");
39 break; 43 break;
...@@ -95,6 +99,9 @@ export function getForm(tabName, djywbm) { ...@@ -95,6 +99,9 @@ export function getForm(tabName, djywbm) {
95 case "fdcq2Qlxx": 99 case "fdcq2Qlxx":
96 form = require("@/views/registerBook/fdcq2.vue"); 100 form = require("@/views/registerBook/fdcq2.vue");
97 break; 101 break;
102 case "lqQlxx":
103 form = require("@/views/registerBook/ldsyq.vue");
104 break;
98 case "diyaqQlxx": 105 case "diyaqQlxx":
99 form = require("@/views/registerBook/diyaq.vue"); 106 form = require("@/views/registerBook/diyaq.vue");
100 break; 107 break;
...@@ -110,10 +117,6 @@ export function getForm(tabName, djywbm) { ...@@ -110,10 +117,6 @@ export function getForm(tabName, djywbm) {
110 case "zdjbxxImg": 117 case "zdjbxxImg":
111 form = require("@/views/workflow/components/zdt.vue"); 118 form = require("@/views/workflow/components/zdt.vue");
112 break; 119 break;
113 //林地使用权
114 case "lqslxx":
115 form = require("@/views/ywbl/slsqxx/lqslxx");
116 break;
117 default: 120 default:
118 form = require("@/views/error-page/404.vue"); 121 form = require("@/views/error-page/404.vue");
119 break; 122 break;
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-14 12:49:48 4 * @LastEditTime: 2023-08-15 10:24:21
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -338,15 +338,15 @@ ...@@ -338,15 +338,15 @@
338 * @author: renchao 338 * @author: renchao
339 */ 339 */
340 onSubmit () { 340 onSubmit () {
341 let arr = this.ruleForm.tdytqxList.filter(item => !item.yt) 341 // let arr = this.ruleForm.tdytqxList || [] .filter(item => !item.yt)
342 if (arr.length > 0) { 342 // if (arr.length > 0) {
343 this.$message({ 343 // this.$message({
344 showClose: true, 344 // showClose: true,
345 message: "土地用途不能为空", 345 // message: "土地用途不能为空",
346 type: "error", 346 // type: "error",
347 }); 347 // });
348 return false; 348 // return false;
349 } 349 // }
350 saveData(this.ruleForm).then((res) => { 350 saveData(this.ruleForm).then((res) => {
351 if (res.code === 200) { 351 if (res.code === 200) {
352 this.$message({ 352 this.$message({
......
...@@ -94,10 +94,6 @@ ...@@ -94,10 +94,6 @@
94 data: [], 94 data: [],
95 }, 95 },
96 bdcdysz: [], 96 bdcdysz: [],
97 bsmSqyw:
98 this.sqywInfo.nodetype === "djlx"
99 ? this.sqywInfo.bsmSqyw
100 : this.sqywInfo.parentid,
101 }; 97 };
102 }, 98 },
103 mounted () { 99 mounted () {
...@@ -131,12 +127,8 @@ ...@@ -131,12 +127,8 @@
131 if (!this.isJump) { 127 if (!this.isJump) {
132 this.loading = true 128 this.loading = true
133 startBusinessFlow({ 129 startBusinessFlow({
134 bsmSqyw: this.bsmSqyw, 130 bsmSqyw: this.sqywInfo.bsmSqyw,
135 bdcdysz: this.bdcdysz, 131 bdcdysz: this.bdcdysz,
136 djqxbm:
137 this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
138 djqxmc:
139 this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
140 }).then((res) => { 132 }).then((res) => {
141 this.loading = false 133 this.loading = false
142 if (res.code == 200) { 134 if (res.code == 200) {
...@@ -153,7 +145,7 @@ ...@@ -153,7 +145,7 @@
153 this.$popupCacel() 145 this.$popupCacel()
154 146
155 } else { 147 } else {
156 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 148 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
157 } 149 }
158 }).catch(() => { 150 }).catch(() => {
159 this.loading = false 151 this.loading = false
......
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
96 * @author: renchao 96 * @author: renchao
97 */ 97 */
98 queryClick () { 98 queryClick () {
99 console.log("sdfsdf");
99 this.$startLoading(); 100 this.$startLoading();
100 this.queryForm.sqywbm = this.sqywInfo.djywbm; 101 this.queryForm.sqywbm = this.sqywInfo.djywbm;
101 selectDiyaq({ ...this.queryForm, ...this.pageData }).then((res) => { 102 selectDiyaq({ ...this.queryForm, ...this.pageData }).then((res) => {
...@@ -116,12 +117,12 @@ ...@@ -116,12 +117,12 @@
116 this.$message.error("请至少选择一条数据"); 117 this.$message.error("请至少选择一条数据");
117 return; 118 return;
118 } 119 }
119 this.loading = true 120 this.loading = true;
120 startBusinessFlow({ 121 startBusinessFlow({
121 bsmSqyw: this.sqywInfo.parentid, 122 bsmSqyw: this.sqywInfo.bsmSqyw,
122 bdcdysz: this.bdcdysz, 123 bdcdysz: this.bdcdysz,
123 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "", 124 // djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
124 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "", 125 // djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
125 }).then((res) => { 126 }).then((res) => {
126 this.loading = false 127 this.loading = false
127 if (res.code == 200) { 128 if (res.code == 200) {
...@@ -137,7 +138,7 @@ ...@@ -137,7 +138,7 @@
137 } 138 }
138 this.$popupCacel() 139 this.$popupCacel()
139 } else { 140 } else {
140 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 141 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
141 } 142 }
142 }).catch(() => { 143 }).catch(() => {
143 this.loading = false 144 this.loading = false
......
...@@ -168,10 +168,6 @@ ...@@ -168,10 +168,6 @@
168 data: [], 168 data: [],
169 }, 169 },
170 bdcdysz: [], 170 bdcdysz: [],
171 bsmSqyw:
172 this.sqywInfo.nodetype === "djlx"
173 ? this.sqywInfo.bsmSqyw
174 : this.sqywInfo.parentid,
175 }; 171 };
176 }, 172 },
177 mounted () { 173 mounted () {
...@@ -243,12 +239,10 @@ ...@@ -243,12 +239,10 @@
243 if (!this.isJump) { 239 if (!this.isJump) {
244 this.loading = true 240 this.loading = true
245 startBusinessFlow({ 241 startBusinessFlow({
246 bsmSqyw: this.bsmSqyw, 242 bsmSqyw: this.sqywInfo.bsmSqyw,
247 //sjlx: 'zrz', 243 //sjlx: 'zrz',
248 sjlx: this.activeName, 244 sjlx: this.activeName,
249 bdcdysz: this.bdcdysz, 245 bdcdysz: this.bdcdysz,
250 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
251 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
252 }).then((res) => { 246 }).then((res) => {
253 this.loading = false 247 this.loading = false
254 if (res.code == 200) { 248 if (res.code == 200) {
...@@ -264,7 +258,7 @@ ...@@ -264,7 +258,7 @@
264 } 258 }
265 this.$popupCacel() 259 this.$popupCacel()
266 } else { 260 } else {
267 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 261 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
268 } 262 }
269 }).catch(() => { 263 }).catch(() => {
270 this.loading = false 264 this.loading = false
...@@ -285,7 +279,7 @@ ...@@ -285,7 +279,7 @@
285 store.dispatch('user/refreshPage', true); 279 store.dispatch('user/refreshPage', true);
286 this.$popupCacel() 280 this.$popupCacel()
287 } else { 281 } else {
288 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 282 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
289 } 283 }
290 }).catch(() => { 284 }).catch(() => {
291 this.loading = false 285 this.loading = false
......
...@@ -70,10 +70,6 @@ ...@@ -70,10 +70,6 @@
70 data: [], 70 data: [],
71 }, 71 },
72 bdcdysz: [], 72 bdcdysz: [],
73 bsmSqyw:
74 this.sqywInfo.nodetype === "djlx"
75 ? this.sqywInfo.bsmSqyw
76 : this.sqywInfo.parentid,
77 }; 73 };
78 }, 74 },
79 mounted () { 75 mounted () {
...@@ -107,10 +103,8 @@ ...@@ -107,10 +103,8 @@
107 } 103 }
108 this.loading = true 104 this.loading = true
109 startBusinessFlow({ 105 startBusinessFlow({
110 bsmSqyw: this.bsmSqyw, 106 bsmSqyw: this.sqywInfo.bsmSqyw,
111 bdcdysz: this.bdcdysz, 107 bdcdysz: this.bdcdysz,
112 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
113 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
114 }).then((res) => { 108 }).then((res) => {
115 this.loading = false 109 this.loading = false
116 if (res.code == 200) { 110 if (res.code == 200) {
...@@ -126,7 +120,7 @@ ...@@ -126,7 +120,7 @@
126 } 120 }
127 this.$popupCacel() 121 this.$popupCacel()
128 } else { 122 } else {
129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 123 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
130 } 124 }
131 }).catch(() => { 125 }).catch(() => {
132 this.loading = false 126 this.loading = false
......
...@@ -104,10 +104,8 @@ ...@@ -104,10 +104,8 @@
104 } 104 }
105 this.loading = true 105 this.loading = true
106 startBusinessFlow({ 106 startBusinessFlow({
107 bsmSqyw: this.sqywInfo.parentid, 107 bsmSqyw: this.sqywInfo.bsmSqyw,
108 bdcdysz: this.bdcdysz, 108 bdcdysz: this.bdcdysz,
109 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
110 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
111 }).then((res) => { 109 }).then((res) => {
112 this.loading = false 110 this.loading = false
113 if (res.code == 200) { 111 if (res.code == 200) {
...@@ -123,7 +121,7 @@ ...@@ -123,7 +121,7 @@
123 } 121 }
124 this.$popupCacel() 122 this.$popupCacel()
125 } else { 123 } else {
126 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 124 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
127 } 125 }
128 }).catch(() => { 126 }).catch(() => {
129 this.loading = false 127 this.loading = false
......
...@@ -86,10 +86,6 @@ ...@@ -86,10 +86,6 @@
86 data: [], 86 data: [],
87 }, 87 },
88 bdcdysz: [], 88 bdcdysz: [],
89 bsmSqyw:
90 this.sqywInfo.nodetype === "djlx"
91 ? this.sqywInfo.bsmSqyw
92 : this.sqywInfo.parentid,
93 }; 89 };
94 }, 90 },
95 mounted () { 91 mounted () {
...@@ -111,7 +107,7 @@ ...@@ -111,7 +107,7 @@
111 */ 107 */
112 queryClick () { 108 queryClick () {
113 this.$startLoading(); 109 this.$startLoading();
114 this.queryForm.bsmSqyw = this.bsmSqyw; 110 this.queryForm.bsmSqyw = this.sqywInfo.bsmSqyw;
115 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 111 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
116 this.$endLoading(); 112 this.$endLoading();
117 if (res.code === 200) { 113 if (res.code === 200) {
...@@ -132,10 +128,8 @@ ...@@ -132,10 +128,8 @@
132 } 128 }
133 this.loading = true 129 this.loading = true
134 startBusinessFlow({ 130 startBusinessFlow({
135 bsmSqyw: this.bsmSqyw, 131 bsmSqyw: this.sqywInfo.bsmSqyw,
136 bdcdysz: this.bdcdysz, 132 bdcdysz: this.bdcdysz,
137 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
138 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
139 }).then((res) => { 133 }).then((res) => {
140 this.loading = false 134 this.loading = false
141 if (res.code == 200) { 135 if (res.code == 200) {
...@@ -151,7 +145,7 @@ ...@@ -151,7 +145,7 @@
151 } 145 }
152 this.$popupCacel() 146 this.$popupCacel()
153 } else { 147 } else {
154 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 148 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
155 } 149 }
156 }).catch(() => { 150 }).catch(() => {
157 this.loading = false 151 this.loading = false
......
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
182 } 182 }
183 this.$popupCacel() 183 this.$popupCacel()
184 } else { 184 } else {
185 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 185 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
186 } 186 }
187 }).catch(() => { 187 }).catch(() => {
188 this.loading = false 188 this.loading = false
......
...@@ -111,8 +111,6 @@ ...@@ -111,8 +111,6 @@
111 startBusinessFlow({ 111 startBusinessFlow({
112 bsmSqyw: this.sqywInfo.bsmSqyw, 112 bsmSqyw: this.sqywInfo.bsmSqyw,
113 bdcdysz: this.bdcdysz, 113 bdcdysz: this.bdcdysz,
114 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
115 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
116 }).then((res) => { 114 }).then((res) => {
117 this.loading = false 115 this.loading = false
118 if (res.code == 200) { 116 if (res.code == 200) {
...@@ -128,7 +126,7 @@ ...@@ -128,7 +126,7 @@
128 } 126 }
129 this.$popupCacel() 127 this.$popupCacel()
130 } else { 128 } else {
131 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
132 } 130 }
133 }).catch(() => { 131 }).catch(() => {
134 this.loading = false 132 this.loading = false
......
...@@ -110,8 +110,6 @@ ...@@ -110,8 +110,6 @@
110 startBusinessFlow({ 110 startBusinessFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz,
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
...@@ -127,7 +125,7 @@ ...@@ -127,7 +125,7 @@
127 } 125 }
128 this.$popupCacel() 126 this.$popupCacel()
129 } else { 127 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
131 } 129 }
132 }).catch(() => { 130 }).catch(() => {
133 this.loading = false 131 this.loading = false
......
...@@ -117,10 +117,8 @@ ...@@ -117,10 +117,8 @@
117 } 117 }
118 this.loading = true 118 this.loading = true
119 startBusinessFlow({ 119 startBusinessFlow({
120 bsmSqyw: this.sqywInfo.parentid, 120 bsmSqyw: this.sqywInfo.bsmSqyw,
121 bdcdysz: this.bdcdysz, 121 bdcdysz: this.bdcdysz,
122 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
123 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
124 }).then((res) => { 122 }).then((res) => {
125 this.loading = false 123 this.loading = false
126 if (res.code == 200) { 124 if (res.code == 200) {
...@@ -136,7 +134,7 @@ ...@@ -136,7 +134,7 @@
136 } 134 }
137 this.$popupCacel() 135 this.$popupCacel()
138 } else { 136 } else {
139 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 137 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
140 } 138 }
141 }).catch(() => { 139 }).catch(() => {
142 this.loading = false 140 this.loading = false
......
...@@ -237,10 +237,8 @@ ...@@ -237,10 +237,8 @@
237 submitForm () { 237 submitForm () {
238 this.loading = true 238 this.loading = true
239 startBusinessFlow({ 239 startBusinessFlow({
240 bsmSqyw: this.sqywInfo.parentid, 240 bsmSqyw: this.sqywInfo.bsmSqyw,
241 bdcdysz: this.bdcdysz, 241 bdcdysz: this.bdcdysz,
242 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
243 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
244 }).then((res) => { 242 }).then((res) => {
245 this.loading = false 243 this.loading = false
246 if (res.code == 200) { 244 if (res.code == 200) {
...@@ -256,7 +254,7 @@ ...@@ -256,7 +254,7 @@
256 } 254 }
257 this.$popupCacel() 255 this.$popupCacel()
258 } else { 256 } else {
259 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 257 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
260 } 258 }
261 }).catch(() => { 259 }).catch(() => {
262 this.loading = false 260 this.loading = false
......
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
76 data: [], 76 data: [],
77 }, 77 },
78 bdcdysz: [], 78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 }; 79 };
84 }, 80 },
85 mounted () { 81 mounted () {
...@@ -114,10 +110,8 @@ ...@@ -114,10 +110,8 @@
114 } 110 }
115 this.loading = true 111 this.loading = true
116 startBusinessFlow({ 112 startBusinessFlow({
117 bsmSqyw: this.bsmSqyw, 113 bsmSqyw: this.sqywInfo.bsmSqyw,
118 bdcdysz: this.bdcdysz, 114 bdcdysz: this.bdcdysz,
119 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
120 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
121 }).then((res) => { 115 }).then((res) => {
122 this.loading = false 116 this.loading = false
123 if (res.code == 200) { 117 if (res.code == 200) {
...@@ -133,7 +127,7 @@ ...@@ -133,7 +127,7 @@
133 } 127 }
134 this.$popupCacel() 128 this.$popupCacel()
135 } else { 129 } else {
136 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
137 } 131 }
138 }).catch(() => { 132 }).catch(() => {
139 this.loading = false 133 this.loading = false
......
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
76 data: [], 76 data: [],
77 }, 77 },
78 bdcdysz: [], 78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 }; 79 };
84 }, 80 },
85 mounted () { 81 mounted () {
...@@ -133,7 +129,7 @@ ...@@ -133,7 +129,7 @@
133 } 129 }
134 this.$popupCacel() 130 this.$popupCacel()
135 } else { 131 } else {
136 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 132 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
137 } 133 }
138 }).catch(() => { 134 }).catch(() => {
139 this.loading = false 135 this.loading = false
......
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
76 data: [], 76 data: [],
77 }, 77 },
78 bdcdysz: [], 78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 }; 79 };
84 }, 80 },
85 mounted () { 81 mounted () {
...@@ -114,10 +110,8 @@ ...@@ -114,10 +110,8 @@
114 } 110 }
115 this.loading = true 111 this.loading = true
116 startBusinessFlow({ 112 startBusinessFlow({
117 bsmSqyw: this.bsmSqyw, 113 bsmSqyw: this.sqywInfo.bsmSqyw,
118 bdcdysz: this.bdcdysz, 114 bdcdysz: this.bdcdysz,
119 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
120 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
121 }).then((res) => { 115 }).then((res) => {
122 this.loading = false 116 this.loading = false
123 if (res.code == 200) { 117 if (res.code == 200) {
...@@ -133,7 +127,7 @@ ...@@ -133,7 +127,7 @@
133 } 127 }
134 this.$popupCacel() 128 this.$popupCacel()
135 } else { 129 } else {
136 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
137 } 131 }
138 }).catch(() => { 132 }).catch(() => {
139 this.loading = false 133 this.loading = false
......
...@@ -117,10 +117,8 @@ ...@@ -117,10 +117,8 @@
117 } 117 }
118 this.loading = true 118 this.loading = true
119 startBusinessFlow({ 119 startBusinessFlow({
120 bsmSqyw: this.sqywInfo.parentid, 120 bsmSqyw: this.sqywInfo.bsmSqyw,
121 bdcdysz: this.bdcdysz, 121 bdcdysz: this.bdcdysz,
122 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
123 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
124 }).then((res) => { 122 }).then((res) => {
125 this.loading = false 123 this.loading = false
126 if (res.code == 200) { 124 if (res.code == 200) {
...@@ -136,7 +134,7 @@ ...@@ -136,7 +134,7 @@
136 } 134 }
137 this.$popupCacel() 135 this.$popupCacel()
138 } else { 136 } else {
139 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 137 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
140 } 138 }
141 }).catch(() => { 139 }).catch(() => {
142 this.loading = false 140 this.loading = false
......
...@@ -110,8 +110,6 @@ ...@@ -110,8 +110,6 @@
110 startTogetherFlow({ 110 startTogetherFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz,
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
...@@ -127,7 +125,7 @@ ...@@ -127,7 +125,7 @@
127 this.$popupCacel() 125 this.$popupCacel()
128 } 126 }
129 } else { 127 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
131 } 129 }
132 }).catch(() => { 130 }).catch(() => {
133 this.loading = false 131 this.loading = false
......
...@@ -109,8 +109,6 @@ ...@@ -109,8 +109,6 @@
109 startTogetherFlow({ 109 startTogetherFlow({
110 bsmSqyw: this.sqywInfo.bsmSqyw, 110 bsmSqyw: this.sqywInfo.bsmSqyw,
111 bdcdysz: this.bdcdysz, 111 bdcdysz: this.bdcdysz,
112 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
113 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
114 }).then((res) => { 112 }).then((res) => {
115 if (res.code == 200) { 113 if (res.code == 200) {
116 this.$message({ 114 this.$message({
...@@ -125,7 +123,7 @@ ...@@ -125,7 +123,7 @@
125 } 123 }
126 this.$popupCacel() 124 this.$popupCacel()
127 } else { 125 } else {
128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 126 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
129 } 127 }
130 }).catch(() => { 128 }).catch(() => {
131 this.loading = false 129 this.loading = false
......
...@@ -109,9 +109,7 @@ ...@@ -109,9 +109,7 @@
109 this.loading = true 109 this.loading = true
110 startTogetherFlow({ 110 startTogetherFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
...@@ -127,7 +125,7 @@ ...@@ -127,7 +125,7 @@
127 } 125 }
128 this.$popupCacel() 126 this.$popupCacel()
129 } else { 127 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
131 } 129 }
132 }).catch(() => { 130 }).catch(() => {
133 this.loading = false 131 this.loading = false
......
...@@ -110,8 +110,6 @@ ...@@ -110,8 +110,6 @@
110 startBusinessFlow({ 110 startBusinessFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz,
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
...@@ -127,7 +125,7 @@ ...@@ -127,7 +125,7 @@
127 this.$popupCacel() 125 this.$popupCacel()
128 } 126 }
129 } else { 127 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
131 } 129 }
132 }).catch(() => { 130 }).catch(() => {
133 this.loading = false 131 this.loading = false
......
...@@ -111,8 +111,6 @@ ...@@ -111,8 +111,6 @@
111 startBusinessFlow({ 111 startBusinessFlow({
112 bsmSqyw: this.sqywInfo.bsmSqyw, 112 bsmSqyw: this.sqywInfo.bsmSqyw,
113 bdcdysz: this.bdcdysz, 113 bdcdysz: this.bdcdysz,
114 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
115 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
116 }).then((res) => { 114 }).then((res) => {
117 this.loading = false 115 this.loading = false
118 if (res.code == 200) { 116 if (res.code == 200) {
...@@ -128,7 +126,7 @@ ...@@ -128,7 +126,7 @@
128 } 126 }
129 this.$popupCacel() 127 this.$popupCacel()
130 } else { 128 } else {
131 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
132 } 130 }
133 }).catch(() => { 131 }).catch(() => {
134 this.loading = false 132 this.loading = false
......
...@@ -112,8 +112,6 @@ ...@@ -112,8 +112,6 @@
112 startBusinessFlow({ 112 startBusinessFlow({
113 bsmSqyw: this.sqywInfo.bsmSqyw, 113 bsmSqyw: this.sqywInfo.bsmSqyw,
114 bdcdysz: this.bdcdysz, 114 bdcdysz: this.bdcdysz,
115 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
116 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
117 }).then((res) => { 115 }).then((res) => {
118 this.loading = false 116 this.loading = false
119 if (res.code == 200) { 117 if (res.code == 200) {
...@@ -129,7 +127,7 @@ ...@@ -129,7 +127,7 @@
129 } 127 }
130 this.$popupCacel() 128 this.$popupCacel()
131 } else { 129 } else {
132 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
133 } 131 }
134 }).catch(() => { 132 }).catch(() => {
135 this.loading = false 133 this.loading = false
......
...@@ -148,7 +148,6 @@ ...@@ -148,7 +148,6 @@
148 * @author: renchao 148 * @author: renchao
149 */ 149 */
150 sqywlxClick (item) { 150 sqywlxClick (item) {
151 console.log("item", item);
152 this.btnDisabled = true; 151 this.btnDisabled = true;
153 this.selectType = item.type; 152 this.selectType = item.type;
154 this.sqywQllxList.forEach(item => { 153 this.sqywQllxList.forEach(item => {
...@@ -173,7 +172,6 @@ ...@@ -173,7 +172,6 @@
173 * @author: renchao 172 * @author: renchao
174 */ 173 */
175 qllxClick (index) { 174 qllxClick (index) {
176 console.log("业务", index);
177 this.btnDisabled = true; 175 this.btnDisabled = true;
178 this.sqywQllxList.forEach(item => { 176 this.sqywQllxList.forEach(item => {
179 if (item.check) item.check = false; 177 if (item.check) item.check = false;
...@@ -200,9 +198,9 @@ ...@@ -200,9 +198,9 @@
200 this.btnDisabled = false; 198 this.btnDisabled = false;
201 // this.djqxList = [] 199 // this.djqxList = []
202 } else { 200 } else {
201 this.getNextNode(data[index].bsmSqyw);
203 this.btnDisabled = true; 202 this.btnDisabled = true;
204 } 203 }
205 this.getNextNode(data[index].bsmSqyw);
206 }, 204 },
207 //获取下个节点类型数据 205 //获取下个节点类型数据
208 /** 206 /**
...@@ -212,6 +210,7 @@ ...@@ -212,6 +210,7 @@
212 */ 210 */
213 getNextNode (bsmSqyw) { 211 getNextNode (bsmSqyw) {
214 getNextNode(bsmSqyw).then(res => { 212 getNextNode(bsmSqyw).then(res => {
213 if (res.result) {
215 if (res.result.djqx) { 214 if (res.result.djqx) {
216 this.djqxList = res.result.djqx; 215 this.djqxList = res.result.djqx;
217 this.djqxList.forEach(item => { 216 this.djqxList.forEach(item => {
...@@ -224,6 +223,7 @@ ...@@ -224,6 +223,7 @@
224 this.$set(item, 'selected', false); 223 this.$set(item, 'selected', false);
225 }); 224 });
226 } 225 }
226 }
227 }) 227 })
228 }, 228 },
229 229
...@@ -235,7 +235,6 @@ ...@@ -235,7 +235,6 @@
235 getRepairBiz () { 235 getRepairBiz () {
236 getRepairBiz().then(res => { 236 getRepairBiz().then(res => {
237 if (res) { 237 if (res) {
238 console.log("res", res);
239 this.djqxList = res.result; 238 this.djqxList = res.result;
240 } 239 }
241 }) 240 })
...@@ -259,7 +258,6 @@ ...@@ -259,7 +258,6 @@
259 dialogClick () { 258 dialogClick () {
260 this.openDialog(); 259 this.openDialog();
261 }, 260 },
262 //收藏操作
263 /** 261 /**
264 * @description: 收藏操作 262 * @description: 收藏操作
265 * @param {*} item 263 * @param {*} item
...@@ -357,7 +355,6 @@ ...@@ -357,7 +355,6 @@
357 this.handleSelectYw(item, list) 355 this.handleSelectYw(item, list)
358 this.openDialog() 356 this.openDialog()
359 }, 357 },
360 // 选择不动产信息
361 /** 358 /**
362 * @description: 选择不动产信息 359 * @description: 选择不动产信息
363 * @author: renchao 360 * @author: renchao
...@@ -370,7 +367,10 @@ ...@@ -370,7 +367,10 @@
370 * @author: renchao 367 * @author: renchao
371 */ 368 */
372 openDialog () { 369 openDialog () {
373 let title = "申请业务:" + this.selectParam?.djywmc ? this.selectParam?.djywmc : ''; 370 let title = this.selectParam.djywmc;
371 if (this.selectParam.nodetype == "djqx") {
372 title += "(" + this.selectParam.nodename + ")";
373 }
374 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true) 374 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true)
375 }, 375 },
376 /** 376 /**
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
38 * @author: renchao 38 * @author: renchao
39 */ 39 */
40 loadView (view) { 40 loadView (view) {
41 console.log(view, 'view');
42 return (r) => 41 return (r) =>
43 require.ensure([], () => r(require(`./components/${view}.vue`))); 42 require.ensure([], () => r(require(`./components/${view}.vue`)));
44 }, 43 },
......