From e129f7e30651ebd25a0567bf37ad3dcb683a52a9 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 16 Dec 2021 16:28:11 +0800
Subject: [PATCH] xiugai

---
 hb_client/src/api/sam.js                   |   6 +
 hb_client/src/router/index.js              |  22 +++-
 hb_client/src/views/em/detection.vue       |   7 +-
 hb_client/src/views/em/equipment.vue       |   5 +-
 hb_client/src/views/em/record.vue          |   6 +-
 hb_client/src/views/inm/fifo.vue           |  10 +-
 hb_client/src/views/inm/fifodetail.vue     |   1 +
 hb_client/src/views/inm/inventory.vue      |   5 +-
 hb_client/src/views/inm/materialbatch.vue  |   8 +-
 hb_client/src/views/inm/product.vue        |   8 +-
 hb_client/src/views/inm/warehouse.vue      |  10 +-
 hb_client/src/views/inm/wproduct.vue       |   8 +-
 hb_client/src/views/mtm/material.vue       |   6 +-
 hb_client/src/views/mtm/materialDetail.vue |   1 +
 hb_client/src/views/mtm/materialdo.vue     |   1 +
 hb_client/src/views/mtm/process.vue        |   1 +
 hb_client/src/views/mtm/productprocess.vue |  24 ++--
 hb_client/src/views/mtm/step.vue           |   4 +
 hb_client/src/views/pm/plan.vue            |  16 ++-
 hb_client/src/views/pm/resources.vue       |   6 +-
 hb_client/src/views/pm/work.vue            |   4 +-
 hb_client/src/views/qm/product.vue         |   6 +-
 hb_client/src/views/sam/contract.vue       |  25 +++-
 hb_client/src/views/sam/contractdetail.vue | 129 +++++++++++++++++++++
 hb_client/src/views/sam/customer.vue       |   5 +-
 hb_client/src/views/sam/order.vue          |  21 +++-
 hb_client/src/views/sam/orderdetail.vue    | 127 ++++++++++++++++++++
 hb_client/src/views/sam/review.vue         |   6 +-
 hb_client/src/views/sam/sales.vue          |  10 +-
 hb_client/src/views/wpm/need.vue           |   3 +-
 hb_client/src/views/wpm/operation.vue      |   4 +-
 hb_client/src/views/wpm/operationdo.vue    |   3 +
 hb_client/src/views/wpm/worktask.vue       |   4 +-
 33 files changed, 430 insertions(+), 72 deletions(-)
 create mode 100644 hb_client/src/views/sam/contractdetail.vue
 create mode 100644 hb_client/src/views/sam/orderdetail.vue

diff --git a/hb_client/src/api/sam.js b/hb_client/src/api/sam.js
index 037a628..540441f 100644
--- a/hb_client/src/api/sam.js
+++ b/hb_client/src/api/sam.js
@@ -36,6 +36,12 @@ export function getContractList(query) {
     params: query
   })
 }
