Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/processDesign/ChangeSingle/unqualifiedorder/index.vue

@@ -555,6 +555,7 @@ export default {
       this.$refs.trialOrder.name1 = "";
       this.$refs.trialOrder.name2 = "";
       this.$refs.trialOrder.name3 = "";
+      this.$refs.trialOrder.disabled = true;
       this.flag = 1;
       var url2 = `${designUrl}/unqualifiedorder/getbyid`;
       service

pages/processDesign/ChangeSingle/unqualifiedorder/trialOrder.vue

@@ -54,13 +54,13 @@
             <Col :span="4">审理结论：</Col>
             <Col :span="20">
               <CheckboxGroup v-model="formcontextdata.conclusion">
-                <Checkbox label="返工"></Checkbox>
-                <Checkbox label="返修"></Checkbox>
-                <Checkbox label="降级使用"></Checkbox>
-                <Checkbox label="让步"></Checkbox>
-                <Checkbox label="报废"></Checkbox>
-                <Checkbox label="通知顾客"></Checkbox>
-                <Checkbox label="退货或者暂停提供"></Checkbox>
+                <Checkbox :disabled='disabled' label="返工"></Checkbox>
+                <Checkbox :disabled='disabled' label="返修"></Checkbox>
+                <Checkbox :disabled='disabled' label="降级使用"></Checkbox>
+                <Checkbox :disabled='disabled' label="让步"></Checkbox>
+                <Checkbox :disabled='disabled' label="报废"></Checkbox>
+                <Checkbox :disabled='disabled' label="通知顾客"></Checkbox>
+                <Checkbox :disabled='disabled' label="退货或者暂停提供"></Checkbox>
               </CheckboxGroup>
             </Col>
           </Row>
@@ -70,9 +70,9 @@
             <Col :span="4">审理级别：</Col>
             <Col :span="20">
                 <CheckboxGroup v-model="formcontextdata.triaLevel">
-                <Checkbox label="一级审理"></Checkbox>
-                <Checkbox label="二级审理"></Checkbox>
-                <Checkbox label="三级审理"></Checkbox>
+                <Checkbox :disabled='disabled' label="一级审理"></Checkbox>
+                <Checkbox :disabled='disabled' label="二级审理"></Checkbox>
+                <Checkbox :disabled='disabled' label="三级审理"></Checkbox>
               </CheckboxGroup>
             </Col>
           </Row>
@@ -183,6 +183,7 @@ export default {
       name1:'',
       name2:'',
       name3:'',
+      disabled:false,
     }
   }
 }

plugins/request/index.js

@@ -126,6 +126,10 @@ service.interceptors.response.use(
     },
     error => {
         if (error && error.response) {
+            if(error.response.status=="401"){
+                window.location.href = '/account/login';
+                return;
+            }
             switch (error.response.status) {
             case 400: error.message = '请求错误'; break;
             case 401: error.message = '未授权，请登录'; break;
@@ -140,6 +144,7 @@ service.interceptors.response.use(
             case 505: error.message = 'HTTP版本不受支持'; break;
             default: break;
             }
+
         }        
         errorLog(error);
         // console.warn("Erro:",error)