From 4e0d5f4f2e4d0935a6f4cc1cf39504b9df2bd424 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 16 Nov 2021 10:38:17 +0800
Subject: [PATCH] guize

---
 hb_client/src/router/index.js          |   2 +-
 hb_client/src/views/em/detection.vue   |   9 +-
 hb_client/src/views/em/equipment.vue   |   9 +-
 hb_client/src/views/em/record.vue      |   9 +-
 hb_client/src/views/inm/fifo.vue       |   9 +-
 hb_client/src/views/inm/warehouse.vue  |   9 +-
 hb_client/src/views/mtm/material.vue   |   9 +-
 hb_client/src/views/mtm/materialdo.vue | 974 ++++++++++++++-----------
 hb_client/src/views/pm/plan.vue        |  23 +-
 hb_client/src/views/pm/resources.vue   |   7 +-
 hb_client/src/views/sam/contract.vue   |   9 +-
 hb_client/src/views/sam/customer.vue   |   9 +-
 hb_client/src/views/sam/order.vue      |   9 +-
 hb_client/src/views/sam/review.vue     |   9 +-
 hb_client/src/views/wpm/need.vue       |  61 +-
 hb_client/src/views/wpm/worktask.vue   |  13 +-
 16 files changed, 643 insertions(+), 527 deletions(-)

diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 1003fbd..cbf1edd 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -189,7 +189,7 @@ export const asyncRoutes = [
         path: 'need/:id',
         name: 'need',
         component: () => import('@/views/wpm/need'),
-        meta: { title: '检测项目', icon: 'example', perms: ['index_manage'] }
+        meta: { title: '半成品检验', icon: 'example', perms: ['index_manage'] }
       }
     ]
   },
diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue
index 3838c41..36ce520 100644
--- a/hb_client/src/views/em/detection.vue
+++ b/hb_client/src/views/em/detection.vue
@@ -2,6 +2,9 @@
   <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="设备名称/设备编号/备注"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增设备</el-button
-      >
-    </div>
+  
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue
index e2b7104..30c8be7 100644
--- a/hb_client/src/views/em/equipment.vue
+++ b/hb_client/src/views/em/equipment.vue
@@ -2,6 +2,9 @@
   <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="设备名称/设备编号/备注"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增设备</el-button
-      >
-    </div>
+  
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/em/record.vue b/hb_client/src/views/em/record.vue
index cdec323..730d944 100644
--- a/hb_client/src/views/em/record.vue
+++ b/hb_client/src/views/em/record.vue
@@ -2,6 +2,9 @@
   <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="设备名称/设备编号/备注"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增校准或检定</el-button
-      >
-    </div>
+   
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index 5302945..f19051e 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -2,6 +2,9 @@
   <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="仓库名称/仓库编号"
@@ -26,11 +29,7 @@
       </div>
     </el-card>
     <el-card style="margin-top: 2px">
-      <div style="margin-top: 2px">
-        <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-          >新增出入库记录</el-button
-        >
-      </div>
+     
       <el-table
         v-loading="listLoading"
         :data="fifoList.results"
diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue
index 0644dac..7fcbd01 100644
--- a/hb_client/src/views/inm/warehouse.vue
+++ b/hb_client/src/views/inm/warehouse.vue
@@ -2,6 +2,9 @@
   <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="仓库名称/仓库编号"
@@ -24,11 +27,7 @@
           >重置</el-button
         >
       </div>
-      <div style="margin-top: 2px">
-        <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-          >新增仓库</el-button
-        >
-      </div>
+     
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index b781fc5..cb6daa9 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -2,6 +2,9 @@
   <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="物料名称/物料编号/物料类型"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增物料</el-button
-      >
-    </div>
+   
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index 6edf107..3cb531e 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
-   
     <el-card>
       <el-row :gutter="24">
-        <el-col :span="6" >
-          <el-card >
+        <el-col :span="6">
+          <el-card>
             <div slot="header" class="clearfix">
-          <span style="font-size: 16px;
-          font-weight: 700;
-          ">物料检验记录表</span>
+              <span style="font-size: 16px; font-weight: 700"
+                >物料检验记录表</span
+              >
             </div>
             <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-            >新增</el-button>
+              >新增</el-button
+            >
             <el-table
               :data="recordformList.results"
               border
@@ -19,31 +19,31 @@
               stripe
               highlight-current-row
               height="100"
-              v-el-height-adaptive-table="{bottomOffset: 50}"
+              v-el-height-adaptive-table="{ bottomOffset: 50 }"
               @current-change="handleCurrentChange"
             >
               <el-table-column type="index" width="50" />
               <el-table-column label="表名称">
                 <template slot-scope="scope">{{ scope.row.name }}</template>
               </el-table-column>
-              <el-table-column
-                align="center"
-                label="操作"
-              >
+              <el-table-column align="center" label="操作">
                 <template slot-scope="scope">
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     @click="handleLook(scope)"
-                  >查看</el-link>
+                    >查看</el-link
+                  >
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     @click="handleEdit(scope)"
-                  >编辑</el-link>
+                    >编辑</el-link
+                  >
                   <el-link
                     v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handleDelete(scope)"
-                  >删除</el-link>
+                    >删除</el-link
+                  >
                 </template>
               </el-table-column>
             </el-table>
