修改

lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue

@@ -232,6 +232,8 @@
         <el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
         <el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
         <el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
+        <el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot"/>
+        <el-table-column prop="is_instor" label="请求入半成品库" :min-width="flexWidth('is_instor',crud.data,'请求入半成品库')" :formatter="formatStorIsOrNot"/>
         <el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -288,7 +290,7 @@ const defaultForm = {
 }
 export default {
   name: 'Rawfoilworkorder',
-  dicts: ['product_area', 'product_status'],
+  dicts: ['product_area', 'product_status', 'IS_OR_NOT'],
   components: { pagination, crudOperation, rrOperation, udOperation, Dialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -351,6 +353,12 @@ export default {
     formatStatusName(row) {
       return this.dict.label.product_status[row.status]
     },
+    formatBakeIsOrNot(row) {
+      return this.dict.label.IS_OR_NOT[row.is_baking]
+    },
+    formatStorIsOrNot(row) {
+      return this.dict.label.IS_OR_NOT[row.is_instor]
+    },
     compelEnd() {
       const _selectData = this.$refs.table.selection
       const data = _selectData[0]

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -457,7 +457,6 @@
         <el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName"/>
         <el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName"/>
         <el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
-        <el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
         <el-table-column prop="is_call" label="是否呼叫" width="100px" :formatter="formatChildCallName"/>
         <el-table-column prop="qzzno" label="气涨轴编码" width="100px"/>
         <el-table-column prop="start_time" label="开始时间" width="150px"/>