From 36c115869145967b98c64276695f050ce4b422c6 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 13 Jan 2022 16:11:19 +0800
Subject: [PATCH] xiugai

---
 hb_client/src/api/wpm.js                   |  8 ++-
 hb_client/src/views/dashboard/index.vue    |  5 ++
 hb_client/src/views/inm/product.vue        |  8 +++
 hb_client/src/views/mtm/material.vue       |  4 +-
 hb_client/src/views/mtm/materialDetail.vue | 73 +++++++++++++++++--
 hb_client/src/views/mtm/productprocess.vue | 52 ++++----------
 hb_client/src/views/mtm/step.vue           |  8 +--
 hb_client/src/views/pm/plan.vue            |  4 +-
 hb_client/src/views/pm/plandetails.vue     | 69 +++++++++++++++---
 hb_client/src/views/pm/processcard.vue     |  4 +-
 hb_client/src/views/pm/resources.vue       |  6 +-
 hb_client/src/views/pm/work.vue            | 84 +++++++++++++++++-----
 hb_client/src/views/sam/contract.vue       | 17 ++---
 hb_client/src/views/sam/contractdetail.vue |  7 +-
 hb_client/src/views/sam/order.vue          |  2 +-
 hb_client/src/views/wpm/need.vue           | 35 ++++++++-
 hb_client/src/views/wpm/operation.vue      |  9 +--
 hb_client/src/views/wpm/operationdo.vue    | 45 +++++++++---
 hb_client/src/views/wpm/worktask.vue       | 10 ++-
 19 files changed, 327 insertions(+), 123 deletions(-)

diff --git a/hb_client/src/api/wpm.js b/hb_client/src/api/wpm.js
index 657748f..76affca 100644
--- a/hb_client/src/api/wpm.js
+++ b/hb_client/src/api/wpm.js
@@ -196,7 +196,13 @@ export function getinputList(query) {
     params: query
   })
 }
-
+//消耗物料删除
+export function deleteOperationeinput(id) {
+  return request({
+    url: `/wpm/operation_input/${id}/`,
+    method: 'delete',
+  })
+}
 //车间物料消耗
 
 
diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index 23d0903..2859cc7 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="dashboard-container">
     <el-card class="dashboardTopCard">
+      <div @click="openWord">wendanag</div>
+      <a href="http://www.xdocin.com/xdoc?_func=to&_format=html&_cache=1&_xdoc=http://47.95.0.242:2222/media/2021/09/07/004-%E8%AF%B7%E5%81%87%E5%8D%95_LL8uZdx.docx" target="_blank">XDOC</a>
       <div class="CardTitleWrap">
         <span class="verticalLine"></span><span class="dashboardCardTitle">数据统计</span>
       </div>
