Merge branch 'dev'

@@ -2,7 +2,7 @@
 /*
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-21 10:30:53
+ * @LastEditTime: 2023-08-16 15:16:49
  */
  */
 import axios from 'axios'
 import axios from 'axios'
 import Router from '@/router'
 import Router from '@/router'
@@ -54,10 +54,10 @@ service.interceptors.response.use(
          */
          */
         if (response.status == 200) {
         if (response.status == 200) {
             return response.data;
             return response.data;
-        }else if (response.status == 2002){
+        } else if (response.status == 2002) {
             Message.error(response.message);
             Message.error(response.message);
-        }else {
-            handleErrorData(response.data);
+        } else {
+            handleErrorData(response.status);
         }
         }
         return response;
         return response;
     },
     },
@@ -97,10 +97,7 @@ service.interceptors.response.use(
 )
 )
 //对错误信息的处理函数
 //对错误信息的处理函数
 function handleErrorData (errMes) {
 function handleErrorData (errMes) {
-    if (errMes.message) {
-        Message.error(errMes.message);
-    } else {
-        switch (errMes.code) {
+    switch (errMes) {
         case 401:
         case 401:
             Message.error("未授权，请重新登录!");
             Message.error("未授权，请重新登录!");
             break;
             break;
@@ -117,7 +114,6 @@ function handleErrorData (errMes) {
             Message.error("服务正在联调中，请稍后!");
             Message.error("服务正在联调中，请稍后!");
             break;
             break;
     }
     }
-    }
 }
 }
 export default service
 export default service
 
 

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-15 10:57:30
+ * @LastEditTime: 2023-08-16 15:00:12
 -->
 -->
 <template>
 <template>
   <div class="content">
   <div class="content">
@@ -46,7 +46,6 @@
     },
     },
     methods: {
     methods: {
       getBdcdyh (val) {
       getBdcdyh (val) {
-        console.log(val, ';222222222222');
         // this.loadData(val);
         // this.loadData(val);
       },
       },
       /**
       /**
@@ -65,6 +64,8 @@
               this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
               this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
               this.loadComponent(this.defaultNode.form);
               this.loadComponent(this.defaultNode.form);
             })
             })
+          } else {
+            this.$message.error(res.message);
           }
           }
         })
         })
         this.currentSelectProps = {
         this.currentSelectProps = {
@@ -90,7 +91,6 @@
        * @author: renchao
        * @author: renchao
        */
        */
       loadComponent (form) {
       loadComponent (form) {
-        console.log(form, 'form');
         this.componentTag = (r) =>
         this.componentTag = (r) =>
           require.ensure([], () => r(require("@/views/registerBook/" + form)))
           require.ensure([], () => r(require("@/views/registerBook/" + form)))
       }
       }

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 14:08:42
+ * @LastEditTime: 2023-08-16 15:33:46
 -->
 -->
 <template>
 <template>
   <div>
   <div>
@@ -106,10 +106,10 @@
                     this.isDisabled ? <el-button
                     this.isDisabled ? <el-button
                       icon="el-icon-view"
                       icon="el-icon-view"
                       type="text"
                       type="text"
-                      onClick={() => { this.queryViewClick(scope.$index, scope.row) }} disabled={this.isDisabled} > 查看</el-button> : <el-button
+                      onClick={() => { this.queryViewClick(scope.$index, scope.row) }} > 查看</el-button> : <el-button
                         icon="el-icon-edit-outline"
                         icon="el-icon-edit-outline"
                         type="text"
                         type="text"
-                        onClick={() => { this.editClick(scope.$index, scope.row) }} disabled={this.isDisabled}>编辑</el-button>
+                        onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
                   }
                   }
                 </div>
                 </div>
               )
               )

 <!--
 <!--
  * @Description: 受理信息
  * @Description: 受理信息
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 14:38:36
+ * @LastEditTime: 2023-08-16 15:36:07
 -->
 -->
 <template>
 <template>
   <div class="slxx">
   <div class="slxx">
@@ -345,7 +345,7 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
-        <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="viewEdit"
+        <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!viewEdit"
           :gyfs="ruleForm.qlxx.gyfs" />
           :gyfs="ruleForm.qlxx.gyfs" />
 
 
         <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
         <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:53:35
+ * @LastEditTime: 2023-08-16 14:59:46
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -239,7 +239,6 @@
   * @author: miaofang
   * @author: miaofang
   */
   */
       openBook (row) {
       openBook (row) {
-        console.log("的急急急急急急");
         var param = {
         var param = {
           bdcdyid: row.bdcdyid,
           bdcdyid: row.bdcdyid,
           qllx: row.qllx,
           qllx: row.qllx,