@@ -57,233 +57,373 @@
                 label-width="80px"
                 label-position="right"
               >
-
                 <el-form-item label="表格名称" prop="name">
                   <el-input v-model="recordform.name" placeholder="表格名称" />
                 </el-form-item>
-               
-
-
-
               </el-form>
               <div style="text-align: right">
-                <el-button type="danger" @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="recordformconfirm('Forms')">确认</el-button>
+                <el-button type="danger" @click="dialogVisible = false"
+                  >取消</el-button
+                >
+                <el-button type="primary" @click="recordformconfirm('Forms')"
+                  >确认</el-button
+                >
               </div>
             </el-dialog>
             <el-dialog
               :model="tableForm"
               :visible.sync="dialogVisibleForm"
-              :title="tableForm.name">
-              <el-form
-                label-width="80px"
-                label-position="right"
-              >
-                <el-row  v-for="(item,$index) in fieldList.results" :key="$index">
-                  <el-form-item v-if="item.field_type==='string'" :label="item.field_name" >
-                    <el-input  placeholder="请输入" v-model="item.sort"/>
+              :title="tableForm.name"
+            >
+              <el-form label-width="80px" label-position="right">
+                <el-row
+                  v-for="(item, $index) in fieldList.results"
+                  :key="$index"
+                >
+                  <el-form-item
+                    v-if="item.field_type === 'string'"
+                    :label="item.field_name"
+                  >
+                    <el-input placeholder="请输入" v-model="item.sort" />
                   </el-form-item>
-                  <el-form-item v-else-if="item.field_type==='int'" :label="item.field_name">
-                    <el-input type="number"  placeholder="请输入" v-model="item.sort"/>
+                  <el-form-item
+                    v-else-if="item.field_type === 'int'"
+                    :label="item.field_name"
+                  >
+                    <el-input
+                      type="number"
+                      placeholder="请输入"
+                      v-model="item.sort"
+                    />
                   </el-form-item>
-                  <el-form-item v-else-if="item.field_type==='float'" :label="item.field_name">
-                    <el-input type="number"  placeholder="请输入" v-model="item.sort"/>
+                  <el-form-item
+                    v-else-if="item.field_type === 'float'"
+                    :label="item.field_name"
+                  >
+                    <el-input
+                      type="number"
+                      placeholder="请输入"
+                      v-model="item.sort"
+                    />
                   </el-form-item>
-                  <el-form-item v-else-if="item.field_type==='date'" :label="item.field_name">
+                  <el-form-item
+                    v-else-if="item.field_type === 'date'"
+                    :label="item.field_name"
+                  >
                     <el-date-picker
                       v-model="item.create_time"
                       type="date"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd"
-                      style="width:100%"
+                      style="width: 100%"
                     >
                     </el-date-picker>
                   </el-form-item>
-                  <el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
+                  <el-form-item
+                    v-else-if="item.field_type === 'datetime'"
+                    :label="item.field_name"
+                  >
                     <el-date-picker
                       v-model="item.create_time"
                       type="datetime"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd HH:mm:ss"
-                      style="width:100%"
+                      style="width: 100%"
                     >
                     </el-date-picker>
                   </el-form-item>
-                  <el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
-                    <el-select  style="width: 100%"  v-model="item.sort" placeholder="请选择">
+                  <el-form-item
+                    v-else-if="item.field_type === 'select'"
+                    :label="item.field_name"
+                  >
+                    <el-select
+                      style="width: 100%"
+                      v-model="item.sort"
+                      placeholder="请选择"
+                    >
                       <el-option
                         v-for="item1 in item.field_choice"
                         :key="item1"
                         :label="item1"
-                        :value="item1">
+                        :value="item1"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name">
-                    <el-select  style="width: 100%" v-model="optio" multiple  placeholder="请选择">
+                  <el-form-item
+                    v-else-if="item.field_type === 'selects'"
+                    :label="item.field_name"
+                  >
+                    <el-select
+                      style="width: 100%"
+                      v-model="optio"
+                      multiple
+                      placeholder="请选择"
+                    >
                       <el-option
                         v-for="item1 in item.field_choice"
                         :key="item1"
                         :label="item1"
-                        :value="item1">
+                        :value="item1"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
                 </el-row>
               </el-form>
               <!--<div style="text-align: right">-->
-                <!--<el-button type="danger">取消</el-button>-->
-                <!--<el-button type="primary">确认</el-button>-->
+              <!--<el-button type="danger">取消</el-button>-->
+              <!--<el-button type="primary">确认</el-button>-->
               <!--</div>-->
             </el-dialog>
           </el-card>
         </el-col>
-        <el-col :span="18" >
-          <el-card >
+        <el-col :span="18">
+          <el-card>
             <div slot="header" class="clearfix">
-          <span style="font-size: 16px;
-          font-weight: 700;
-          ">记录字段</span>
+              <span style="font-size: 16px; font-weight: 700">记录字段</span>
             </div>
-            <el-button type="primary" icon="el-icon-plus" @click="handlefieldCreate"
-            >新增</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="handlefieldCreate"
+              >新增</el-button
+            >
             <el-table
-
               :data="fieldList.results"
               border
               fit
               stripe
               highlight-current-row
               height="100"