+export function getContract(id) {
+  return request({
+    url: `/sam/contract/${id}/`,
+    method: 'get'
+  })
+}
 export function createContract(data) {
   return request({
     url: '/sam/contract/',
diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 321c51f..f5f751f 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -276,13 +276,21 @@ export const asyncRoutes = [
         path: 'customer',
         name: 'customer',
         component: () => import('@/views/sam/customer'),
-        meta: { title: '客户信息', icon: 'example', perms: ['index_manage'] }
+        meta: { title: '客户管理', icon: 'example', perms: ['index_manage'] }
       },
       {
         path: 'contract',
         name: 'contract',
         component: () => import('@/views/sam/contract'),
-        meta: { title: '合同信息', icon: 'example', perms: ['index_manage'] }
+        meta: { title: '合同管理', icon: 'example', perms: ['index_manage'] }
+      }
+      ,
+      {
+        path: 'contractdetail/:id',
+        name: 'contractdetail',
+        component: () => import('@/views/sam/contractdetail'),
+        meta: { title: '合同详情', perms: ['vendor_manage'] },
+        hidden: true
       }
       
       ,
@@ -290,9 +298,17 @@ export const asyncRoutes = [
         path: 'order',
         name: 'order',
         component: () => import('@/views/sam/order'),
-        meta: { title: '订单信息', icon: 'example', perms: ['index_manage'] }
+        meta: { title: '订单管理', icon: 'example', perms: ['index_manage'] }
       }
+      
       ,
+      {
+        path: 'orderdetail/:id',
+        name: 'orderdetail',
+        component: () => import('@/views/sam/orderdetail'),
+        meta: { title: '订单详情', perms: ['vendor_manage'] },
+        hidden: true
+      },
       {
         path: 'sales',
         name: 'sales',
diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue
index 2f5461f..4091991 100644
--- a/hb_client/src/views/em/detection.vue
+++ b/hb_client/src/views/em/detection.vue
@@ -29,7 +29,7 @@
     </div>
   
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="equipmentList.results"
@@ -37,8 +37,8 @@
         fit
         stripe
         highlight-current-row
-       height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+      height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
          <el-table-column label="设备编号">
@@ -104,6 +104,7 @@
            
             <el-link
               v-if="checkPermission(['equipment_update'])"
+               type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue
index 6346164..2138828 100644
--- a/hb_client/src/views/em/equipment.vue
+++ b/hb_client/src/views/em/equipment.vue
@@ -29,7 +29,7 @@
     </div>
   
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="equipmentList.results"
@@ -38,7 +38,7 @@
         stripe
         highlight-current-row
        height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="设备名称" width="120"  show-overflow-tooltip>
@@ -113,6 +113,7 @@
            
             <el-link
               v-if="checkPermission(['equipment_update'])"
+               type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
diff --git a/hb_client/src/views/em/record.vue b/hb_client/src/views/em/record.vue
index bf1999e..afc20ef 100644
--- a/hb_client/src/views/em/record.vue
+++ b/hb_client/src/views/em/record.vue
@@ -29,7 +29,7 @@
     </div>
    
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="equipmentrecordList.results"
@@ -37,7 +37,8 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+        height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
        
         <el-table-column type="index" width="50" />
@@ -72,6 +73,7 @@
            
             <el-link
               v-if="checkPermission(['equipment_update'])"
+               type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index b0e0a92..1225521 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -28,7 +28,7 @@
         >
       </div>
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
      
       <el-table
         v-loading="listLoading"
@@ -37,9 +37,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="700"
-         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+      
+          height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="出入记录ID">
@@ -70,11 +70,13 @@
           <template slot-scope="scope">
             <el-link
               v-if="checkPermission(['warehouse_update'])"
+               type="primary"
               @click="handleDetail(scope)"
               >查看</el-link
             >
             <el-link
               v-if="scope.row.is_audited == false"
+               type="primary"
               @click="handleAudit(scope)"
               >审核</el-link
             >
diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue
index 0f6db34..6e0d836 100644
--- a/hb_client/src/views/inm/fifodetail.vue
+++ b/hb_client/src/views/inm/fifodetail.vue
@@ -52,6 +52,7 @@
           <template slot-scope="scope">
             <el-link
               v-if="scope.row.is_tested == false"
+               type="primary"
               @click="handleMaterial(scope)"
               >检查</el-link
             >
diff --git a/hb_client/src/views/inm/inventory.vue b/hb_client/src/views/inm/inventory.vue
index 668a027..b4f021d 100644
--- a/hb_client/src/views/inm/inventory.vue
+++ b/hb_client/src/views/inm/inventory.vue
@@ -25,7 +25,7 @@
             >
     </div>
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       
       <el-table
         v-loading="listLoading"
@@ -34,7 +34,8 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
       
      
diff --git a/hb_client/src/views/inm/materialbatch.vue b/hb_client/src/views/inm/materialbatch.vue
index 5272e5b..9955898 100644
--- a/hb_client/src/views/inm/materialbatch.vue
+++ b/hb_client/src/views/inm/materialbatch.vue
@@ -25,7 +25,7 @@
         >
       </div>
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="InventoryList.results"
@@ -33,9 +33,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="700"
-         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+      
+          height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="物料批次">
diff --git a/hb_client/src/views/inm/product.vue b/hb_client/src/views/inm/product.vue
index e5dddef..6d4b9f7 100644
--- a/hb_client/src/views/inm/product.vue
+++ b/hb_client/src/views/inm/product.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
    
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="iproductData.results"
@@ -9,9 +9,9 @@
         fit
         stripe
         highlight-current-row
-         max-height="700"
-         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+       
+          height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="成品编号">
diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue
index a8ab21e..ebff072 100644
--- a/hb_client/src/views/inm/warehouse.vue
+++ b/hb_client/src/views/inm/warehouse.vue
@@ -29,7 +29,7 @@
       </div>
      
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="warehouseList.results"
@@ -37,9 +37,9 @@
         fit
         stripe
         highlight-current-row
-        max-height="700"
-         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+      
+          height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="仓库名称">
@@ -60,11 +60,13 @@
           <template slot-scope="scope">
             <el-link
               v-if="checkPermission(['warehouse_update'])"
+               type="primary"
               @click="handleMaterial(scope)"
               >查看物料</el-link
             >
             <el-link
               v-if="checkPermission(['warehouse_update'])"
+               type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
diff --git a/hb_client/src/views/inm/wproduct.vue b/hb_client/src/views/inm/wproduct.vue
index bb46bf3..47c2956 100644
--- a/hb_client/src/views/inm/wproduct.vue
+++ b/hb_client/src/views/inm/wproduct.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
    
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="iproductData.results"
@@ -9,9 +9,9 @@
         fit
         stripe
         highlight-current-row
-         max-height="700"
-         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+        
+          height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="半成品编号">
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 8d1677a..0edb0a0 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -49,7 +49,7 @@
        highlight-current-row
         max-height="620"
          height="100"
-        v-el-height-adaptive-table="{bottomOffset: 10}"
+        v-el-height-adaptive-table="{bottomOffset: 40}"
       >
         <el-table-column type="index" width="50" />
          <el-table-column label="物料编号">
@@ -89,17 +89,20 @@
           <template slot-scope="scope">
             <el-link
               v-if="checkPermission(['material_update'])"
+              type="primary"
               @click="handlebind(scope)"
               >检查表</el-link
             >
             
             <el-link
               v-if="checkPermission(['material_update'])"
+              type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
              <el-link
               v-if="checkPermission(['material_update'])"
+              type="primary"
               @click="handledetail(scope)"
               >详情</el-link
             >
@@ -391,3 +394,4 @@ export default {
   },
 };
 </script>
+
diff --git a/hb_client/src/views/mtm/materialDetail.vue b/hb_client/src/views/mtm/materialDetail.vue
index ca00e21..2ed9da7 100644
--- a/hb_client/src/views/mtm/materialDetail.vue
+++ b/hb_client/src/views/mtm/materialDetail.vue
@@ -228,3 +228,4 @@ getMaterial(){
     },
   };
 </script>
+
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index da3120f..8792fb0 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -311,6 +311,7 @@
                 <template slot-scope="scope">
                   <el-link
                     v-if="checkPermission(['material_update'])"
+                    type="primary"
                     @click="handlefieldEdit(scope)"
                   >编辑
                   </el-link
diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue
index 3557080..8d52cd9 100644
--- a/hb_client/src/views/mtm/process.vue
+++ b/hb_client/src/views/mtm/process.vue
@@ -55,6 +55,7 @@
             >
             <el-link
               v-if="checkPermission(['process_update'])"
+              type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index 7dd2203..bf8ea59 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -41,16 +41,10 @@
     </el-card>
  <el-card >
  
-      <el-descriptions class="margin-top" title="产品信息" :column="3"  border>
+      <el-descriptions class="margin-top" title="产品信息" :column="1"  border>
+   
    
    
-    <el-descriptions-item>
-      <template slot="label">
-     
-        产品名称
-      </template>
-     {{products.name}}
-    </el-descriptions-item>
     <el-descriptions-item>
       <template slot="label">
        
@@ -59,6 +53,14 @@
       {{products.number}}
     </el-descriptions-item>
   
+   
+     <el-descriptions-item>
+      <template slot="label">
+     
+        产品名称
+      </template>
+     {{products.name}}
+    </el-descriptions-item>
   </el-descriptions>
  
 </el-card>
@@ -115,6 +117,7 @@
            
             <el-link
               v-if="checkPermission(['material_update'])"
+              type="primary"
               @click="handlesubproducationEdit(scope)"
               >编辑</el-link
             >
@@ -213,6 +216,7 @@
            
             <el-link
               v-if="checkPermission(['material_update'])"
+              type="primary"
               @click="handleinputEdit(scope)"
               >编辑</el-link
             >
@@ -314,6 +318,7 @@
            
             <el-link
               v-if="checkPermission(['material_update'])"
+              type="primary"
               @click="handleoutputEdit(scope)"
               >编辑</el-link
             >
@@ -411,6 +416,7 @@
            
             <el-link
               v-if="checkPermission(['material_update'])"
+              type="primary"
               @click="handleotherEdit(scope)"
               >编辑</el-link
             >
@@ -498,6 +504,7 @@
             <el-link
               type="primary"
               @click="handlesearch(scope)"
+              
               >查看</el-link
             >
             <el-link
@@ -576,6 +583,7 @@
            
             <el-link
               v-if="checkPermission(['process_update'])"
+              type="primary"
               @click="handletechdocEdit(scope)"
               >编辑</el-link
             >
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index 5aa523f..ec69d81 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -47,6 +47,7 @@
           <template slot-scope="scope">
             <el-link
               v-if="checkPermission(['step_update'])"
+              type="primary"
               @click="handleEditStep(scope)"
             >编辑</el-link
             >
@@ -160,10 +161,12 @@
                 <template slot-scope="scope">
                   <el-link
                     v-if="checkPermission(['material_update'])"
+                    type="primary"
                     @click="handleLook(scope)"
                   >查看</el-link>
                   <el-link
                     v-if="checkPermission(['material_update'])"
+                    type="primary"
                     @click="handleEdit(scope)"
                   >编辑</el-link>
                   <el-link
@@ -332,6 +335,7 @@
 
                   <el-link
                     v-if="checkPermission(['material_update'])"
+                    type="primary"
                     @click="handlefieldEdit(scope)"
                   >编辑</el-link
                   >
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index dbc41bc..7cc3913 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -13,7 +13,7 @@
         stripe
         style="width: 100%"
          height="300"
-         
+        
       >
         <el-table-column type="index" width="50" />
         
@@ -254,6 +254,7 @@ export default {
   },
   methods: {
     checkPermission,
+    
   //订单列表
     getorderList() {
       this.listLoading = true;
@@ -345,4 +346,15 @@ export default {
   },
 };
     
-  </script>
\ No newline at end of file
+  </script>
+
+
+  <style>
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
\ No newline at end of file
diff --git a/hb_client/src/views/pm/resources.vue b/hb_client/src/views/pm/resources.vue
index aec583f..51bfc98 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: 50}"
+        v-el-height-adaptive-table="{bottomOffset: 40}"
     >
       <el-table-column
       type="selection"
@@ -93,7 +93,7 @@
         fit
         stripe
         style="width: 100%"
-        height="320"
+        height="310"
     
       >
         <el-table-column type="index" width="50" />
@@ -134,7 +134,7 @@
         fit
         stripe
         style="width: 100%"
-        height="300"
+        height="320"
       >
       
         <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 0623fed..efac1c5 100644
--- a/hb_client/src/views/pm/work.vue
+++ b/hb_client/src/views/pm/work.vue
@@ -17,7 +17,9 @@
       >
         <el-table-column type="index" width="50" />
         
-          
+           <el-table-column label="子计划编号">
+                  <template slot-scope="scope">{{scope.row.id}}</template>
+                </el-table-column>
            <el-table-column label="产品名称">
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
diff --git a/hb_client/src/views/qm/product.vue b/hb_client/src/views/qm/product.vue
index ac58135..89bf147 100644
--- a/hb_client/src/views/qm/product.vue
+++ b/hb_client/src/views/qm/product.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
    
-    <el-card style="margin-top: 2px">
+    <el-card>
       <el-table
         v-loading="listLoading"
         :data="iproductData.results"
@@ -10,8 +10,8 @@
         stripe
         highlight-current-row
          max-height="700"
-         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+           height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="成品编号">
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index 86a3547..e89a3a2 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -29,7 +29,7 @@
     </div>
     
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="contractList.results"
@@ -38,27 +38,27 @@
         stripe
         highlight-current-row
        height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="合同名称"  width="130" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
        
-        <el-table-column label="合同编号" width="130">
+        <el-table-column label="合同编号" >
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
-         <el-table-column label="合同金额（元）" width="130">
+         <el-table-column label="合同金额（元）">
           <template slot-scope="scope">{{ scope.row.amount }}</template>
         </el-table-column>
-         <el-table-column label="开票金额（元）" width="130">
+         <el-table-column label="开票金额（元）" >
           <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="签订日期"  width="130">
+         <el-table-column label="签订日期"  >
           <template slot-scope="scope">{{ scope.row.sign_date }}</template>
         </el-table-column>
        <el-table-column label="描述" width="130" show-overflow-tooltip>
@@ -76,6 +76,7 @@
            
             <el-link
               v-if="checkPermission(['warehouse_update'])"
+              type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
@@ -85,6 +86,14 @@
               @click="handleDelete(scope)"
               >删除</el-link
             >
+             <el-link
+              v-if="checkPermission(['warehouse_delete'])"
+            type="primary"
+              @click="handleDetail(scope)"
+              >详情</el-link
+            >
+
+            
           </template>
         </el-table-column>
       </el-table>
@@ -279,6 +288,10 @@ export default {
         }
       });
     },