@@ -280,6 +282,9 @@ export default {
     ])
   },
   methods:{
+    openWord(){
+      window.open("http://47.95.0.242:2222/media/2021/09/07/004-%E8%AF%B7%E5%81%87%E5%8D%95_LL8uZdx.docx");
+    },
     getStatisticsData(){
       let dat = new Date();
       this.week = dat.getDay();
diff --git a/hb_client/src/views/inm/product.vue b/hb_client/src/views/inm/product.vue
index 6689732..6decf36 100644
--- a/hb_client/src/views/inm/product.vue
+++ b/hb_client/src/views/inm/product.vue
@@ -36,6 +36,14 @@
               <el-tag v-else>已军检</el-tag></template>
 
         </el-table-column>
+         <el-table-column label="是否售出">
+          <template slot-scope="scope">
+          
+
+             <el-tag v-if="scope.row.is_saled == false">未售出</el-tag>
+              <el-tag v-else>已售出</el-tag></template>
+
+        </el-table-column>
         
    <el-table-column label="军检">
           <template slot-scope="scope">
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 0edb0a0..a35603f 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -88,7 +88,7 @@
         >
           <template slot-scope="scope">
             <el-link
-              v-if="checkPermission(['material_update'])"
+              v-if="checkPermission(['material_update'])&&scope.row.type!=5&&scope.row.type!=6"
               type="primary"
               @click="handlebind(scope)"
               >检查表</el-link
@@ -282,7 +282,7 @@ export default {
     //物料详情
     handledetail(scope)
     {
-        this.$router.push({name: "MaterialDetail", params: { id: scope.row.id }, })
+        this.$router.push({name: "MaterialDetail", params: { id: scope.row.id,type: scope.row.type }, })
            
     },
   
diff --git a/hb_client/src/views/mtm/materialDetail.vue b/hb_client/src/views/mtm/materialDetail.vue
index 2ed9da7..4a4754d 100644
--- a/hb_client/src/views/mtm/materialDetail.vue
+++ b/hb_client/src/views/mtm/materialDetail.vue
@@ -13,7 +13,7 @@
  
 </el-card>
     <el-tabs v-model="activeName" type="card" >
-         <el-tab-pane label="对应的批次" name="3">
+         <el-tab-pane label="批次" name="3">
 
  <el-table
         v-loading="listLoading"
@@ -21,6 +21,7 @@
         border
         fit
         stripe
+         height="460"
         highlight-current-row
        
       >
@@ -65,8 +66,8 @@
         fit
         stripe
         highlight-current-row
-       height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+       height="460"
+       
       >
         <el-table-column type="index" width="50" />
         
@@ -104,7 +105,7 @@
         fit
         stripe
         style="width: 100%"
-         height="300"
+         height="460"
          
       >
         <el-table-column type="index" width="50" />
@@ -147,7 +148,41 @@
        
       </el-table>
     </el-tab-pane>
- 
+      <el-tab-pane label="物料" name="4" v-if="this.type==1||this.type==2">
+    <el-table
+                :data="wproductList"
+                border
+                fit
+                stripe
+                style="width: 100%"
+               height="460"
+                
+              >
+               
+                <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.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"  v-if=" scope.row.warehouse_">{{ scope.row.warehouse_.name }}</template>
+                </el-table-column>
+              warehouse_
+               
+              </el-table>
+               </el-tab-pane>
   </el-tabs>
     </el-card>
   </div>
@@ -161,6 +196,8 @@
   import {getmaterialbatchList} from "@/api/inm";
   import {getOrderList } from "@/api/sam";
   import {getMaterial  } from "@/api/mtm";
+  import {getwproductList } from "@/api/wpm";
+  
   import { upFile } from "@/api/file";
   import {genTree} from "@/utils";
   import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
@@ -173,19 +210,36 @@
       return {
        materialdetail:"",
        orderlist:"",
+       wproductList:"",
        productionplanList:"",
        InventoryList:"",
        activeName:'3',
+         actstate_: {
+        6: "待复检",
+        10: "操作进行中",
+        20: "待检验",
+        30: "已合格",
+        40: "库存中",
+        50: "不合格",
+        60: "待成品检验",
+        8: "操作准备中",
+        26: "待夹层检验",
+        70: "报废",
+      },
       };
     },
     computed: {},
     watch: {},
     created() {
       this.material = this.$route.params.id;
+      this.type=this.$route.params.type;
       this.getMaterial();
+    
       this.getOrderList();
       this.getplanList();
       this.getmaterialbatchList();
+          this.getwproductList();
+    
       
     },
     methods: {
@@ -224,7 +278,14 @@ getMaterial(){
        
       });
     },
-
+   getwproductList(){
+     getwproductList({material:this.material,page:0}).then((response) => {
+        if (response.data) {
+          this.wproductList = response.data;//半成品
+        }
+       
+      });
+   }
     },
   };
 </script>
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index 96ce2e8..847a4aa 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-  <el-card > 
+ 
 <el-row :gutter="2">
   <el-col :span="9" >
  <el-card >
@@ -16,7 +16,7 @@
         fit
         stripe
         highlight-current-row
-       
+        height="660px"
      @current-change="handleCurrentChange">
    
         <el-table-column type="index" width="50" />
