包装

src/api/mes/pro/workorder.js

@@ -134,3 +134,11 @@ export function printInfo(workorderId) {
     method: 'get'
   })
 }
+
+// 指令表的包装类型
+export function getWorkOrderSoDirectivePkgRequireTypeEnum(workorderId) {
+  return request({
+    url: '/common/enum/getWorkOrderSoDirectivePkgRequireTypeEnum',
+    method: 'get'
+  })
+}

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

@@ -333,7 +333,11 @@
         align="center"
         prop="packType"
         width="120"
-      />
+      >
+        <template slot-scope="scope">
+         {{ packOption.find(v => v.value === scope.row.packType) ? packOption.find(v => v.value === scope.row.packType).name : '' }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="包装单位"
         align="center"
@@ -490,6 +494,32 @@
         prop="purchaseOrg"
         width="120"
       />
+      <el-table-column
+        label="是否按组合单包装"
+        align="center"
+        prop="combinationPackstate"
+        width="150"
+      >
+        <template slot-scope="scope">
+         {{ scope.row.combinationPackstate ? '是': '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="样品数"
+        align="center"
+        prop="samples"
+        width="80"
+      />
+      <el-table-column
+        label="是否合并SIZE包装"
+        align="center"
+        prop="mergePackState"
+        width="150"
+      >
+        <template slot-scope="scope">
+         {{ scope.row.mergePackState ? '是': '否' }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         label="包装数量"
         align="center"
@@ -551,6 +581,9 @@
 </template>
 
 <script>
+import {
+  getWorkOrderSoDirectivePkgRequireTypeEnum
+} from "@/api/mes/pro/workorder";
 export default {
   components: {},
   inject: ["mode"],
@@ -604,11 +637,24 @@ export default {
         packBySize: "",
         purchaseOrg: "",
       },
+      packOption: [],
       currentRowIdx: undefined,
     };
   },
-  created() {},
+  created() {
+    this.getWorkOrderSoDirectivePkgRequireTypeEnum()
+  },
   methods: {
+    getWorkOrderSoDirectivePkgRequireTypeEnum (){
+      getWorkOrderSoDirectivePkgRequireTypeEnum().then((res)=>{
+        if(res.code === 200) {
+          Object.keys(res.data).forEach(item => {
+            this.packOption.push({name: res.data[item], value: item})
+          })
+          
+        }
+      })
+    },
     /**多选 */
     handleSelectionChange(val) {
       this.selection = val;

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

@@ -525,6 +525,7 @@ export default {
         { prop: "can", label: "CAN" },
         { prop: "es", label: "ES" },
         { prop: "kr", label: "KR" },
+        { prop: "samples", label: "样品数" }
       ],
       currentRowIdx: undefined,
     };