新增倒冲料的字段和新增生产规格书的两个知字段

src/views/mes/pro/allocation/index.vue

@@ -74,6 +74,11 @@
                     <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.windCase" />
                 </template>
             </el-table-column>
+            <el-table-column label="领料方式" align="center" prop="materialType">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.pro_material_from" :value="scope.row.materialType" />
+                </template>
+            </el-table-column>
             <el-table-column label="需求日期" align="center" prop="startTime" width="180">
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -244,7 +249,7 @@ import {
 export default {
     name: "ProAllocationMaterial",
     components: { ItemSelect, TaskSelect, WorkstationSelect, allocationIndex, BrandSelect, arangeSelect },
-    dicts: ['sys_yes_no'],
+    dicts: ['sys_yes_no','pro_material_from'],
     data() {
         return {
             // 遮罩层

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

@@ -132,12 +132,6 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="加工处理最小厚度" align="center" prop="treatingThicknessMin" />
-      <el-table-column label="加工处理最大厚度" align="center" prop="treatingThicknessMax" />
-      <el-table-column label="加工处理最小宽度" align="center" prop="treatingWidthMin" />
-      <el-table-column label="加工处理最大宽度" align="center" prop="treatingWidthMax" />
-      <el-table-column label="凹印_胶版油槽数" align="center" prop="dieSunkOffsetOilTankNum" />
-      <el-table-column label="印刷方式" align="center" prop="printingMethod" />
       <el-table-column label="工序备注" prop="processRemark" align="center" />
       <el-table-column
         v-if="mode != 'info'"
@@ -304,35 +298,6 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="最小厚度" label-width="120px" prop="treatingThicknessMin">
-              <el-input v-model="form.treatingThicknessMin" placeholder="请输入最小厚度">
-                <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="最大厚度" label-width="120px" prop="treatingThicknessMax">
-              <el-input v-model="form.treatingThicknessMax" placeholder="请输入最大厚度">
-                <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
-      
-          <el-col :span="12">
-            <el-form-item label="最小宽度" label-width="120px" prop="treatingWidthMin">
-              <el-input v-model="form.treatingWidthMin" placeholder="请输入最小宽度">
-                <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="最大宽度" label-width="120px" prop="treatingWidthMax">
-              <el-input v-model="form.treatingWidthMax" placeholder="请输入最大宽度">
-                <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
 
           <el-col :span="12">
             <el-form-item label="单位转换比例" prop="unitConvert">
@@ -352,11 +317,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="印刷方式" label-width="120px" prop="printingMethod">
-              <el-input v-model="form.printingMethod" placeholder="请输入印刷方式" />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="加工方式" prop="processingMethod">
               <el-select
@@ -593,12 +553,6 @@ export default {
                sacmForThermalSelfFusion: '',
                sacmForMolarTooth: '',
                sacmForSlitting: '',
-               treatingThicknessMin: '',
-               treatingThicknessMax: '',
-               treatingWidthMin: '',
-               treating_WidthMax: '',
-               dieSunkOffsetOilTankNum: '',
-               printingMethod: '',
       },
       currentRow: {},
       currentRowIndex: undefined,
@@ -719,12 +673,7 @@ export default {
                sacmForThermalSelfFusion: '',
                sacmForMolarTooth: '',
                sacmForSlitting: '',
-               treatingThicknessMin: '',
-               treatingThicknessMax: '',
-               treatingWidthMin: '',
-               treating_WidthMax: '',
-               dieSunkOffsetOilTankNum: '',
-               printingMethod: '',
+             
       };
     },
     /**重置组件状态 */

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

@@ -536,7 +536,20 @@
             <el-input v-model="form.productMaterial" placeholder />
           </el-form-item>
         </el-col>
+        <el-col :lg="6" :md="8" :sm="12" :xs="12">
+          <el-form-item label="凹印_胶版油槽数" prop="dieSunkOffsetOilTankNum">
+            <el-input v-model="form.dieSunkOffsetOilTankNum" placeholder >
+              <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">个</i>
+              </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :lg="6" :md="8" :sm="12" :xs="12">
+          <el-form-item label="印刷方式" prop="printingMethod">
+            <el-input v-model="form.printingMethod" placeholder />
+          </el-form-item>
+        </el-col>
       </el-row>
+      
       <!-- <el-row>
         <el-col :span="23">
           <el-form-item label="备注" prop="remark">
@@ -694,6 +707,8 @@ export default {
         rowNum: "",
         isCreateSpec: "",
         isNeedShoeImg: "",
+        dieSunkOffsetOilTankNum: "",
+        printingMethod: "",
       },
       currentRow: {},
       currentRowIndex: undefined,
@@ -769,6 +784,8 @@ export default {
         rowNum: "",
         isCreateSpec: "",
         isNeedShoeImg: "",
+        dieSunkOffsetOilTankNum: "",
+        printingMethod: "",
       };
     },
     /**重置组件状态 */