@@ -24,7 +24,7 @@
          <el-table-column label="产品编号">
           <template slot-scope="scope"> {{ scope.row.number }}</template>
         </el-table-column>
-         <el-table-column label="产品名称">
+         <el-table-column label="产品名称"  width="200px">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
        
@@ -39,31 +39,7 @@
       </el-table>
     
     </el-card>
- <el-card >
  
-      <el-descriptions class="margin-top" title="产品信息" :column="1"  border>
-   
-   
-   
-    <el-descriptions-item>
-      <template slot="label">
-       
-        产品编号
-      </template>
-      {{products.number}}
-    </el-descriptions-item>
-  
-   
-     <el-descriptions-item>
-      <template slot="label">
-     
-        产品名称
-      </template>
-     {{products.name}}
-    </el-descriptions-item>
-  </el-descriptions>
- 
-</el-card>
   </el-col>
   <el-col :span="15" >
     <el-card class="box-card">
@@ -72,7 +48,7 @@
     font-weight: 700;
 ">工艺流程</span>
      </div>
- <el-steps :active="values" spac="400px" align-center="" style="padding-top: 20px;">
+ <el-steps :active="values" spac="400px" align-center="" style="padding-top: 20px;height:80px">
  <el-step :title="item.name"  v-for="(item,index) in processoptions " :key="index" @click.native=stepclick(item.id)>
 
  </el-step>
@@ -87,7 +63,7 @@
    <el-button type="primary" icon="el-icon-plus" @click="handlesubproducationCreate"
         >新增</el-button>
          <el-table
-       
+         height="190px"
         :data="subproducationData"
         border
         fit
@@ -176,8 +152,8 @@
 </el-card>
 
 
-  <el-tabs type="border-card">
-  <el-tab-pane label="输入物料">
+  <el-tabs type="border-card"  style="height:310px">
+  <el-tab-pane label="输入物料"  >
     <el-button type="primary" icon="el-icon-plus" @click="handleinputCreate"
         >新增</el-button>
        
@@ -187,7 +163,9 @@
        border
         fit
         stripe
-        style="width: 100%"
+        height="220px"
+        style="width: 100%;"
+
       >
         <el-table-column type="index" width="50" />
          <el-table-column label="物料编号" min-width="100">
@@ -297,7 +275,7 @@
           <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.count }}</template>
         </el-table-column>
          <el-table-column label="是否主产出">
@@ -348,7 +326,7 @@
         </el-form-item>
          
         <el-form-item label="输出物料" prop="unit">
-        <el-select  style="width: 50%" v-model="outputmaterial.material" placeholder="请选择">
+        <el-select filterable  style="width: 50%" v-model="outputmaterial.material" placeholder="请选择">
              <el-option
                 v-for="item in materialoptions"
                 :key="item.id"
@@ -440,11 +418,11 @@
         label-width="80px"
         label-position="right"
       >
-       
+       <!--
         <el-form-item label="消耗量" prop="count">
            <el-input-number v-model="othermaterial.count"  :min="0" placeholder="输入整数或小数" />
         </el-form-item>
-        
+        !-->
         <el-form-item label="输入物料" prop="unit">
         <el-select filterable style="width: 50%" v-model="othermaterial.material" placeholder="请选择">
              <el-option
@@ -651,7 +629,7 @@
 </el-tabs>
   </el-col>
 </el-row>
-  </el-card >
+  
  </div>
 </template>
 <script>
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index ec69d81..3cdebbe 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -105,13 +105,7 @@
           </el-form-item>
 
 
-          <el-form-item label="排序" prop="sort">
-            <el-input-number
-              v-model="step.sort"
-              :min="-2147483648"
-              :max="2147483647"
-            ></el-input-number>
-          </el-form-item>
+         
 
         </el-form>
         <div style="text-align: right">
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index faed2a3..fa906fa 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -162,7 +162,7 @@
             align="center"
             label="操作"
              fixed="right"
-            width="220px"
+            width="100px"
           >
             <template slot-scope="scope">
 