+    //合同详情
+    handleDetail(scope){
+      this.$router.push({name: "contractdetail", params: { id: scope.row.id }, })
+    }
   },
 };
 </script>
diff --git a/hb_client/src/views/sam/contractdetail.vue b/hb_client/src/views/sam/contractdetail.vue
new file mode 100644
index 0000000..8dcbd7b
--- /dev/null
+++ b/hb_client/src/views/sam/contractdetail.vue
@@ -0,0 +1,129 @@
+<template>
+  <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-item label="编号" >  {{contractdetail.number}}</el-descriptions-item>
+  <el-descriptions-item label="金额" :span="2" >  {{contractdetail.amount}}</el-descriptions-item>
+  <el-descriptions-item label="客户名称" v-if="contractdetail.customer">  {{contractdetail.customer_.name}} </el-descriptions-item>
+</el-descriptions>
+ </el-card>
+<el-card class="box-card">
+  <div slot="header" class="clearfix">
+    <span>关联订单</span>
+  </div>
+ <el-table
+        v-loading="listLoading"
+        :data="OrderList"
+        border
+        fit
+        stripe
+        highlight-current-row
+      
+      >
+        <el-table-column type="index" width="50" />
+        
+        <el-table-column label="订单编号"  width="160" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+         <el-table-column label="客户"  width="200" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
+        </el-table-column>
+         
+         <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="产品数量"   >
+          <template slot-scope="scope">{{ scope.row.count }}</template>
+        </el-table-column>
+         <el-table-column label="交货日期"  >
+          <template slot-scope="scope">{{ scope.row.delivery_date }}</template>
+        </el-table-column>
+        <el-table-column label="已交货数量"  >
+          <template slot-scope="scope">{{ scope.row.delivered_count }}</template>
+        </el-table-column>
+        
+  <el-table-column label="创建时间"  width="160" >
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
+      <el-table-column
+          align="center"
+          label="操作"
+          width="220px"
+        >
+          <template slot-scope="scope">
+           
+           
+             <el-link
+              v-if="checkPermission(['warehouse_delete'])"
+             type="primary"
+              @click="handleDetail(scope)"
+              >详情</el-link
+            >
+
+            
+          </template>
+        </el-table-column>
+      </el-table>
+</el-card>
+  </div>
+</template>
+<script>
+import {getContract,getOrderList} from "@/api/sam";
+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 {
+   
+     contractdetail:"",
+     OrderList:"",
+   
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+     this.id = this.$route.params.id; 
+    this.getdetail();
+    this.getList();
+
+
+  },
+  methods: {
+    checkPermission,
+     getList() {
+     getOrderList({contract:this.id,page:0}).then((response) => {
+        if (response.data) {
+          this.OrderList = response.data;
+        }
+        
+      })
+    },
+    //详情
+    getdetail() {
+     
+      getContract(this.id).then((response) => {
+        if (response.data) {
+          this.contractdetail = response.data;
+        }
+      
+      })
+    },
+   
+    //订单详情
+    handleDetail(scope){
+      this.$router.push({name: "orderdetail", params: { id: scope.row.id }, })
+    }
+  },
+};
+</script>
diff --git a/hb_client/src/views/sam/customer.vue b/hb_client/src/views/sam/customer.vue
index 9a736d7..b6270d6 100644
--- a/hb_client/src/views/sam/customer.vue
+++ b/hb_client/src/views/sam/customer.vue
@@ -29,7 +29,7 @@
     </div>
    
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="customerList.results"
@@ -38,7 +38,7 @@
         stripe
         highlight-current-row
        height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="客户名称" width="200" show-overflow-tooltip>
