生产版本命名修改,生产版本工序字段添加

src/api/mes/pro/productionSolution.js

-import request from '@/utils/request'
+import request from "@/utils/request";
 
-// 查询生产方案列表
+// 查询生产版本列表
 export function listProductionSolution(query) {
   return request({
-    url: 'pro/productionSolution/list',
-    method: 'get',
-    params: query
-  })
+    url: "pro/productionSolution/list",
+    method: "get",
+    params: query,
+  });
 }
 
-// 查询生产方案详细
+// 查询生产版本详细
 export function getProductionSolution(productionSolutionId) {
   return request({
-    url: 'pro/productionSolution/' + productionSolutionId,
-    method: 'get'
-  })
+    url: "pro/productionSolution/" + productionSolutionId,
+    method: "get",
+  });
 }
 
-// 新增生产方案
+// 新增生产版本
 export function addProductionSolution(data) {
   return request({
-    url: 'pro/productionSolution',
-    method: 'post',
-    data: data
-  })
+    url: "pro/productionSolution",
+    method: "post",
+    data: data,
+  });
 }
 
-// 修改生产方案
+// 修改生产版本
 export function updateProductionSolution(data) {
   return request({
-    url: 'pro/productionSolution',
-    method: 'put',
-    data: data
-  })
+    url: "pro/productionSolution",
+    method: "put",
+    data: data,
+  });
 }
 
-// 删除生产方案
+// 删除生产版本
 export function delProductionSolution(productionSolutionId) {
   return request({
-    url: 'pro/productionSolution/' + productionSolutionId,
-    method: 'delete'
-  })
+    url: "pro/productionSolution/" + productionSolutionId,
+    method: "delete",
+  });
+}
+// 提交生产版本
+export function submitProductionSolution(data) {
+  return request({
+    url: "pro/productionSolution/submit",
+    method: "put",
+    data: data,
+  });
 }

src/api/mes/pro/productionSolutionBom.js

-import request from '@/utils/request'
+import request from "@/utils/request";
 
-// 查询生产方案BOM列表
+// 查询生产版本BOM列表
 export function listProductionSolutionBom(query) {
   return request({
-    url: '/mes/pro/productionSolutionBom/list',
-    method: 'get',
-    params: query
-  })
+    url: "/mes/pro/productionSolutionBom/list",
+    method: "get",
+    params: query,
+  });
 }
 
-// 查询生产方案BOM详细
+// 查询生产版本BOM详细
 export function getProductionSolutionBom(bomItemId) {
   return request({
-    url: '/mes/pro/productionSolutionBom/' + bomItemId,
-    method: 'get'
-  })
+    url: "/mes/pro/productionSolutionBom/" + bomItemId,
+    method: "get",
+  });
 }
 
-// 新增生产方案BOM
+// 新增生产版本BOM
 export function addProductionSolutionBom(data) {
   return request({
-    url: '/mes/pro/productionSolutionBom',
-    method: 'post',
-    data: data
-  })
+    url: "/mes/pro/productionSolutionBom",
+    method: "post",
+    data: data,
+  });
 }
 
-// 修改生产方案BOM
+// 修改生产版本BOM
 export function updateProductionSolutionBom(data) {
   return request({
-    url: '/mes/pro/productionSolutionBom',
-    method: 'put',
-    data: data
-  })
+    url: "/mes/pro/productionSolutionBom",
+    method: "put",
+    data: data,
+  });
 }
 
-// 删除生产方案BOM
+// 删除生产版本BOM
 export function delProductionSolutionBom(bomItemId) {
   return request({
-    url: '/mes/pro/productionSolutionBom/' + bomItemId,
-    method: 'delete'
-  })
+    url: "/mes/pro/productionSolutionBom/" + bomItemId,
+    method: "delete",
+  });
 }

src/api/mes/pro/productionSolutionProcess.js

-import request from '@/utils/request'
+import request from "@/utils/request";
 
-// 查询生产方案工序列表
+// 查询生产版本工序列表
 export function listProductionSolutionProcess(query) {
   return request({
-    url: '/mes/pro/productionSolutionProcess/list',
-    method: 'get',
-    params: query
-  })
+    url: "/mes/pro/productionSolutionProcess/list",
+    method: "get",
+    params: query,
+  });
 }
 
