From 000ec82331506b0fbb4b0b584c83f5955c96bff3 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 1 Jun 2023 16:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=9F=A5=E8=AF=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/udi/trace/history/index.vue |  2 +-
 src/views/udi/trace/manu/index.vue    | 45 ++++++++++++++++++++++-----
 src/views/udi/trace/task/index.vue    | 33 +++++++++-----------
 3 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/src/views/udi/trace/history/index.vue b/src/views/udi/trace/history/index.vue
index 6540835..2eb638b 100644
--- a/src/views/udi/trace/history/index.vue
+++ b/src/views/udi/trace/history/index.vue
@@ -47,7 +47,7 @@
             <el-form-item label="查询方式:" prop="traceSource" class="query-form-item">
               <el-select v-model="filterQuery.traceSource" placeholder="请选择查询方式" style="width: 200px" @change="onSubmit" clearable>
                 <el-option label="源头查询" value="1"></el-option>
-                <el-option label="现在检查查询" value="2"></el-option>
+                <el-option label="现场检查查询" value="2"></el-option>
 <!--                <el-option label="出库" value="3"></el-option>-->
               </el-select>
             </el-form-item>
diff --git a/src/views/udi/trace/manu/index.vue b/src/views/udi/trace/manu/index.vue
index 2fb52b1..286379a 100644
--- a/src/views/udi/trace/manu/index.vue
+++ b/src/views/udi/trace/manu/index.vue
@@ -97,7 +97,7 @@
         <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
         <el-table-column label="查询人" prop="createUser" width="180"></el-table-column>
         <el-table-column label="所属企业" prop="companyName" width="180"></el-table-column>
-        <el-table-column label="查询方式" prop="traceType" width="120"></el-table-column>
+        <el-table-column label="查询方式" prop="traceType" width="120" :formatter="formaterTraceType"></el-table-column>
         <el-table-column label="备注" prop="remark" width="220"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
@@ -187,8 +187,8 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
-              <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
+            <el-form-item label="批次号" prop="batchNo">
+              <el-input v-model="formView.batchNo" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -232,14 +232,14 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="批次号" prop="batchNo">
-              <el-input v-model="formView.batchNo" size="small" style="width: 90%" :disabled="true"
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+              <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
             <el-form-item label="查询方式" prop="traceType">
-              <el-input v-model="formView.traceType" size="small"
+              <el-input v-model="this.formateTraceType" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -276,7 +276,7 @@
           <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
           <el-table-column label="序列号" prop="serialNo" width="180"></el-table-column>
           <el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
-          <el-table-column label="包装状态" prop="packState" width="180"></el-table-column>
+          <el-table-column label="包装状态" prop="packState" width="180" :formatter="formaterPackState"></el-table-column>
           <el-table-column label="操作" width="100" fixed="right">
             <template slot-scope="scope">
               <el-button
@@ -345,7 +345,7 @@
         <el-row type="flex">
           <el-col :span="11" type="flex">
             <el-form-item label="包装状态" prop="packState">
-              <el-input v-model="formViewCodeRel.packState" size="small" style="width: 90%" :disabled="true"
+              <el-input v-model="this.formatePackState" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -432,9 +432,36 @@ export default {
       formView: {},
       formViewCodeRel: {},
       showSearch: true,
+      formateTraceType: null,
+      formatePackState: null
     }
   },
   methods: {
+    formaterPackState(row){
+      if (row.packState == 1) {
+        this.formatePackState = "满箱"
+        return "满箱"
+      }else if (row.packState == 2){
+        this.formatePackState = "零箱"
+        return "零箱"
+      }else if (row.packState == 3){
+        this.formatePackState = "拼箱满箱"
+        return "拼箱满箱"
+      }else {
+        this.formatePackState = "拼箱零箱"
+        return "拼箱零箱"
+      }
+    },
+    formaterTraceType(row){
+      if (row.traceType == 1) {
+        this.formateTraceType = "源头查询"
+        return "源头查询"
+      }else {
+        this.formateTraceType = "现场检查查询"
+        return "现场检查查询"
+      }
+
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -500,10 +527,12 @@ export default {
         page: 1,
         limit: 10,
       };
+      this.currentRow.billNo = null
       this.listCodeRel = null,
       this.getManuOrderList();
     },
     onSubmit(){
+      this.currentRow.billNo = null
       this.filterQuery.page = 1;
       this.getManuOrderList()
     },
diff --git a/src/views/udi/trace/task/index.vue b/src/views/udi/trace/task/index.vue
index 61e6f9b..e217ea6 100644
--- a/src/views/udi/trace/task/index.vue
+++ b/src/views/udi/trace/task/index.vue
@@ -201,21 +201,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row type="flex">
-          <el-col :span="11" type="flex">
-            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
-              <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" class="el-col">
-            <el-form-item label="医疗器械注册人统一社会信用号" prop="creditNum">
-              <el-input v-model="formView.creditNum" size="small"
-                        style="width: 90%" :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
             <el-form-item label="产品名称" prop="cpmctymc">
@@ -245,7 +230,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row type="flex">
           <el-col :span="11" class="el-col">
@@ -277,8 +261,21 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
+        <el-row type="flex">
+          <el-col :span="11" type="flex">
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+              <el-input v-model="formView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="医疗器械注册人统一社会信用号" prop="creditNum">
+              <el-input v-model="formView.creditNum" size="small"
+                        style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="open = false" size="small">关闭</el-button>