Merge branch 'dev' into test

src/views/saleOrder/components/order-search.vue

@@ -530,6 +530,7 @@
         const produceRoutingId = this.selection[0].produceRoutingId;
         const measuringUnit = this.selection[0].measuringUnit;
         const factoriesId = this.selection[0].factoriesId;
+        const bomCategoryId = this.selection[0].bomCategoryId
 
         // if(!factoriesId){
         //   this.$message.warning('工厂未选择！');
@@ -564,6 +565,7 @@
             produceRoutingId: produceRoutingId,
             produceRoutingName: this.selection[0].produceRoutingName,
             factoriesId: factoriesId,
+            bomCategoryId: bomCategoryId
           }
         });
       },

src/views/saleOrder/salesToProductionNew.vue

@@ -467,6 +467,8 @@ export default {
           res.produceRoutingId || this.$route.query.produceRoutingId;
         this.form.factoriesId =
           res.factoriesId || this.$route.query.factoriesId;
+        this.form.bomCategoryId=res.bomCategoryId || this.$route.query.bomCategoryId;
+        this.changeBomId()
         console.log(this.form.factoriesId, '99999999999999')
         if (this.clientEnvironmentId == '4') {
           if (this.form.salesOrders[0].productName.includes('板材')) {

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -725,6 +725,8 @@ export default {
                     res.produceRoutingId || this.$route.query.produceRoutingId;
                 this.form.factoriesId =
                     res.factoriesId || this.$route.query.factoriesId;
+                this.form.bomCategoryId=res.bomCategoryId || this.$route.query.bomCategoryId;
+                this.changeBomId()
                 console.log(this.form.factoriesId, '99999999999999')
                 if (this.clientEnvironmentId == '4') {
                     if (this.form.salesOrders[0].productName.includes('板材')) {