-// 查询生产方案工序详细
+// 查询生产版本工序详细
 export function getProductionSolutionProcess(productionSolutionProcessId) {
   return request({
-    url: '/mes/pro/productionSolutionProcess/' + productionSolutionProcessId,
-    method: 'get'
-  })
+    url: "/mes/pro/productionSolutionProcess/" + productionSolutionProcessId,
+    method: "get",
+  });
 }
 
-// 新增生产方案工序
+// 新增生产版本工序
 export function addProductionSolutionProcess(data) {
   return request({
-    url: '/mes/pro/productionSolutionProcess',
-    method: 'post',
-    data: data
-  })
+    url: "/mes/pro/productionSolutionProcess",
+    method: "post",
+    data: data,
+  });
 }
 
-// 修改生产方案工序
+// 修改生产版本工序
 export function updateProductionSolutionProcess(data) {
   return request({
-    url: '/mes/pro/productionSolutionProcess',
-    method: 'put',
-    data: data
-  })
+    url: "/mes/pro/productionSolutionProcess",
+    method: "put",
+    data: data,
+  });
 }
 
-// 删除生产方案工序
+// 删除生产版本工序
 export function delProductionSolutionProcess(productionSolutionProcessId) {
   return request({
-    url: '/mes/pro/productionSolutionProcess/' + productionSolutionProcessId,
-    method: 'delete'
-  })
+    url: "/mes/pro/productionSolutionProcess/" + productionSolutionProcessId,
+    method: "delete",
+  });
 }

src/api/mes/pro/productionSolutionProcessItem.js

-import request from '@/utils/request'
+import request from "@/utils/request";
 
-// 查询生产方案工序物料列表
+// 查询生产版本工序物料列表
 export function listProductionSolutionProcessItem(query) {
   return request({
-    url: '/mes/pro/productionSolutionProcessItem/list',
-    method: 'get',
-    params: query
-  })
+    url: "/mes/pro/productionSolutionProcessItem/list",
+    method: "get",
+    params: query,
+  });
 }
 
-// 查询生产方案工序物料详细
-export function getProductionSolutionProcessItem(productionSolutionProcessItemId) {
+// 查询生产版本工序物料详细
+export function getProductionSolutionProcessItem(
+  productionSolutionProcessItemId
+) {
   return request({
-    url: '/mes/pro/productionSolutionProcessItem/' + productionSolutionProcessItemId,
-    method: 'get'
-  })
+    url:
+      "/mes/pro/productionSolutionProcessItem/" +
+      productionSolutionProcessItemId,
+    method: "get",
+  });
 }
 
-// 新增生产方案工序物料
+// 新增生产版本工序物料
 export function addProductionSolutionProcessItem(data) {
   return request({
-    url: '/mes/pro/productionSolutionProcessItem',
-    method: 'post',
-    data: data
-  })
+    url: "/mes/pro/productionSolutionProcessItem",
+    method: "post",
+    data: data,
+  });
 }
 
-// 修改生产方案工序物料
+// 修改生产版本工序物料
 export function updateProductionSolutionProcessItem(data) {
   return request({
-    url: '/mes/pro/productionSolutionProcessItem',
-    method: 'put',
-    data: data
-  })
+    url: "/mes/pro/productionSolutionProcessItem",
+    method: "put",
+    data: data,
+  });
 }
 
-// 删除生产方案工序物料
-export function delProductionSolutionProcessItem(productionSolutionProcessItemId) {
+// 删除生产版本工序物料
+export function delProductionSolutionProcessItem(
+  productionSolutionProcessItemId
+) {
   return request({
-    url: '/mes/pro/productionSolutionProcessItem/' + productionSolutionProcessItemId,
-    method: 'delete'
-  })
+    url:
+      "/mes/pro/productionSolutionProcessItem/" +
+      productionSolutionProcessItemId,
+    method: "delete",
+  });
 }

src/views/mes/md/product/components/productionPlan.vue

 <!--客户loss信息-->
 <template>
   <div class="app-container">
