Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/router/index.js

@@ -107,7 +107,6 @@ export const asyncRoutes = [
         name: 'material',
         component: () => import('@/views/mtm/material'),
         meta: { title: '物料清单', icon: 'material', perms: ['mtm_material'] }
-        
       }
       ,
       {
@@ -151,7 +150,19 @@ export const asyncRoutes = [
         name: 'productprocess',
         component: () => import('@/views/mtm/productprocess'),
         meta: { title: '产品管理', icon: 'product', perms: ['mtm_productprocess'] }
-      },
+      }
+      ,{
+        path: 'productList',
+        name: 'productList',
+        component: () => import('@/views/mtm/productList'),
+        meta: { title: '成品列表', icon: 'material', perms: ['mtm_material'] }
+      }
+      ,{
+        path: 'wproductList',
+        name: 'wproductList',
+        component: () => import('@/views/mtm/wproductList'),
+        meta: { title: '半成品列表', icon: 'material', perms: ['mtm_material'] }
+      }
     ]
   },
   {

hb_client/src/views/bigScreen/bottomLeft.vue

@@ -31,67 +31,33 @@
       return {
         options: {},
         cdata: {
-          category: [
-            "JH5jhx463-1",
-            "JH5jhx463-2",
-            "JH5jhx463-3",
-            "JH5jhx463-4",
-            "JH5jhx463-5",
-            "JH5jhx463-6",
-            "JH5jhx463-7",
-            "JH5jhx463-8",
-            "JH5jhx463-9",
-            "JH5jhx463-10",
-            "JH5jhx463-11",
-            "JH5jhx463-12",
-            "JH5jhx463-13",
-            "JH5jhx463-14",
-            "JH5jhx463-15"
-          ],
-          planData: [
-            18092,
-            20728,
-            24045,
-            28348,
-            32808,
-            36097,
-            39867,
-            18092,
-            20728,
-            24045,
-            28348,
-            32808,
-            36097,
-            39867,
-            44715,
-          ],
-          barData: [
-            9600,
-            19000,
-            19500,
-            20500,
-            19500,
-            28500,
-            31900,
-            12500,
-            14000,
-            21500,
-            23200,
-            24450,
-            25250,
-            33300,
-            40715
-          ],
           rateData: []
         }
       };
     },
-    mounted() {
+    props:{
-      this.setData();
+      category:{
+        type:Array,
+        default:()=>{
+          return []
+        }
       },
-    watch: {
+      planData:{
-      cdata: {
+        type:Array,
-        handler(newData) {
+        default:()=>{
+          return []
+        }
+      },
+      realData:{
+        type:Array,
+        default:()=>{
+          return []
+        }
+      }
+    },
+    mounted() {
+      let that=this;
+      this.setData();
       this.options = {
         /*tooltip: {
           trigger: "axis",
@@ -143,7 +109,7 @@
           }
         },*/
         legend: {
-              data: ["已完成", "计划完成"],
+          data: [" 计划完成", " 已完成 "],
           textStyle: {
             color: "#B4B4B4"
           },
@@ -155,7 +121,7 @@
           y: "4%"
         },
         xAxis: {
-              data: newData.category,
+          data: that.category,
           axisLine: {
             lineStyle: {
               color: "#B4B4B4"
@@ -167,7 +133,10 @@
         },
         yAxis:{
           splitLine: {
-                show: false
+            type:"dashed",
+            color: "#B4B4B4",
+            width:"1",
+            // show: true,
           },
           axisLine: {
             lineStyle: {
@@ -192,7 +161,7 @@
                 ])
               }
             },
-                data: newData.barData
+            data: that.realData
           },
           {
             name: "计划完成",
@@ -210,22 +179,18 @@
               }
             },
             z: -12,
-                data: newData.planData
+            data: that.planData
           }
         ]
       }
     },
-        immediate: true,
-        deep: true
-      },
-    },
     methods: {
       // 根据自己的业务情况修改
       setData() {
-        for (let i = 0; i < this.cdata.barData.length - 1; i++) {
+        /*for (let i = 0; i < this.cdata.realData.length - 1; i++) {
-          let rate = this.cdata.barData[i] / this.cdata.planData[i];
+          let rate = this.cdata.realData[i] / this.cdata.planData[i];
           this.cdata.rateData.push(rate.toFixed(2));
-        }
+        }*/
       },
     }
   }

hb_client/src/views/bigScreen/index.vue

@@ -104,6 +104,9 @@
             <dv-border-box-13>
               <bottomLeft
                 v-if="limitedTwo"
+                :category="category"
+                :planData="planData"
+                :realData="realData"
               />
             </dv-border-box-13>
           </div>
@@ -126,7 +129,7 @@
   import bottomRight from './bottomRight'
   import {getPlanGantt} from "@/api/srm";
   import {getProductionplanList} from "@/api/pm";
-  import {getProcessYield, productCount, getProcessNow, planCount, orderCount} from "@/api/srm";
+  import {getProcessYield, productCount, getProcessNow} from "@/api/srm";
   import {getContractList, getOrderList} from "@/api/sam";
   import {getArticles} from "@/api/cms";
 
@@ -139,10 +142,11 @@
         dateDay: null,
         dateYear: null,
         dateWeek: null,
-        planGanttList: [],
         numberShow: false,
         processRate: false,
         listUser: false,