@@ -70,6 +70,7 @@
             <el-link
               v-if="checkPermission(['warehouse_update'])"
               @click="handleEdit(scope)"
+              type="primary"
               >编辑</el-link
             >
             <el-link
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index 5f3e833..e0bb94c 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -29,7 +29,7 @@
     </div>
    
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="orderList.results"
@@ -38,7 +38,7 @@
         stripe
         highlight-current-row
        height="100"
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         
@@ -79,8 +79,9 @@
           <template slot-scope="scope">
            
             <el-link
-              v-if="scope.row.planed_count==0&&checkPermission(['warehouse_update'])"
+              v-if="checkPermission(['warehouse_update'])"
               @click="handleEdit(scope)"
+              type="primary"
               >编辑</el-link
             >
             <el-link
@@ -89,6 +90,12 @@
               @click="handleDelete(scope)"
               >删除</el-link
             >
+             <el-link
+              v-if="checkPermission(['warehouse_delete'])"
+            type="primary"
+              @click="handleDetail(scope)"
+              >详情</el-link
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -127,8 +134,8 @@
           </el-select>
           </el-form-item>
           
-        <el-form-item label="所需数量" prop="count">
-           <el-input type="number" v-model="order.count"></el-input>
+        <el-form-item label="所需数量" prop="count" >
+            <el-input-number type="number" v-model="order.count"  :min="0"></el-input-number>
         </el-form-item>
          <el-form-item label="交货日期" prop="delivery_date">
            <el-date-picker
