修改生产版本和生产工单的修改

src/components/productionSolution/index.vue

 <template>
-  <el-dialog
-    title="工艺路线选择"
-    v-if="showFlag"
-    :visible.sync="showFlag"
-    :modal="true"
-    width="80%"
-    append-to-body
-    center
-  >
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      inline
-      v-show="showSearch"
-      label-width="110px"
-    >
-      <el-form-item label="生产版本编码" prop="productionSolutionCode">
-        <el-input
-          v-model="queryParams.productionSolutionCode"
-          placeholder="请输入生产版本编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+  <el-dialog title="工艺路线选择" v-if="showFlag" :visible.sync="showFlag" :modal="true" width="80%" append-to-body center>
+    <el-form :model="queryParams" ref="queryForm" size="small" inline v-show="showSearch" label-width="110px">
+      <el-form-item label="成品物料号" prop="itemCode">
+        <el-input v-model="queryParams.itemCode" clearable placeholder="请输入成品物名称" @keyup.enter.native="handleQuery">
+        </el-input>
       </el-form-item>
-      <el-form-item label="生产用途" prop="productionSolutionName">
-        <el-input
-          v-model="queryParams.productionSolutionName"
-          placeholder="请输入生产用途"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="成品物名称" prop="itemName">
+        <el-input v-model="queryParams.itemName" clearable placeholder="请输入成品物名称" @keyup.enter.native="handleQuery">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="组件号" prop="groupCounter">
+        <el-input v-model="queryParams.groupCounter" clearable placeholder="请输入组件号" @keyup.enter.native="handleQuery">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="打样订单号" prop="sapPrototypeMakeCode">
+        <el-input v-model="queryParams.sapPrototypeMakeCode" clearable placeholder="请输入打样订单号"
+          @keyup.enter.native="handleQuery">
+        </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table
-      v-loading="loading"
-      :data="processRoutesList"
-      highlight-current-row
-      @current-change="handleCurrent"
-      @row-dblclick="handleRowDbClick"
-      height="400"
-    >
+    <el-table v-loading="loading" :data="processRoutesList" highlight-current-row @current-change="handleCurrent"
+      @row-dblclick="handleRowDbClick" height="400">
       <el-table-column width="50" align="center">
         <template v-slot="scope">
-          <el-radio
-            v-model="selectedRouteId"
-            :label="scope.row.productionSolutionId"
-            @change="handleRowChange(scope.row)"
-            >{{ "" }}</el-radio
-          >
+          <el-radio v-model="selectedRouteId" :label="scope.row.productionSolutionId"
+            @change="handleRowChange(scope.row)">{{ "" }}</el-radio>
         </template>
       </el-table-column>
       <el-table-column label="生产版本编码" align="center" prop="productionSolutionCode" />
-       <el-table-column label="组件号" align="center" prop="groupCounter" />
+      <el-table-column label="组件号" align="center" prop="groupCounter" />
+      <el-table-column label="产品版本名称" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
+      <el-table-column label="成品物料编码" align="center" prop="itemCode" />
+      <el-table-column label="成品物料名称" align="center" prop="itemName" />
       <el-table-column label="生产用途" align="center" prop="usageName" />
+      <el-table-column label="打样订单" align="center" prop="sapPrototypeMakeCode" />
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
-   
+    <el-tabs type="border-card" style="margin-top: 30px">
+      <el-tab-pane label="工序">
+        <el-table v-loading="processLoading" :data="processList">
+          <el-table-column label="工序编码" width="120px" fixed align="center" prop="processCode" />
+          <el-table-column label="工序名称" width="150px" fixed align="center" prop="processName" />
+          <el-table-column label="标准工时" width="150px" align="center" prop="stdWorkingTime" />
+          <el-table-column label="工作中心" width="150px" align="center" prop="workstationName" />
+          <el-table-column label="工序总量" width="100px" align="center" prop="keyFlag" />
+          <el-table-column label="换型时间" prop="lineBreakTime" align="center" />
+          <el-table-column label="工时单位" prop="stdWorkingTimeUom" align="center" />
+          <el-table-column label="工序总数量" prop="quantity" align="center" />
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="confirmSelect">确 定</el-button>
       <el-button @click="showFlag = false">取 消</el-button>
