界面优化

src/views/udi/trace/history/index.vue

@@ -101,7 +101,7 @@
             {{ formatTaskType1(traceType.row) }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remark" width="220"></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">
             <el-button

src/views/udi/trace/manu/index.vue

@@ -86,7 +86,7 @@
                 @row-click="handleSelectionChange"
                 highlight-current-row border>
         <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="recordCode" width="180"></el-table-column>
         <el-table-column label="生产订单号" prop="billNo" width="220"></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>
@@ -98,7 +98,7 @@
 <!--        <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="备注" prop="remark" width="220"></el-table-column>-->
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button

src/views/udi/trace/search/index.vue

@@ -5,7 +5,7 @@
             <el-row type="flex">
               <el-col :span="18">
                 <el-form-item label="UDI码:" class="query-form-item">
-                  <el-input v-model="filterQuery.udiCode" placeholder="UDI码查询"
+                  <el-input v-model="filterQuery.udiCode" placeholder="请输入UDI码"
                             clearable></el-input>
                 </el-form-item>
               </el-col>
@@ -20,7 +20,7 @@
                     clearable="true"
                     style="width: 100%"
                     reserve-keyword
-                    placeholder="医疗器械注册人"
+                    placeholder="请输入医疗器械注册人"
                     :remote-method="getYlqxzcrbarmcList"
                     :loading="loading"
                     @change="ylqxzcrbarmcChange"
@@ -152,14 +152,18 @@
                 style="width: 100%"
                 border highlight-current-row>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
+        <el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
+        <el-table-column label="单据源头类型" prop="sourceType" width="100" :formatter="formaterSourceType"></el-table-column>
+        <el-table-column label="出入库类型" prop="inOutType" width="100" :formatter="formaterInOutType"></el-table-column>
+        <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
+        <el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
         <el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
-        <el-table-column label="收货企业" prop="toCorp" width="150"></el-table-column>
+        <el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
         <el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
-        <el-table-column label="出入库类型" prop="inOutType" width="150" :formatter="formaterInOutType"></el-table-column>
+
-        <el-table-column label="单据源头类型" prop="sourceType" width="150" :formatter="formaterSourceType"></el-table-column>
+<!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
-        <el-table-column label="备注" prop="remark" width="220"></el-table-column>
+
-        <!--        <el-table-column label="单据类型" prop="billType" width="150"></el-table-column>-->
         <!--        <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>-->
 <!--        <el-table-column label="客户端类型" prop="clientType" width="150"></el-table-column>
         <el-table-column label="当前企业统一社会信用号" prop="companyCertNum" width="200"></el-table-column>
@@ -173,7 +177,7 @@
         <el-table-column label="监督人姓名" prop="superviserUser" width="150"></el-table-column>
         <el-table-column label="收货企业统一社会信用号" prop="toCorpCreditNum" width="200"></el-table-column>
         <el-table-column label="使用者信息" prop="toUserInfo" width="150"></el-table-column>
-        <el-table-column label="更新时间" prop="updateTime" width="220"></el-table-column>
+
         <el-table-column label="上传人" prop="uploadUser" width="220"></el-table-column>-->
 
         <el-table-column label="操作" width="100" fixed="right">

src/views/udi/trace/searchLive/index.vue

@@ -5,7 +5,7 @@
             <el-row type="flex">
               <el-col :span="18">
                 <el-form-item label="UDI码:" class="query-form-item">
-                  <el-input v-model="filterQuery.udiCode" placeholder="UDI码查询"
+                  <el-input v-model="filterQuery.udiCode" placeholder="请输入UDI码"
                             clearable></el-input>
                 </el-form-item>
               </el-col>
@@ -20,7 +20,7 @@
                     style="width: 100%"
                     clearable="true"
                     reserve-keyword
-                    placeholder="请输入产品名称"
+                    placeholder="请输入当前所在企业"
                     :remote-method="geCompanyNameList"
                     :loading="loading"
                   >
@@ -43,7 +43,7 @@
                     clearable="true"
                     style="width: 100%"
                     reserve-keyword
-                    placeholder="医疗器械注册人"
+                    placeholder="请输入医疗器械注册人"
                     :remote-method="getYlqxzcrbarmcList"
                     :loading="loading"
                     @change="ylqxzcrbarmcChange"
@@ -60,7 +60,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="产品名称:" class="query-form-item">
+                <el-form-item label="产品通用名称:" class="query-form-item">
                   <el-select
                     v-model="filterQuery.cpmctymc"
                     filterable
@@ -68,7 +68,7 @@
                     clearable="true"
                     :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                     reserve-keyword
-                    placeholder="请输入产品名称"
+                    placeholder="请输入产品通用名称"
                     :remote-method="getCpmctymcList"
                     :loading="loading"
                     style="width: 100%"
@@ -98,7 +98,7 @@
                     :disabled="filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
                                   filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                     reserve-keyword
-                    placeholder="请输入产品名称"
+                    placeholder="请输入规格型号"
                     :remote-method="getGgxhList"
                     :loading="loading"
                     @change="ggxhChange"
@@ -114,7 +114,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="DI标识:" class="query-form-item">
+                <el-form-item label="产品DI标识:" class="query-form-item">
                   <el-select
                     v-model="filterQuery.nameCode"
                     filterable
@@ -125,7 +125,7 @@
                                 filterQuery.cpmctymc==null || filterQuery.cpmctymc=='' ||
                                   filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"
                     reserve-keyword
-                    placeholder="请输入DI"
+                    placeholder="请输入产品DI标识"
                     :remote-method="getNameCodeList"
                     :loading="loading"
                     @change="nameCodeChange"
@@ -175,13 +175,17 @@
                 style="width: 100%"
                 border highlight-current-row>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
+        <el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
+        <el-table-column label="单据源头类型" prop="sourceType" width="100" :formatter="formaterSourceType"></el-table-column>
+        <el-table-column label="出入库类型" prop="inOutType" width="100" :formatter="formaterInOutType"></el-table-column>
+        <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
+        <el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
         <el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
-        <el-table-column label="收货企业" prop="toCorp" width="150"></el-table-column>
+        <el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
         <el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
-        <el-table-column label="出入库类型" prop="inOutType" width="150" :formatter="formaterInOutType"></el-table-column>
+
-        <el-table-column label="单据源头类型" prop="sourceType" width="150" :formatter="formaterSourceType"></el-table-column>
+<!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
-        <el-table-column label="备注" prop="remark" width="220"></el-table-column>
 <!--        <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="单据号" prop="billNo" width="180"></el-table-column>
         <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>

src/views/userManage/customerManage.vue

@@ -124,8 +124,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog title="企业信息编辑" :visible.sync="formVisible" width="60%">
+      <el-dialog title="企业信息编辑" :visible.sync="formVisible" width="80%">
         <el-form :model="formData" ref="dataForm" label-width="100px">
+          <el-card>
             <el-row >
               <el-col :span="11">
                 <el-form-item label="企业名称:" prop="companyName" >
@@ -224,6 +225,8 @@
               </el-col>
 
             </el-row>
+          </el-card>
+
 
 
           <!--<el-form-item label="分配角色：">-->
@@ -235,6 +238,7 @@
           <!--  </el-radio-group>-->
           <!--</el-form-item>-->
         </el-form>
+        <el-card>
           <el-table
             v-loading="certLoading"
             :data="certList"
@@ -274,7 +278,7 @@
 
             <el-table-column label="备注" prop="remark" width="120"></el-table-column>
 
-          <el-table-column label="操作" width="120">
+            <el-table-column label="操作" width="120" fixed="right">
               <template slot-scope="scope">
 
                 <el-button
@@ -286,6 +290,8 @@
               </template>
             </el-table-column>
           </el-table>
+        </el-card>
+
 
         <div slot="footer" class="dialog-footer">
           <el-button @click.native="cancelDialog" size="small">取消</el-button>

src/views/userManage/registerManage.vue

@@ -250,11 +250,11 @@
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         :before-close="Refresh"
-        width="60%"
+        width="80%"
         center
       >
         <el-form :model="rowData" :rules="rowDataRules" ref="rowDataForm" label-width="100px">
-
+          <el-card>
             <el-row>
               <el-col :span="11">
                 <el-form-item label="企业名称:" prop="companyName">
@@ -391,7 +391,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-
+          </el-card>
         </el-form>
 
         <span slot="footer" class="dialog-footer">
@@ -399,6 +399,7 @@
         <el-button type="primary"  :disabled="this.check != 3" @click="passRegister">通过</el-button>
         <el-button type="primary"  :disabled="this.check != 3" @click="noPassRegister">不通过</el-button>
       </span>
+        <el-card>
           <el-table
             v-loading="certLoading"
             :data="certList"
@@ -438,7 +439,7 @@
 
             <el-table-column label="备注" prop="remark" width="120"></el-table-column>
 
-          <el-table-column label="操作" width="80">
+            <el-table-column label="操作" width="80" fixed="right">
               <template slot-scope="scope">
 
                 <el-button
@@ -457,6 +458,8 @@
               </template>
             </el-table-column>
           </el-table>
+        </el-card>
+
         <pagination
           v-show="certTotal > 0"
           :total="certTotal"