3b52bc54 by tianhaohao@pashanhoo.com

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

2 parents 1364d6c9 0471b202
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 <!-- 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 }
...@@ -209,14 +208,14 @@ ...@@ -209,14 +208,14 @@
209 return new Promise(resolve => { 208 return new Promise(resolve => {
210 this.unitData = this.$parent.unitData; 209 this.unitData = this.$parent.unitData;
211 var formdata = new FormData(); 210 var formdata = new FormData();
212 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq); 211 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
213 if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") { 212 if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
214 formdata.append("bsmSldy", this.formData.bsmRepair); 213 formdata.append("bsmSldy", this.formData.bsmRepair);
215 formdata.append("clfl", 3); 214 formdata.append("clfl", 3);
216 } else { 215 } else {
217 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy); 216 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
218 formdata.append("clfl", 2); 217 formdata.append("clfl", 2);
219 } 218 }
220 InitClml(formdata).then((res) => { 219 InitClml(formdata).then((res) => {
221 if (res.code == 200) { 220 if (res.code == 200) {
222 resolve(res.code) 221 resolve(res.code)
......
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({
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 this.$popupCacel() 145 this.$popupCacel()
146 146
147 } else { 147 } else {
148 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 148 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
149 } 149 }
150 }).catch(() => { 150 }).catch(() => {
151 this.loading = false 151 this.loading = false
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 this.$message.error("请至少选择一条数据"); 117 this.$message.error("请至少选择一条数据");
118 return; 118 return;
119 } 119 }
120 this.loading = true; 120 this.loading = true;
121 startBusinessFlow({ 121 startBusinessFlow({
122 bsmSqyw: this.sqywInfo.bsmSqyw, 122 bsmSqyw: this.sqywInfo.bsmSqyw,
123 bdcdysz: this.bdcdysz, 123 bdcdysz: this.bdcdysz,
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
138 } 138 }
139 this.$popupCacel() 139 this.$popupCacel()
140 } else { 140 } else {
141 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 141 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
142 } 142 }
143 }).catch(() => { 143 }).catch(() => {
144 this.loading = false 144 this.loading = false
......
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
258 } 258 }
259 this.$popupCacel() 259 this.$popupCacel()
260 } else { 260 } else {
261 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 261 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
262 } 262 }
263 }).catch(() => { 263 }).catch(() => {
264 this.loading = false 264 this.loading = false
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
279 store.dispatch('user/refreshPage', true); 279 store.dispatch('user/refreshPage', true);
280 this.$popupCacel() 280 this.$popupCacel()
281 } else { 281 } else {
282 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 282 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
283 } 283 }
284 }).catch(() => { 284 }).catch(() => {
285 this.loading = false 285 this.loading = false
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 } 120 }
121 this.$popupCacel() 121 this.$popupCacel()
122 } else { 122 } else {
123 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 123 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
124 } 124 }
125 }).catch(() => { 125 }).catch(() => {
126 this.loading = false 126 this.loading = false
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 } 121 }
122 this.$popupCacel() 122 this.$popupCacel()
123 } else { 123 } else {
124 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 124 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
125 } 125 }
126 }).catch(() => { 126 }).catch(() => {
127 this.loading = false 127 this.loading = false
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
85 columns: datas.columns(), 85 columns: datas.columns(),
86 data: [], 86 data: [],
87 }, 87 },
88 bdcdysz: [], 88 bdcdysz: [],
89 }; 89 };
90 }, 90 },
91 mounted () { 91 mounted () {
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 } 145 }
146 this.$popupCacel() 146 this.$popupCacel()
147 } else { 147 } else {
148 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 148 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
149 } 149 }
150 }).catch(() => { 150 }).catch(() => {
151 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
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 } 126 }
127 this.$popupCacel() 127 this.$popupCacel()
128 } else { 128 } else {
129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
130 } 130 }
131 }).catch(() => { 131 }).catch(() => {
132 this.loading = false 132 this.loading = false
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 } 125 }
126 this.$popupCacel() 126 this.$popupCacel()
127 } else { 127 } else {
128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
129 } 129 }
130 }).catch(() => { 130 }).catch(() => {
131 this.loading = false 131 this.loading = false
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
134 } 134 }
135 this.$popupCacel() 135 this.$popupCacel()
136 } else { 136 } else {
137 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 137 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
138 } 138 }
139 }).catch(() => { 139 }).catch(() => {
140 this.loading = false 140 this.loading = false
......
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
254 } 254 }
255 this.$popupCacel() 255 this.$popupCacel()
256 } else { 256 } else {
257 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 257 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
258 } 258 }
259 }).catch(() => { 259 }).catch(() => {
260 this.loading = false 260 this.loading = false
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 } 127 }
128 this.$popupCacel() 128 this.$popupCacel()
129 } else { 129 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
131 } 131 }
132 }).catch(() => { 132 }).catch(() => {
133 this.loading = false 133 this.loading = false
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 } 129 }
130 this.$popupCacel() 130 this.$popupCacel()
131 } else { 131 } else {
132 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 132 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
133 } 133 }
134 }).catch(() => { 134 }).catch(() => {
135 this.loading = false 135 this.loading = false
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 } 127 }
128 this.$popupCacel() 128 this.$popupCacel()
129 } else { 129 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
131 } 131 }
132 }).catch(() => { 132 }).catch(() => {
133 this.loading = false 133 this.loading = false
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
134 } 134 }
135 this.$popupCacel() 135 this.$popupCacel()
136 } else { 136 } else {
137 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 137 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
138 } 138 }
139 }).catch(() => { 139 }).catch(() => {
140 this.loading = false 140 this.loading = false
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 this.$popupCacel() 125 this.$popupCacel()
126 } 126 }
127 } else { 127 } else {
128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
129 } 129 }
130 }).catch(() => { 130 }).catch(() => {
131 this.loading = false 131 this.loading = false
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
123 } 123 }
124 this.$popupCacel() 124 this.$popupCacel()
125 } else { 125 } else {
126 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 126 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
127 } 127 }
128 }).catch(() => { 128 }).catch(() => {
129 this.loading = false 129 this.loading = false
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 } 125 }
126 this.$popupCacel() 126 this.$popupCacel()
127 } else { 127 } else {
128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
129 } 129 }
130 }).catch(() => { 130 }).catch(() => {
131 this.loading = false 131 this.loading = false
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 this.$popupCacel() 125 this.$popupCacel()
126 } 126 }
127 } else { 127 } else {
128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
129 } 129 }
130 }).catch(() => { 130 }).catch(() => {
131 this.loading = false 131 this.loading = false
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 } 126 }
127 this.$popupCacel() 127 this.$popupCacel()
128 } else { 128 } else {
129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
130 } 130 }
131 }).catch(() => { 131 }).catch(() => {
132 this.loading = false 132 this.loading = false
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 } 127 }
128 this.$popupCacel() 128 this.$popupCacel()
129 } else { 129 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
131 } 131 }
132 }).catch(() => { 132 }).catch(() => {
133 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 => {
...@@ -211,17 +210,19 @@ ...@@ -211,17 +210,19 @@
211 */ 210 */
212 getNextNode (bsmSqyw) { 211 getNextNode (bsmSqyw) {
213 getNextNode(bsmSqyw).then(res => { 212 getNextNode(bsmSqyw).then(res => {
214 if (res.result.djqx) { 213 if (res.result) {
215 this.djqxList = res.result.djqx; 214 if (res.result.djqx) {
216 this.djqxList.forEach(item => { 215 this.djqxList = res.result.djqx;
217 this.$set(item, 'selected', false); 216 this.djqxList.forEach(item => {
218 }); 217 this.$set(item, 'selected', false);
219 } 218 });
220 if (res.result.djlx) { 219 }
221 this.djlxList = res.result.djlx; 220 if (res.result.djlx) {
222 this.djlxList.forEach(item => { 221 this.djlxList = res.result.djlx;
223 this.$set(item, 'selected', false); 222 this.djlxList.forEach(item => {
224 }); 223 this.$set(item, 'selected', false);
224 });
225 }
225 } 226 }
226 }) 227 })
227 }, 228 },
...@@ -234,7 +235,6 @@ ...@@ -234,7 +235,6 @@
234 getRepairBiz () { 235 getRepairBiz () {
235 getRepairBiz().then(res => { 236 getRepairBiz().then(res => {
236 if (res) { 237 if (res) {
237 console.log("res", res);
238 this.djqxList = res.result; 238 this.djqxList = res.result;
239 } 239 }
240 }) 240 })
...@@ -258,7 +258,6 @@ ...@@ -258,7 +258,6 @@
258 dialogClick () { 258 dialogClick () {
259 this.openDialog(); 259 this.openDialog();
260 }, 260 },
261 //收藏操作
262 /** 261 /**
263 * @description: 收藏操作 262 * @description: 收藏操作
264 * @param {*} item 263 * @param {*} item
...@@ -356,7 +355,6 @@ ...@@ -356,7 +355,6 @@
356 this.handleSelectYw(item, list) 355 this.handleSelectYw(item, list)
357 this.openDialog() 356 this.openDialog()
358 }, 357 },
359 // 选择不动产信息
360 /** 358 /**
361 * @description: 选择不动产信息 359 * @description: 选择不动产信息
362 * @author: renchao 360 * @author: renchao
...@@ -370,11 +368,9 @@ ...@@ -370,11 +368,9 @@
370 */ 368 */
371 openDialog () { 369 openDialog () {
372 let title = this.selectParam.djywmc; 370 let title = this.selectParam.djywmc;
373 if(this.selectParam.nodetype=="djqx"){ 371 if (this.selectParam.nodetype == "djqx") {
374 title+="("+this.selectParam.nodename+")"; 372 title += "(" + this.selectParam.nodename + ")";
375 } 373 }
376 //let title = "申请业务:";
377 //console.log(title);
378 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true) 374 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true)
379 }, 375 },
380 /** 376 /**
......