From d552079fe316bd3153612b40757b90582684ed84 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 12 Jul 2023 14:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/udi/trace/history/index.vue | 75 +++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/views/udi/trace/history/index.vue b/src/views/udi/trace/history/index.vue
index 5530159..31756bb 100644
--- a/src/views/udi/trace/history/index.vue
+++ b/src/views/udi/trace/history/index.vue
@@ -13,10 +13,10 @@
             </el-form-item>
           </el-col>
           <el-col type="flex" :span="8">
-            <el-form-item label="产品通用名称:" class="query-form-item">
+            <el-form-item label="产品名称:" class="query-form-item">
               <el-input v-model="filterQuery.cpmctymc"
                         style="width: 90%"
-                        placeholder="请输入产品通用名称"
+                        placeholder="请输入产品名称"
                         clearable
 
               ></el-input>
@@ -84,7 +84,7 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="查询记录号" prop="recordCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="UDI码" prop="udiCode" width="270" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
         <!--        <el-table-column label="注册备案人" prop="ylqxzcrbarmc" width="200"></el-table-column>-->
         <!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>-->
@@ -181,7 +181,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品通用名称" prop="cpmctymc" show-overflow-tooltip>
+            <el-form-item label="产品名称" prop="cpmctymc" show-overflow-tooltip>
               <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -297,7 +297,7 @@
             <el-table-column label="生产订单号" prop="billNo" width="160"></el-table-column>
             <el-table-column label="订单日期" prop="billDate" width="140"></el-table-column>
             <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
-            <el-table-column label="产品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="产品名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
             <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="160"></el-table-column>
             <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160"></el-table-column>
@@ -321,7 +321,7 @@
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="UDI码" prop="code" width="180" show-overflow-tooltip></el-table-column>
                 <el-table-column label="父级UDI码" prop="pcode" width="180"></el-table-column>
-                <el-table-column label="产品通用名称" prop="cpmctymc" width="160"></el-table-column>
+                <el-table-column label="产品名称" prop="cpmctymc" width="160"></el-table-column>
                 <el-table-column label="DI标识" prop="nameCode" width="160"></el-table-column>
                 <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
                 <el-table-column label="批次号" prop="batchNo" width="140"></el-table-column>
@@ -371,7 +371,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品通用名称" prop="cpmctymc" show-overflow-tooltip>
+            <el-form-item label="产品名称" prop="cpmctymc" show-overflow-tooltip>
               <el-input v-model="manuOrderFormView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -530,7 +530,7 @@
         <el-row type="flex">
 
           <el-col :span="11" class="el-col">
-            <el-form-item label="产品通用名称" prop="cpmctymc" show-overflow-tooltip>
+            <el-form-item label="产品名称" prop="cpmctymc" show-overflow-tooltip>
               <el-input v-model="manuOrderCodeRelFormView.cpmctymc" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -612,7 +612,7 @@
             <el-table-column label="单据日期" prop="billDate" width="150" show-overflow-tooltip></el-table-column>
             <el-table-column label="发货企业" prop="fromCorp" width="220" show-overflow-tooltip></el-table-column>
             <el-table-column label="收货企业" prop="toCorp" width="220" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="产品名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
             <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
@@ -826,6 +826,62 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="11" type="flex">
+            <el-form-item label="产品名称" prop="cpmctymc" show-overflow-tooltip>
+              <el-input v-model="orderFormView.cpmctymc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" type="flex">
+            <el-form-item label="规格型号" prop="ggxh" show-overflow-tooltip>
+              <el-input v-model="orderFormView.ggxh" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11" type="flex">
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip>
+              <el-input v-model="orderFormView.ylqxzcrbarmc" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" type="flex">
+            <el-form-item label="备案号" prop="zczbhhzbapzbh" show-overflow-tooltip>
+              <el-input v-model="orderFormView.zczbhhzbapzbh" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11" type="flex">
+            <el-form-item label="批次号" prop="batchNo" show-overflow-tooltip>
+              <el-input v-model="orderFormView.batchNo" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" type="flex">
+            <el-form-item label="序列号" prop="serialNo" show-overflow-tooltip>
+              <el-input v-model="orderFormView.serialNo" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11" type="flex">
+            <el-form-item label="生产日期" prop="produceDate" show-overflow-tooltip>
+              <el-input v-model="orderFormView.produceDate" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" type="flex">
+            <el-form-item label="失效日期" prop="expireDate" show-overflow-tooltip>
+              <el-input v-model="orderFormView.expireDate" size="small" style="width: 90%" :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="11" type="flex">
             <el-form-item label="备注" prop="remark" show-overflow-tooltip>
@@ -833,6 +889,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
+
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">