-    <el-table
-      v-loading="loading"
-      :data="productionPlanList"
-    >
+    <el-table v-loading="loading" :data="productionPlanList">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="生产方案编码" align="center" prop="productionSolutionCode" />
-      <el-table-column label="生产方案名称" align="center" prop="productionSolutionName" />
+      <el-table-column
+        label="生产版本编码"
+        align="center"
+        prop="productionSolutionCode"
+      />
+      <el-table-column
+        label="生产版本名称"
+        align="center"
+        prop="productionSolutionName"
+      />
       <el-table-column label="工艺路线编码" align="center" prop="routeCode" />
       <el-table-column label="工艺路线名称" align="center" prop="routeName" />
       <el-table-column label="用途编码" align="center" prop="usageCode" />
@@ -24,13 +29,10 @@
 </template>
 
 <script>
-import {
-  listProductionSolution,
-} from "@/api/mes/pro/productionSolution";
+import { listProductionSolution } from "@/api/mes/pro/productionSolution";
 export default {
   name: "ProductionPlan",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -45,7 +47,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 产品生产方案表格数据
+      // 产品生产版本表格数据
       productionPlanList: [],
       // 弹出层标题
       title: "",

src/views/mes/pro/productionSolution/components/ProcessProd.vue

@@ -25,8 +25,13 @@
         <el-table-column label="单位" prop="unitOfMeasure" align="center" />
         <el-table-column label="数量" prop="quantity" align="center" />
         <el-table-column label="备注" prop="remark" align="center" />
-        <el-table-column label="操作" align="center" width="150">
-          <!-- <template slot-scope="{ row, $index }">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150"
+          v-if="!(optType === 'detail')"
+        >
+          <template slot-scope="{ row, $index }">
             <el-button
               type="text"
               icon="el-icon-edit"
@@ -41,7 +46,23 @@
               @click="deleteRow($index)"
               >删除</el-button
             >
-          </template> -->
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150"
+          v-if="optType === 'detail'"
+        >
+          <template slot-scope="{ row, $index }">
+            <el-button
+              type="text"
+              icon="el-icon-search"
+              size="small"
+              @click="searchRow(row, $index)"
+              >查看详情</el-button
+            >
+          </template>
         </el-table-column>
       </el-table>
 
@@ -74,12 +95,19 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" prop="itemName" />
+        <el-table-column label="项目号" prop="idx" />
+        <el-table-column label="物料名称" prop="sapItemName" />
+        <el-table-column label="组件数量" prop="quantity" />
         <el-table-column label="单位" prop="unitOfMeasure" />
-        <el-table-column label="用料比例" prop="quantity" />
+        <el-table-column label="副单位" prop="deputyUnitOfMeasure" />
+        <el-table-column label="主副单位转换比例" prop="unitConvert" />
+        <el-table-column label="备注" prop="remark" />
+        <el-table-column label="反冲" prop="recoil" />
       </el-table>
       <div slot="footer">
-        <el-button @click="configmSelect">确认</el-button>
+        <el-button @click="configmSelect" v-if="!(optType === 'detail')"
+          >确认</el-button
+        >
         <el-button @click="showFlag = false">取消</el-button>
       </div>
     </el-dialog>
@@ -92,20 +120,33 @@
     >
       <el-form :model="form" inline size="small" label-width="80px">
         <el-form-item label="物料名称">
-          <el-input disabled v-model="form.itemName"></el-input>
+          <el-input disabled v-model="form.sapItemName"></el-input>
+        </el-form-item>
+        <el-form-item label="数量">
+          <el-input type="number" v-model="form.quantity"></el-input>
         </el-form-item>
         <el-form-item label="单位">
           <el-input disabled v-model="form.unitOfMeasure"></el-input>
         </el-form-item>
-        <el-form-item label="数量">
-          <el-input type="number" v-model="form.quantity"></el-input>
+        <el-form-item label="副单位">
+          <el-input v-model="form.deputyUnitOfMeasure"></el-input>
+        </el-form-item>
+        <el-form-item label="主副单位转换比例">
+          <el-input type="number" v-model="form.unitConvert"></el-input>
+        </el-form-item>
+        <el-form-item label="反冲">
+          <el-input v-model="form.idx"></el-input>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button type="primary" size="small" @click="submitEditConnect"
+        <el-button
+          type="primary"
+          size="small"
+          @click="submitEditConnect"
+          v-if="!(optType === 'detail')"
           >确认</el-button
         >
         <el-button size="small" @click="editConnectVisible = false"
@@ -131,10 +172,18 @@ export default {
   data() {
     return {
       form: {
-        itemName: "",
+        productionSolutionProcessItemId: "",
+        productionSolutionProcessId: "",
+        sapItemCode: "",
+        sapItemName: "",
+        usageCode: "",
         unitOfMeasure: "",
+        deputyUnitOfMeasure: "",
+        unitConvert: "",
         quantity: "",
         remark: "",
+        idx: "",
+        recoil: "",
       },
       currentRowIdx: undefined,
       tableData: [],
@@ -208,10 +257,18 @@ export default {
     /**重置表单 */
     resetForm() {
       this.form = {
-        itemName: "",
+        productionSolutionProcessItemId: "",
+        productionSolutionProcessId: "",
+        sapItemCode: "",
+        sapItemName: "",
+        usageCode: "",
         unitOfMeasure: "",
+        deputyUnitOfMeasure: "",
+        unitConvert: "",
         quantity: "",
         remark: "",
+        idx: "",
+        recoil: "",
       };
     },
     /** 提交编辑关联信息 */
@@ -221,6 +278,14 @@ export default {
       });
       this.editConnectVisible = false;
     },
+    /**查看 */
+    searchRow(row, idx) {
+      this.resetForm();
+      Object.assign(this.form, row);
+      this.currentRowIdx = idx;
+      this.optType = "detail";
+      this.editConnectVisible = true;
+    },
   },
 };
 </script>

src/views/mes/pro/productionSolution/components/ProcessQcindex.vue

@@ -8,7 +8,7 @@
       append-to-body
       title="设置检验项"
     >
-      <!-- <el-row :gutter="10" class="mb8">
+      <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -16,10 +16,11 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
+            v-if="!(optType === 'detail')"
           >新增</el-button
           >
         </el-col>
-      </el-row> -->
+      </el-row>
       <el-table :data="tableData">
         <el-table-column label="检测项编码" align="center" prop="indexCode" />
         <el-table-column label="检测项名称" align="center" prop="indexName" />
@@ -30,7 +31,12 @@
         </el-table-column>
         <el-table-column label="检测工具" align="center" prop="qcTool" />
         <el-table-column label="备注" prop="remark" align="center" />
-        <el-table-column label="操作" align="center" width="150">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150"
+          v-if="!(optType === 'detail')"
+        >
           <template slot-scope="{ row, $index }">
             <el-button
               type="text"
@@ -48,6 +54,22 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150"
+          v-if="optType === 'detail'"
+        >
+          <template slot-scope="{ row, $index }">
+            <el-button
+              type="text"
+              icon="el-icon-edit"
+              size="small"
+              @click="SearchRow(row, $index)"
+              >查看详情</el-button
+            >
+          </template>
+        </el-table-column>
       </el-table>
 
       <div slot="footer">
@@ -61,7 +83,7 @@
     <el-dialog
       :visible.sync="editConnectVisible"
       width="800px"
-      title="编辑检验项关联信息"
+      title="检验项关联信息"
     >
       <el-form ref="form" :model="form" label-width="120px">
         <el-row>
@@ -89,6 +111,7 @@
       </el-form>
       <div slot="footer">
         <el-button type="primary" size="small" @click="addOrEditubmit"
+        v-if="!(optType === 'detail')"
         >确认</el-button
         >
         <el-button size="small" @click="editConnectVisible = false"
@@ -112,6 +135,7 @@
     dicts: ['mes_index_type'],
     data() {
       return {
+        optType: "add",
         form: {
           indexCode: "",
           indexName: "",
@@ -159,7 +183,7 @@
      /**新增按钮 */
     handleAdd() {
       this.resetForm();
-        this.optType='add';
+      this.optType = "add";
       this.editConnectVisible = true;
     },
     /**编辑 */
@@ -167,7 +191,15 @@
       this.resetForm();
       Object.assign(this.form, row);
       this.currentRowIdx = idx;
-        this.optType='edit';
+      this.optType = "edit";
+      this.editConnectVisible = true;
+    },
+    /**查看详情 */
+    SearchRow(row, idx) {
+      this.resetForm();
+      Object.assign(this.form, row);
+      this.currentRowIdx = idx;
+      this.optType = "detail";
       this.editConnectVisible = true;
     },
       /**新增 */

src/views/mes/pro/productionSolution/components/ProcessTool.vue

@@ -16,21 +16,70 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
+            v-if="!(optType === 'detail')"
             >新增</el-button
           >
         </el-col>
       </el-row>
       <el-table :data="tableData">
-        <el-table-column label="编号" align="center" prop="itemCode" >
+        <el-table-column label="编号" align="center" prop="itemCode">
         </el-table-column>
-        <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
+        <el-table-column
+          label="名称"
+          align="center"
+          prop="itemName"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
-        <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
+        <el-table-column
+          label="型号"
+          align="center"
+          prop="specification"
+          :show-overflow-tooltip="true"
+        />
         <el-table-column label="类型" align="center" prop="itemTypeName" />
         <el-table-column label="要求数量" align="center" prop="quantity" />
         <el-table-column label="备注" prop="remark" align="center" />
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150"
+          v-if="!(optType === 'detail')"
+        >
+          <template slot-scope="{ row, $index }">
+            <el-button
+              type="text"
+              icon="el-icon-edit"
+              size="small"
+              @click="updateRow(row, $index)"
+              >修改</el-button
+            >
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              @click="deleteRow($index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150"
+          v-if="optType === 'detail'"
+        >
+          <template slot-scope="{ row, $index }">
+            <el-button
+              type="text"
+              icon="el-icon-edit"
+              size="small"
+              @click="searchRow(row, $index)"
+              >查看详情</el-button
+            >
+          </template>
+        </el-table-column>
       </el-table>
-
       <div slot="footer">
         <el-button type="primary" size="small" @click="cancleConnect"
           >关闭</el-button
@@ -42,14 +91,17 @@
     <el-dialog
       :visible.sync="editConnectVisible"
       width="800px"
-      title="编辑工装量具关联信息"
+      title="工装量具关联信息"
     >
       <el-form ref="form" :model="form" label-width="120px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="工装量具编码" prop="toolCode" >
-              <el-input v-model="form.itemCode"  placeholder="请选择数据"
-                        disabled>
+            <el-form-item label="工装量具编码" prop="toolCode">
+              <el-input
+                v-model="form.itemCode"
+                placeholder="请选择数据"
+                disabled
+              >
                 <el-button
                   slot="append"
                   icon="el-icon-search"
@@ -61,11 +113,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="工装量具名称" prop="itemName">
-              <el-input
-                type="text"
-                v-model="form.itemName"
-                disabled
-              ></el-input>
+              <el-input type="text" v-model="form.itemName" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -81,13 +129,21 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                :rows="3"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer">
-        <el-button type="primary" size="small" @click="addOrEditubmit"
+        <el-button
+          type="primary"
+          size="small"
+          @click="addOrEditubmit"
+          v-if="!(optType === 'detail')"
           >确认</el-button
         >
         <el-button size="small" @click="editConnectVisible = false"
@@ -99,8 +155,8 @@
 </template>
 
 <script>
-  import ItemSelect from "@/components/itemSelect/single.vue";
-  export default {
+import ItemSelect from "@/components/itemSelect/single.vue";
+export default {
   props: {
     process: {
       type: Object,
@@ -108,24 +164,25 @@
     },
   },
   components: { ItemSelect },
-    dicts: ['mes_index_type'],
+  dicts: ["mes_index_type"],
   data() {
     return {
+      optType: "add",
       form: {
         itemCode: "",
         itemName: "",
-          specification:"",
-          itemTypeName:"",
+        specification: "",
+        itemTypeName: "",
         remark: "",
         quantity: "",
-          toolId:"",
+        toolId: "",
       },
       currentRowIdx: undefined,
       tableData: [],
       selectedItemId: undefined,
       selectedRows: null,
       showFlag: false,
-        optType:null,
+      optType: null,
       showProcessProd: false,
       editConnectVisible: false,
     };
@@ -159,7 +216,7 @@
     /**新增按钮 */
     handleAdd() {
       this.resetForm();
-        this.optType='add';
+      this.optType = "add";
       this.editConnectVisible = true;
     },
     /**编辑 */
@@ -167,7 +224,15 @@
       this.resetForm();
       Object.assign(this.form, row);
       this.currentRowIdx = idx;
-        this.optType='edit';
+      this.optType = "edit";
+      this.editConnectVisible = true;
+    },
+    /**查看 */
+    searchRow(row, idx) {
+      this.resetForm();
+      Object.assign(this.form, row);
+      this.currentRowIdx = idx;
+      this.optType = "detail";
       this.editConnectVisible = true;
     },
     /**新增 */
@@ -178,7 +243,6 @@
       this.tableData.unshift({
         ...this.form,
         processId: this.process.processId,
-
       });
       this.editConnectVisible = false;
     },
@@ -189,10 +253,10 @@
       });
       this.editConnectVisible = false;
     },
-      addOrEditubmit(){
-        if(this.optType=='add'){
+    addOrEditubmit() {
+      if (this.optType == "add") {
         this.configmSelect();
-        }else{
+      } else {
         this.submitEditConnect();
       }
     },
@@ -213,14 +277,14 @@
       this.form = {
         itemCode: "",
         itemName: "",
-          specification:"",
-          itemTypeName:"",
+        specification: "",
+        itemTypeName: "",
         remark: "",
         quantity: "",
-          toolId:"",
+        toolId: "",
       };
     },
-      onItemSelect(row){
+    onItemSelect(row) {
       if (row != undefined && row != null) {
         this.form.itemCode = row.itemCode;
         this.form.itemName = row.itemName;
@@ -228,13 +292,13 @@
         this.form.itemTypeName = row.itemTypeName;
         this.form.toolId = row.itemId;
       }
-      }
     },
-  };
+  },
+};
 </script>
 
 <style>
