Просмотр исходного кода

修改碳谷单件质检可以修合格和不合格

695593266@qq.com 10 месяцев назад
Родитель
Сommit
bb2cda32fc

+ 9 - 7
src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -202,10 +202,11 @@
           filterable
           placeholder="请选择"
           :disabled="
-            isDetails ||
-            taskObj.type == 2 ||
-            taskObj.type == 3 ||
-            taskObj.type == 6
+            (isDetails ||
+              taskObj.type == 2 ||
+              taskObj.type == 3 ||
+              taskObj.type == 6) &&
+            clientEnvironmentId != 3
           "
         >
           <el-option
@@ -253,7 +254,8 @@
           v-if="
             row.extInfo.notType &&
             row.extInfo.notType != 5 &&
-            row.extInfo.notType != 8
+            row.extInfo.notType != 8 &&
+            clientEnvironmentId != 3
           "
         >
           <span v-if="isDetails">{{ row.extInfo.notReason }}</span>
@@ -634,7 +636,7 @@
         },
         dialogVisible: false,
         dialogEngrave: false,
-        columnsVersion:0
+        columnsVersion: 0
       };
     },
 
@@ -671,7 +673,7 @@
         return this.$store.state.user.taskObj;
       },
       columns() {
-        let columnsVersion=this.columnsVersion
+        let columnsVersion = this.columnsVersion;
 
         let areaCodeColumns = {
           width: 55,

+ 3 - 3
vue.config.js

@@ -33,9 +33,9 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.103:18086',192.168.1.116
-        // target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.251:18086',
+        // // target: 'http://192.168.1.103:18086',192.168.1.116
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',