Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/saleOrder/salesToProduction.vue

@@ -72,7 +72,7 @@
 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }" v-if="clientEnvironmentId == 4">
             <el-form-item label="工艺路线:" prop="produceRoutingId">
-              <el-input v-model="form.produceRoutingName" style="width: 100%"  @click.native="openVersion"  ></el-input>
+              <el-input v-model="form.produceRoutingName" style="width: 100%"  readonly ></el-input>
             </el-form-item>
           </el-col>
 
@@ -811,6 +811,21 @@ export default {
           res.produceRoutingName || this.$route.query.produceRoutingName;
         this.form.produceRoutingId =
           res.produceRoutingId || this.$route.query.produceRoutingId;
+        if (this.clientEnvironmentId == '4') {
+          if (this.form.salesOrders[0].productName.includes('板材')) {
+            this.changeProduct({
+              id: '1856970794952372226',
+              name: '板材',
+              produceVersionName: '板材'
+            });
+          } else {
+            this.changeProduct({
+              id: '1857313733642596353',
+              name: '砌块',
+              produceVersionName: '砌块'
+            });
+          }
+        }
         this.form.salesOrders.map((item, index) => {
           if (this.clientEnvironmentId == '4') {
             this.tableHandleKeyUp(item, '', item.lackNum, 'sum');