-  .process-prod {
+.process-prod {
   padding: 0 20px;
-  }
+}
 </style>

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

@@ -10,12 +10,13 @@
 
       <!-- 修改 按钮显示 -->
       <template slot="buttons" v-if="mode == 'edit'">
-        <!-- <el-button size="mini" type="primary" @click="saveForm">提交</el-button> -->
+        <el-button size="mini" type="primary" @click="saveForm">提交</el-button>
       </template>
     </PageTitle>
 
     <PageWrapper>
       <el-form
+        class="page-form"
         :model="form"
         ref="form"
         size="small"
@@ -23,8 +24,8 @@
         label-width="8em"
       >
         <el-row>
-        <el-col :md="12" :xs="12">
-            <el-form-item label="生产方法编码" prop="productionSolutionCode">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="生产版本编码" prop="productionSolutionCode">
               <el-input
                 v-model="form.productionSolutionCode"
                 disabled
@@ -32,8 +33,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="12" :xs="12">
-            <el-form-item label="生产方法名称" prop="productionSolutionName">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="生产版本名称" prop="productionSolutionName">
               <el-input
                 v-model="form.productionSolutionName"
                 disabled
@@ -41,18 +42,29 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="12" :xs="12">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="生产版本类型" prop="productionSolutionType">
+              <el-select
+                v-model="form.productionSolutionType"
+                clearable
+                placeholder="请选择项目类别"
+              >
+                <el-option
+                  v-for="dict in dict.type.production_solution_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="产品名称" prop="itemName">
-              <el-input
-                v-model="form.itemName"
-                disabled
-                placeholder
-              ></el-input>
+              <el-input v-model="form.itemName" disabled placeholder></el-input>
             </el-form-item>
           </el-col>
