Merge remote-tracking branch 'origin/dev' into dev

src/views/mes/pro/workorder/indexApply.vue

@@ -155,6 +155,7 @@
           <dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
         </template>
       </el-table-column>
+      <el-table-column label="工艺名称" width="140" align="center" prop="routeName" />
       <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />
       <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
       <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
@@ -295,14 +296,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="产品编号" prop="productCode">
               <el-input v-model="form.productCode" placeholder="请选择产品" >
                 <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
               </el-input>
               <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="产品名称" prop="productName">
               <el-input v-model="form.productName" placeholder="请选择产品" disabled/>
@@ -463,6 +464,7 @@ export default {
         productCode: null,
         productName: null,
         productSpc: null,
+        routeName: null,
         unitOfMeasure: null,
         quantity: null,
         quantityProduced: null,
@@ -561,6 +563,7 @@ export default {
         productCode: null,
         productName: null,
         productSpc: null,
+        routeName: null,
         unitOfMeasure: null,
         quantity: null,
         quantityProduced: null,
@@ -636,10 +639,11 @@ export default {
     handleView(row){
       this.reset();
       this.getTreeselect();
-    
+      const workorderId = row.workorderId || this.ids;
       this.$router.push(
         "/mes/pro/workorder/info?workorderId=" + workorderId
       );
+     
       // this.reset();
       // this.getTreeselect();
       // const workorderId = row.workorderId || this.ids;

src/views/mes/pro/workorder/proofingInfo.vue

@@ -101,6 +101,26 @@
           </el-col>
         </el-row>
        <el-row>
+        <el-col :md="8" :xs="12" style="height: 50.5px">
+            <el-form-item label="工艺名称" prop="routeId">
+              <el-input
+                v-model="form.routeName"
+                readonly
+                placeholder="请选择工艺路线"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['RoutesProcessSelectRef'].showFlag = true"
+                ></el-button>
+              </el-input>
+              <RoutesProcessSelect
+                ref="RoutesProcessSelectRef"
+                @onSelected="onRoutesProcessSelect"
+              />
+            </el-form-item>
+          </el-col>
+       
          <el-col :span="8">
             <el-form-item label="产品编号" prop="productCode">
               <el-input v-model="form.productCode" placeholder="请选择产品" >
@@ -253,6 +273,7 @@ export default {
         workorderCode: "",
         workorderName: "",
         orderSource: "",
+        routeName: "",
         sourceCode: "",
         productId: "",
         productCode: "",
@@ -328,6 +349,7 @@ export default {
   },
   
   methods: {
+  
     
     /** 查询生产工单下拉树结构 */
     getTreeselect() {
@@ -445,7 +467,6 @@ export default {
       if (row != undefined && row != null) {
         this.form.routeId = row.routeId;
         this.form.routeName = row.routeName;
-
         const params = {
           pageNum: 1,
           pageSize: 1000,
@@ -510,6 +531,7 @@ export default {
         workorderId: null,
         workorderCode: null,
         workorderName: null,
+        routeName: null,
         workorderType: 'SELF',
         orderSource: null,
         sourceCode: null,