Merge branch 'test' into dev

jsconfig.json

@@ -11,7 +11,7 @@
     }
   },
   "exclude": ["node_modules", "dist"],
-  "vueCompilerOptions": {
-    "experimentalShamefullySupportOptionsApi": false
-  }
+  // "vueCompilerOptions": {
+  //   "experimentalShamefullySupportOptionsApi": false
+  // }
 }

src/views/productionPlan/components/factoryAdd/index.vue

@@ -17,7 +17,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="名称:" prop="productName">
+            <el-form-item label="产品名称:" prop="productName">
               <el-input
                 @click.native="handleAdd"
                 placeholder="请选择物料"
@@ -96,7 +96,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="BOM版本:" prop="bomCategoryId">
+            <el-form-item label="BOM版本:" prop="bomCategoryId" v-if="clientEnvironmentId != 4">
               <el-select
                 v-model="form.bomCategoryId"
                 style="width: 100%"
@@ -126,7 +126,9 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
-                ></el-option>
+                >
+              </el-option>
+
               </el-select>
             </el-form-item>
           </el-col>
@@ -284,6 +286,11 @@
         }
       }
     },
+    computed: {
+    clientEnvironmentId() {
+      return this.$store.state.user.info.clientEnvironmentId;
+    },
+    },
     data() {
       return {
         visible: true,
@@ -309,13 +316,13 @@
           productName: [
             { required: true, message: '请选择名称', trigger: 'change' }
           ],
-          bomCategoryId: [
-            { required: true, message: '请选择BOM版本', trigger: 'blur' }
-          ],
+          // bomCategoryId: [
+          //   { required: true, message: '请选择BOM版本', trigger: 'blur' }
+          // ],
 
-          produceRoutingId: [
-            { required: true, message: '请选择工艺路线', trigger: 'blur' }
-          ],
+          // produceRoutingId: [
+          //   { required: true, message: '请选择工艺路线', trigger: 'blur' }
+          // ],
 
           reqMoldTime: [
             { required: true, message: '请选择要求完成日期', trigger: 'blur' }
@@ -446,10 +453,15 @@
       },
 
       changeRoute() {
+        console.log(this.routingList,this.form.produceRoutingId);
+        this.$forceUpdate()
         this.routingList.forEach((f) => {
           if (f.id == this.form.produceRoutingId) {
+            this.$set(this.form, 'produceRoutingId', f.id);
             this.$set(this.form, 'produceRoutingName', f.name);
             this.$set(this.form, 'produceVersionName', f.version);
+
+            console.log(this.form,'1111111');
           }
         });
       },

src/views/saleOrder/salesToProduction.vue

@@ -57,8 +57,10 @@
           </el-col>
 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }" v-if="clientEnvironmentId != 4">
+            {{ form.produceRoutingId }}99999
             <el-form-item label="工艺路线:" prop="produceRoutingId">
               <!--  @click.native="openVersion"   -->
+
               <el-select v-model="form.produceRoutingId" style="width: 100%" @change="changeRoute">
                   <el-option
                     v-for="item of routingList"
@@ -644,7 +646,6 @@ export default {
       form: {
         planType: 1,
         produceRoutingId: '',
-
         stockCountBase: '',
         salesOrders: [],
         produceRoutingName: '',
@@ -798,6 +799,10 @@ export default {
 
 
     changeRoute() {
+
+      console.log(this.routingList);
+      console.log(this.form.produceRoutingId);
+
       this.routingList.forEach((f) => {
         if(f.id == this.form.produceRoutingId) {
           this.$set(this.form, 'produceRoutingName', f.name);