-      </el-row>
-      <el-row>    
-          <el-col :md="12" :xs="12">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="工艺路线" prop="routeName">
               <el-input
                 v-model="form.routeName"
@@ -61,26 +73,78 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="12" :xs="12">
-            <el-form-item label="生产用途" prop="usageName">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="生产用途" prop="usageId">
+              <el-select v-model="form.usageId" placeholder="请选择用途">
+                <el-option
+                  v-for="dict in dict.type.production_solution_usage"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="有效起始日期" prop="startDate">
+              <el-date-picker
+                clearable
+                v-model="form.startDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择有效起始日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="有效期截止日期" prop="expiryDate">
+              <el-date-picker
+                clearable
+                v-model="form.expiryDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择有效期截止日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="最小批量" prop="minLot">
+              <el-input-number
+                :min="1"
+                v-model="form.minLot"
+                placeholder="请输入最小批量"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="最大批量" prop="maxLot">
+              <el-input-number
+                :min="1"
+                v-model="form.maxLot"
+                placeholder="请输入最大批量"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="单位" prop="unitOfMeasure">
               <el-input
-                v-model="form.usageName"
+                v-model="form.unitOfMeasure"
                 disabled
                 placeholder
               ></el-input>
             </el-form-item>
           </el-col>
-
-        
-         
-          
- <el-col :md="24" :xs="12">
+        </el-row>
+        <el-row>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="备注" prop="remark">
               <el-input
                 type="textarea"
                 :rows="3"
                 v-model="form.remark"