@@ -322,6 +329,10 @@ export default {
         }
       });
     },
+     //订单详情
+    handleDetail(scope){
+      this.$router.push({name: "orderdetail", params: { id: scope.row.id }, })
+    }
   },
 };
 </script>
diff --git a/hb_client/src/views/sam/orderdetail.vue b/hb_client/src/views/sam/orderdetail.vue
new file mode 100644
index 0000000..b7e1b0a
--- /dev/null
+++ b/hb_client/src/views/sam/orderdetail.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="app-container">
+  
+    <el-card style="margin-top: 2px">
+      <el-descriptions title="基本信息"  :column="4"  border>
+  <el-descriptions-item label="订单编号">  {{orderdetail.number}}</el-descriptions-item>
+  <el-descriptions-item label="产品名称" >  {{orderdetail.product_.name}}</el-descriptions-item>
+  <el-descriptions-item label="产品型号"  >  {{orderdetail.product_.specification}}</el-descriptions-item>
+  <el-descriptions-item label="产品数量" >  {{orderdetail.count}} </el-descriptions-item>
+ <el-descriptions-item label="已交货数量" > {{orderdetail.delivered_count}}</el-descriptions-item>
+  <el-descriptions-item label="已排产数量">  {{orderdetail.planed_count}}</el-descriptions-item>
+  <el-descriptions-item label="交货日期" >  {{orderdetail.delivery_date}}</el-descriptions-item>
+
+
+</el-descriptions>
+ </el-card>
+<el-card class="box-card">
+  <div slot="header" class="clearfix">
+    <span>关联生产任务</span>
+  </div>
+ <el-table
+        :data="productionplan"
+       border
+        fit
+        stripe
+        style="width: 100%"
+         height="300"
+        
+      >
+        <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.order_.contract_.number }}</template>
+        </el-table-column>
+        
+         <el-table-column label="产品名称" width="150" show-overflow-tooltip>
+          <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.product_.unit }}</template>
+        </el-table-column>
+         <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.start_date }}</template>
+        </el-table-column>
+         <el-table-column label="计划完工时间" > 
+          <template slot-scope="scope">{{ scope.row.end_date }}</template>
+        </el-table-column>
+        
+          <el-table-column label="是否生成子计划">
+          <template slot-scope="scope" >
+            <el-tag v-if="scope.row.is_planed==false">否</el-tag>
+             <el-tag  v-if="scope.row.is_planed==true">是</el-tag>
+            </template>
+        </el-table-column>
+  <el-table-column label="创建时间" width="160">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
+      
+      </el-table>
+</el-card>
+  </div>
+</template>
+<script>
+import {getOrder} from "@/api/sam";
+import {getProductionplanList} from "@/api/pm";
+
+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 {
+   
+     productionplan:"",
+     orderdetail:"",
+   
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+     this.id = this.$route.params.id; 
+    this.getdetail();
+    this.getList();
+
+
+  },
+  methods: {
+    checkPermission,
+     getList() {
+     getProductionplanList({order:this.id,page:0}).then((response) => {
+        if (response.data) {
+          this.productionplan = response.data;
+        }
+        
+      })
+    },
+    //详情
+    getdetail() {
+     
+      getOrder(this.id).then((response) => {
+        if (response.data) {
+          this.orderdetail = response.data;
+        }
+      
+      })
+    },
+   
+   
+  },
+};
+</script>
diff --git a/hb_client/src/views/sam/review.vue b/hb_client/src/views/sam/review.vue
index 9a5d55f..f5d3995 100644
--- a/hb_client/src/views/sam/review.vue
+++ b/hb_client/src/views/sam/review.vue
@@ -29,7 +29,7 @@
     </div>
    
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="contractList.results"
@@ -37,7 +37,8 @@
         fit
         stripe
         highlight-current-row
