xiugaitijiao

hb_client/src/api/wpm.js

@@ -58,6 +58,15 @@ export function wproductTest(data) {
     data
   })
 }
+//半成品复检
+export function wproductRetest(data) {
+  return request({
+    url: '/wpm/wproduct/retest/',
+    method: 'post',
+    data
+  })
+}
+
 
 //半成品入库
 

hb_client/src/router/index.js

@@ -103,6 +103,7 @@ export const asyncRoutes = [
         name: 'material',
         component: () => import('@/views/mtm/material'),
         meta: { title: '物料清单', icon: 'example', perms: ['mtm_material'] }
+        
       }
       ,
       {
@@ -337,6 +338,12 @@ export const asyncRoutes = [
         component: () => import('@/views/inm/wproduct'),
         meta: { title: '半成品', icon: 'example', perms: ['index_manage'] }
       },
+      {
+        path: 'product',
+        name: 'product',
+        component: () => import('@/views/inm/product'),
+        meta: { title: '成品', icon: 'example', perms: ['index_manage'] }
+      },
      
     ]
   },

hb_client/src/views/inm/inventory.vue

@@ -49,9 +49,13 @@
           <el-table-column label="物料单位">
           <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
         </el-table-column>
-           <el-table-column label="物料型号">
+           <el-table-column label="规格型号">
           <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
         </el-table-column>
+         <el-table-column label="物料类别">
+          <template slot-scope="scope"> {{options_[scope.row.material_.type]}}</template>
+        </el-table-column>
+        
          <el-table-column label="物料存量">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
@@ -90,7 +94,16 @@ export default {
         page: 1,
         page_size: 20,
       },
-     
+      options_:{
+        
+        "1":'成品',
+        "2":'半成品',
+        "3":'主要原料',
+        "4":'辅助材料',
+         "5":'加工工具',
+        "6":'辅助工装',
+       
+      },
       listLoading: true,
       dialogVisible: false,
       dialogType: "new",

hb_client/src/views/inm/materialbatch.vue

@@ -44,7 +44,10 @@
         <el-table-column label="物料名称">
           <template slot-scope="scope">{{ scope.row.material_.name }}</template>
         </el-table-column>