@@ -89,8 +69,9 @@
 <script>
 
 import {
-    listProductionSolution,
+  listProductionSolution,
 } from "@/api/mes/pro/productionSolution";
+import { listProductionSolutionProcess } from "@/api/mes/pro/productionSolutionProcess";
 export default {
   name: "RoutesProcessSelectSingle",
   components: {},
@@ -127,6 +108,9 @@ export default {
         productionSolutionName: null,
         statsu: "PREPARE",
         itemId: null,
+        groupCounter: null,
+        itemCode: null,
+        itemName: null,
         routeId: null,
         usageId: null,
         remark: null,
@@ -163,10 +147,10 @@ export default {
       const params = {
         pageNum: 1,
         pageSize: 1000,
-        routeId: row.productionSolutionId,
+        productionSolutionId: row.productionSolutionId,
       };
       this.processLoading = true;
-      listProductionSolution(params)
+      listProductionSolutionProcess(params)
         .then(({ rows }) => {
           this.processList = rows;
           this.processLoading = false;
@@ -178,7 +162,7 @@ export default {
         this.selectedRows = row;
       }
     },
-    getProcess() {},
+    getProcess() { },
     // 单选选中数据
     handleRowChange(row) {
       if (row) {
@@ -194,15 +178,18 @@ export default {
       }
     },
 
-     // 表单重置
-     reset() {
+    // 表单重置
+    reset() {
       this.form = {
         productionSolutionId: null,
         productionSolutionCode: null,
         productionSolutionName: null,
         itemId: null,
+        groupCounter: null,
         routeId: null,
         usageId: null,
+        itemCode: null,
+        itemName: null,
         remark: null,
         createBy: null,
         createTime: null,

src/views/mes/pro/productionSolution/proofingApply.vue

@@ -8,43 +8,40 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="生产版本名称" prop="productionSolutionName">
+      <el-form-item label="成品物料号" prop="itemCode">
         <el-input
-          v-model="queryParams.itemName"
-          placeholder="请输入版本名称"
+          v-model="queryParams.itemCode"
+          placeholder="请输入成品物料号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="生产用途" prop="usageName">
-        <el-select
-          v-model="queryParams.usageName"
+      <el-form-item label="成品物名称" prop="itemName">
+        <el-input
+          v-model="queryParams.itemName"
           clearable
-          placeholder="请输入生产用途"
+          placeholder="请输入成品物名称"
+          @keyup.enter.native="handleQuery"
         >
-          <el-option
-            v-for="item in usageNames"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+        </el-input>
       </el-form-item>
-      <el-form-item label="单据状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
+      <el-form-item label="组件号" prop="groupCounter">
+        <el-input
+          v-model="queryParams.groupCounter"
           clearable
-          placeholder="请选择单据状态"
+          placeholder="请输入组件号"
+          @keyup.enter.native="handleQuery"
         >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="打样订单号" prop="sapPrototypeMakeCode">
+        <el-input
+          v-model="queryParams.sapPrototypeMakeCode"
+          clearable
+          placeholder="请输入打样订单号"
+          @keyup.enter.native="handleQuery"
+        >
+        </el-input>
       </el-form-item>
       <el-form-item>
         <el-button

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

@@ -309,7 +309,8 @@ import ItemSelect from "@/components/itemSelect/single.vue";
 import ClientSelect from "@/components/clientSelect/single.vue";
 import VendorSelect from "@/components/vendorSelect/single.vue";
 import RoutesProcessSelect from "@/components/productionSolution/index.vue";
-import { listRouteprocess } from "@/api/mes/pro/routeprocess";
+// import { listRouteprocess } from "@/api/mes/pro/routeprocess";
+import { listProductionSolutionProcess } from "@/api/mes/pro/productionSolutionProcess";
 import tabPlugins from "@/plugins/tab";
 import {
   addPrototypeRequest,
@@ -633,9 +634,9 @@ export default {
         const params = {
           pageNum: 1,
           pageSize: 1000,
-          routeId: row.productionSolutionId,
+          productionSolutionId: row.productionSolutionId,
         };
-        listRouteprocess(params).then(({ rows }) => {
+        listProductionSolutionProcess(params).then(({ rows }) => {
           this.$refs["ProogingProcessRef"].setList(rows);
         });
       }