-                disabled
                 placeholder
               ></el-input>
             </el-form-item>
@@ -112,12 +176,13 @@ import {
   // addPrototypeRequest,
   // getPrototypeRequest,
   // updatePrototypeRequest,
-  getProductionSolution
+  getProductionSolution,
+  submitProductionSolution,
 } from "@/api/mes/pro/productionSolution";
 
 export default {
   components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
-  dicts: [],
+  dicts: ["production_solution_type", "production_solution_usage"],
   provide() {
     return {
       mode: this.mode,
@@ -132,11 +197,25 @@ export default {
         productionSolutionId: "",
         productionSolutionCode: "",
         productionSolutionName: "",
+        productionSolutionType: "",
         itemId: "",
         itemName: "",
         routeId: "",
         routeName: "",
         usageId: "",
+        usageName: "",
+        startDate: "",
+        expiryDate: "",
+        maxLot: "",
+        minLot: "",
+        unitOfMeasure: "",
+        materialsGroupBill: "",
+        alternativeBill: "",
+        groupCounter: "",
+        groupKey: "",
+        status: "",
+        sapItemCode: "",
+        factoryCode: "",
         remark: "",
         createBy: "",
         createTime: "",
@@ -155,9 +234,9 @@ export default {
     },
     pageTitle() {
       const titles = {
-        edit: "打样单修改",
-        info: "生产方案详情",
-        apply: "打样单申请",
+        edit: "生产版本确认",
+        info: "生产版本详情",
+        apply: "生产版本申请",
       };
       return titles[this.mode];
     },
@@ -177,9 +256,10 @@ export default {
         getProductionSolution(id)
           .then(({ data }) => {
             Object.assign(this.form, data);
-            this.bomList = data.bomList;
+            this.bomList = data.bomHead.bomItemList;
             // 设置组件数据
-            this.$refs["ProogingBomRef"].tableData = data.bomList;
+            this.$refs["ProogingBomRef"].form2 = data.bomHead;
+            this.$refs["ProogingBomRef"].tableData = data.bomHead.bomItemList;
             this.$refs["ProogingProcessRef"].tableData = data.processList;
           })
           .finally(() => {
@@ -223,11 +303,11 @@ export default {
     },
     /**提交 */
     saveForm() {
-      const bomList = this.$refs.ProogingBomRef.getComData();
+      const bomHead = this.$refs.ProogingBomRef.getComData();
       const processList = this.$refs.ProogingProcessRef.getComData();
       const params = {
         ...this.form,
-        bomList,
+        bomHead,
         processList,
       };
       this.loading = true;
@@ -244,7 +324,7 @@ export default {
             this.loading = false;
           });
       } else {
-        updatePrototypeRequest(params)
+        submitProductionSolution(params)
           .then(() => {
             this.loading = false;
             this.$modal.msgSuccess("提交成功！");
@@ -260,9 +340,25 @@ export default {
         productionSolutionId: "",
         productionSolutionCode: "",
         productionSolutionName: "",
+        productionSolutionType: "",
         itemId: "",
+        itemName: "",
         routeId: "",
+        routeName: "",
         usageId: "",
+        usageName: "",
+        startDate: "",
+        expiryDate: "",
+        maxLot: "",
+        minLot: "",
+        unitOfMeasure: "",
+        materialsGroupBill: "",
+        alternativeBill: "",
+        groupCounter: "",
+        groupKey: "",
+        status: "",
+        sapItemCode: "",
+        factoryCode: "",
         remark: "",
         createBy: "",
         createTime: "",