From 6510ad48904b2eaf46ea7e465c05da6ccf7b2e64 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 5 Jul 2023 17:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/rel/productEdit.vue   | 100 +++++-----
 src/views/improveInfo.vue                     | 174 ++++++++++--------
 src/views/purchase/cert/userCertAddDialog.vue |   7 +-
 src/views/udi/trace/history/index.vue         |  18 +-
 4 files changed, 169 insertions(+), 130 deletions(-)

diff --git a/src/views/basic/product/rel/productEdit.vue b/src/views/basic/product/rel/productEdit.vue
index fb9e3c1..fd4537e 100644
--- a/src/views/basic/product/rel/productEdit.vue
+++ b/src/views/basic/product/rel/productEdit.vue
@@ -73,23 +73,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="填报者身份:" class="query-form-item">
-              <el-select
-                v-model="detailQuery.companyType"
-                placeholder="请选择填报者身份"
-                clearable
-                size="small"
-                style="width: 80%"
-              >
-                <el-option label="生产企业" :value="1"></el-option>
-                <el-option label="代理商" :value="2"></el-option>
-                <el-option label="购买方" :value="3"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="产品描述:" class="query-form-item" show-overflow-tooltip>
               <el-input
@@ -103,34 +86,21 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row type="flex" class="edit-row">
-          <el-col :span="12">
-            <el-form-item label="代理起始时间:" class="query-form-item">
-              <el-date-picker
-                format="yyyy 年 MM 月 dd 日"
-                v-model="detailQuery.agengtStartDate"
-                type="date"
-                style="width: 80%"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="代理截止时间:" class="query-form-item">
-              <el-date-picker
-                format="yyyy 年 MM 月 dd 日"
-                v-model="detailQuery.agengtEndDate"
-                type="date"
-                style="width: 80%"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--        <el-row type="flex" class="edit-row">-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="产品描述:" class="query-form-item" show-overflow-tooltip>-->
+<!--              <el-input-->
+
+<!--                style="width: 80%"-->
+<!--                size="small"-->
+<!--                :disabled="true"-->
+<!--                splaceholder="请输入内容"-->
+<!--                v-model="detailQuery.cpms"-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
-        </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="计量单位:" class="query-form-item">
@@ -164,6 +134,48 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="填报者身份:" class="query-form-item">
+              <el-select
+                v-model="detailQuery.companyType"
+                placeholder="请选择填报者身份"
+                clearable
+                size="small"
+                style="width: 80%"
+              >
+                <el-option label="本企业" :value="1"></el-option>
+                <el-option label="代理商" :value="2"></el-option>
+                <el-option label="购买方" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="代理起始时间:" class="query-form-item">
+              <el-date-picker
+                format="yyyy 年 MM 月 dd 日"
+                v-model="detailQuery.agengtStartDate"
+                type="date"
+                style="width: 80%"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="代理截止时间:" class="query-form-item">
+              <el-date-picker
+                format="yyyy 年 MM 月 dd 日"
+                v-model="detailQuery.agengtEndDate"
+                type="date"
+                style="width: 80%"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
         </el-row>
       </el-card>
diff --git a/src/views/improveInfo.vue b/src/views/improveInfo.vue
index 50484d1..5a016fe 100644
--- a/src/views/improveInfo.vue
+++ b/src/views/improveInfo.vue
@@ -9,7 +9,8 @@
           src="../assets/logo/logo.png"
         />
       </div>
-      <h3 style="text-align: center;font-size: larger ;color:#707070 ">UDI监管平台企业信息登记</h3>
+      <h3 style="text-align: center;font-size: larger ;color:#707070 ">医用耗材UDI追溯平台</h3>
+      <h3 style="text-align: center;font-size: larger ;color:#707070 ">新用户注册</h3>
     </div>
     <el-form
       :model="inputQuery"
@@ -20,7 +21,7 @@
     >
       <el-card class="el-card">
         <div slot="header" class="clearfix">
-          <span>企业信息:</span>
+          <span>本企业信息:</span>
           <div>
             <div style="float: right;margin-top: -20px ">
               <el-button
@@ -43,15 +44,36 @@
             </div>
           </div>
         </div>
+<!--        <el-row-->
+<!--          :gutter="20"-->
+<!--          class="el-row"-->
+<!--          type="flex"-->
+<!--        >-->
+<!--          <el-col :span="15" class="el-col">-->
+
+<!--            <el-form-item-->
+<!--              label="本企业信息审核状态:"-->
+<!--              prop="reason"-->
+<!--            >-->
+<!--               <span>-->
+<!--           <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
+<!--             {{ checkSupFlag[inputQuery.ucstatus] }}-->
+<!--              </el-tag>-->
+<!--          </span>-->
+<!--            </el-form-item>-->
+
+
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row
           :gutter="20"
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
 
             <el-form-item
-              label="本企业信息审核状态:"
+              label="审核结果:"
               prop="reason"
             >
                <span>