+        listNews: false,
+        listProcess: false,
         create_time_start: '',
         titleItem: [
           {
@@ -428,7 +432,10 @@
           // columnWidth: [50],
           align: ['center']
         },
-        weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+        weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+        category:[],
+        planData:[],
+        realData:[],
       }
     },
     components: {
@@ -480,16 +487,6 @@
           this.dateWeek = this.weekday[new Date().getDay()]
         }, 1000)
       },
-      getPageData() {
-        let that = this;
-        getPlanGantt({type: 'big_screen'}).then(res => {
-          if (res.code === 200) {
-            this.planGanttList = res.data.results;
-          } else {
-            that.$message.error(res.msg);
-          }
-        })
-      },
       cancelLoading() {
         setTimeout(() => {
           this.loading = false
@@ -676,6 +673,7 @@
       //企业资讯
       getArticle() {
         let that = this;
+        that.listNews = false;
         getArticles({type: 'big_screen', page: 0}).then((response) => {
           if (response.data) {
             // this.configArticle = response.data;
@@ -694,11 +692,28 @@
               data.push(obj)
             });
             that.configArticle.data = data;
+            that.listNews = true;
           }
         });
       },
-
       //任务完成进度
+      getPageData() {
+        let that = this;
+        that.listNews = false;
+        getPlanGantt({type: 'big_screen'}).then(res => {
+          if (res.code === 200) {
+            let list = res.data.results;
+            list.forEach(item=>{
+              that.category.push(item.number);
+              that.planData.push(item.count);
+              that.realData.push(item.count_ok);
+            })
+            that.listNews = true;
+          } else {
+            that.$message.error(res.msg);
+          }
+        })
+      },
     }
   }
 </script>

hb_client/src/views/dashboard/index.vue

@@ -218,7 +218,7 @@
               :height="cardTabelHeight"
               style="border-top: 1px solid #f5f5f5;"
             >
-              <el-table-column label="id" prop="id" width="50">
+              <el-table-column type="index" width="50">
               </el-table-column>
               <el-table-column label="人员名称" prop="name" show-overflow-tooltip>
               </el-table-column>
@@ -233,7 +233,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="部门" prop="dept_">
-                <template slot-scope="scope">{{scope.row.dept_.name}}</template>
+                <template slot-scope="scope" v-if="scope.row.dept_">{{scope.row.dept_.name}}</template>
               </el-table-column>
             </el-table>
           </div>
@@ -585,7 +585,7 @@
         let that = this;
         that.listLoadingUser = true;
         that.userPage = 1;