-              v-el-height-adaptive-table="{bottomOffset: 50}"
-
+              v-el-height-adaptive-table="{ bottomOffset: 50 }"
             >
-             <el-table-column type="index" width="50" />
+              <el-table-column type="index" width="50" />
               <el-table-column label="字段名称">
-                <template slot-scope="scope">{{ scope.row.field_name }}</template>
-              </el-table-column>
-             
-              <el-table-column label="字段类型">
-                <template slot-scope="scope">{{ options_[scope.row.field_type] }}</template>
+                <template slot-scope="scope">{{
+                  scope.row.field_name
+                }}</template>
               </el-table-column>
 
-            
+              <el-table-column label="字段类型">
+                <template slot-scope="scope">{{
+                  options_[scope.row.field_type]
+                }}</template>
+              </el-table-column>
 
               <el-table-column label="字段标识">
-                <template slot-scope="scope">{{ scope.row.field_key }}</template>
+                <template slot-scope="scope">{{
+                  scope.row.field_key
+                }}</template>
               </el-table-column>
-                <el-table-column label="上限值">
-                <template slot-scope="scope">{{ scope.row.high_limit }}</template>
+              <el-table-column label="上限值">
+                <template slot-scope="scope">{{
+                  scope.row.high_limit
+                }}</template>
               </el-table-column>
-                 <el-table-column label="上限规则">
-                <template slot-scope="scope">{{ highoptionss_[scope.row.high_rule] }}</template>
+              <el-table-column label="上限规则">
+                <template slot-scope="scope">{{
+                  highoptionss_[scope.row.high_rule]
+                }}</template>
               </el-table-column>
-                <el-table-column label="下限值">
-                <template slot-scope="scope">{{ scope.row.low_limit }}</template>
+              <el-table-column label="下限值">
+                <template slot-scope="scope">{{
+                  scope.row.low_limit
+                }}</template>
               </el-table-column>
-               <el-table-column label="下限规则">
-                <template slot-scope="scope"> {{ lowoptionss_[scope.row.low_rule] }}</template>
-              </el-table-column>
-            <el-table-column label="是否判定">
+              <el-table-column label="下限规则">
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.need_judge==true">是</el-tag>
-                     <el-tag v-else>否</el-tag>
-                  </template>
+                  {{ lowoptionss_[scope.row.low_rule] }}</template
+                >
               </el-table-column>
-            
-
-
-              <el-table-column
-                align="center"
-                label="操作"
-
-              >
+              <el-table-column label="是否判定">
                 <template slot-scope="scope">
+                  <el-tag v-if="scope.row.need_judge == true">是</el-tag>
+                  <el-tag v-else>否</el-tag>
+                </template>
+              </el-table-column>
 
+              <el-table-column align="center" label="操作">
+                <template slot-scope="scope">
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     @click="handlefieldEdit(scope)"
-                  >编辑</el-link
+                    >编辑</el-link
                   >
                   <el-link
                     v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handlefieldDelete(scope)"
-                  >删除</el-link
+                    >删除</el-link
                   >
                 </template>
               </el-table-column>
-
             </el-table>
-            <el-dialog :visible.sync="dialogVisible1" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'">
-              <el-form ref="Form" :model="field" label-width="100px" label-position="right">
+            <el-dialog
+              :visible.sync="dialogVisible1"
+              :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"
+            >
+              <el-form
+                ref="Form"
+                :model="field"
+                label-width="100px"
+                label-position="right"
+              >
                 <el-form-item label="字段类型" prop="field_type">
-                  <el-select  style="width: 100%"  v-model="field.field_type" placeholder="请选择">
+                  <el-select
+                    style="width: 100%"
+                    v-model="field.field_type"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item in fieldtypeoptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="字段标识" prop="field_key">
-                  <el-input v-model="field.field_key" placeholder="字段标识" onkeyup="value=value.replace(/[^A-Za-z_\/]/ig,'')"/>
+                  <el-input
+                    v-model="field.field_key"
+                    placeholder="字段标识"
+                    onkeyup="value=value.replace(/[^A-Za-z_\/]/ig,'')"
+                  />
                 </el-form-item>
                 <el-form-item label="字段名称" prop="field_name">
                   <el-input v-model="field.field_name" placeholder="字段名称" />
                 </el-form-item>
-                <el-form-item label="选项" v-show="field.field_type=='radio'||field.field_type=='checkbox'||field.field_type=='select'||field.field_type=='selects'">
-                  <el-button @click.prevent="addDomain" style="border: none;">
+                <el-form-item
+                  label="选项"
+                  v-show="
+                    field.field_type == 'radio' ||
+                    field.field_type == 'checkbox' ||
+                    field.field_type == 'select' ||
+                    field.field_type == 'selects'
+                  "
+                >
+                  <el-button @click.prevent="addDomain" style="border: none">
                     <i class="el-icon-circle-plus-outline"></i>
-                    <span style="font-size:14px;">添加</span>
+                    <span style="font-size: 14px">添加</span>
                   </el-button>
-                  <el-row v-for="(domain, $index) in field_choice" :key=domain+$index style="margin-bottom: 10px">
+                  <el-row
+                    v-for="(domain, $index) in field_choice"
+                    :key="domain + $index"
+                    style="margin-bottom: 10px"
+                  >
                     <el-col :span="20">