@@ -64,32 +86,32 @@
 
           </el-col>
         </el-row>
+<!--        <el-row-->
+<!--          :gutter="20"-->
+<!--          class="el-row"-->
+<!--          type="flex"-->
+<!--        >-->
+<!--          <el-col :span="15" class="el-col">-->
+<!--            <el-form-item-->
+<!--              label="审核说明:"-->
+<!--              prop="reason"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                size="small"-->
+<!--                disabled-->
+<!--                v-model="inputQuery.reason"-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+
+<!--        </el-row>-->
         <el-row
           :gutter="20"
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
-            <el-form-item
-              label="审核说明:"
-              prop="reason"
-            >
-              <el-input
-                size="small"
-                disabled
-                v-model="inputQuery.reason"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
-
-        </el-row>
-        <el-row
-          :gutter="20"
-          class="el-row"
-          type="flex"
-        >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label=" 企业名称:"
 
@@ -113,7 +135,7 @@
           type="flex"
 
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label=" 社会信用号:"
 
@@ -132,7 +154,7 @@
 
 
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item label="企业类型:" prop="bussinessStatus">
               <el-select
                 size="small"
@@ -157,7 +179,7 @@
 
 
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
 
             <el-form-item
               label=" 法人名称 :"
@@ -179,7 +201,7 @@
 
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
 
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label="法人身份证号 :"
 
@@ -197,7 +219,7 @@
         </el-row>
 
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
 
             <el-form-item
               label="注册地址:"
@@ -213,38 +235,14 @@
             </el-form-item>
 
           </el-col>
-
-
         </el-row>
-
-        <!--<el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">-->
-        <!--  <el-col :span="20" class="el-col">-->
-        <!--    <el-form-item label="备注:" prop="remark">-->
-        <!--      <el-input-->
-        <!--        size="small"-->
-        <!--        v-model="inputQuery.remark"-->
-        <!--      ></el-input>-->
-        <!--    </el-form-item>-->
-        <!--  </el-col>-->
-        <!--</el-row>-->
-
-      </el-card>
-
-      <el-card class="el-card">
-
-
-        <div slot="header" class="clearfix">
-          <span>
-            企业系统负责人信息
-          </span>
-        </div>
         <el-row
           :gutter="20"
           class="el-row"
           type="flex"
-          style="margin-top: 25px"
+          style="margin-top: 0px"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item label="注册手机:" prop="mobile">
               <el-input
                 size="small"
@@ -260,7 +258,7 @@
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item label="注册人名称:" prop="realName">
               <el-input
                 size="small"
@@ -277,7 +275,7 @@
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item label="法人联系电话:" prop="fmobile">
               <el-input
                 size="small"
@@ -294,7 +292,7 @@
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item label="邮箱:" prop="email">
               <el-input
                 size="small"
@@ -306,13 +304,37 @@
           </el-col>
         </el-row>
 
+        <!--<el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">-->
+        <!--  <el-col :span="20" class="el-col">-->
+        <!--    <el-form-item label="备注:" prop="remark">-->
+        <!--      <el-input-->
+        <!--        size="small"-->
+        <!--        v-model="inputQuery.remark"-->
+        <!--      ></el-input>-->
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
+
+      </el-card>
+
+      <el-card class="el-card">
+
+
+        <div slot="header" class="clearfix">
+          <span>
+            系统负责人信息
+          </span>
+        </div>
+
+
 
         <el-row
           :gutter="20"
           class="el-row"
           type="flex"
+          style="margin-top: 10px"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label="系统负责人姓名:"
 
@@ -333,7 +355,7 @@
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label="系统负责人电话:"
 
@@ -353,7 +375,7 @@
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label="系统负责人QQ:"
 
@@ -374,7 +396,7 @@
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label="系统负责人微信:"
 
@@ -395,7 +417,7 @@
           class="el-row"
           type="flex"
         >
-          <el-col :span="20" class="el-col">
+          <el-col :span="15" class="el-col">
             <el-form-item
               label="系统负责人邮箱:"
 
@@ -416,6 +438,11 @@
 
 
       <el-card>
+        <div slot="header" class="clearfix">
+          <span>
+            资质证书信息
+          </span>
+
         <div style="float: right; text-align: right; margin-bottom: 8px">
           <el-button
             type="primary"
@@ -428,6 +455,7 @@
           </el-button>
         </div>
 
+        </div>
         <el-table
           v-loading="certLoading"
           :data="certList"
@@ -441,9 +469,9 @@
             width="50"
           ></el-table-column>
           <el-table-column label="证书名称" prop="name"></el-table-column>