@@ -353,7 +353,7 @@
         this.delivery_date = scope.row.delivery_date;
         this.dialogVisible = true;
         this.$nextTick(() => {
-          this.$refs["Form"].clearValidate();
+          this.$refs["Form"].resetFields();
         });
 
       },
diff --git a/hb_client/src/views/pm/plandetails.vue b/hb_client/src/views/pm/plandetails.vue
index 71440bf..b0499d3 100644
--- a/hb_client/src/views/pm/plandetails.vue
+++ b/hb_client/src/views/pm/plandetails.vue
@@ -44,14 +44,16 @@
                   }}</template>
                 </el-table-column>
                   <el-table-column label="最后检验结果">
-                  <template slot-scope="scope"  >{{
-                    scope.row.step_.name
-                  }}</template>
+                  <template slot-scope="scope"  >
+                    <el-span v-if="scope.row.last_test_result==false">不合格</el-span>
+            <el-span v-if="scope.row.last_test_result==true">合格</el-span>
+                    
+                  </template>
                 </el-table-column>
-                 <el-table-column label="生成记录">
-                  <template slot-scope="scope"  >{{
-                    scope.row.step_.name
-                  }}</template>
+                 <el-table-column label="生产记录">
+                  <template slot-scope="scope"  >
+                     <el-button @click="select(scope)">查看</el-button>
+                  </template>
                 </el-table-column>
                <el-table-column
           align="center"
@@ -72,7 +74,43 @@
                
               </el-table>
 
-  
+       <!--检验记录-->
+    <el-dialog title="检验记录" :close-on-click-modal="false" :visible.sync="limitedCheckRecord">
+      <el-table
+        :data="recordList"
+        border
+        height="400"
+      >
+        <el-table-column type="index" width="50"/>
+        <el-table-column label="表单名称">
+          <template slot-scope="scope">{{ scope.row.form_.name }}</template>
+        </el-table-column>
+      
+      
+        <el-table-column align="center" label="操作">
+          <template slot-scope="scope">
+            <el-link
+              v-if="!scope.row.is_submited"
+              @click="handleInspectionRecord(scope)"
+            >检验
+            </el-link>
+            <el-link
+              v-else
+              @click="handleRecordDetail(scope)"
+            >查看
+            </el-link>
+            <el-link
+              @click="delTestRecord(scope)"
+            >删除
+            </el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="putin">确 定</el-button>
+      </div>
+    </el-dialog>
     </el-card>
 
   
@@ -83,7 +121,7 @@
 <script>
 
 import { getProductionplan,getsubproductionplanList } from "@/api/pm";
-import {  getwproductList} from "@/api/wpm";
+import {  getwproductList,getrecordList} from "@/api/wpm";
 import checkPermission from "@/utils/permission";
 
 import {getTestRecord} from "@/api/qm";
@@ -98,7 +136,7 @@ export default {
      },
      activeName:"1",
      wproduct:[],
-    
+    limitedCheckRecord:false,
       listQuery: {
         page: 1,
         page_size: 20,
@@ -173,7 +211,16 @@ export default {
         this.$router.push({name: "processcard", params: { id: scope.row.id }, })
     
     },
-   
+    //查看生产记录
+   select(scope)
+   {
+     this.limitedCheckRecord=true;
+       getrecordList({wproduct: scope.row.id,page:0}).then(res => {
+          if (res.code == 200) {
+            that.recordList = res.data.results;
+          } 
+        })
+   }
   },
 };
 </script>
diff --git a/hb_client/src/views/pm/processcard.vue b/hb_client/src/views/pm/processcard.vue
index 7d9266d..febcbad 100644
--- a/hb_client/src/views/pm/processcard.vue
+++ b/hb_client/src/views/pm/processcard.vue
@@ -1,8 +1,8 @@
 <template>
   <div style="text-align: center">
    
