From 371ee6ecf4dad102b5363562ce0fd5540ccf1fe1 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Mon, 17 Jan 2022 09:04:51 +0800
Subject: [PATCH] xiugai

---
 hb_client/src/views/inm/fifodetail.vue     | 25 ++++++++++++++++------
 hb_client/src/views/mtm/materialDetail.vue |  5 ++++-
 hb_client/src/views/wpm/operation.vue      |  4 ++--
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue
index 6e0d836..08dec4f 100644
--- a/hb_client/src/views/inm/fifodetail.vue
+++ b/hb_client/src/views/inm/fifodetail.vue
@@ -35,14 +35,14 @@
         <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>
+            <el-tag v-if="scope.row.need_test == false">否</el-tag>
+            <el-tag v-else>是</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="检查是否合格">
-          <template slot-scope="scope" v-if="scope.row.is_tested == true">
+        <el-table-column label="复验是否合格">
+          <template slot-scope="scope">
             <el-tag v-if="scope.row.is_testok == false">不合格</el-tag>
             <el-tag v-else>合格</el-tag>
           </template>
@@ -51,10 +51,16 @@
         <el-table-column align="center" label="操作" width="220px">
           <template slot-scope="scope">
             <el-link
-              v-if="scope.row.is_tested == false"
+             
                type="primary"
               @click="handleMaterial(scope)"
-              >检查</el-link
+              >复验</el-link
+            >
+            <el-link
+             
+               type="primary"
+              @click="handlefile(scope)"
+              >上传</el-link
             >
           </template>
         </el-table-column>
@@ -262,6 +268,11 @@ export default {
         }
         this.listLoading = false;
       });
+    },
+    //上传物料文件
+    handlefile(scope)
+    {
+
     },
     handleMaterial(scope) {
       //调该物料对应的检查表
diff --git a/hb_client/src/views/mtm/materialDetail.vue b/hb_client/src/views/mtm/materialDetail.vue
index 4a4754d..a9b9fd0 100644
--- a/hb_client/src/views/mtm/materialDetail.vue
+++ b/hb_client/src/views/mtm/materialDetail.vue
@@ -12,7 +12,10 @@
    
  
 </el-card>
-    <el-tabs v-model="activeName" type="card" >
+
+    <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="供应商" name="5"  v-if="this.type==3||this.type==4">
+        </el-tab-pane>
          <el-tab-pane label="批次" name="3">
 
  <el-table
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index 37671c8..61164f1 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -50,8 +50,8 @@
          
         </el-table-column>
         <el-table-column label="产品数量">
-           <template slot-scope="scope" v-if="scope.row.wproduct_">
-             {{ scope.row.wproduct_.length }}
+           <template slot-scope="scope" >
+             {{ scope.row.count_work }}
            
        </template>
         </el-table-column>