-                      <el-input v-model="field_choice[$index]"  auto-complete="off"></el-input>
+                      <el-input
+                        v-model="field_choice[$index]"
+                        auto-complete="off"
+                      ></el-input>
                     </el-col>
-                    <el-col :span="3" style="text-align: center" v-if="$index!==0">
-                      <i class="el-icon-remove-outline" @click.prevent="removeDomain($index,'1')" style="color: red;font-size: 16px;"></i>
+                    <el-col
+                      :span="3"
+                      style="text-align: center"
+                      v-if="$index !== 0"
+                    >
+                      <i
+                        class="el-icon-remove-outline"
+                        @click.prevent="removeDomain($index, '1')"
+                        style="color: red; font-size: 16px"
+                      ></i>
                     </el-col>
                   </el-row>
                 </el-form-item>
+         
                 <el-form-item label="是否需要判定" prop="need_judge">
-                   <el-switch v-model="field.need_judge"></el-switch>
+                  <el-switch v-model="field.need_judge"></el-switch>
                 </el-form-item>
-                 
-                  <el-form-item label="上限值" v-if="field.need_judge==true" prop="high_limit">
-                   <el-input-number v-model="field.high_limit"  :precision="2" :min="0"></el-input-number>
+  <!--
+                <el-form-item
+                  label="上限值"
+                  v-if="field.need_judge == true"
+                  prop="high_limit"
+                >
+                  <el-input-number
+                    v-model="field.high_limit"
+                    :precision="2"
+                    :min="0"
+                  ></el-input-number>
                 </el-form-item>
-                 <el-form-item label="上限规则" v-if="field.need_judge==true" prop="high_rule">
-                <el-select  style="width: 100%"  v-model="field.high_rule" placeholder="请选择">
+                <el-form-item
+                  label="上限规则"
+                  v-if="field.need_judge == true"
+                  prop="high_rule"
+                >
+                  <el-select
+                    style="width: 100%"
+                    v-model="field.high_rule"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item in highoptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
-                   </el-form-item>
-                  <el-form-item label="下限值" v-if="field.need_judge==true" prop="low_limit">
-                    <el-input-number v-model="field.low_limit" :precision="2" :min="0"></el-input-number>
                 </el-form-item>
-                  <el-form-item label="下限规则" v-if="field.need_judge==true" prop="low_rule">
-                <el-select  style="width: 100%"  v-model="field.low_rule" placeholder="请选择">
+                <el-form-item
+                  label="下限值"
+                  v-if="field.need_judge == true"
+                  prop="low_limit"
+                >
+                  <el-input-number
+                    v-model="field.low_limit"
+                    :precision="2"
+                    :min="0"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item
+                  label="下限规则"
+                  v-if="field.need_judge == true"
+                  prop="low_rule"
+                >
+                  <el-select
+                    style="width: 100%"
+                    v-model="field.low_rule"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item in lowoptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
-                   </el-form-item>
+                </el-form-item>
+
+!-->
+
+                <el-form-item label="表达式"  v-if="field.need_judge == true">
+                  <vue-json-editor
+                    :mode="'code'"
+                    lange="zh"
+                    v-model="field.rule_expression"
+                  >
+                   
+                  </vue-json-editor>
+                </el-form-item>
+
                 <el-form-item label="排序" prop="sort">
-                  <el-input-number v-model="field.sort"  :min="1" placeholder="排序"></el-input-number>
+                  <el-input-number
+                    v-model="field.sort"
+                    :min="1"
+                    placeholder="排序"
+                  ></el-input-number>
                 </el-form-item>
               </el-form>
               <div style="text-align: right">
-                <el-button type="danger" @click="dialogVisible1 = false">取消</el-button>
-                <el-button type="primary" @click="fieldconfirm('Form')">确认</el-button>
+                <el-button type="danger" @click="dialogVisible1 = false"
+                  >取消</el-button
+                >
+                <el-button type="primary" @click="fieldconfirm('Form')"
+                  >确认</el-button
+                >
               </div>
             </el-dialog>
           </el-card>
@@ -294,329 +434,329 @@
 </template>
 
 <script>
- 
-  import checkPermission from "@/utils/permission";
-  import { getEquipmentAll } from "@/api/equipment";
-  import { upUrl, upHeaders } from "@/api/file";
-  import {getrecordformList,createrecordform,updaterecordform,deleterecordform,getrffieldList,createrffield,updaterffield,
-    deleterffield} from "@/api/mtm";
-  import vueJsonEditor from 'vue-json-editor'
-  import { genTree } from "@/utils";
-  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-  const defaultstep = {
-    name: "",
-    number: "",
-  };
+import checkPermission from "@/utils/permission";
+import { getEquipmentAll } from "@/api/equipment";
+import vueJsonEditor from "vue-json-editor";
+import { upUrl, upHeaders } from "@/api/file";
+import {
+  getrecordformList,
+  createrecordform,
+  updaterecordform,
+  deleterecordform,
+  getrffieldList,
+  createrffield,
+  updaterffield,
+  deleterffield,
+} from "@/api/mtm";
+import { genTree } from "@/utils";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+const defaultstep = {
+  name: "",
+  number: "",
+};
 
