工单、生产版本前端修改 工作中心前端修改

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

@@ -13,14 +13,14 @@
       />
       <el-table-column
         label="加工方式"
-        prop="controlCode"
+        prop="processingMethod"
         align="center"
         width="215"
       >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.process_control_code"
-            :value="scope.row.controlCode"
+            :value="scope.row.processingMethod"
           />
         </template>
       </el-table-column>
@@ -204,9 +204,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="加工方式" prop="controlCode">
+            <el-form-item label="加工方式" prop="processingMethod">
               <el-select
-                v-model="form.controlCode"
+                v-model="form.processingMethod"
                 placeholder="请选择加工方式"
                 clearable
                 style="width: 150px"
@@ -220,7 +220,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <template v-if="form.controlCode == 'PP02'">
+          <template v-if="form.processingMethod == 'PP02'">
             <el-col :span="12">
               <el-form-item
                 label="采购信息记录号"

src/views/mes/pro/workorder/components/WorkOrderSale.vue

@@ -23,7 +23,7 @@
       </el-col>
     </el-row> -->
 
-    <el-form
+    <!-- <el-form
       class="page-form"
       :model="form"
       ref="form"
@@ -294,9 +294,9 @@
             ></el-input></el-form-item
         ></el-col>
       </el-row>
-    </el-form>
+    </el-form> -->
 
-    <!-- <el-table :data="tableData">
+    <el-table :data="tableData">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="指令号"
@@ -456,6 +456,39 @@
         prop="purchaseOrg"
         width="120"
       />
+      <!-- <el-table-column
+        label="包装数量"
+        align="center"
+        prop="packNum"
+        width="120"
+      />
+      <el-table-column
+        label="按指令包装"
+        align="center"
+        prop="packByDirective"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.packByDirective"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="按size包装"
+        align="center"
+        prop="packBySize"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.packBySize"
+          />
+        </template> -->
+      <!-- </el-table-column> -->
+
       <el-table-column
         v-if="mode != 'info'"
         label="操作"
@@ -470,16 +503,16 @@
             @click="updateRow(row, $index)"
             >修改</el-button
           >
-          <el-button
+          <!-- <el-button
             type="text"
             icon="el-icon-delete"
             size="small"
             @click="deleteRow($index)"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
-    </el-table> -->
+    </el-table>
   </div>
 </template>
 

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

@@ -187,7 +187,36 @@
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="厚度(丝)" prop="thickness">
-              <el-input v-model="form.thickness" placeholder="厚度(丝)" />
+              <el-input v-model="form.thickness" placeholder="请输入厚度(丝)" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="包装数量" prop="packNum">
+              <el-input v-model="form.packNum" placeholder="请输入包装数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="按指令包装" prop="packByDirective">
+              <el-select v-model="form.packByDirective" placeholder="请选择类型">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :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="按size包装" prop="packBySize">
+              <el-select v-model="form.packBySize" placeholder="请选择类型">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -267,6 +296,7 @@ export default {
     "mes_workorder_status",
     "mes_workorder_sourcetype",
     "mes_workorder_type",
+    "sys_yes_no",
   ],
   provide() {
     return {
@@ -315,6 +345,9 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        packBySize: null,
+        packByDirective: null,
+        packNum: null,
       },
       // 表单校验
       rules: {
@@ -593,6 +626,9 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        packBySize: null,
+        packByDirective: null,
+        packNum: null,
       };
       this.$refs["ProogingBomRef"].resetState();
       this.$refs["ProogingProcessRef"].resetState();