-        getEmployee({page: that.userPage, page_size: that.userPageSize}).then((response) => {
+        getEmployee({page: that.userPage, page_size: that.userPageSize,show_atwork:true}).then((response) => {
           if (response.data) {
             that.userList = response.data.results;
             that.userTotal = response.data.count;
@@ -602,6 +602,7 @@
         that.userPage = val;
         getEmployee({
           page: val,
+          show_atwork:true,
           page_size: that.userPageSize,
           fields: 'id,name,dept_name,is_atwork'
         }).then((response) => {

hb_client/src/views/inm/fifodetail.vue

@@ -6,8 +6,9 @@
         type="primary"
         icon="el-icon-plus"
         @click="handlecgxCreate"
-        >新增采购项入库</el-button
       >
+        新增采购项入库
+      </el-button>
       <el-table
         v-loading="listLoading"
         :data="fifodetailList.results"
@@ -18,7 +19,7 @@
         height="100"
         v-el-height-adaptive-table="{ bottomOffset: 42 }"
       >
-        <el-table-column type="index" width="50" />
+        <el-table-column type="index" width="50"/>
         <el-table-column label="物料名称">
           <template slot-scope="scope">{{ scope.row.material_.name }}</template>
         </el-table-column>
@@ -27,19 +28,14 @@
           <template slot-scope="scope">{{ scope.row.batch }}</template>
         </el-table-column>
         <el-table-column label="物料编号">
-          <template slot-scope="scope">{{
+          <template slot-scope="scope">{{scope.row.material_.number}}</template>
-            scope.row.material_.number
-          }}</template>
         </el-table-column>
         <el-table-column label="物料单位">
           <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
         </el-table-column>
         <el-table-column label="物料型号">
-          <template slot-scope="scope">{{
+          <template slot-scope="scope">{{scope.row.material_.specification}}</template>
-            scope.row.material_.specification
-          }}</template>
         </el-table-column>
-
         <el-table-column label="出入库数量">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
@@ -70,24 +66,25 @@
             <div v-for="item in scope.row.files_" v-bind:key="item.id">
               <el-link :href="item.path" target="_blank" type="primary">{{
                 item.name
-              }}</el-link>
+                }}
+              </el-link>
             </div>
           </template>
         </el-table-column>
         <el-table-column
+          v-if="this.$route.params.pu_order != null"
           align="center"
           label="操作"
           width="220px"
-          v-if="this.$route.params.pu_order != null"
         >
           <template slot-scope="scope">
             <el-link
+              v-if="scope.row.need_test"
               type="primary"
               @click="handleMaterial(scope)"
-              v-if="scope.row.need_test"
-              >复验</el-link
             >
-
+              复验
+            </el-link>
             <el-link type="primary" @click="handleEdit(scope)">上传</el-link>
           </template>
         </el-table-column>
@@ -113,8 +110,8 @@
         :rules="rule1"
       >
         <el-row :gutter="24">
-          <el-col :span="12"
+          <el-col :span="12">
-            ><div class="grid-content bg-purple">
+            <div class="grid-content bg-purple">
               <el-form-item label="采购订单项目" :prop="pu_order_item">
                 <el-select v-model="inpur.pu_order_item" @change="showmessage">
                   <el-option
@@ -125,39 +122,42 @@
                   >
                   </el-option>
                 </el-select>
-              </el-form-item></div
+              </el-form-item>
-          ></el-col>
+            </div>
-          <el-col :span="12"
+          </el-col>
-            ><div class="grid-content bg-purple">
+          <el-col :span="12">
+            <div class="grid-content bg-purple">
               <el-form-item label="采购数量">
                 <el-input v-model="puorderItemdetial.count" :disabled="true">
                 </el-input>
-              </el-form-item></div
+              </el-form-item>
-          ></el-col>
+            </div>
+          </el-col>
         </el-row>
         <el-row :gutter="24">
-          <el-col :span="12"
+          <el-col :span="12">
-            ><div class="grid-content bg-purple">
+            <div class="grid-content bg-purple">
               <el-form-item label="到货时间">
                 <el-input
                   v-model="puorderItemdetial.delivery_date"
                   :disabled="true"
                 >
                 </el-input>
-              </el-form-item></div
+              </el-form-item>
-          ></el-col>
+            </div>
-          <el-col :span="12"
+          </el-col>
-            ><div class="grid-content bg-purple">
+          <el-col :span="12">
+            <div class="grid-content bg-purple">
               <el-form-item label="到货数量">
                 <el-input
                   v-model="puorderItemdetial.delivered_count"
                   :disabled="true"
                 >
                 </el-input>
-              </el-form-item></div
+              </el-form-item>
-          ></el-col>
+            </div>
+          </el-col>
         </el-row>
-
         <el-form-item label="仓库" :prop="warehouse">
           <el-select v-model="inpur.warehouse">
             <el-option
@@ -188,14 +188,13 @@
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisibles = false"
-          >取消</el-button
+        >取消
-        >
+        </el-button>
         <el-button type="primary" @click="confirminpur('Form1')"
-          >确认</el-button
+        >确认
-        >
+        </el-button>
       </div>
     </el-dialog>
-
     <el-dialog
       :close-on-click-modal="false"
       :visible.sync="dialogVisible"
@@ -210,7 +209,6 @@
         <el-form-item label="是否需要复验" prop="need_test">
           <el-switch v-model="FIFOItem.need_test"></el-switch>
         </el-form-item>
-
         <el-form-item label="文件列表">
           <el-upload
             ref="upload"
@@ -239,7 +237,8 @@
           ></i>
           <el-link :href="item.path" target="_blank" type="primary">{{
             item.name
-          }}</el-link>
+            }}
+          </el-link>
         </div>
       </el-form>
       <div style="text-align: right">
@@ -275,16 +274,16 @@
               v-if="item.field_type === 'string'"
               :label="item.field_name"
             >
-              <el-input placeholder="请输入" v-model="item.sort" />
+              <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
+                v-model="item.sort"
                 type="number"
                 placeholder="请输入"
-                v-model="item.sort"
               />
             </el-form-item>
             <el-form-item
@@ -292,9 +291,9 @@
               :label="item.field_name"
             >
               <el-input
+                v-model="item.sort"
                 type="number"
                 placeholder="请输入"
-                v-model="item.sort"
               />
             </el-form-item>
             <el-form-item
@@ -371,41 +370,41 @@
 
         <div slot="footer" class="dialog-footer">
           <el-button @click="innerVisible = false">取 消</el-button>
-          <el-button type="primary" @click="submitfield"
+          <el-button type="primary" @click="submitfield">
-            >提交检查项目</el-button
+            提交检查项目
-          >
+          </el-button>
         </div>
       </el-dialog>
       <div slot="footer" class="dialog-footer">
         <el-button @click="outerVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitrecordform"
+        <el-button type="primary" @click="submitrecordform">
-          >填写检查项目</el-button
+          填写检查项目
-        >
+        </el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import {
+  import {
     getfifodetailList,
     itemfiles,
     createfifoitem,
     getWarehouseList,
-} from "@/api/inm";
+  } from "@/api/inm";
-import checkPermission from "@/utils/permission";
+  import checkPermission from "@/utils/permission";
-import { getPuorderItemList, getpuorder } from "@/api/pum";
+  import {getPuorderItemList, getpuorder} from "@/api/pum";
-import { getMaterialList, getrecordformList, getrffieldList } from "@/api/mtm";
+  import {getMaterialList, getrecordformList, getrffieldList} from "@/api/mtm";
-import { createTestrecord } from "@/api/inm";
+  import {createTestrecord} from "@/api/inm";
 
-import { upUrl, upHeaders } from "@/api/file";
+  import {upUrl, upHeaders} from "@/api/file";
-import { genTree } from "@/utils";
+  import {genTree} from "@/utils";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-const defaultfile = {
+  const defaultfile = {
     files: [],
     need_test: false,
-};
+  };
-export default {
+  export default {
-  components: { Pagination },
+    components: {Pagination},
     data() {
       return {
         InventoryList: {
@@ -446,7 +445,7 @@ export default {
         puorderItemdetial: [],
         puorderTtemoptions: [],
         rule1: {
-        name: [{ required: true, message: "请输入", trigger: "blur" }],
+          name: [{required: true, message: "请输入", trigger: "blur"}],
         },
         fileList: [],
         item: "",
@@ -457,7 +456,8 @@ export default {
     created() {
       this.getList();
     },
-  mounted() {},
+    mounted() {
+    },
     methods: {
       checkPermission,
 
@@ -505,7 +505,7 @@ export default {
       },
       //仓库
       getlists() {
-      getWarehouseList({ page: 0 }).then((response) => {
+        getWarehouseList({page: 0}).then((response) => {
           if (response.data) {
             this.warehouseData = genTree(response.data);
           }
@@ -547,11 +547,12 @@ export default {
         return isLt2M;
       },
       deleteFile(index) {
-      this.$confirm("确定删除该文件, 是否继续?", { type: "error" })
+        this.$confirm("确定删除该文件, 是否继续?", {type: "error"})
           .then(() => {
             this.fileList.splice(index, 1);
           })
-        .catch((e) => {});
+          .catch((e) => {
+          });
       },
       yeschange(val) {
         if (!val) {
@@ -592,7 +593,7 @@ export default {
         this.outerVisible = true;
         this.fifo_detail = scope.row.id;
         this.listQueryrecordform.material = scope.row.material;
-      this.listQueryrecordform.type = 2;
+        this.listQueryrecordform.type = 30;
         getrecordformList(this.listQueryrecordform).then((response) => {
           if (response.data) {
             this.recordformList = response.data;
@@ -602,7 +603,7 @@ export default {
       //根据选择的表，渲染检查项目
       submitrecordform() {
         if (this.recordform != "") {
-        getrffieldList({ form: this.recordform, page: 0 }).then((response) => {
+          getrffieldList({form: this.recordform, page: 0}).then((response) => {
             if (response.data) {
               this.fieldList = response.data;
               this.innerVisible = true;
@@ -636,5 +637,5 @@ export default {
         });
       },
     },
-};
+  };
 </script>

hb_client/src/views/mtm/material.vue

@@ -30,8 +30,8 @@
     </el-card>
     <el-card style="margin-top: 2px">
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="成品" name="1"></el-tab-pane>
+        <!--<el-tab-pane label="成品" name="1"></el-tab-pane>
-        <el-tab-pane label="半成品" name="2"></el-tab-pane>
+        <el-tab-pane label="半成品" name="2"></el-tab-pane>-->
         <el-tab-pane label="主要原料" name="3"></el-tab-pane>
         <el-tab-pane label="辅助材料" name="4"></el-tab-pane>
         <el-tab-pane label="加工工具" name="5"></el-tab-pane>
@@ -210,22 +210,23 @@
         },
         processOptions: [],
         options_: {
-
+          // "1": '成品',
-          "1": '成品',
+          // "2": '半成品',
-          "2": '半成品',
           "3": '主要原料',
           "4": '辅助材料',
           "5": '加工工具',
           "6": '辅助工装',
 
         },
-        options: [{
+        options: [
+          /*{
           value: 1,
           label: '成品'
         }, {
           value: 2,
           label: '半成品'
-        }, {
+        }, */
+          {
           value: 3,
           label: '主要原料'
         }, {
@@ -258,10 +259,11 @@
           },
         ],
         listQuery: {
+          type:3,
           page: 1,
           page_size: 20,
         },
-        activeName: "",
+        activeName: "3",
         listLoading: true,
         dialogVisible: false,
         dialogType: "new",

hb_client/src/views/mtm/productList.vue

@@ -0,0 +1,351 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div>
+        <el-button
+          v-if="checkPermission(['material_create'])"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleCreate"
+        >
+          新增成品
+        </el-button>
+        <el-input
+          v-model="listQuery.search"
+          placeholder="成品名称/成品编号"
+          style="width: 300px"
+          class="filter-item"
+          clearable
+          @keyup.enter.native="handleFilter"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter"
+        >
+          搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter"
+        >
+          重置
+        </el-button>
+      </div>
+    </el-card>
+    <el-card style="margin-top: 2px">
+      <el-table
+        v-loading="listLoading"
+        :data="materialList.results"
+        border
+        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="成品编号">
+          <template slot-scope="scope">
+            {{ scope.row.number }}
+          </template>
+        </el-table-column>
+        <el-table-column label="物料类别">
+          <template> 成品</template>
+        </el-table-column>
+        <el-table-column label="成品名称">
+          <template slot-scope="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+        <el-table-column label="规格型号">
+          <template slot-scope="scope">{{ scope.row.specification }}</template>
+        </el-table-column>
+        <el-table-column label="单片玻璃数量">
+          <template slot-scope="scope">{{ scope.row.piece_count }}</template>
+        </el-table-column>
+        <el-table-column label="计量单位">
+          <template slot-scope="scope">{{ scope.row.unit }}</template>
+        </el-table-column>
+        <el-table-column label="创建时间">
+          <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(['material_update'])&&scope.row.type!=5&&scope.row.type!=6"
+              type="primary"
+              @click="handlebind(scope)"
+            >
+              检查表
+            </el-link>
+            <el-link
+              subproduction_delete
+              type="primary"
+              @click="handleEdit(scope)"
+            >
+              编辑
+            </el-link>
+            <el-link
+              v-if="checkPermission(['material_update'])"
+              type="primary"
+              @click="handledetail(scope)"
+            >
+              详情
+            </el-link>
+            <el-link
+              v-if="checkPermission(['material_delete'])"
+              type="danger"
+              @click="handleDelete(scope)"
+            >
+              删除
+            </el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="materialList.count > 0"
+        :total="materialList.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :title="dialogType === 'edit' ? '编辑成品' : '新增成品'"
+    >
+      <el-form
+        ref="Form"
+        :model="material"
+        label-width="100px"
+        label-position="right"
+        :rules="rule1"
+      >
+        <el-form-item label="成品名称" prop="name">
+          <el-input v-model="material.name" placeholder="成品名称"/>
+        </el-form-item>
+        <el-form-item label="成品编号" prop="number">
+          <el-input v-model="material.number" placeholder="成品编号"/>
+        </el-form-item>
+        <el-form-item label="规格型号">
+          <el-input v-model="material.specification" placeholder="规格型号"/>
+        </el-form-item>
+
+        <el-form-item label="计量单位">
+          <el-select style="width: 100%" v-model="material.unit" placeholder="请选择">
+            <el-option
+              v-for="item in unitoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单片玻璃数量" v-if="material.type==1">
+          <el-input v-model="material.piece_count" placeholder="单片玻璃数量"/>
+        </el-form-item>
+        <el-form-item label="安全库存数">
+          <el-input-number style="width: 100%;" v-model="material.count_safe" :step="1" :min="0" step-strictly
+                           placeholder="安全库存数"></el-input-number>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number style="width: 100%;" v-model="material.sort_str" :step="1" :min="0" step-strictly
+                           placeholder="排序"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    getMaterialList,
+    createMaterial,
+    updateMaterial,
+    deleteMaterial
+  } from "@/api/mtm";
+  import checkPermission from "@/utils/permission";
+  import Pagination from "@/components/Pagination";
+
+  const defaultmaterial = {
+    name: null,
+    number: null,
+    specification: null,
+    unit: null,
+    type: 1,
+    piece_count: null,
+    sort_str: null,
+    count_safe: 0,
+    processes: [],
+  };
+  export default {
+    name: "productList",
+    components: {Pagination},
+    data() {
+      return {
+        material: defaultmaterial,
+        materialList: {
+          count: 0,
+        },
+        options_: {
+
+          "1": '成品',
+          "2": '半成品',
+          "3": '主要原料',
+          "4": '辅助材料',
+          "5": '加工工具',
+          "6": '辅助工装',
+
+        },
+        unitoptions: [
+          {
+            value: '块',
+            label: '块'
+          }, {
+            value: '套',
+            label: '套'
+          },
+          {
+            value: '个',
+            label: '个'
+          }, {
+            value: 'm2',
+            label: 'm2'
+          }, {
+            value: '瓶',
+            label: '瓶'
+          },
+        ],
+        listQuery: {
+          type: 1,
+          page: 1,
+          page_size: 20,
+        },
+        activeName: "",
+        listLoading: true,
+        dialogVisible: false,
+        dialogType: "new",
+        rule1: {
+          name: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入", trigger: "blur"}],
+
+        },
+      };
+    },
+    computed: {},
+    watch: {},
+    created() {
+      this.getList();
+      // this.getProcessList();
+    },
+    methods: {
+      checkPermission,
+      //成品详情
+      handledetail(scope) {
+        this.$router.push({name: "MaterialDetail", params: {id: scope.row.id, type: scope.row.type},})
+      },
+      getList() {
+        let that = this;
+        that.listLoading = true;
+        getMaterialList(this.listQuery).then((response) => {
+          if (response.data) {
+            that.materialList = response.data;
+          }
+          that.listLoading = false;
+        });
+      },
+      //检查表
+      handlebind(scope) {
+        this.$router.push({name: "MaterialDO", params: {id: scope.row.id},})
+      },
+      handleFilter() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+      resetFilter() {
+        this.activeName = "";
+        this.listQuery = {
+          type: 1,
+          page: 1,
+          page_size: 20,
+        };
+        this.getList();
+      },
+      handleCreate() {
+        this.material = Object.assign({}, defaultmaterial);
+        this.dialogType = "new";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+      handleEdit(scope) {
+        this.material = Object.assign({}, scope.row); // copy obj
+        this.dialogType = "edit";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+      handleDelete(scope) {
+        let that = this;
+        this.$confirm("确认删除?", "警告", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await deleteMaterial(scope.row.id);
+            that.getList();
+            that.$message.success("成功");
+          })
+          .catch((err) => {
+            that.$message.error(err);
+          });
+      },
+      async confirm(form) {
+        let that = this;
+        that.$refs[form].validate((valid) => {
+          if (valid) {
+            const isEdit = this.dialogType === "edit";
+            if (isEdit) {
+              updateMaterial(this.material.id, this.material).then((res) => {
+                if (res.code >= 200) {
+                  that.getList();
+                  that.dialogVisible = false;
+                  that.$message.success("成功");
+                }
+              });
+            } else {
+              createMaterial(this.material).then((res) => {
+                if (res.code >= 200) {
+                  that.getList();
+                  that.dialogVisible = false;
+                  that.$message.success("成功");
+                }
+              });
+            }
+          } else {
+            return false;
+          }
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

hb_client/src/views/mtm/wproductList.vue

@@ -0,0 +1,322 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div>
+        <el-button
+          v-if="checkPermission(['material_create'])"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleCreate"
+        >
+          新增半成品
+        </el-button>
+        <el-input
+          v-model="listQuery.search"
+          placeholder="半成品名称/半成品编号"
+          style="width: 300px"
+          class="filter-item"
+          clearable
+          @keyup.enter.native="handleFilter"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter"
+        >搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter"
+        >重置
+        </el-button>
+      </div>
+    </el-card>
+    <el-card style="margin-top: 2px">
+      <el-table
+        v-loading="listLoading"
+        :data="materialList.results"
+        border
+        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="半成品编号">
+          <template slot-scope="scope">
+            {{ scope.row.number }}
+          </template>
+        </el-table-column>
+        <el-table-column label="物料类别">
+          <template> 半成品</template>
+        </el-table-column>
+        <el-table-column label="半成品名称">
+          <template slot-scope="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+        <el-table-column label="规格型号">
+          <template slot-scope="scope">{{ scope.row.specification }}</template>
+        </el-table-column>
+        <el-table-column label="计量单位">
+          <template slot-scope="scope">{{ scope.row.unit }}</template>
+        </el-table-column>
+        <el-table-column label="创建时间">
+          <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(['material_update'])&&scope.row.type!=5&&scope.row.type!=6"
+              type="primary"
+              @click="handlebind(scope)"
+            >检查表
+            </el-link>
+            <el-link
+              subproduction_delete
+              type="primary"
+              @click="handleEdit(scope)"
+            >编辑
+            </el-link>
+            <el-link
+              v-if="checkPermission(['material_update'])"
+              type="primary"
+              @click="handledetail(scope)"
+            >详情
+            </el-link>
+            <el-link
+              v-if="checkPermission(['material_delete'])"
+              type="danger"
+              @click="handleDelete(scope)"
+            >删除
+            </el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="materialList.count > 0"
+        :total="materialList.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :title="dialogType === 'edit' ? '编辑半成品' : '新增半成品'"
+    >
+      <el-form
+        ref="Form"
+        :model="material"
+        label-width="100px"
+        label-position="right"
+        :rules="rule1"
+      >
+        <el-form-item label="半成品名称" prop="name">
+          <el-input v-model="material.name" placeholder="半成品名称"/>
+        </el-form-item>
+        <el-form-item label="半成品编号" prop="number">
+          <el-input v-model="material.number" placeholder="半成品编号"/>
+        </el-form-item>
+        <el-form-item label="规格型号">
+          <el-input v-model="material.specification" placeholder="规格型号"/>
+        </el-form-item>
+        <el-form-item label="计量单位">
+          <el-select style="width: 100%" v-model="material.unit" placeholder="请选择">
+            <el-option
+              v-for="item in unitoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="安全库存数">
+          <el-input-number style="width: 100%;" v-model="material.count_safe" :step="1" :min="0" step-strictly placeholder="安全库存数"></el-input-number>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number style="width: 100%;" v-model="material.sort_str" :step="1" :min="0" step-strictly placeholder="排序"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    getMaterialList,
+    createMaterial,
+    updateMaterial,
+    deleteMaterial
+  } from "@/api/mtm";
+  import checkPermission from "@/utils/permission";
+  import Pagination from "@/components/Pagination";
+  const defaultmaterial = {
+    name: null,
+    number: null,
+    specification: null,
+    unit: null,
+    type: 2,
+    piece_count: null,
+    sort_str: null,
+    count_safe: 0,
+    processes: [],
+  };
+    export default {
+        name: "wproductList",
+      components: {Pagination},
+      data() {
+        return {
+          material: defaultmaterial,
+          materialList: {
+            count: 0,
+          },
+          unitoptions: [
+            {
+              value: '块',
+              label: '块'
+            }, {
+              value: '套',
+              label: '套'
+            },
+            {
+              value: '个',
+              label: '个'
+            }, {
+              value: 'm2',
+              label: 'm2'
+            }, {
+              value: '瓶',
+              label: '瓶'
+            },
+          ],
+          listQuery: {
+            type:2,
+            page: 1,
+            page_size: 20,
+          },
+          activeName: "",
+          listLoading: true,
+          dialogVisible: false,
+          dialogType: "new",
+          rule1: {
+            name: [{required: true, message: "请输入", trigger: "blur"}],
+            number: [{required: true, message: "请输入", trigger: "blur"}],
+
+          },
+        };
+      },
+      computed: {},
+      watch: {},
+      created() {
+        this.getList();
+        // this.getProcessList();
+      },
+      methods: {
+        checkPermission,
+        //半成品详情
+        handledetail(scope){
+          this.$router.push({name: "MaterialDetail", params: { id: scope.row.id,type: scope.row.type }, })
+        },
+        getList() {
+          this.listLoading = true;
+          getMaterialList(this.listQuery).then((response) => {
+            if (response.data) {
+              this.materialList = response.data;
+            }
+            this.listLoading = false;
+          });
+        },
+        //检查表
+        handlebind(scope) {
+          this.$router.push({name: "MaterialDO", params: {id: scope.row.id},})
+        },
+        handleFilter() {
+          this.listQuery.page = 1;
+          this.getList();
+        },
+        resetFilter() {
+          this.activeName = "";
+          this.listQuery = {
+            type: 2,
+            page: 1,
+            page_size: 20,
+          };
+          this.getList();
+        },
+        handleCreate() {
+          this.material = Object.assign({}, defaultmaterial);
+          this.dialogType = "new";
+          this.dialogVisible = true;
+          this.$nextTick(() => {
+            this.$refs["Form"].clearValidate();
+          });
+        },
+        handleEdit(scope) {
+          this.material = Object.assign({}, scope.row); // copy obj
+          this.dialogType = "edit";
+          this.dialogVisible = true;
+          this.$nextTick(() => {
+            this.$refs["Form"].clearValidate();
+          });
+        },
+        handleDelete(scope) {
+          this.$confirm("确认删除?", "警告", {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "error",
+          })
+            .then(async () => {
+              await deleteMaterial(scope.row.id);
+              this.getList();
+              this.$message.success("成功");
+            })
+            .catch((err) => {
+              this.$message.error(err);
+            });
+        },
+        async confirm(form) {
+          this.$refs[form].validate((valid) => {
+            if (valid) {
+              const isEdit = this.dialogType === "edit";
+              if (isEdit) {
+                updateMaterial(this.material.id, this.material).then((res) => {
+                  if (res.code >= 200) {
+                    this.getList();
+                    this.dialogVisible = false;
+                    this.$message.success("成功");
+                  }
+                });
+              } else {
+                createMaterial(this.material).then((res) => {
+                  if (res.code >= 200) {
+                    this.getList();
+                    this.dialogVisible = false;
+                    this.$message.success("成功");
+                  }
+                });
+              }
+            } else {
+              return false;
+            }
+          });
+        },
+      },
+    }
+</script>
+
+<style scoped>
+
+</style>

hb_client/src/views/qm/admissiontest.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card style="margin-top: 2px">
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-    <el-tab-pane label="总览" name="1" >
+        <el-tab-pane label="总览" name="1">
           <el-table
             v-loading="listLoading"
             :data="fifodetailList1.results"
@@ -13,7 +13,7 @@
             height="620"
             v-el-height-adaptive-table="{bottomOffset: 40}"
           >
-        <el-table-column type="index" width="50" />
+            <el-table-column type="index" width="50"/>
             <el-table-column label="物料批次">
               <template slot-scope="scope">{{ scope.row.batch }}</template>
             </el-table-column>
@@ -21,9 +21,7 @@
               <template slot-scope="scope">{{ scope.row.material_.name }}</template>
             </el-table-column>
             <el-table-column label="规格型号">
-          <template slot-scope="scope">{{
+              <template slot-scope="scope">{{scope.row.material_.specification}}</template>
-            scope.row.material_.specification
-          }}</template>
             </el-table-column>
             <el-table-column label="物料单位">
               <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@@ -31,22 +29,47 @@
             <el-table-column label="总数量">
               <template slot-scope="scope">{{ scope.row.count }}</template>
             </el-table-column>
-        <el-table-column label="检查状态">
+            <!--<el-table-column label="检查状态">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.is_tested == false">未检查</el-tag>
                 <el-tag v-else>已检查</el-tag>
               </template>
-        </el-table-column>
+            </el-table-column>-->
             <el-table-column label="检查是否合格">
-          <template slot-scope="scope" v-if="scope.row.is_tested == true">
+              <template slot-scope="scope">
                 <el-tag v-if="scope.row.is_testok == false">不合格</el-tag>
                 <el-tag v-else>合格</el-tag>
               </template>
             </el-table-column>
-  <el-table-column label="创建时间">
+            <el-table-column label="是否需要复验">
-          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.need_test">是</el-tag>
+                <el-tag v-else>否</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="文件">
+              <template slot-scope="scope" v-if="scope.row.files">
+                <div v-for="item in scope.row.files_" v-bind:key="item.id">
+                  <el-link :href="item.path" target="_blank" type="primary">{{item.name}}</el-link>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建时间">
+              <template slot-scope="scope">{{scope.row.create_time}}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+            >
+              <template slot-scope="scope">
+                <el-link
+                  type="primary"
+                  @click="handleRecord(scope)"
+                >
+                  复验记录
+                </el-link>
+              </template>
             </el-table-column>
-      
           </el-table>
           <pagination
             v-show="fifodetailList1.count > 0"
@@ -55,7 +78,6 @@
             :limit.sync="listQuery1.page_size"
             @pagination="getList1"
           />
-
         </el-tab-pane>
         <el-tab-pane label="待检物料" name="2">
           <el-table
@@ -68,7 +90,7 @@
             height="620"
             v-el-height-adaptive-table="{bottomOffset: 40}"
           >
-        <el-table-column type="index" width="50" />
+            <el-table-column type="index" width="50"/>
             <el-table-column label="物料批次">
               <template slot-scope="scope">{{ scope.row.batch }}</template>
             </el-table-column>
@@ -76,9 +98,7 @@
               <template slot-scope="scope">{{ scope.row.material_.name }}</template>
             </el-table-column>
             <el-table-column label="规格型号">
-          <template slot-scope="scope">{{
+              <template slot-scope="scope">{{scope.row.material_.specification}}</template>
-            scope.row.material_.specification
-          }}</template>
             </el-table-column>
             <el-table-column label="物料单位">
               <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@@ -86,11 +106,9 @@
             <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.create_time }}</template>
             </el-table-column>
-      
           </el-table>
           <pagination
             v-show="fifodetailList2.count > 0"
@@ -111,7 +129,7 @@
             height="620"
             v-el-height-adaptive-table="{bottomOffset: 40}"
           >
-        <el-table-column type="index" width="50" />
+            <el-table-column type="index" width="50"/>
             <el-table-column label="物料批次">
               <template slot-scope="scope">{{ scope.row.batch }}</template>
             </el-table-column>
@@ -119,9 +137,7 @@
               <template slot-scope="scope">{{ scope.row.material_.name }}</template>
             </el-table-column>
             <el-table-column label="规格型号">
-          <template slot-scope="scope">{{
+              <template slot-scope="scope">{{scope.row.material_.specification}}</template>
-            scope.row.material_.specification
-          }}</template>
             </el-table-column>
             <el-table-column label="物料单位">
               <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@@ -129,15 +145,47 @@
             <el-table-column label="仓库">
               <template slot-scope="scope">{{ scope.row.warehouse_.name }}</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">
+                <el-tag v-if="scope.row.need_test">是</el-tag>
+                <el-tag v-else>否</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="文件">
+              <template slot-scope="scope" v-if="scope.row.files">
+                <div v-for="item in scope.row.files_" v-bind:key="item.id">
+                  <el-link :href="item.path" target="_blank" type="primary">{{item.name}}</el-link>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column label="创建时间">
               <template slot-scope="scope">{{ scope.row.create_time }}</template>
             </el-table-column>
-      
+            <el-table-column
+              align="center"
+              label="操作"
+            >
+              <template slot-scope="scope">
+                <el-link
+                  v-if="scope.row.need_test"
+                  type="primary"
+                  @click="handleRecord(scope)"
+                >
+                  复验记录
+                </el-link>
+                <el-link
+                  v-else
+                  type="info"
+                  :disabled="!scope.row.need_test"
+                  @click="handleRecord(scope)"
+                >
+                  复验记录
+                </el-link>
+              </template>
+            </el-table-column>
           </el-table>
           <pagination
             v-show="fifodetailList3.count > 0"
@@ -158,7 +206,7 @@
             height="620"
             v-el-height-adaptive-table="{bottomOffset: 40}"
           >
-        <el-table-column type="index" width="50" />
+            <el-table-column type="index" width="50"/>
             <el-table-column label="物料批次">
               <template slot-scope="scope">{{ scope.row.batch }}</template>
             </el-table-column>
@@ -166,18 +214,49 @@
               <template slot-scope="scope">{{ scope.row.material_.name }}</template>
             </el-table-column>
             <el-table-column label="规格型号">
-          <template slot-scope="scope">{{
+              <template slot-scope="scope">{{scope.row.material_.specification}}</template>
-            scope.row.material_.specification
-          }}</template>
             </el-table-column>
             <el-table-column label="物料单位">
               <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
             </el-table-column>
-    
+            <el-table-column label="文件">
+              <template slot-scope="scope" v-if="scope.row.files">
+                <div v-for="item in scope.row.files_" v-bind:key="item.id">
+                  <el-link :href="item.file" target="_blank" type="primary">{{item.name}}</el-link>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="是否需要复验">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.need_test">是</el-tag>
+                <el-tag v-else>否</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="创建时间">
               <template slot-scope="scope">{{ scope.row.create_time }}</template>
             </el-table-column>
-      
+            <el-table-column
+              align="center"
+              label="操作"
+            >
+              <template slot-scope="scope">
+                <el-link
+                  v-if="scope.row.need_test"
+                  type="primary"
+                  @click="handleRecord(scope)"
+                >
+                  复验记录
+                </el-link>
+                <el-link
+                  v-else
+                  type="info"
+                  :disabled="!scope.row.need_test"
+                  @click="handleRecord(scope)"
+                >
+                  复验记录
+                </el-link>
+              </template>
+            </el-table-column>
           </el-table>
           <pagination
             v-show="fifodetailList4.count > 0"
@@ -188,22 +267,17 @@
           />
         </el-tab-pane>
       </el-tabs>
-     
     </el-card>
-
-  
-
-    
   </div>
 </template>
 <script>
-import { getfifodetailList } from "@/api/inm";
+  import {getfifodetailList} from "@/api/inm";
-import checkPermission from "@/utils/permission";
+  import checkPermission from "@/utils/permission";
-import { createTestrecord } from "@/api/inm";
+  import {createTestrecord} from "@/api/inm";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 
-export default {
+  export default {
-  components: { Pagination },
+    components: {Pagination},
     data() {
       return {
         InventoryList: {
@@ -229,16 +303,16 @@ export default {
           page_size: 20,
         },
         is_testok: "true",
-       fifodetailList2:{
+        fifodetailList2: {
           count: 0,
         },
-       fifodetailList3:{
+        fifodetailList3: {
           count: 0,
         },
-       fifodetailList4:{
+        fifodetailList4: {
           count: 0,
         },
-    activeName:"1"
+        activeName: "1"
       };
     },
     computed: {},
@@ -299,25 +373,20 @@ export default {
       },
       //选项卡切换
       handleClick(tab) {
- 
+        if (tab.name == 1) {
-     
-       if(tab.name==1)
-       {
           this.getList1()
-       }
+        } else if (tab.name == 2) {
-       else if(tab.name==2)
-       {
           this.getList2()
-       }
+        } else if (tab.name == 3) {
-       else if(tab.name==3)
-        {
           this.getList3()
-       }
+        } else {
-        else 
-        {
           this.getList4()
         }
       },
+      //检验记录
+        handleRecord(){
+
         },
-};
+    },
+  };
 </script>

hb_client/src/views/qm/product.vue

@@ -35,15 +35,21 @@
         <el-table-column label="合同">
           <template slot-scope="scope">
             <span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.name}}</span>
-                <span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>
+            <!--<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>
-                <span v-else></span>
+            <span v-else></span>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="监管协议号">
+          <template slot-scope="scope">
+            <span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.watch_num}}</span>
+            <!--<span v-else>{{scope.row.order_.contract_.watch_num}}</span>-->
           </template>
         </el-table-column>
         <el-table-column label="客户">
           <template slot-scope="scope">
             <span v-if="scope.row.to_order_">{{scope.row.to_order_.customer_.name}}</span>
-                <span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>
+            <!--<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>-->
-                <span v-else></span>
+            <!--<span v-else></span>-->
           </template>
         </el-table-column>
         <el-table-column label="军检">