-
+           <el-table-column label="规格型号">
+          <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
+        </el-table-column>
+      
         <el-table-column label="物料编号">
           <template slot-scope="scope">{{
             scope.row.material_.number

hb_client/src/views/inm/product.vue

@@ -0,0 +1,89 @@
+<template>
+  <div class="app-container">
+   
+    <el-card style="margin-top: 2px">
+      <el-table
+        v-loading="listLoading"
+        :data="iproductData.results"
+        border
+        fit
+        stripe
+        highlight-current-row
+         max-height="700"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
+      >
+        <el-table-column type="index" width="50" />
+        <el-table-column label="成品编号">
+          <template slot-scope="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+
+        <el-table-column label="成品批次">
+          <template slot-scope="scope">{{ scope.row.batch }}</template>
+        </el-table-column>
+          <el-table-column label="成品名称">
+          <template slot-scope="scope">{{ scope.row.material_.name }}</template>
+        </el-table-column>
+        
+        <el-table-column label="所在仓库">
+          <template slot-scope="scope">{{ scope.row.warehouse_.name }}</template>
+        </el-table-column>
+
+      
+      </el-table>
+      <pagination
+        v-show="iproductData.count > 0"
+        :total="iproductData.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
+  
+  </div>
+</template>
+<script>
+import {
+  getiproductList,
+} from "@/api/inm";
+import checkPermission from "@/utils/permission";
+
+import { genTree } from "@/utils";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+
+export default {
+  components: { Pagination },
+  data() {
+    return {
+     
+      iproductData: {
+        count: 0,
+      },
+       listQuery: {
+        page: 1,
+        page_size: 20,
+      },
+     
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.getList();
+  },
+  methods: {
+    checkPermission,
+    //半成品列表
+    getList() {
+      this.listLoading = true;
+      getiproductList(this.listQuery).then((response) => {
+        if (response.data) {
+          this.iproductData= response.data;
+        }
+        this.listLoading = false;
+      });
+    },
+    
+  },
+};
+</script>

hb_client/src/views/mtm/material.vue

@@ -1,13 +1,15 @@
 <template>
+ 
   <div class="app-container">
     <el-card>
+     
         <div>
           <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增物料</el-button
       >
       <el-input
               v-model="listQuery.search"
-              placeholder="物料名称/物料编号/物料类型"
+              placeholder="物料名称/物料编号"
               style="width: 300px"
               class="filter-item"
               @keyup.enter.native="handleFilter"
@@ -30,6 +32,14 @@
    
     </el-card>
     <el-card style="margin-top: 2px">
+       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+    <el-tab-pane label="成品" name="1"></el-tab-pane>
+    <el-tab-pane label="半成品" name="2"></el-tab-pane>
+    <el-tab-pane label="主要原料" name="3"></el-tab-pane>
+    <el-tab-pane label="辅助材料" name="4"></el-tab-pane>
+      <el-tab-pane label="加工工具" name="5"></el-tab-pane>
+    <el-tab-pane label="辅助工装" name="6"></el-tab-pane>
+  </el-tabs>
       <el-table
         v-loading="listLoading"
         :data="materialList.results"
@@ -60,6 +70,9 @@
         <el-table-column label="规格型号">
           <template slot-scope="scope">{{ scope.row.specification }}</template>
         </el-table-column>
+         <el-table-column label="单片玻璃数量" v-if="materialList.results[0].type==1">
+          <template slot-scope="scope">{{ scope.row.piece_count }}</template>
+        </el-table-column>
         
         <el-table-column label="计量单位">
           <template slot-scope="scope">{{ scope.row.unit }}</template>
@@ -144,7 +157,11 @@
               </el-option>
           </el-select>
         </el-form-item>
-      
+           <el-form-item label="单片玻璃数量" prop="piece_count" v-if="material.type==1">
+          <el-input v-model="material.piece_count" placeholder="单片玻璃数量" />
+        </el-form-item>
+     
+
         <el-form-item label="排序" prop="sort_str">
           <el-input v-model="material.sort_str" placeholder="排序" />
         </el-form-item>
@@ -230,7 +247,8 @@ export default {
         page: 1,
         page_size: 20,
       },
-     
+      activeName:"",
+
       listLoading: true,
       dialogVisible: false,
       dialogType: "new",
@@ -250,8 +268,18 @@ export default {
   },
   methods: {
     checkPermission,
-    //物料列表
+     //选项卡切换
-    getList() {
+    handleClick(tab) {
+      this.listLoading = true;
+      this.listQuery.type=tab.name;
+      getMaterialList(this.listQuery).then((response) => {
+        if (response.data) {
+          this.materialList = response.data;
+        }
+        this.listLoading = false;
+      });
+    },
+     getList() {
       this.listLoading = true;
       getMaterialList(this.listQuery).then((response) => {
         if (response.data) {
@@ -260,10 +288,6 @@ export default {
         this.listLoading = false;
       });
     },
-    filterTag(value, row) {
-        return row.type === value;
-        
-      },
     //工序清单
  getProcessList() {
       getProcessList().then((res) => {
@@ -282,6 +306,7 @@ export default {
       this.getList();
     },
     resetFilter() {
+      this.activeName="";
       this.listQuery = {
         page: 1,
         page_size: 20,

hb_client/src/views/mtm/process.vue

@@ -25,6 +25,9 @@
         </el-table-column>
          <el-table-column label="工序名称">
           <template slot-scope="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+         <el-table-column label="工序类别">
+          <template slot-scope="scope">{{ type_[scope.row.type] }}</template>
         </el-table-column>
          <el-table-column label="生产车间" >
           <template slot-scope="scope"  v-if="scope.row.workshop_">{{ scope.row.workshop_.name }}</template>
@@ -88,6 +91,16 @@
         </el-form-item>
         <el-form-item label="工序编号" prop="number">
           <el-input v-model="process.number" placeholder="工序编号" />
+        </el-form-item>
+         <el-form-item label="工序编号" prop="type">
+           <el-select  style="width: 100%" v-model="process.type" placeholder="请选择" >
+             <el-option
+                v-for="item in option"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="生产车间" prop="workshop">
             <treeselect v-model="process.workshop"  :options="workoptions" placeholder="所属部门"/>
@@ -149,7 +162,22 @@ export default {
         page: 1,
         page_size: 20,
       },
-     
+     type_:{
+        10:'特殊',
+        20:'关键',
+        30:'普通',
+        
+     },
+      option: [{
+          value: 10,
+          label: '特殊'
+        }, {
+          value: 20,
+          label: '关键'
+        }, {
+          value: 30,
+          label: '普通'
+        }],
       listLoading: true,
       dialogVisible: false,
       dialogType: "new",

hb_client/src/views/mtm/productprocess.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <el-card > 
 <el-row :gutter="2">
-  <el-col :span="6" >
+  <el-col :span="9" >
  <el-card >
     <div slot="header" class="clearfix">
     <span style="font-size: 16px;
@@ -20,11 +20,20 @@
      @current-change="handleCurrentChange">
    
         <el-table-column type="index" width="50" />
-         <el-table-column label="产品信息">
+        
-          <template slot-scope="scope">{{ scope.row.number }}-{{ scope.row.name }}</template>
+         <el-table-column label="产品编号">
+          <template slot-scope="scope"> {{ scope.row.number }}</template>
+        </el-table-column>
+         <el-table-column label="产品名称">
+          <template slot-scope="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+       
+         <el-table-column label="规格型号">
+          <template slot-scope="scope">{{ scope.row.specification }}</template>
        
         
         </el-table-column>
+        
 
      
       </el-table>
@@ -54,7 +63,7 @@
  
 </el-card>
   </el-col>
-  <el-col :span="18" >
+  <el-col :span="15" >
     <el-card class="box-card">
        <div slot="header" class="clearfix">
     <span style="font-size: 16px;

hb_client/src/views/mtm/step.vue

@@ -19,7 +19,7 @@
         @row-click="rowClick"
       >
         <el-table-column type="index" width="50" />
-        <el-table-column label="工序步骤名称">
+        <el-table-column label="子工序名称">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
         <el-table-column label="步骤编号">
@@ -38,9 +38,7 @@
         </el-table-column>
     
         
-           <el-table-column label="排序">
+         
-          <template slot-scope="scope">{{ scope.row.sort }}</template>
-        </el-table-column>
         <el-table-column
           align="center"
           label="操作"
@@ -122,7 +120,7 @@
     </el-card>
     <el-card>
       <el-row :gutter="2">
-        <el-col :span="6" >
+        <el-col :span="9" >
           <el-card >
             <div slot="header" class="clearfix">
           <span style="font-size: 16px;
@@ -142,8 +140,17 @@
               @current-change="handleCurrentChange"
             >
               <el-table-column type="index" width="50" />
-              <el-table-column label="表名称">
+              <el-table-column label="名称">
                 <template slot-scope="scope">{{ scope.row.name }}</template>
+              </el-table-column>
+                <el-table-column label="状态">
+                   <template slot-scope="scope">
+                  <el-tag v-if="scope.row.enabled==true" >启用</el-tag>
+                 <el-tag v-else>禁用</el-tag>
+                 </template>
+              </el-table-column>
+               <el-table-column label="文件号">
+                <template slot-scope="scope">{{ scope.row.number }}</template>
               </el-table-column>
               <el-table-column
                 align="center"
@@ -180,6 +187,14 @@
                 <el-form-item label="表格名称" prop="name">
                   <el-input v-model="recordform.name" placeholder="表格名称" />
                 </el-form-item>
+                 <el-form-item label="文件号" prop="number">
+                  <el-input v-model="recordform.number" placeholder="文件号" />
+                </el-form-item>
+
+             <el-form-item label="状态">
+    <el-switch v-model="recordform.enabled"></el-switch>
+  </el-form-item>
+
                 <el-form-item label="表格类型" prop="type">
                   <el-select  style="width: 100%" v-model="recordform.type" placeholder="请选择">
                     <el-option
@@ -266,7 +281,7 @@
             </el-dialog>
           </el-card>
         </el-col>
-        <el-col :span="18" >
+        <el-col :span="15" >
           <el-card >
             <div slot="header" class="clearfix">
           <span style="font-size: 16px;
@@ -398,7 +413,7 @@
   };
 
   const defaultrecordform = {
-
+   enabled:true
   };
   const defaultfield = {
 

hb_client/src/views/pm/plan.vue

@@ -19,20 +19,18 @@
         
       
         
-         <el-table-column label="生产计划编号" width="110"> 
+         <el-table-column label="任务编号" width="110"> 
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
-         <el-table-column label="生产订单编号" width="110">
+         <el-table-column label="订单编号" width="110">
           <template slot-scope="scope">{{ scope.row.order_.number }}</template>
         </el-table-column>
          <el-table-column label="合同编号" width="110">
           <template slot-scope="scope">{{ scope.row.order_.contract_.number }}</template>
         </el-table-column>
-         <el-table-column label="客户名称" width="110" show-overflow-tooltip>
+        
-          <template slot-scope="scope">{{ scope.row.order_.customer_.name }}</template>
-        </el-table-column>
          <el-table-column label="产品名称" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.product_.number }}-{{ scope.row.product_.name }}</template>
+          <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
        <el-table-column label="产品型号" width="110">
           <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
@@ -107,10 +105,14 @@
         <el-table-column label="订单编号" width="110">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
-         <el-table-column label="客户" width="110">
+         <el-table-column label="客户名称" width="110">
           <template slot-scope="scope" show-overflow-tooltip>{{ scope.row.customer_.name }}</template>
         </el-table-column>
-          <el-table-column label="所属合同" show-overflow-tooltip width="110">
+        
+          <el-table-column label="合同编号" width="110">
+          <template slot-scope="scope">{{ scope.row.contract_.number }}</template>
+        </el-table-column>
+          <el-table-column label="合同名称" show-overflow-tooltip width="110">
           <template slot-scope="scope">{{ scope.row.contract_.name }}</template>
         </el-table-column>
          <el-table-column label="所需产品" show-overflow-tooltip width="150">
@@ -119,7 +121,7 @@
           <el-table-column label="产品型号" width="110">
           <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
         </el-table-column>
-       <el-table-column label="所需数量" width="110">
+       <el-table-column label="产品数量" width="110">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
          <el-table-column label="已派数量" width="110">

hb_client/src/views/pm/resources.vue

@@ -33,7 +33,7 @@
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
         
-       <el-table-column label="所需数量">
+       <el-table-column label="产品数量">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
          <el-table-column label="已派数量">
@@ -43,10 +43,13 @@
           <el-table-column label="产品型号">
           <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
         </el-table-column>
-         <el-table-column label="客户"  show-overflow-tooltip width="150">
+         <el-table-column label="客户名称"  show-overflow-tooltip width="150">
           <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
         </el-table-column>
-          <el-table-column label="所属合同"  show-overflow-tooltip width="150">
+          <el-table-column label="合同编号"  show-overflow-tooltip width="150">
+          <template slot-scope="scope">{{ scope.row.contract_.number }}</template>
+        </el-table-column>
+          <el-table-column label="合同名称"  show-overflow-tooltip width="150">
           <template slot-scope="scope">{{ scope.row.contract_.name }}</template>
         </el-table-column>
          <el-table-column label="交货日期" width="110">

hb_client/src/views/pm/work.vue

@@ -8,22 +8,27 @@
         
          <el-table
         :data="subproductionplanList.results"
-       border
         fit
-        stripe
         style="width: 100%"
-        max-height="700"
+        height="100"
+          stripe
+          border
+          v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         
-       
+          
+           <el-table-column label="“产品名称”">
+          <template slot-scope="scope">{{ scope.row.product_.name }}</template>
+        </el-table-column>
+           <el-table-column label="“产品型号”">
+          <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
+        </el-table-column>
          <el-table-column label="名称">
           <template slot-scope="scope">{{ scope.row.subproduction_.name }}</template>
         </el-table-column>
         
-         <el-table-column label="生产车间">
+        
-          <template slot-scope="scope">{{ scope.row.workshop_.name }}</template>
-        </el-table-column>
          <el-table-column label="工序名">
           <template slot-scope="scope">{{ scope.row.process_.name }}</template>
         </el-table-column>
@@ -40,7 +45,10 @@
 
           </template>
         </el-table-column>
-          <el-table-column label="生产个数">
+         <el-table-column label="生产车间">
+          <template slot-scope="scope">{{ scope.row.workshop_.name }}</template>
+        </el-table-column>
+          <el-table-column label="生产数量">
           <template slot-scope="scope">{{ scope.row.main_count }}</template>
         </el-table-column>
           <el-table-column label="开工时间">
@@ -61,6 +69,7 @@
           align="center"
           label="操作"
           width="100px"
+    
         >
           <template slot-scope="scope">
             <el-link type="primary"

hb_client/src/views/sam/order.vue

@@ -51,13 +51,13 @@
           <el-table-column label="所属合同"  width="200" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.contract_.name }}</template>
         </el-table-column>
-         <el-table-column label="所需产品"  width="200" show-overflow-tooltip>
+         <el-table-column label="产品名称"  width="200" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
           <el-table-column label="产品型号"  width="120" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
         </el-table-column>
-       <el-table-column label="所需数量"  width="90" >
+       <el-table-column label="产品数量"  width="90" >
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
          <el-table-column label="交货日期"  width="150" >

hb_client/src/views/wpm/need.vue

@@ -49,7 +49,55 @@
       />
     </el-card>
   </el-tab-pane>
-  <el-tab-pane label="已检半成品">
+   <el-tab-pane label="复检半成品">
+     <el-card style="margin-top: 2px">
+      <el-table
+        v-loading="listLoading"
+        :data="wproductList2.results"
+        border
+        fit
+        stripe
+        highlight-current-row
+        max-height="600"
+      >
+        <el-table-column type="index" width="50" />
+        <el-table-column label="半成品名称">
+          <template slot-scope="scope">{{ scope.row.material_.name }}</template>
+        </el-table-column>
+
+        <el-table-column label="半成品编号">
+          <template slot-scope="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+        <el-table-column label="检测状态">
+          <template slot-scope="scope">
+            {{ actstate_[scope.row.act_state] }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="所在子工序">
+          <template slot-scope="scope">{{ scope.row.step_.name }}</template>
+        </el-table-column>
+
+        <el-table-column align="center" label="操作" width="220px">
+          <template slot-scope="scope">
+             <el-link
+              v-if="checkPermission(['warehouse_update'])"
+              @click="handleInspection(scope)"
+              >检验</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="wproductList2.count > 0"
+        :total="wproductList2.count"
+        :page.sync="listQuery2.page"
+        :limit.sync="listQuery2.page_size"
+        @pagination="getList2"
+      />
+    </el-card>
+  </el-tab-pane>
+  <el-tab-pane label="已合格半成品">
      <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
@@ -303,6 +351,9 @@ export default {
        wproductList1: {
         count: 0,
       },
+      wproductList2: {
+        count: 0,
+      },
       listQuery: {
         page: 1,
         page_size: 20,
@@ -310,12 +361,19 @@ export default {
         listQuery1: {
         page: 1,
         page_size: 20,
+      },
+       listQuery2: {
+        page: 1,
+        page_size: 20,
       },
       actstate_: {
-        1: "生产中",
+        6: "待复检",
-        2: "待检测",
+        10: "生产中",
-        3: "已合格",
+        20: "待检验",
-        4: "库存中",
+        30: "已合格",
+        40: "库存中",
+        50: "不合格",
+        60: "待成品检验",
       },
       choice: [
         {
@@ -349,15 +407,16 @@ export default {
   watch: {},
   created() {
     this.getList();
+     this.getList2();
      this.getList1();
     this.getLists();
   },
   methods: {
     checkPermission,
-    //半成品列表
+    //待检半成品列表
     getList() {
       this.listLoading = true;
-      this.listQuery.act_state = 2;
+      this.listQuery.act_state = 20;
       getwproductList(this.listQuery).then((response) => {
         if (response.data) {
           this.wproductList = response.data;
@@ -365,9 +424,21 @@ export default {
         this.listLoading = false;
       });
     },
+     //复检半成品列表
+    getList2() {
+     
+      this.listQuery2.act_state = 6;
+      getwproductList(this.listQuery2).then((response) => {
+        if (response.data) {
+          this.wproductList2 = response.data;
+        }
+        
+      });
+    },
+    //已合格半成品
       getList1() {
       
-      this.listQuery1.act_state = 3;
+      this.listQuery1.act_state = 30;
       getwproductList(this.listQuery1).then((response) => {
         if (response.data) {
           this.wproductList1 = response.data;
@@ -389,6 +460,7 @@ export default {
       //调该物料对应的检查表
       this.outerVisible = true;
       this.wproduct=scope.row.id;//半成品ID
+       this.wproductactstate=scope.row.act_state;//半成品状态
       this.listQueryrecordform.material =  scope.row.material;//
       this.listQueryrecordform.type = 2;
       this.recordform="";
@@ -427,14 +499,22 @@ export default {
       this.testrecord.record_data = _this.field;//检查项列表
       this.testrecord.is_testok = this.is_testok;//检查表检查结果
        this.testrecord.wproduct = this.wproduct;//半成品ID
-      wproductTest(this.testrecord).then((res) => {
+      
+
+    
+       wproductTest(this.testrecord).then((res) => {
         if (res.code >= 200) {
           this.innerVisible = false;
           this.outerVisible = false;
           this.getList();
            this.getList1();
+           this.getList2();
         }
       });
+
+     
+    
+
     },
     //半成品入库
     handlePutin(scope){

hb_client/src/views/wpm/operation.vue

@@ -36,10 +36,10 @@
           >
         </el-table-column>
 
-        <el-table-column label="自定义表单数">
+        <el-table-column label="过程记录表">
           <template slot-scope="scope">{{ scope.row.record_count }}</template>
         </el-table-column>
-        <el-table-column label="涉及半成品数">
+        <el-table-column label="产品数量">
           <template slot-scope="scope">{{ scope.row.wproduct_count }}</template>
         </el-table-column>
         <el-table-column label="设备数量">

hb_client/src/views/wpm/operationdo.vue

@@ -74,9 +74,9 @@
                   label="子计划编号"
                 >
                 </el-table-column>
-                <el-table-column prop="number" label="半成品编号">
+                <el-table-column prop="number" label="玻璃编号">
                 </el-table-column>
-                <el-table-column prop="material_.name" label="半成品名称">
+                <el-table-column prop="material_.name" label="玻璃状态">
                 </el-table-column>
 
                 <el-table-column align="center" label="操作" width="100px">
@@ -127,7 +127,7 @@
         <el-col span="8">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
-              <span>自定义表格</span>
+              <span>生产记录表</span>
             </div>
             <template>
               <el-table
@@ -139,7 +139,7 @@
                 height="230"
                 style="width: 100%"
               >
-                <el-table-column prop="form_.name" label="表名">
+                <el-table-column prop="form_.name" label="名称">
                 </el-table-column>
                 <el-table-column label="是否填写">
                   <template slot-scope="scope">

hb_client/src/views/wpm/worktask.vue

@@ -19,7 +19,7 @@
         >
           <el-table-column type="index" width="50" />
           
-           <el-table-column label="生产计划编号">
+           <el-table-column label="任务编号">
             <template slot-scope="scope">{{
               scope.row.number
             }}</template>
@@ -141,11 +141,11 @@
                   <template slot-scope="scope">{{scope.row.subproduction_plan}}</template>
                 </el-table-column>
 
-                <el-table-column label="半成品编号">
+                <el-table-column label="玻璃编号">
                   <template slot-scope="scope">{{ scope.row.number }}</template>
                 </el-table-column>
 
-                <el-table-column label="半成品状态">
+                <el-table-column label="玻璃状态">
                   <template slot-scope="scope">{{
                     scope.row.material_.name
                   }}</template>
@@ -155,6 +155,11 @@
                   <template slot-scope="scope">{{
                     scope.row.step_.name
                   }}</template>
+                </el-table-column>
+                  <el-table-column label="检验状态">
+                  <template slot-scope="scope">{{
+                   actstate_[scope.row.act_state]
+                  }}</template>
                 </el-table-column>
                 <el-table-column label="所在子工序执行状态">
                   <template slot-scope="scope">
@@ -265,12 +270,12 @@
        <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column type="index" width="50" />
         
-        <el-table-column label="半成品编号">
+        <el-table-column label="玻璃编号">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
 
       
-          <el-table-column label="半成品名称">
+          <el-table-column label="玻璃状态">
           <template slot-scope="scope">{{ scope.row.material_.name }}</template>
         </el-table-column>
         
@@ -380,14 +385,14 @@
       >
        <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column type="index" width="50" />
-        <el-table-column label="半成品编号">
+        <el-table-column label="玻璃编号">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
 
         <el-table-column label="半成品批次">
           <template slot-scope="scope">{{ scope.row.batch }}</template>
         </el-table-column>
-          <el-table-column label="半成品名称">
+          <el-table-column label="玻璃状态">
           <template slot-scope="scope">{{ scope.row.material_.name }}</template>
         </el-table-column>
         
@@ -687,6 +692,15 @@ export default {
       needwl: "",
       showPrise: false,
       showPrise1: false,
+       actstate_: {
+        6: "待复检",
+        10: "生产中",
+        20: "待检验",
+        30: "已合格",
+        40: "库存中",
+        50: "不合格",
+        60: "待成品检验",
+      },
       state_: {
         0: "制定中",
         1: "已下达",
@@ -937,7 +951,7 @@ handlepick(scope){
 handleReceive(scope){
   this.dialogTableVisiblepicks=true;
   this.bcpxlID=scope.row.id;
-     getwproductList({material:scope.row.material,act_state:3,page:0}).then((res) => {
+     getwproductList({material:scope.row.material,act_state:30,page:0}).then((res) => {
         if (res.code >= 200) {
          this.wproductslist = res.data;
         }