-  const defaultrecordform = {
-
-  };
-  const defaultfield = {
-  
-  };
-  export default {
-    components: { Pagination,vueJsonEditor },
-    data() {
-      return {
-        step: defaultstep,
-        stepList:[],
-        upHeaders: upHeaders(),
-        upUrl: upUrl(),
-        fileList:[],
-        listLoading: true,
-        need_judge:false,
-        dialogVisibles: false,
-        dialogVisibleForm: false,
-        dialogTypes: "new",
-        field: {
-          field_type:'',
-          field_key:'',
-          field_name:'',
-          sort:'',
-          field_choice:[""],
+const defaultrecordform = {};
+const defaultfield = {};
+export default {
+  components: { Pagination, vueJsonEditor },
+  data() {
+    return {
+      step: defaultstep,
+      stepList: [],
+      upHeaders: upHeaders(),
+      upUrl: upUrl(),
+      fileList: [],
+      listLoading: true,
+      need_judge: false,
+      dialogVisibles: false,
+      dialogVisibleForm: false,
+      dialogTypes: "new",
+      field: {
+        field_type: "",
+        field_key: "",
+        field_name: "",
+        sort: "",
+        field_choice: [""],
+      },
+      field_choice: [""],
+      options: [],
+      optio: [],
+      rule1: {
+        name: [{ required: true, message: "请输入", trigger: "blur" }],
+        number: [{ required: true, message: "请输入", trigger: "blur" }],
+      },
+      recordform: defaultrecordform,
+      dialogType: "new",
+      dialogVisible: false,
+      dialogType1: "new",
+      dialogVisible1: false,
+      tableForm: {
+        name: "",
+      },
+      listQueryrecordform: {
+        page: 1,
+        page_size: 20,
+      },
+      recordformList: {
+        count: 0,
+      },
+      fieldList: {
+        count: 0,
+      },
+      listQueryfield: {
+        page: 1,
+        page_size: 20,
+      },
+      highoptions: [
+        { value: 1, label: "<" },
+        { value: 2, label: "<=" },
+      ],
+      lowoptions: [
+        { value: 1, label: ">" },
+        { value: 2, label: ">=" },
+      ],
+      highoptionss_: {
+        1: "<",
+        2: "<=",
+      },
+      lowoptionss_: {
+        1: ">",
+        2: ">=",
+      },
+      options_: {
+        string: "文本",
+        int: "整数",
+        float: "小数",
+        date: "日期",
+        datetime: "日期时间",
+        select: "单选",
+        selects: "多选",
+      },
+      fieldtypeoptions: [
+        {
+          value: "string",
+          label: "文本",
         },
-        field_choice:[''],
-        options:[],
-        optio:[],
-        rule1: {
-          name: [{ required: true, message: "请输入", trigger: "blur" }],
-          number: [{ required: true, message: "请输入", trigger: "blur" }],
+        {
+          value: "int",
+          label: "整数",
         },
-        recordform: defaultrecordform,
-        dialogType: "new",
-        dialogVisible:false,
-        dialogType1: "new",
-        dialogVisible1:false,
-        tableForm:{
-          name:'',
+        {
+          value: "float",
+          label: "小数",
         },
-        listQueryrecordform: {
-          page: 1,
-          page_size: 20,
+        {
+          value: "date",
+          label: "日期",
         },
-        recordformList: {
-          count: 0,
+        {
+          value: "time",
+          label: "时间",
         },
-        fieldList: {
-          count: 0,
+        {
+          value: "datetime",
+          label: "日期时间",
         },
-        listQueryfield: {
-          page: 1,
-          page_size: 20,
+        {
+          value: "select",
+          label: "单选",
         },
-        highoptions:[{ value: 1,
-          label: '<'},{ value: 2,
-          label: '<='}],
-        lowoptions:[{ value: 1,
-          label: '>'},{ value: 2,
-          label: '>='}],
-         highoptionss_:{ 
-           1: '<',
-            2: '<='
-            },
-        lowoptionss_:{
-          1: '>',
-          2: '>='
-          },
-        options_: {
-          'string':'文本',
-          'int':'整数',
-          'float':'小数',
-          'date': '日期',
-          'datetime': '日期时间',
-          'select': '单选',
-          'selects': '多选',
+        {
+          value: "selects",
+          label: "多选",
         },
-        fieldtypeoptions: [{
-          value: 'string',
-          label: '文本'
-        },
-          {
-            value: 'int',
-            label: '整数'
-          },
-          {
-            value: 'float',
-            label: '小数'
-          },
-          {
-            value: 'date',
-            label: '日期'
-          },
-          {
-            value: 'time',
-            label: '时间'
-          },
-          {
-            value: 'datetime',
-            label: '日期时间'
-          },
-          {
-            value: 'select',
-            label: '单选'
-          },
-          {
-            value: 'selects',
-            label: '多选'
-          }
-        ],
-        typeoptions: [{
+      ],
+      typeoptions: [
+        {
           value: 1,
-          label: '生产记录'
-        }],
-      };
-    },
-    computed: {},
-    watch: {},
-    created() {
-      this.material = this.$route.params.id;
+          label: "生产记录",
+        },
+      ],
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.material = this.$route.params.id;
     this.recordformLists();
-
+  },
+  methods: {
+    //添加字段选项
+    addDomain() {
+      this.field_choice.push("");
     },
-    methods: {
-      //添加字段选项
-      addDomain() {
-        this.field_choice.push('')
-      },
-      //删除字段选项
-      removeDomain(index){
-        this.field_choice.splice(index, 1)
-      },
-      handleLook(scope){
-        debugger;
-        console.log(scope);
-        this.dialogVisibleForm = true;
-        this.tableForm = Object.assign({}, scope.row); // copy obj
-        this.formID=this.tableForm.id;
-        this.fieldLists();
-      },
-      checkPermission,
-     
-     
+    //删除字段选项
+    removeDomain(index) {
+      this.field_choice.splice(index, 1);
+    },
+    handleLook(scope) {
+      debugger;
+      console.log(scope);
+      this.dialogVisibleForm = true;
+      this.tableForm = Object.assign({}, scope.row); // copy obj
+      this.formID = this.tableForm.id;
+      this.fieldLists();
+    },
+    checkPermission,
 
-      handleCurrentChange(row){
-        this.formID=row.id;
-        this.fieldLists();
-
-      },
-      recordformLists()
-      {
-        this.listQueryrecordform.material=this.material;
-         this.listQueryrecordform.type=2;
-        getrecordformList(this.listQueryrecordform).then((response) => {
-          if (response.data) {
-            this.recordformList = response.data;
-          }
-
-        });
-      },
-      fieldLists()
-      {
-        this.listQueryfield.form=this.formID
-        getrffieldList(this.listQueryfield).then((response) => {
-          if (response.data) {
-            this.fieldList = response.data;
-           
-          }
-
-        });
-      },
-      //新增记录表
-      handleCreate() {
-        this.recordform = Object.assign({}, defaultrecordform);
-        this.dialogType = "new";
-        this.dialogVisible = true;
-        this.$nextTick(() => {
-          this.$refs["Forms"].clearValidate();
-        });
-      },
-      //新增字段
-      handlefieldCreate() {
-
-        this.field_choice = [''];
-        this.field = Object.assign({}, defaultfield);
-        this.dialogType1 = "new";
-        this.dialogVisible1 = true;
-        this.$nextTick(() => {
-          this.$refs["Form"].clearValidate();
-        });
-      },
-      handleEdit(scope) {
-        this.recordform = Object.assign({}, scope.row); // copy obj
-        this.dialogType = "edit";
-        this.dialogVisible = true;
-        this.$nextTick(() => {
-          this.$refs["Forms"].clearValidate();
-        });
-      },
-      handlefieldEdit(scope) {
-        this.field = Object.assign({}, scope.row); // copy obj
-        this.field_choice = this.field.field_choice;
-        this.dialogType1 = "edit";
-        this.dialogVisible1 = true;
-        this.$nextTick(() => {
-          this.$refs["Form"].clearValidate();
-        });
-      },
-      handleDelete(scope) {
-        this.$confirm("确认删除?", "警告", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "error",
+    handleCurrentChange(row) {
+      this.formID = row.id;
+      this.fieldLists();
+    },
+    recordformLists() {
+      this.listQueryrecordform.material = this.material;
+      this.listQueryrecordform.type = 2;
+      getrecordformList(this.listQueryrecordform).then((response) => {
+        if (response.data) {
+          this.recordformList = response.data;
+        }
+      });
+    },
+    fieldLists() {
+      this.listQueryfield.form = this.formID;
+      getrffieldList(this.listQueryfield).then((response) => {
+        if (response.data) {
+          this.fieldList = response.data;
+        }
+      });
+    },
+    //新增记录表
+    handleCreate() {
+      this.recordform = Object.assign({}, defaultrecordform);
+      this.dialogType = "new";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Forms"].clearValidate();
+      });
+    },
+    //新增字段
+    handlefieldCreate() {
+      this.field_choice = [""];
+      this.field = Object.assign({}, defaultfield);
+      this.dialogType1 = "new";
+      this.dialogVisible1 = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+    handleEdit(scope) {
+      this.recordform = Object.assign({}, scope.row); // copy obj
+      this.dialogType = "edit";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Forms"].clearValidate();
+      });
+    },
+    handlefieldEdit(scope) {
+      this.field = Object.assign({}, scope.row); // copy obj
+      this.field_choice = this.field.field_choice;
+      this.dialogType1 = "edit";
+      this.dialogVisible1 = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+    handleDelete(scope) {
+      this.$confirm("确认删除?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleterecordform(scope.row.id);
+          this.recordformLists();
+          this.$message.success("成功");
         })
-          .then(async () => {
-            await deleterecordform(scope.row.id);
-            this.recordformLists()
-            this.$message.success("成功");
-          })
-          .catch((err) => {
-            console.error(err);
-          });
-      },
-      handlefieldDelete(scope) {
-        this.$confirm("确认删除?", "警告", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "error",
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    handlefieldDelete(scope) {
+      this.$confirm("确认删除?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleterffield(scope.row.id);
+          this.fieldLists();
+          this.$message.success("成功");
         })
-          .then(async () => {
-            await deleterffield(scope.row.id);
-            this.fieldLists()
-            this.$message.success("成功");
-          })
-          .catch((err) => {
-            console.error(err);
-          });
-      },
-      async recordformconfirm(form) {
-        this.$refs[form].validate((valid) => {
-          if (valid) {
-            const isEdit = this.dialogType === "edit";
-            if (isEdit) {
-              this.recordform.material=this.material;
-               this.recordform.type=2;
-              updaterecordform(this.recordform.id, this.recordform).then((res) => {
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    async recordformconfirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType === "edit";
+          if (isEdit) {
+            this.recordform.material = this.material;
+            this.recordform.type = 2;
+            updaterecordform(this.recordform.id, this.recordform).then(
+              (res) => {
                 if (res.code >= 200) {
-                  this.recordformLists()
+                  this.recordformLists();
                   this.dialogVisible = false;
                   this.$message.success("成功");
                 }
-              });
-            } else {
-              this.recordform.material=this.material;
-              this.recordform.type=2;
-              createrecordform(this.recordform).then((res) => {
-                if (res.code >= 200) {
-                  this.recordformLists()
-                  this.dialogVisible = false;
-                  this.$message.success("成功");
-                }
-              });
-            }
+              }
+            );
           } else {
-            return false;
+            this.recordform.material = this.material;
+            this.recordform.type = 2;
+            createrecordform(this.recordform).then((res) => {
+              if (res.code >= 200) {
+                this.recordformLists();
+                this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
           }
-        });
-      },
-      async fieldconfirm(form) {
-        this.$refs[form].validate((valid) => {
-          if (valid) {
-            const isEdit = this.dialogType1 === "edit";
-            if (isEdit) {
-              this.field.form=this.formID;
-              this.field.field_choice = this.field_choice;
-              updaterffield(this.field.id, this.field).then((res) => {
-                if (res.code >= 200) {
-                  this.fieldLists()
-                  this.dialogVisible1 = false;
-                  this.$message.success("成功");
-                }
-              });
-            } else {
-              this.field.form=this.formID;
-              this.field.field_choice = this.field_choice;
-              createrffield(this.field).then((res) => {
-                if (res.code >= 200) {
-                  this.fieldLists()
-                  this.dialogVisible1 = false;
-                  this.$message.success("成功");
-                }
-              });
-            }
-          } else {
-            return false;
-          }
-        });
-      },
+        } else {
+          return false;
+        }
+      });
     },
-  };
+    async fieldconfirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType1 === "edit";
+          if (isEdit) {
+            this.field.form = this.formID;
+            this.field.field_choice = this.field_choice;
+            updaterffield(this.field.id, this.field).then((res) => {
+              if (res.code >= 200) {
+                this.fieldLists();
+                this.dialogVisible1 = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            this.field.form = this.formID;
+            this.field.field_choice = this.field_choice;
+            createrffield(this.field).then((res) => {
+              if (res.code >= 200) {
+                this.fieldLists();
+                this.dialogVisible1 = false;
+                this.$message.success("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
 </script>
 <style>
-  .my-label {
-    background: #E1F3D8;
-  }
+.my-label {
+  background: #e1f3d8;
+}
 
-  .my-content {
-    background: #FDE2E2;
-  }
+.my-content {
+  background: #fde2e2;
+}
 </style>
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index b581a2e..7fb0a6f 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -274,7 +274,9 @@ export default {
     },
      handleclick(scope){
       this.orderID =  scope.row.id;
-     
+      this.countsx = scope.row.count;
+       this.planed_count = scope.row.planed_count;
+       this.delivery_date = scope.row.delivery_date;
       this.dialogVisible = true;
       this.$nextTick(() => {
         this.$refs["Form"].clearValidate();
@@ -284,9 +286,18 @@ export default {
     async confirm(form) {
     
        this.orderplan.start_date = this.value1[0];
-        this.orderplan.end_date  = this.value1[1];
+      
+       if( this.delivery_date>=this.value1[1])
+       {
+          this.orderplan.end_date  = this.value1[1];
+       }
+       else{
+          this.$message.error("计划完成时间超过订单交付日期，请从新选择日期！");
+       }
+        
          this.orderplan.order  = this.orderID
-      createProductionplan(this.orderplan).then((res) => {
+         if( this.orderplan.count<=(this.countsx-this.planed_count)){
+                  createProductionplan(this.orderplan).then((res) => {
               if (res.code >= 200) {
                 this.getorderList();
                  this.getplanList();
@@ -294,6 +305,12 @@ export default {
                 this.$message.success("成功");
               }
             });
+         }
+         else
+            {
+               this.$message.error("排产数超过所需数，请合理排产！");
+            }
+    
     },
     handleWork(scope)
     {
diff --git a/hb_client/src/views/pm/resources.vue b/hb_client/src/views/pm/resources.vue
index d5f6dd7..34fc8bd 100644
--- a/hb_client/src/views/pm/resources.vue
+++ b/hb_client/src/views/pm/resources.vue
@@ -90,6 +90,7 @@
         fit
         stripe
         style="width: 100%"
+        height="320"
     
       >
         <el-table-column type="index" width="50" />
@@ -130,7 +131,7 @@
         fit
         stripe
         style="width: 100%"
-    
+        height="300"
       >
       
         <el-table-column type="index" width="50" />
@@ -151,8 +152,8 @@
          
       </el-table>
     <pagination
-        v-show="orderList.count > 0"
-        :total="orderList.count"
+        v-show="equipmentTable.count > 0"
+        :total="equipmentTable.count"
         :page.sync="listQuery.page"
         :limit.sync="listQuery.page_size"
         @pagination="getorderList"
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index 52a7493..86a3547 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -2,6 +2,9 @@
   <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="客户名称"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增合同</el-button
-      >
-    </div>
+    
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/sam/customer.vue b/hb_client/src/views/sam/customer.vue
index d1fa0d0..d63b264 100644
--- a/hb_client/src/views/sam/customer.vue
+++ b/hb_client/src/views/sam/customer.vue
@@ -2,6 +2,9 @@
   <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="客户名称"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增客户</el-button
-      >
-    </div>
+   
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index caeb6a6..529c3d7 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -2,6 +2,9 @@
   <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="订单名称"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增订单</el-button
-      >
-    </div>
+   
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/sam/review.vue b/hb_client/src/views/sam/review.vue
index 6735fc4..eed7344 100644
--- a/hb_client/src/views/sam/review.vue
+++ b/hb_client/src/views/sam/review.vue
@@ -2,6 +2,9 @@
   <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="客户名称"
@@ -24,11 +27,7 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 2px">
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增客户</el-button
-      >
-    </div>
+   
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index bfc12ea..f1eea65 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -24,16 +24,12 @@
           >重置</el-button
         >
       </div>
-      <div style="margin-top: 2px">
-        <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-          >新增项目</el-button
-        >
-      </div>
+     
     </el-card>
     <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
-        :data="testitemList.results"
+        :data="wproductList.results"
         border
         fit
         stripe
@@ -41,44 +37,28 @@
         max-height="600"
       >
         <el-table-column type="index" width="50" />
-        <el-table-column label="项目名称">
-          <template slot-scope="scope">{{ scope.row.name }}</template>
+        <el-table-column label="半成品名称">
+          <template slot-scope="scope">{{ scope.row.m_state_.name }}</template>
         </el-table-column>
 
-        <el-table-column label="条款号">
-          <template slot-scope="scope">{{ scope.row.term_number }}</template>
-        </el-table-column>
-        <el-table-column label="标准名称">
-          <template slot-scope="scope">{{ scope.row.standard_.name }}</template>
-        </el-table-column>
-        <el-table-column label="标准编号">
-          <template slot-scope="scope">{{
-            scope.row.standard_.number
-          }}</template>
-        </el-table-column>
-
-        <el-table-column label="创建时间">
-          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        <el-table-column label="半成品编号">
+          <template slot-scope="scope">{{ scope.row.m_state_.number }}</template>
         </el-table-column>
+       
         <el-table-column align="center" label="操作" width="220px">
           <template slot-scope="scope">
             <el-link
               v-if="checkPermission(['warehouse_update'])"
-              @click="handleEdit(scope)"
-              >编辑</el-link
-            >
-            <el-link
-              v-if="checkPermission(['warehouse_delete'])"
-              type="danger"
-              @click="handleDelete(scope)"
-              >删除</el-link
+              @click="handleInspection(scope)"
+              >检验</el-link
             >
+           
           </template>
         </el-table-column>
       </el-table>
       <pagination
-        v-show="testitemList.count > 0"
-        :total="testitemList.count"
+        v-show="wproductList.count > 0"
+        :total="wproductList.count"
         :page.sync="listQuery.page"
         :limit.sync="listQuery.page_size"
         @pagination="getList"
@@ -126,12 +106,8 @@
 </template>
 <script>
 import {
-  getTestitemList,
-  createTestitem,
-  updateTestitem,
-  deleteTestitem,
-  getStandardList,
-} from "@/api/qm";
+  getwproductList,
+} from "@/api/wpm";
 import checkPermission from "@/utils/permission";
 
 import { genTree } from "@/utils";
@@ -142,7 +118,7 @@ export default {
   data() {
     return {
       testitem: defaultetestitem,
-      testitemList: {
+      wproductList: {
         count: 0,
       },
       listQuery: {
@@ -167,12 +143,13 @@ export default {
   },
   methods: {
     checkPermission,
-    //列表
+    //半成品列表
     getList() {
       this.listLoading = true;
-      getTestitemList(this.listQuery).then((response) => {
+      this.listQuery.act_state=2
+      getwproductList(this.listQuery).then((response) => {
         if (response.data) {
-          this.testitemList = response.data;
+          this.wproductList = response.data;
         }
         this.listLoading = false;
       });
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index feb0976..e8a38cb 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -641,18 +641,9 @@ export default {
   
     //确认领料
     handlePick() {
-      let _this = this;
-      _this.picks = []; //所需物料
-      this.$refs.multipleTable.selection.forEach((item) => {
-        _this.picks.push({
-          warehouse:item.warehouse,
-          material: item.material,
-          batch: item.batch,
-          pick_count: item.pick_count,
-        });
-      });
+    
       this.pickData.subproduction_plan = this.id;
-      this.pickData.picks = this.picks;
+      this.pickData.picks = this.havewl;
 
       //  console.log(this.pickData);