合并dev代码

src/api/aps/index.js

@@ -31,14 +31,6 @@ export async function getPlanDeviceList ({ produceVersionId }) {
   }
   return Promise.reject(new Error(res.data.message));
 }
-
-// 选择工艺路线
-export async function routeList(params) {
-  const res = await request.get('/main/producerouting/page', { params });
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-}
 // 工序
 export async function getProduceTaskList(params) {
   const res = await request.post('/main/producerouting/taskinstance/page',params);

src/api/produceOrder/index.js

@@ -164,9 +164,9 @@ export async function queryPrint (data) {
 }
 // 修改优先级
 export async function updatePriority(data) {
-    const res = await request.post(`/mes/workorder/updatePriority`,  data);
-    if (res.data.code == 0) {
-      return res.data.data;
-    }
-    return Promise.reject(new Error(res.data.message));
-  }
+  const res = await request.post(`/mes/workorder/updatePriority`,  data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/produceWord/index.js

@@ -37,13 +37,11 @@ export async function getteampage(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
-
 // 修改优先级
 export async function updatePriority(data) {
-    const res = await request.post(`/aps/workorder/updatePriority`,  data);
-    if (res.data.code == 0) {
-      return res.data.data;
-    }
-    return Promise.reject(new Error(res.data.message));
+  const res = await request.post(`/aps/workorder/updatePriority`,  data);
+  if (res.data.code == 0) {
+    return res.data.data;
   }
-  
+  return Promise.reject(new Error(res.data.message));
+}

src/config/setting.js

@@ -2,7 +2,7 @@
 export const API_BASE_URL = process.env.VUE_APP_API_BASE_URL;
 
 // 项目名称
-export const PROJECT_NAME = '';
+export const PROJECT_NAME = ''; // process.env.VUE_APP_NAME
 
 // 不显示侧栏的路由
 export const HIDE_SIDEBARS = [];

src/styles/index.scss

@@ -3,3 +3,4 @@ $--ele-font-path: '~ele-admin/es/style/fonts';
 @import '~ele-admin/es/style/themes/dynamic.scss';
 @import '~ele-admin/es/style/index.scss';
 @import './transition/index.scss';
+

src/utils/util.js

@@ -33,7 +33,6 @@ export function randomString(len) {
   }
   return pwd;
 }
-
 //不合格品台账状态
 export function unacceptedProductStatus(v) {
   let status = '';

src/views/InTheSystem/components/search.vue

@@ -1,137 +1,129 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="90px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="工单编码:">
-          <el-input
-            clearable
-            v-model="where.workOrderCode"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物品名称:">
-          <el-input
-            clearable
-            v-model="where.categoryName"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="类型:">
-          <el-select v-model="where.feedStatus">
-            <el-option label="已投料" :value="1" />
-            <el-option label="未投料" :value="0" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="设备名称:">
-          <el-input clearable v-model="where.deviceName" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="工位:">
-          <el-input
-            clearable
-            v-model="where.workstationName"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="工序:">
-          <el-select v-model="where.taskId">
-            <el-option
-              v-for="(item, index) in produceTaskList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label-width="0px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-col>
-    </el-row>
+  <el-form label-width="90px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
+      <el-row :gutter="15">
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="工单编码:">
+                  <el-input clearable v-model="where.workOrderCode" placeholder="请输入" />
+              </el-form-item>
+          </el-col>
+
+
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="物品名称:">
+                  <el-input clearable v-model="where.categoryName" placeholder="请输入" />
+              </el-form-item>
+          </el-col>
+
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="类型:">
+                  <el-select v-model="where.feedStatus">
+                      <el-option label="已投料" :value="1" />
+                      <el-option label="未投料" :value="0" />
+                  </el-select>
+              </el-form-item>
+          </el-col>
+
+
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="设备名称:">
+                  <el-input clearable v-model="where.deviceName" placeholder="请输入" />
+              </el-form-item>
+          </el-col>
+
+
+
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="工位:">
+                  <el-input clearable v-model="where.workstationName" placeholder="请输入" />
+              </el-form-item>
+          </el-col>
+
+
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label="工序:">
+                  <el-select v-model="where.taskId">
+                      <el-option v-for="(item,index) in produceTaskList" :key="index" :label="item.name" :value="item.id"></el-option>
+                  </el-select>
+              </el-form-item>
+          </el-col>
+
+
+
+
+
+
+
+
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+              <el-form-item label-width="0px">
+                  <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+                      查询
+                  </el-button>
+                  <el-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
+              </el-form-item>
+          </el-col>
+      </el-row>
   </el-form>
 </template>
-  
+
 <script>
 import { produceTask } from '../../../api/InTheSystem';
 export default {
   props: [],
   data() {
-    // 默认表单数据
-    const defaultWhere = {
-      workOrderCode: '',
-      categoryName: '',
-      deviceName: '',
-      workstationName: ''
-    };
-    return {
-      // 表单数据
-      where: { ...defaultWhere },
-      produceTaskList: []
-    };
+      // 默认表单数据
+      const defaultWhere = {
+          workOrderCode: '',
+          categoryName: '',
+          deviceName: '',
+          workstationName: '',
+
+
+      };
+
+
+      return {
+          // 表单数据
+          where: { ...defaultWhere },
+
+          produceTaskList: [ ],
+
+      };
   },
   computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
-    }
+      // 是否开启响应式布局
+      styleResponsive() {
+          return this.$store.state.theme.styleResponsive;
+      }
   },
   watch: {},
   created() {
-    this.produceTaskFn();
+      this.produceTaskFn();
   },
   methods: {
-    /* 搜索 */
-    search() {
-      this.$emit('search', this.where);
-    },
-    produceTaskFn() {
-      let params = {
-        pageNum: 1,
-        size: -1
-      };
-      produceTask(params).then((res) => {
-        console.log(res);
-        this.produceTaskList = res.list;
-      });
-    },
-    /*  重置 */
-    reset() {
-      this.where = { ...this.defaultWhere };
-      this.search();
-    }
+      /* 搜索 */
+      search() {
+          this.$emit('search', this.where);
+      },
+      /*  重置 */
+      reset() {
+          this.where = { ...this.defaultWhere };
+          this.search();
+      },
+
+      produceTaskFn() {
+          let params = {
+              pageNum: 1,
+              size: -1
+          }
+          produceTask(params).then((res) => {
+              console.log(res);
+              this.produceTaskList = res.list;
+          })
+      }
+
+
   }
 };
 </script>
@@ -142,4 +134,3 @@ export default {
   justify-content: flex-end;
 }
 </style>
-  

src/views/produce/components/jobBooking/components/byProductBom.vue

@@ -0,0 +1,149 @@
+<template>
+  <div>
+    <div class="title_box rx-bc mt6">
+      <div class="name">副产品回收 </div>
+
+      <div class="rx-bc"> </div>
+    </div>
+
+    <div class="material">
+      <div class="content_table2">
+        <div class="head row rx-sc">
+          <div class="item ww30">物料编码</div>
+          <div class="item ww30">物料名称</div>
+          <div class="item ww40">重量</div>
+        </div>
+
+        <div class="table">
+          <div class="tr row rx-sc" v-for="(item, index) in list" :key="index">
+            <div class="item ww30">{{ item.code }}</div>
+            <div class="item ww30">{{
+              isDetails ? item.categoryName : item.name
+            }}</div>
+            <div class="item ww40 content_num">
+              <el-input
+                v-model="item.recycleQuantity"
+                type="digit"
+                v-if="!isDetails"
+              ></el-input>
+              <div v-if="isDetails">{{ item.quantity }}</div>
+              <div class="unit">{{ item.unit }}</div>
+            </div>
+
+            <div
+              class="penalize"
+              v-if="!isDetails"
+              :style="{ background: item.warehouseId ? '#FFA07A' : '' }"
+              @click="penalize(index)"
+              >处置</div
+            >
+            <div
+              v-if="isDetails"
+              class="penalize"
+              :style="{ background: item.warehouseId ? '#FFA07A' : '' }"
+              @click="handleView(item.warehouseName)"
+              >查看</div
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <el-dialog
+      title="仓库处置"
+      :visible.sync="visible"
+      :before-close="handleClose"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      width="500px"
+    >
+      <el-form size="mini" :model="form" label-width="96px">
+        <el-form-item label="仓库" prop="warehouseList">
+          <el-select v-model="form.warehouseId" placeholder="请选择仓库">
+            <el-option
+              v-for="item in warehouseList"
+              :label="item.name"
+              :value="item.id"
+              :key="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <template slot="footer">
+        <el-button size="mini" @click="visible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="warehouseSave"
+          >保 存</el-button
+        >
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'semiProductJobBom',
+
+    props: {
+      list: {
+        type: Array,
+        default: () => []
+      },
+
+      isDetails: {
+        type: Boolean,
+        default: false
+      },
+
+      warehouseList: {
+        type: Array,
+        default: () => []
+      }
+    },
+
+    data() {
+      return {
+        form: {
+          warehouseId: null
+        },
+        penalizeIndex: null,
+        visible: false
+      };
+    },
+
+    methods: {
+      handleClose() {
+        this.penalizeIndex = null;
+
+        this.visible = false;
+      },
+
+      penalize(index) {
+        this.penalizeIndex = index;
+        this.visible = true;
+      },
+
+      warehouseSave() {
+        this.$set(
+          this.list[penalizeIndex],
+          'warehouseId',
+          this.form.warehouseId || null
+        );
+
+        this.handleClose();
+        this.$forceUpdate();
+      },
+      handleView(name) {
+        this.$message.info(name || '未设置');
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .materialBor {
+    border: 1rpx solid #157a2c;
+  }
+</style>

src/views/produce/components/jobBooking/components/oneJobQualityBom.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <div class="title_box rx-bc mt6">
+      <div class="name">报工信息({{ list.length || 0 }})个 </div>
+
+      <div class="rx-bc"> </div>
+    </div>
+
+    <div class="material" v-for="(it, idx) in list" :key="idx">
+      <div class="content_table"> </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'semiProductJobBom',
+
+    props: {
+      list: {
+        type: Array,
+        default: () => []
+      },
+      equipmentList: {
+        type: Array,
+        default: () => []
+      },
+
+      currentTaskDiagram: {
+        type: Object,
+        default: () => {}
+      },
+      isDetails: {
+        type: Boolean,
+        default: false
+      }
+    },
+
+    data() {
+      return {};
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .materialBor {
+    border: 1rpx solid #157a2c;
+  }
+</style>

src/views/produce/components/jobBooking/components/palletBom.vue

@@ -0,0 +1,89 @@
+<template>
+    <div>
+      <div class="title_box rx-bc mt6">
+        <div class="name">舟皿 </div>
+  
+        <div class="rx-bc"> </div>
+      </div>
+  
+      <div class="material">
+        <div class="content_table" v-for="(item, index) in list" :key="index">
+          <div class="item rx-sc">
+            <div class="rx ww33">
+              <div class="lable rx-cc">编号</div>
+              <div class="content">
+                {{ item.code }}
+              </div>
+            </div>
+  
+            <div class="rx ww33">
+              <div class="lable rx-cc">名称</div>
+              <div
+                class="content"
+              >
+              {{item.name}}
+              </div>
+            </div>
+  
+            <div class="rx ww33">
+              <div class="lable rx-cc">型号</div>
+              <div class="content">	{{item.modelType}}</div>
+            </div>
+          </div>
+  
+          <div class="item rx-sc" >
+
+
+            <div class="rx ww33">
+              <div class="lable rx-cc">数量</div>
+              <div class="content content_num rx-sc">
+              <el-input size="mini" v-model="item.extInfo.formedNum" type='digit' :disabled="isDetails"/>
+            </div>
+            </div>
+
+          </div>
+  
+          <div class="del_box">
+            <el-link
+              type="danger"
+              icon="el-icon-delete"
+              @click="getDelete(index)"
+            ></el-link>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    export default {
+      name: 'deviceBom',
+      props: {
+        list: {
+          type: Array,
+          default: () => []
+        },
+		isDetails: {
+				type: Boolean,
+				default: false
+			}
+  
+  
+      },
+  
+      computed: {},
+  
+      data() {
+        return {};
+      },
+  
+      methods: {
+        getDelete(idx) {
+          this.list.splice(idx, 1);
+        }
+      }
+    };
+  </script>
+  
+  <style scoped lang="scss"></style>
+  

src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <div class="title_box rx-bc mt6">
+      <div class="name">报工信息({{ list.length || 0 }})个 </div>
+
+      <div class="rx-bc"> </div>
+    </div>
+
+    <div
+      :class="[
+        'material',
+        it.extInfo.reportWeight && it.extInfo.reportWeight && 'materialBor'
+      ]"
+      v-for="(it, idx) in list"
+      :key="idx"
+    >
+      <div class="content_table"> </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'semiProductJobBom',
+
+    props: {
+      list: {
+        type: Array,
+        default: () => []
+      },
+      equipmentList: {
+        type: Array,
+        default: () => []
+      },
+
+      currentTaskDiagram: {
+        type: Object,
+        default: () => {}
+      },
+      isDetails: {
+        type: Boolean,
+        default: false
+      }
+    },
+
+    data() {
+      return {};
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .materialBor {
+    border: 1rpx solid #157a2c;
+  }
+</style>

src/views/produce/components/jobBooking/index.vue

@@ -26,6 +26,14 @@
         <deviceBom v-if="item.equipmentList.length != 0" :list="item.equipmentList"></deviceBom>
 
         <modelBom v-if='item.modelList.length != 0' :list='item.modelList' pattern='job' ref='modelRef'></modelBom>
+
+        <palletBom v-if="item.palletList.length != 0" :list='item.palletList'></palletBom>
+
+        <revolvingDiskBom  v-if="item.revolvingDiskList.length > 0" pattern='job' :list="objData.revolvingDiskList"></revolvingDiskBom>
+
+        <semiProductJobBom></semiProductJobBom>
+
+        <byProductBom  v-if='item.productRecycleList.length != 0' :list='item.productRecycleList'> </byProductBom>
       </div>
     </div>
   </div>
@@ -40,12 +48,22 @@ import paramBom from '../feeding/components/paramBom.vue';
 import jobBom from './components/jobBom.vue';
 import deviceBom from '../feeding/components/deviceBom.vue';
 import modelBom from '../feeding/components/modelBom.vue'
+import palletBom from './components/palletBom.vue'
+import revolvingDiskBom from '../feeding/components/revolvingDiskBom.vue' 
+import semiProductJobBom from './components/semiProductJobBom.vue'
+
+import byProductBom from './components/byProductBom.vue'
 export default {
   components: {
     workOrderBom,
     paramBom,
     jobBom,
-    deviceBom
+    deviceBom,
+    modelBom,
+    palletBom,
+    revolvingDiskBom,
+    semiProductJobBom,
+    byProductBom
   },
   props: {
     workListIds: {

src/views/produceWord/components/order-search.vue

@@ -31,7 +31,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物料编码:">
+        <el-form-item label="产品编码:">
           <el-input
             clearable
             v-model="where.productCode"

src/views/unacceptedProduct/index.vue

@@ -1,225 +1,225 @@
 <template>
-  <div class="ele-body">
-    <el-card shadow="never" v-loading="loading">
-      <order-search @search="reload" ref="searchRef"> </order-search>
-      <ele-pro-table
-        ref="table"
-        :columns="columns"
-        :datasource="datasource"
-        
-      >
+    <div class="ele-body">
+      <el-card shadow="never" v-loading="loading">
+        <order-search @search="reload" ref="searchRef"> </order-search>
+        <ele-pro-table
+          ref="table"
+          :columns="columns"
+          :datasource="datasource"
+          
+        >
+     
    
- 
-        <!-- 操作列 -->
-        <template v-slot:toolbar>
-          <el-button type="success" @click="open()">新建</el-button>
-        </template>
-        <template v-slot:action="{ row }">
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-truck"
-            v-if="row.status == 0"
-            @click="open(row)"
-          >
-            编辑
-          </el-link>
-          <el-popconfirm
-            class="ele-action"
-            title="确定要删除吗？"
-            v-if="row.status == 0"
-            @confirm="remove(row)"
-          >
-            <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
-                删除
-              </el-link>
-            </template>
-          </el-popconfirm>
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-edit"
-            @click="detail(row)"
-          >
-            处置
-          </el-link>
-        </template>
-      </ele-pro-table>
-    </el-card>
-    <Create ref="create" @refresh="reload" />
-  </div>
-</template>
-
-<script>
-import OrderSearch from './components/order-search.vue';
-import dictMixins from '@/mixins/dictMixins';
-import { unacceptedProductStatus } from '@/utils/util';
-import Create from './components/create';
-
-import { getList,deleteUnacceptedProduct } from '@/api/unacceptedProduct/index';
-export default {
-  components: {
-    OrderSearch,
-    Create
-  },
-  mixins: [dictMixins],
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      releasParams: {
-        teamId: '',
-        id: ''
-      },
-
-      current: null
-    };
-  },
-  computed: {
-    // 表格列配置
-    columns() {
-      return [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          prop: 'code',
-          label: '编码',
-          align: 'center'
-        },
-        {
-          prop: 'workOrderCode',
-          label: '工单号',
-          align: 'center'
-        },
-        {
-          prop: 'batchNo',
-          label: '批号',
-          align: 'center'
-        },
-        {
-          prop: 'unqualifiedQuantity',
-          label: '数量',
-          align: 'center'
-        },
-        {
-          prop: 'produceRoutingName',
-          label: '工艺路线',
-          align: 'center'
-        },
-        {
-          prop: 'produceTaskName',
-          label: '工序',
-          align: 'center'
-        },
-    
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          align: 'center'
-        },
-        {
-          prop: 'reviewerName',
-          label: '创建人',
-          align: 'center'
-        },
-        // {
-        //   prop: 'slottingType',
-        //   label: '状态',
-        //   align: 'center',
-        //   slot: 'SlottingType'
-        // },
-        {
-          prop: 'status',
-          label: '状态',
-          align: 'center',
-          formatter: (row, column, cellValue) => {
-            return unacceptedProductStatus(cellValue);
-          }
+          <!-- 操作列 -->
+          <template v-slot:toolbar>
+            <el-button type="success" @click="open()">新建</el-button>
+          </template>
+          <template v-slot:action="{ row }">
+            <el-link
+              type="primary"
+              :underline="false"
+              icon="el-icon-truck"
+              v-if="row.status == 0"
+              @click="open(row)"
+            >
+              编辑
+            </el-link>
+            <el-popconfirm
+              class="ele-action"
+              title="确定要删除吗？"
+              v-if="row.status == 0"
+              @confirm="remove(row)"
+            >
+              <template v-slot:reference>
+                <el-link type="danger" :underline="false" icon="el-icon-delete">
+                  删除
+                </el-link>
+              </template>
+            </el-popconfirm>
+            <el-link
+              type="primary"
+              :underline="false"
+              icon="el-icon-edit"
+              @click="detail(row)"
+            >
+              处置
+            </el-link>
+          </template>
+        </ele-pro-table>
+      </el-card>
+      <Create ref="create" @refresh="reload" />
+    </div>
+  </template>
+  
+  <script>
+  import OrderSearch from './components/order-search.vue';
+  import dictMixins from '@/mixins/dictMixins';
+  import { unacceptedProductStatus } from '@/utils/util';
+  import Create from './components/create';
+  
+  import { getList,deleteUnacceptedProduct } from '@/api/unacceptedProduct/index';
+  export default {
+    components: {
+      OrderSearch,
+      Create
+    },
+    mixins: [dictMixins],
+    data() {
+      return {
+        visible: false,
+        loading: false,
+        releasParams: {
+          teamId: '',
+          id: ''
         },
-
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 240,
-          align: 'center',
-          resizable: false,
-          fixed: 'right',
-          slot: 'action',
-          showOverflowTooltip: true
-        }
-      ];
-    }
-  },
-  created() {
-  },
-  filters: {
-
-  },
-  methods: {
-    //处置
-    detail(row) {
-      this.$router.push({
-        path: '/unacceptedProduct/detailList',
-        query: {
-          id: row.id
-        }
-      });
+  
+        current: null
+      };
     },
-    /* 表格数据源 */
-    datasource({ page, limit, where }) {
-      return getList({
-        pageNum: page,
-        size: limit,
-        ...where
-      });
+    computed: {
+      // 表格列配置
+      columns() {
+        return [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'code',
+            label: '编码',
+            align: 'center'
+          },
+          {
+            prop: 'workOrderCode',
+            label: '工单号',
+            align: 'center'
+          },
+          {
+            prop: 'batchNo',
+            label: '批号',
+            align: 'center'
+          },
+          {
+            prop: 'unqualifiedQuantity',
+            label: '数量',
+            align: 'center'
+          },
+          {
+            prop: 'produceRoutingName',
+            label: '工艺路线',
+            align: 'center'
+          },
+          {
+            prop: 'produceTaskName',
+            label: '工序',
+            align: 'center'
+          },
+      
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center'
+          },
+          {
+            prop: 'reviewerName',
+            label: '创建人',
+            align: 'center'
+          },
+          // {
+          //   prop: 'slottingType',
+          //   label: '状态',
+          //   align: 'center',
+          //   slot: 'SlottingType'
+          // },
+          {
+            prop: 'status',
+            label: '状态',
+            align: 'center',
+            formatter: (row, column, cellValue) => {
+              return unacceptedProductStatus(cellValue);
+            }
+          },
+  
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 240,
+            align: 'center',
+            resizable: false,
+            fixed: 'right',
+            slot: 'action',
+            showOverflowTooltip: true
+          }
+        ];
+      }
     },
-    open(row) {
-      this.$refs.create.open(row?JSON.parse(JSON.stringify(row)):'');
+    created() {
     },
-    remove(row) {
-      deleteUnacceptedProduct(row.id).then((res) => {
-        this.$message.success('删除'+res);
-        this.reload();
-      });
+    filters: {
+  
     },
-    // // 下达
-    // toRelease(row) {
-    //   this.current = row;
-    //   this.visible = true;
-    // },
-    // // 下达
-    // confirm(row) {
-    //   this.$confirm('确认下发选中的任务吗？', '提示', {
-    //     confirmButtonText: '确定',
-    //     cancleButtonText: '取消',
-    //     type: 'warning'
-    //   })
-    //     .then(async () => {
-    //       const res = await issuedPutMeshWorkOrder({
-    //         id: [row.id],
-    //         status: 1
-    //       });
-    //       this.$message.success('任务下发成功！');
-    //       this.reload();
-    //     })
-    //     .catch(() => {});
-    // },
-    /* 刷新表格 */
-    reload(where) {
-      this.$nextTick(() => {
-        this.$refs.table.reload({ page: 1, where });
-      });
+    methods: {
+      //处置
+      detail(row) {
+        this.$router.push({
+          path: '/unacceptedProduct/detailList',
+          query: {
+            id: row.id
+          }
+        });
+      },
+      /* 表格数据源 */
+      datasource({ page, limit, where }) {
+        return getList({
+          pageNum: page,
+          size: limit,
+          ...where
+        });
+      },
+      open(row) {
+        this.$refs.create.open(row?JSON.parse(JSON.stringify(row)):'');
+      },
+      remove(row) {
+        deleteUnacceptedProduct(row.id).then((res) => {
+          this.$message.success('删除'+res);
+          this.reload();
+        });
+      },
+      // // 下达
+      // toRelease(row) {
+      //   this.current = row;
+      //   this.visible = true;
+      // },
+      // // 下达
+      // confirm(row) {
+      //   this.$confirm('确认下发选中的任务吗？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancleButtonText: '取消',
+      //     type: 'warning'
+      //   })
+      //     .then(async () => {
+      //       const res = await issuedPutMeshWorkOrder({
+      //         id: [row.id],
+      //         status: 1
+      //       });
+      //       this.$message.success('任务下发成功！');
+      //       this.reload();
+      //     })
+      //     .catch(() => {});
+      // },
+      /* 刷新表格 */
+      reload(where) {
+        this.$nextTick(() => {
+          this.$refs.table.reload({ page: 1, where });
+        });
+      }
     }
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>
+  };
+  </script>
+  
+  <style lang="scss" scoped></style>