-       <table style=" margin: auto;margin-top:50px; font-family: verdana,arial,sans-serif;font-size:20px;color:#333333;border-width: 1px;border-color: #666666; border-collapse: collapse;">
-      <tr v-for="(items,indexs) in card" :key="indexs+1" onmouseover="this.style.backgroundColor='#ffff66';" onmouseout="this.style.backgroundColor='#d4e3e5';">
+       <table style=" margin: auto;margin-top:50px; font-family: verdana,arial,sans-serif;font-size:16px;backgroundColor:#bdf6be;color:#333333;border-width: 1px;border-color: #666666; border-collapse: collapse;">
+      <tr v-for="(items,indexs) in card" :key="indexs+1">
         
          <td v-for="(item,index) in card[indexs]" :key="index" style="border-width: 1px;
   padding: 8px;    border-style: solid;    border-color: #a9c6c9;">
diff --git a/hb_client/src/views/pm/resources.vue b/hb_client/src/views/pm/resources.vue
index 51bfc98..f6b28df 100644
--- a/hb_client/src/views/pm/resources.vue
+++ b/hb_client/src/views/pm/resources.vue
@@ -17,7 +17,7 @@
         stripe
         highlight-current-row
        height="100"
-        v-el-height-adaptive-table="{bottomOffset: 40}"
+        v-el-height-adaptive-table="{bottomOffset: 25}"
     >
       <el-table-column
       type="selection"
@@ -93,7 +93,7 @@
         fit
         stripe
         style="width: 100%"
-        height="310"
+        height="300"
     
       >
         <el-table-column type="index" width="50" />
@@ -134,7 +134,7 @@
         fit
         stripe
         style="width: 100%"
-        height="320"
+        height="280"
       >
       
         <el-table-column type="index" width="50" />
diff --git a/hb_client/src/views/pm/work.vue b/hb_client/src/views/pm/work.vue
index 477ab75..666212f 100644
--- a/hb_client/src/views/pm/work.vue
+++ b/hb_client/src/views/pm/work.vue
@@ -17,16 +17,16 @@
       >
         <el-table-column type="index" width="50" />
         
-           <el-table-column label="子计划编号">
-                  <template slot-scope="scope">{{scope.row.id}}</template>
+           <el-table-column label="子计划编号"   width="100px">
+                  <template slot-scope="scope">{{scope.row.number}}</template>
                 </el-table-column>
-           <el-table-column label="产品名称">
+           <el-table-column label="产品名称"   width="180px">
           <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="名称">
+         <el-table-column label="名称"   width="160px">
           <template slot-scope="scope">{{ scope.row.subproduction_.name }}</template>
         </el-table-column>
         
@@ -37,7 +37,7 @@
          <el-table-column label="工序编号">
           <template slot-scope="scope">{{ scope.row.process_.number }}</template>
         </el-table-column>
-         <el-table-column label="子工序" width="160">
+         <el-table-column label="子工序" width="200">
            <template slot-scope="scope" v-if="scope.row.steps">
             <el-tag v-for="item in scope.row.steps"
                     :key="item.number"
@@ -47,16 +47,16 @@
 
           </template>
         </el-table-column>
-         <el-table-column label="生产车间">
+         <el-table-column label="生产车间"   width="100px">
           <template slot-scope="scope">{{ scope.row.workshop_.name }}</template>
         </el-table-column>
           <el-table-column label="生产数量">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
-          <el-table-column label="开工时间">
+          <el-table-column label="开工时间"   width="100px">
           <template slot-scope="scope">{{ scope.row.start_date }}</template>
         </el-table-column>
-         <el-table-column label="完工时间">
+         <el-table-column label="完工时间"   width="100px">
           <template slot-scope="scope">{{ scope.row.end_date }}</template>
         </el-table-column>
          <el-table-column label="下达状态">
@@ -64,14 +64,14 @@
         </el-table-column>
           
         
-  <el-table-column label="创建时间">
+  <el-table-column label="创建时间"   width="160px">
           <template slot-scope="scope">{{ scope.row.create_time }}</template>
         </el-table-column>
         <el-table-column
           align="center"
           label="操作"
           width="100px"