-        max-height="600"
+         height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="合同名称">
@@ -75,6 +76,7 @@
            
             <el-link
               v-if="checkPermission(['warehouse_update'])"
+              type="primary"
               @click="handleEdit(scope)"
               >编辑</el-link
             >
diff --git a/hb_client/src/views/sam/sales.vue b/hb_client/src/views/sam/sales.vue
index a6f53ce..a85a9b1 100644
--- a/hb_client/src/views/sam/sales.vue
+++ b/hb_client/src/views/sam/sales.vue
@@ -29,7 +29,7 @@
     </div>
     
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card >
       <el-table
         v-loading="listLoading"
         :data="saleList.results"
@@ -37,7 +37,8 @@
         fit
         stripe
         highlight-current-row
-      
+        height="100"
+        v-el-height-adaptive-table="{bottomOffset: 42}"
       >
         <el-table-column type="index" width="50" />
           <el-table-column label="产品名称"    show-overflow-tooltip>
@@ -66,14 +67,14 @@
           <template slot-scope="scope">
              <el-link
               v-if="checkPermission(['warehouse_delete'])"
-            
+            type="primary"
               @click="handleDetail(scope)"
               >详情</el-link
             >
             
              <el-link
               v-if="scope.row.is_audited==false"
-            
+            type="primary"
               @click="handleAudit(scope)"
               >审核</el-link
             >
