From f074b3142d7a0badda20c3b1eb4e0a8869309ad5 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 7 Jun 2023 16:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/license/license.vue  |  6 +-
 src/views/udi/trace/history/index.vue | 11 ++--
 src/views/udi/trace/manu/index.vue    | 80 ++++++++++++++-------------
 src/views/udi/trace/task/index.vue    |  8 +--
 4 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/src/views/system/license/license.vue b/src/views/system/license/license.vue
index f0f3074..e19afc9 100644
--- a/src/views/system/license/license.vue
+++ b/src/views/system/license/license.vue
@@ -79,13 +79,13 @@
         </el-table-column>
         <el-table-column label="备注" prop="remark" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="操作" width="120" fixed="right">
+        <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
               @click.native.stop="printOrder(scope.row,'add')"
-            >新增
+            >新增接口
             </el-button
             >
             <el-button
@@ -669,7 +669,7 @@ export default {
       this.formName = formName;
       this.check = row;
       this.subData = row;
-      this.subFormVisible1 = true;
+      this.subFormVisible = true;
 
     },
 
diff --git a/src/views/udi/trace/history/index.vue b/src/views/udi/trace/history/index.vue
index 804ebd3..fa37443 100644
--- a/src/views/udi/trace/history/index.vue
+++ b/src/views/udi/trace/history/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form label-width="70px" >
+      <el-form label-width="120px"  >
           <el-row type="flex">
             <el-col type="flex" :span="8">
               <el-form-item label="记录号:" class="query-form-item">
@@ -13,11 +13,12 @@
               </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: 200px;"
-                          placeholder="请输入产品名称"
+                          placeholder="请输入产品通用名称"
                           clearable
+
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -80,7 +81,7 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="查询记录号" prop="recordCode" width="140"></el-table-column>
         <el-table-column label="UDI码" prop="udiCode" width="270"></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" width="140"></el-table-column>
+        <el-table-column label="产品通用名称" prop="cpmctymc" width="140"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="120"></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>-->
@@ -173,7 +174,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品通用名" prop="cpmctymc">
+            <el-form-item label="产品通用名称" prop="cpmctymc">
               <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
diff --git a/src/views/udi/trace/manu/index.vue b/src/views/udi/trace/manu/index.vue
index 5c3d704..620a273 100644
--- a/src/views/udi/trace/manu/index.vue
+++ b/src/views/udi/trace/manu/index.vue
@@ -32,10 +32,10 @@
         </el-row>
         <el-row type="flex" >
           <el-col type="flex" >
-            <el-form-item label="产品名称:" prop="cpmctymc" class="query-form-item">
+            <el-form-item label="产品通用名称:" prop="cpmctymc" class="query-form-item">
               <el-input v-model="filterQuery.cpmctymc"
                         style="width: 200px"
-                        placeholder="请输入产品名称"
+                        placeholder="请输入产品通用名称"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -88,16 +88,16 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="查询记录号" prop="recordCode" width="180"></el-table-column>
         <el-table-column label="生产订单号" prop="billNo" width="220"></el-table-column>
-        <el-table-column label="订单日期" prop="billDate" width="180"></el-table-column>
-        <el-table-column label="DI标识" prop="nameCode" width="120"></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" width="180"></el-table-column>
+        <el-table-column label="DI标识" prop="nameCode" width="180"></el-table-column>
+        <el-table-column label="产品通用名称" prop="cpmctymc" width="180"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
+        <el-table-column label="订单日期" prop="billDate" width="180"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="180"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
-        <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" :formatter="formaterTraceType"></el-table-column>
+<!--        <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" :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">
@@ -142,7 +142,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品名称" prop="cpmctymc">
+            <el-form-item label="产品通用名称" prop="cpmctymc">
               <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -267,16 +267,17 @@
                   highlight-current-row border>
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="DI标识" prop="nameCode" width="180"></el-table-column>
-          <el-table-column label="产品名称" prop="cpmctymc" width="220"></el-table-column>
-          <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
-          <el-table-column label="UDI码" prop="code" width="120"></el-table-column>
-          <el-table-column label="父码" prop="pcode" width="180"></el-table-column>
           <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
-          <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
-          <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="cpmctymc" width="220"></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
+<!--          <el-table-column label="UDI码" prop="code" width="120"></el-table-column>-->
+<!--          <el-table-column label="父码" prop="pcode" width="180"></el-table-column>-->
+
           <el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
           <el-table-column label="包装状态" prop="packState" width="180" :formatter="formaterPackState"></el-table-column>
+          <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
+          <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
           <el-table-column label="操作" width="100" fixed="right">
             <template slot-scope="scope">
               <el-button
@@ -320,27 +321,45 @@
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="生产日期" prop="produceDate">
-              <el-input v-model="formViewCodeRel.produceDate" size="small"
+            <el-form-item label="序列号" prop="serialNo">
+              <el-input v-model="formViewCodeRel.serialNo" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
+
         </el-row>
         <el-row type="flex">
+
+          <el-col :span="11" class="el-col">
+            <el-form-item label="产品通用名称" prop="cpmctymc">
+              <el-input v-model="formViewCodeRel.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="expireDate">
-              <el-input v-model="formViewCodeRel.expireDate" size="small" style="width: 90%" :disabled="true"
+            <el-form-item label="规格型号" prop="ggxh">
+              <el-input v-model="formViewCodeRel.ggxh" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="序列号" prop="serialNo">
-              <el-input v-model="formViewCodeRel.serialNo" size="small"
+            <el-form-item label="生产日期" prop="produceDate">
+              <el-input v-model="formViewCodeRel.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">
+              <el-input v-model="formViewCodeRel.expireDate" 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">
@@ -357,28 +376,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row type="flex">
+
           <el-col :span="11" type="flex">
             <el-form-item label="DI产品标识" prop="nameCode">
               <el-input v-model="formViewCodeRel.nameCode" 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="cpmctymc">
-              <el-input v-model="formViewCodeRel.cpmctymc" 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="ggxh">
-              <el-input v-model="formViewCodeRel.ggxh" size="small" style="width: 90%" :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
 
diff --git a/src/views/udi/trace/task/index.vue b/src/views/udi/trace/task/index.vue
index 91eca59..da3eda2 100644
--- a/src/views/udi/trace/task/index.vue
+++ b/src/views/udi/trace/task/index.vue
@@ -29,10 +29,10 @@
           </el-col>
 
           <el-col type="flex">
-            <el-form-item label="产品名称:" prop="cpmctymc" class="query-form-item">
+            <el-form-item label="产品通用名称:" prop="cpmctymc" class="query-form-item">
               <el-input v-model="filterQuery.cpmctymc"
                         style="width: 200px"
-                        placeholder="请输入产品名称"
+                        placeholder="请输入产品通用名称"
                         @keyup.native="onSubmit"
               ></el-input>
             </el-form-item>
@@ -155,7 +155,7 @@
 
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="200"></el-table-column>
         <el-table-column label="医疗器械注册人统一社会信用号" prop="creditNum" width="220"></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" width="180"></el-table-column>
+        <el-table-column label="产品通用名称" prop="cpmctymc" width="180"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
         <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
@@ -203,7 +203,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="产品名称" prop="cpmctymc">
+            <el-form-item label="产品通用名称" prop="cpmctymc">
               <el-input v-model="formView.cpmctymc" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>