-    
+     fixed="right"
         >
           <template slot-scope="scope">
             <el-link type="primary"
@@ -145,9 +145,9 @@
       :visible.sync="dialogVisibles"
       :close-on-click-modal="false"
     >
-     
+    
           <el-table
-        :data="progressList"
+        :data="xhwl"
        border
         fit
         stripe
@@ -158,10 +158,45 @@
         
       
         
-         <el-table-column label="预计产出/消耗">
+         <el-table-column label="预计消耗">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
-          <el-table-column label="实际产出/消耗">
+          <el-table-column label="实际消耗">
+          <template slot-scope="scope">{{ scope.row.count_real }}</template>
+        </el-table-column>
+        <el-table-column label="生产计划编号">
+          <template slot-scope="scope">{{ scope.row.subproduction_plan }}</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.material_.number }}</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_.unit }}</template>
+        </el-table-column>
+        
+      </el-table>
+          <el-table
+        :data="ccwl"
+       border
+        fit
+        stripe
+        style="width: 100%"
+        max-height="400"
+      >
+        <el-table-column type="index" width="50" />
+        
+      
+        
+         <el-table-column label="预计产出">
+          <template slot-scope="scope">{{ scope.row.count }}</template>
+        </el-table-column>
+          <el-table-column label="实际产出">
           <template slot-scope="scope">{{ scope.row.count_real }}</template>
         </el-table-column>
         <el-table-column label="生产计划编号">
@@ -181,7 +216,6 @@
         </el-table-column>
         
       </el-table>
-    
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisibles = false">取消</el-button>
        
@@ -211,7 +245,8 @@ export default {
         page_size: 20,
       },
        
-      progressList:[],
+      xhwl:[],
+      ccwl:[],
       listLoading: true,
       dialogVisible: false,
        dialogVisibles: false,
