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

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 16:09:44
+ * @LastEditTime: 2023-08-15 10:01:26
 -->
 <template>
   <transition name="msgbox-fade">
@@ -148,8 +148,8 @@
 
   .ls-title {
     padding: 16px;
-    color: #4a4e56;
-    // background: linear-gradient(3deg, #edf0f7, #f4f5f6);
+    color: #ffffff;
+    background: linear-gradient(3deg, #409eff, #a7cbee);
     font-size: 16px;
   }
 
@@ -185,7 +185,7 @@
     right: 26px;
     font-size: 24px;
     cursor: pointer;
-    color: #4a4e56;
+    color: #ffffff;
   }
 
   /deep/.el-loading-mask {

@@ -54,7 +54,9 @@ service.interceptors.response.use(
          */
         if (response.status == 200) {
             return response.data;
-        } else {
+        }else if (response.status == 2002){
+            Message.error(response.message);
+        }else {
             handleErrorData(response.data);
         }
         return response;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:53:05
+ * @LastEditTime: 2023-08-15 09:43:46
 -->
 <template>
   <div class="clmlmx-box">
-    <div class="title">申请材料目录</div>
     <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
     </lb-table>
     <div class="text-center">
@@ -61,7 +60,7 @@
             label: "材料名称",
             render: (h, scope) => {
               return (
-                this.formData.ableOperation ?
+                (this.formData.ableOperation && scope.row.isrequired != '1') ?
                   <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
               )
             }
@@ -209,14 +208,14 @@
         return new Promise(resolve => {
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
-        formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
-        if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
-          formdata.append("bsmSldy", this.formData.bsmRepair);
-          formdata.append("clfl", 3);
-        } else {
-             formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
-          formdata.append("clfl", 2);
-        }
+          formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
+          if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
+            formdata.append("bsmSldy", this.formData.bsmRepair);
+            formdata.append("clfl", 3);
+          } else {
+            formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
+            formdata.append("clfl", 2);
+          }
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
               resolve(res.code)

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-14 12:49:48
+ * @LastEditTime: 2023-08-15 10:24:21
 -->
 <template>
   <div class="slxx">
@@ -338,15 +338,15 @@
        * @author: renchao
        */
       onSubmit () {
-        let arr = this.ruleForm.tdytqxList.filter(item => !item.yt)
-        if (arr.length > 0) {
-          this.$message({
-            showClose: true,
-            message: "土地用途不能为空",
-            type: "error",
-          });
-          return false;
-        }
+        // let arr = this.ruleForm.tdytqxList || [] .filter(item => !item.yt)
+        // if (arr.length > 0) {
+        //   this.$message({
+        //     showClose: true,
+        //     message: "土地用途不能为空",
+        //     type: "error",
+        //   });
+        //   return false;
+        // }
         saveData(this.ruleForm).then((res) => {
           if (res.code === 200) {
             this.$message({

@@ -145,7 +145,7 @@
               this.$popupCacel()
 
             } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
             }
           }).catch(() => {
             this.loading = false

@@ -117,7 +117,7 @@
           this.$message.error("请至少选择一条数据");
           return;
         }
-        this.loading = true;        
+        this.loading = true;
         startBusinessFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
@@ -138,7 +138,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -258,7 +258,7 @@
               }
               this.$popupCacel()
             } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
             }
           }).catch(() => {
             this.loading = false
@@ -279,7 +279,7 @@
               store.dispatch('user/refreshPage', true);
               this.$popupCacel()
             } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
             }
           }).catch(() => {
             this.loading = false

@@ -120,7 +120,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -121,7 +121,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -85,7 +85,7 @@
           columns: datas.columns(),
           data: [],
         },
-        bdcdysz: [],       
+        bdcdysz: [],
       };
     },
     mounted () {
@@ -145,7 +145,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -182,7 +182,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -126,7 +126,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -134,7 +134,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -254,7 +254,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -127,7 +127,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -129,7 +129,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -127,7 +127,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -134,7 +134,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,7 @@
               this.$popupCacel()
             }
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -123,7 +123,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -125,7 +125,7 @@
               this.$popupCacel()
             }
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -126,7 +126,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -127,7 +127,7 @@
             }
             this.$popupCacel()
           } else {
-            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
+            ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true)
           }
         }).catch(() => {
           this.loading = false

@@ -148,7 +148,6 @@
        * @author: renchao
        */
       sqywlxClick (item) {
-        console.log("item", item);
         this.btnDisabled = true;
         this.selectType = item.type;
         this.sqywQllxList.forEach(item => {
@@ -211,17 +210,19 @@
        */
       getNextNode (bsmSqyw) {
         getNextNode(bsmSqyw).then(res => {
-          if (res.result.djqx) {
-            this.djqxList = res.result.djqx;
-            this.djqxList.forEach(item => {
-              this.$set(item, 'selected', false);
-            });
-          }
-          if (res.result.djlx) {
-            this.djlxList = res.result.djlx;
-            this.djlxList.forEach(item => {
-              this.$set(item, 'selected', false);
-            });
+          if (res.result) {
+            if (res.result.djqx) {
+              this.djqxList = res.result.djqx;
+              this.djqxList.forEach(item => {
+                this.$set(item, 'selected', false);
+              });
+            }
+            if (res.result.djlx) {
+              this.djlxList = res.result.djlx;
+              this.djlxList.forEach(item => {
+                this.$set(item, 'selected', false);
+              });
+            }
           }
         })
       },
@@ -234,7 +235,6 @@
       getRepairBiz () {
         getRepairBiz().then(res => {
           if (res) {
-            console.log("res", res);
             this.djqxList = res.result;
           }
         })
@@ -258,7 +258,6 @@
       dialogClick () {
         this.openDialog();
       },
-      //收藏操作
       /**
        * @description: 收藏操作
        * @param {*} item
@@ -356,7 +355,6 @@
         this.handleSelectYw(item, list)
         this.openDialog()
       },
-      // 选择不动产信息
       /**
        * @description: 选择不动产信息
        * @author: renchao
@@ -370,11 +368,9 @@
        */
       openDialog () {
         let title = this.selectParam.djywmc;
-        if(this.selectParam.nodetype=="djqx"){
-          title+="（"+this.selectParam.nodename+"）";
+        if (this.selectParam.nodetype == "djqx") {
+          title += "（" + this.selectParam.nodename + "）";
         }
-        //let title = "申请业务：";
-        //console.log(title);
         this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true)
       },
       /**