-          <el-table-column label="证书编号" prop="code"></el-table-column>
-          <el-table-column label="生效期" prop="validDate"></el-table-column>
-          <el-table-column label="失效期" prop="expireDate"></el-table-column>
+          <el-table-column label="证书编号" prop="code" ></el-table-column>
+          <el-table-column label="生效日期" prop="validDate"></el-table-column>
+          <el-table-column label="失效日期" prop="expireDate"></el-table-column>
           <el-table-column label="确认状态" prop="checkStatus" width="120">
             <template slot-scope="scope">
               <el-tag :type="scope.row.checkStatus | statusFilterType">
@@ -451,12 +479,12 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            label="确认说明"
-            prop="checkComment"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column label="状态" prop="status" width="120">
+<!--          <el-table-column-->
+<!--            label="确认说明"-->
+<!--            prop="checkComment"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+          <el-table-column label="状态说明" prop="status" width="120">
             <template slot-scope="scope">
               <el-tag :type="scope.row.status | statusFilterType">
                 {{ statusFlag[scope.row.status] }}
diff --git a/src/views/purchase/cert/userCertAddDialog.vue b/src/views/purchase/cert/userCertAddDialog.vue
index 2f95601..0e07613 100644
--- a/src/views/purchase/cert/userCertAddDialog.vue
+++ b/src/views/purchase/cert/userCertAddDialog.vue
@@ -34,8 +34,7 @@
         <el-row>
           <el-col :span="3">
             <div class="ao-text">
-              <span>起始日期：</span>
-              <span>生效期：</span>
+              <span>生效日期：</span>
             </div>
           </el-col>
           <el-col :span="8">
@@ -53,8 +52,8 @@
 
           <el-col :span="3">
             <div class="ao-text">
-              <span>有效期：</span>
-              <span>失效期：</span>
+
+              <span>失效日期：</span>
             </div>
           </el-col>
           <el-col :span="8">
diff --git a/src/views/udi/trace/history/index.vue b/src/views/udi/trace/history/index.vue
index 0a6e0d5..40ddf26 100644
--- a/src/views/udi/trace/history/index.vue
+++ b/src/views/udi/trace/history/index.vue
@@ -45,8 +45,8 @@
             </el-form-item>
           </el-col>
           <el-col type="flex" :span="8">
-            <el-form-item label="查询方式:" prop="traceSource" class="query-form-item">
-              <el-select v-model="filterQuery.traceSource" placeholder="请选择查询方式" style="width: 90%" @change="onSubmit" clearable>
+            <el-form-item label="查询场景:" prop="traceSource" class="query-form-item">
+              <el-select v-model="filterQuery.traceSource" placeholder="请选择查询场景" style="width: 90%" @change="onSubmit" clearable>
                 <el-option label="源头查询" value="1"></el-option>
                 <el-option label="现场检查查询" value="2"></el-option>
 <!--                <el-option label="出库" value="3"></el-option>-->
@@ -57,7 +57,7 @@
             <el-form-item label="查询方案:" prop="traceType" class="query-form-item">
               <el-select v-model="filterQuery.traceType" placeholder="请选择查询方案" style="width: 90%" @change="onSubmit" clearable>
                 <el-option label="按UDI码查询" 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>
@@ -91,8 +91,8 @@
 <!--        <el-table-column label="发货单位" prop="fromCorp" width="180"></el-table-column>-->
 <!--        <el-table-column label="收货单位" prop="toCorp" width="180"></el-table-column>-->
 <!--        <el-table-column label="所属企业" prop="companyName" width="180"></el-table-column>-->
-<!--        <el-table-column label="查询方式" prop="traceSource" width="120"></el-table-column>-->
-        <el-table-column label="查询方式" prop="traceSource" width="120">
+<!--        <el-table-column label="查询场景" prop="traceSource" width="120"></el-table-column>-->
+        <el-table-column label="查询场景" prop="traceSource" width="120">
           <template slot-scope="traceSource">
             {{ formatTaskType(traceSource.row) }}
           </template>
@@ -257,7 +257,7 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="11" class="el-col">
-            <el-form-item label="查询方式" prop="traceSource">
+            <el-form-item label="查询场景" prop="traceSource">
               <el-input v-model="traceSourceText" size="small" style="width: 90%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
@@ -460,7 +460,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="查询方式" prop="traceType">
+            <el-form-item label="查询场景" prop="traceType">
               <el-input v-model="this.formateTraceType" size="small"
                         style="width: 90%" :disabled="true"
               ></el-input>
@@ -746,7 +746,7 @@
         </el-row>
         <el-row type="flex">
           <el-col :span="11" type="flex">
-            <el-form-item label="查询方式" prop="sourceType"show-overflow-tooltip>
+            <el-form-item label="查询场景" prop="sourceType"show-overflow-tooltip>
               <el-input v-model="this.formateSourceType" size="small" style="width: 90%" :disabled="true"
               ></el-input>
             </el-form-item>
@@ -1072,7 +1072,7 @@ export default {
         case 2:
           return '现在检查查询';
         default:
-          return '查询方式有误！！';
+          return '查询场景有误！！';
       }
     },