@@ -262,9 +297,24 @@ export default {
      handleselectclick(scope)
      {
        this.dialogVisibles = true;
+        this.xhwl=[];
+
+          this.ccwl=[];
          getProgress(scope.row.id).then((res) => {
               if (res.code >= 200) {
-                 this.progressList = res.data;
+               
+                   res.data.forEach((item) => {
+                   
+                     if(item.type==1)
+                     {
+                         this.xhwl.push(item);
+                     }
+                     else{
+                       this.ccwl.push(item);
+                     }
+        
+      });
+                
               }
             });
      },
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index e89a3a2..2c3a0a3 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -41,24 +41,24 @@
         v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
-        <el-table-column label="合同名称"  width="130" show-overflow-tooltip>
+        <el-table-column label="合同名称"  width="160" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
        
-        <el-table-column label="合同编号" >
+        <el-table-column label="合同编号"  width="160" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
-         <el-table-column label="合同金额（元）">
+         <el-table-column label="合同金额（元）" width="120">
           <template slot-scope="scope">{{ scope.row.amount }}</template>
         </el-table-column>
-         <el-table-column label="开票金额（元）" >
+         <el-table-column label="开票金额（元）" width="120" >
           <template slot-scope="scope">{{ scope.row.invoice }}</template>
         </el-table-column>
         
           <el-table-column label="客户名称" width="130" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
         </el-table-column>
-         <el-table-column label="签订日期"  >
+         <el-table-column label="签订日期" width="120" >
           <template slot-scope="scope">{{ scope.row.sign_date }}</template>
         </el-table-column>
        <el-table-column label="描述" width="130" show-overflow-tooltip>
@@ -71,6 +71,7 @@
           align="center"
           label="操作"
           width="220px"
+          fixed="right"
         >
           <template slot-scope="scope">
            
@@ -112,7 +113,7 @@
       <el-form
         ref="Form"
         :model="contract"
-        label-width="80px"
+        label-width="130px"
         label-position="right"
         :rules="rule1"
       >
@@ -122,10 +123,10 @@
         <el-form-item label="合同编号" prop="number">
           <el-input v-model="contract.number" placeholder="合同编号" />
         </el-form-item>
-         <el-form-item label="合同金额" prop="amount">
+         <el-form-item label="合同金额（元）" prop="amount">
           <el-input v-model="contract.amount" placeholder="合同金额" />
         </el-form-item>
-        <el-form-item label="开票金额" prop="invoice">
+        <el-form-item label="开票金额（元）" prop="invoice">
           <el-input v-model="contract.invoice" placeholder="开票金额" />
         </el-form-item>
          <el-form-item label="签订日期" prop="sign_date">
diff --git a/hb_client/src/views/sam/contractdetail.vue b/hb_client/src/views/sam/contractdetail.vue
index 8dcbd7b..59e557a 100644
--- a/hb_client/src/views/sam/contractdetail.vue
+++ b/hb_client/src/views/sam/contractdetail.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
   
     <el-card style="margin-top: 2px">
-      <el-descriptions title="基本信息" direction="vertical" :column="8" border>
-  <el-descriptions-item label="合同名称">  {{contractdetail.name}}</el-descriptions-item>
+      <el-descriptions title="基本信息" :column="8" :size="size" border>
+  <el-descriptions-item label="合同名称" >  {{contractdetail.name}}</el-descriptions-item>
   <el-descriptions-item label="编号" >  {{contractdetail.number}}</el-descriptions-item>
-  <el-descriptions-item label="金额" :span="2" >  {{contractdetail.amount}}</el-descriptions-item>
+  <el-descriptions-item label="金额"  >  {{contractdetail.amount}}</el-descriptions-item>
   <el-descriptions-item label="客户名称" v-if="contractdetail.customer">  {{contractdetail.customer_.name}} </el-descriptions-item>
 </el-descriptions>
  </el-card>
@@ -20,6 +20,7 @@
         fit
         stripe
         highlight-current-row
+        height="510px"
       
       >
         <el-table-column type="index" width="50" />
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index 4a4da9f..f64155d 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -121,7 +121,7 @@
       >
        
         <el-form-item label="订单编号" prop="number">
-          <el-input v-model="order.number" placeholder="订单编号" />
+          <el-input v-model="order.number" placeholder="订单编号自动生成" disabled="true" />
         </el-form-item>
           <el-form-item label="所需产品" prop="product">
          <el-select  style="width: 100%" v-model="order.product" placeholder="请选择">
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 2a498fd..bfb4ae5 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -19,10 +19,17 @@
             <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.material_.specification }}</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.subproduction_plan_.number }}</template>
             </el-table-column>
             <el-table-column label="所在子工序">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
@@ -99,11 +106,17 @@
 
             <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.material_.specification }}</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.subproduction_plan_.number }}</template>
             </el-table-column>
             <el-table-column label="所在子工序">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
@@ -159,13 +172,18 @@
 
             <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.material_.specification }}</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.subproduction_plan_.number }}</template>
+            </el-table-column>
             <el-table-column label="所在子工序">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
@@ -217,6 +235,9 @@
               <template slot-scope="scope">
                 {{ actstate_[scope.row.act_state] }}
               </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.step_.name }}</template>
@@ -225,6 +246,9 @@
               <template slot-scope="scope">
                 {{ ng_sign_[scope.row.ng_sign] }}
               </template>
+            </el-table-column>
+             <el-table-column label="子计划编号">
+              <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
               <template slot-scope="scope">
@@ -266,19 +290,26 @@
             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">{{ scope.row.material_.specification }}</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.subproduction_plan_.number }}</template>
+            </el-table-column>
             <el-table-column label="所在子工序">
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index 926aaf5..cc8d5f8 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -36,12 +36,7 @@
             scope.row.create_by_.username
           }}</template>
         </el-table-column>
-        <el-table-column label="是否使用边角料">
-          <template slot-scope="scope">
-            <el-span v-if="scope.row.use_scrap">是</el-span>
-            <el-span v-else>否</el-span></template
-          >
-        </el-table-column>
+      
 
         <el-table-column label="过程记录表">
           