@@ -152,6 +153,7 @@
         stripe
         highlight-current-row
          ref="multipleTable"
+         
       >
       <el-table-column
       type="selection"
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index ef1a5da..c936938 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -10,7 +10,8 @@
             fit
             stripe
             highlight-current-row
-            max-height="600"
+            max-height="700"
+            
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="半成品名称">
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index 89b9c65..21b794b 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -11,7 +11,7 @@
         style="width: 100%"
         max-height="670"
          highlight-current-row
-        v-el-height-adaptive-table="{bottomOffset: 50}"
+        v-el-height-adaptive-table="{bottomOffset: 30}"
       >
         <el-table-column type="index" width="50" />
 
@@ -70,11 +70,13 @@
            <template slot-scope="scope">
             <el-link
               v-if="checkPermission(['warehouse_update'])"
+              type="primary"
               @click="handleoperation(scope)"
               >前往操作</el-link>
            
             <el-link
               v-if="checkPermission(['warehouse_update'])"
+              type="danger"
               @click="handleDelete(scope)"
               >删除</el-link>
             
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index ace3ea3..8a1be8b 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -97,6 +97,7 @@
                   <template slot-scope="scope">
                     <el-link
                       v-if="checkPermission(['warehouse_update'])"
+                      type="danger"
                       @click="handleDeletewproduct(scope)"
                       >删除</el-link
                     >
@@ -129,6 +130,7 @@
                   <template slot-scope="scope">
                     <el-link
                       v-if="checkPermission(['warehouse_update'])"
+                      type="danger"
                       @click="handleDeletequip(scope)"
                       >删除</el-link
                     >
@@ -165,6 +167,7 @@
                   <template slot-scope="scope">
                     <el-link
                       v-if="checkPermission(['warehouse_update'])"
+                       type="primary"
                       @click="handlerecord(scope)"
                       >填写表单</el-link
                     >
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index 58efbcd..2de6677 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -18,7 +18,9 @@
           @current-change="handleCurrentChange"
         >
           <el-table-column type="index" width="50" />
-          
+           <el-table-column label="子计划编号">
+                  <template slot-scope="scope">{{scope.row.id}}</template>
+                </el-table-column>
            <el-table-column label="任务编号">
             <template slot-scope="scope">{{
               scope.row.number