@@ -141,7 +136,7 @@ export default {
    
 handleoperation(scope)
 {
-       this.$router.push({name: "operationdo", params: { id: scope.row.id,is_submited:scope.row.is_submited }, })
+       this.$router.push({name: "operationdo", params: { id: scope.row.id,submited:scope.row.is_submited }, })
 },
   //大工序工序渲染
     getProcessList() {
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 622d78a..bbf317f 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -3,6 +3,7 @@
       <el-card>
         <div slot="header" class="clearfix">
           <span>基本信息</span>
+
              <el-button style="float: right; padding: 3px 0" @click="readbook()" type="text">查看作业指导书</el-button>
         </div>
         <el-form
@@ -30,6 +31,11 @@
               disabled="disabled"
             ></el-input>
           </el-form-item>
+           <el-form-item >
+           <el-button type="primary" style="float: right" @click="handlesubmit()" v-if="operationData.is_submited==false"
+          >提交本次操作</el-button
+        >
+         </el-form-item>
 <!--
           <el-form-item label="边角料">
             <el-radio-group v-model="operationData.use_scrap">
@@ -322,6 +328,16 @@
                 </el-table-column>
                 <el-table-column prop="count" label="消耗数量">
                 </el-table-column>
+                 <el-table-column align="center" label="操作" width="100px">
+                  <template slot-scope="scope">
+                    <el-link
+                      v-if="checkPermission(['warehouse_update'])"
+                      type="danger"
+                      @click="handleDeleteinput(scope)"
+                      >删除</el-link
+                    >
+                  </template>
+                </el-table-column>
               </el-table>
               <el-dialog title="车间物料" :close-on-click-modal="false" :visible.sync="dialogTablepick">
                 <el-table
@@ -511,7 +527,7 @@
         <el-col span="8">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
-              <span>工序工装</span>
+              <span>工具工装</span>
             </div>
         
             <el-table
@@ -537,11 +553,7 @@
           </el-card>
         </el-col>
       </el-row>
-      <el-card>
-        <el-button type="primary" style="float: right" @click="handlesubmit()" v-if="this.is_submited==false"
-          >提交本次操作</el-button
-        >
-      </el-card>
+     
 
   </div>
 </template>
@@ -570,7 +582,8 @@ import {
   createTool,
   createInputs,
   recordInit,
-  createOutputs
+  createOutputs,
+  deleteOperationeinput
 } from "@/api/wpm";
 
 import { getrffieldList,gettechdocList } from "@/api/mtm";
@@ -701,7 +714,7 @@ export default {
   watch: {},
   created() {
     this.id = this.$route.params.id; //操作ID
-    this.is_submited=this.$route.params.is_submited; //操作是否提交
+   
     this.getList(); //边角料
     this.getpwpList(); //半成品
     this.getequList(); //设备
@@ -890,7 +903,23 @@ export default {
         }
       });
     },
+//消耗物料删除
+    handleDeleteinput(scope) {
 
+      this.$confirm("确认删除该消耗物料操作?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleteOperationeinput(scope.row.id);
+          this.getinputLists();
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
 //车间领料批量提交
  handlepicks() {
 
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index 0200394..ad5db37 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -24,7 +24,7 @@
           </el-table-column>
           <el-table-column label="产品名称">
             <template slot-scope="scope">{{
-              scope.row.product_.name
+              scope.row.plan_product_.name
             }}</template>
           </el-table-column>
           <el-table-column label="产品型号">
@@ -325,11 +325,9 @@
           <template slot-scope="scope">{{ scope.row.material_.name }}</template>
         </el-table-column>
 
-        <el-table-column label="所属子计划">
-          <template slot-scope="scope">{{
-            scope.row.subproduction_plan
-          }}</template>
-        </el-table-column>
+        <el-table-column label="子计划编号">
+              <template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
+            </el-table-column>
         <el-table-column label="备注">
           <template slot-scope="scope">{{ scope.row.remark }}</template>
         </el-table-column>