界面优化

2 years ago · 3af5f05443
parent 5f97d7c339
commit 3af5f05443
6 changed files with 132 additions and 121 deletions
--- a/src/views/basic/product/dict/UdiBasicProduct.vue
+++ b/src/views/basic/product/dict/UdiBasicProduct.vue
@ -3,37 +3,38 @@
    <el-card>
      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
        <el-row>
-          <el-col :span="8">
-            <el-form-item label="产品编码:">
+          <el-col :span="6">
+            <el-form-item label="产品编码:" class="query-form-item">
              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
-            <el-form-item label="产品名称:">
+          <el-col :span="6">
+            <el-form-item label="产品通用名称:" class="query-form-item">
              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
-            <el-form-item label="规格型号:">
+          <el-col :span="6">
+            <el-form-item label="规格型号:" class="query-form-item">
              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
-          <el-col :span="8">
-            <el-form-item label="注册备案号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"
+          <el-col :span="6">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
-            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+          <el-col :span="6">
+            <el-form-item label="注册备案号:" class="query-form-item">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"
                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
+
        </el-row>
      </el-form>
      <div class="top-right-btn">
@ -48,11 +49,11 @@
      <el-table v-loading="loading" :data="list" key="1" style="width: 100%"
                border>
        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品通用名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>
        <el-table-column width="120" label="操作">
          <template slot-scope="scope">
            <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
@ -65,7 +66,7 @@
        :visible.sync="editDialogVisible"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
-        width="60%"
+        width="80%"
        v-if="editDialogVisible"
      >
        <UdiBasicProductEdit
--- a/src/views/basic/product/dict/UdiBasicProductEdit.vue
+++ b/src/views/basic/product/dict/UdiBasicProductEdit.vue
@ -3,7 +3,7 @@
    <el-card>
      <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border key="3"
                @current-change="handleDetail">
-        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>
        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
        <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
        <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
@ -14,7 +14,7 @@

        <el-row type="flex" class="edit-row" style="margin-top: 20px">
          <el-col :span="12">
-            <el-form-item label="产品名称:">
+            <el-form-item label="产品通用名称:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -25,7 +25,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="规格型号:">`
+            <el-form-item label="规格型号:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -39,7 +39,7 @@
        </el-row>
        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="医疗器械注册人:">
+            <el-form-item label="医疗器械注册人:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -50,7 +50,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="注册证/备案号:">
+            <el-form-item label="注册证/备案号:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small" disabled
@ -62,17 +62,19 @@
        </el-row>
        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="计量单位:">
+            <el-form-item label="产品描述:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
+                :disabled="true"
                splaceholder="请输入内容"
-                v-model="detailQuery.measname"
+                v-model="detailQuery.cpms"
              ></el-input>
            </el-form-item>
          </el-col>
+
          <el-col :span="12">
-            <el-form-item label="生产企业:">
+            <el-form-item label="生产企业:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -84,7 +86,7 @@
        </el-row>
        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="商品名称:">
+            <el-form-item label="商品名称:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -94,12 +96,12 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="产品描述:">
+            <el-form-item label="计量单位:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
                splaceholder="请输入内容"
-                v-model="detailQuery.cpms"
+                v-model="detailQuery.measname"
              ></el-input>
            </el-form-item>
          </el-col>
@ -115,7 +117,7 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>产品标识:&nbsp;</span>
+                    <span>产品DI标识:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
@ -126,21 +128,21 @@
                  ></el-input>
                </div>
              </el-col>
-
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                    <span>包含最小销售包装数量:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
-                    :disabled="!checked"
                    size="small"
+                    :disabled="true"
                    splaceholder="请输入内容"
-                    v-model="detailQuery.zxxsbzbhsydysl"
+                    v-model="detailQuery.bhzxxsbzsl"
                  ></el-input>
                </div>
              </el-col>
+
            </el-row>

            <el-row :gutter="20" class="el-row" type="flex">
@ -161,17 +163,18 @@
                </div>
              </el-col>

+
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>包含最小销售包装数量:&nbsp;</span>
+                    <span>最小包装单元内包含使用单元数量:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
+                    :disabled="!checked"
                    size="small"
-                    :disabled="true"
                    splaceholder="请输入内容"
-                    v-model="detailQuery.bhzxxsbzsl"
+                    v-model="detailQuery.zxxsbzbhsydysl"
                  ></el-input>
                </div>
              </el-col>
@ -186,7 +189,7 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>产品名称:&nbsp;</span>
+                    <span>产品通用名称:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
@ -200,7 +203,7 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>产品标识:&nbsp;</span>
+                    <span>产品DI标识:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
--- a/src/views/basic/product/rel/UdiRlCompany.vue
+++ b/src/views/basic/product/rel/UdiRlCompany.vue
@ -4,7 +4,7 @@
      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
        <el-row>
          <el-col :span="6">
-            <el-form-item label="注册企业:">
+            <el-form-item label="注册企业:" class="query-form-item">
              <el-select
                v-model="filterQuery.companyIdFk"
                style="width: 90%"
@ -28,33 +28,34 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="产品编码:" class="query-form-item">
              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="产品名称:">
+            <el-form-item label="产品名称:" class="query-form-item">
              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
+
+        </el-row>
+
+        <el-row>
          <el-col :span="6">
-            <el-form-item label="规格型号:">
+            <el-form-item label="规格型号:" class="query-form-item">
              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
            </el-form-item>
          </el-col>
-        </el-row>
-
-        <el-row>
          <el-col :span="6">
-            <el-form-item label="注册备案号:">
+            <el-form-item label="注册备案号:" class="query-form-item">
              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"
                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="生产企业:">
+            <el-form-item label="生产企业:" class="query-form-item">
              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
                        clearable="true"></el-input>
            </el-form-item>
@ -82,11 +83,11 @@
          </template>

        </el-table-column>
-        <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
        <el-table-column label="产品名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
        <el-table-column width="120" label="操作">
          <template slot-scope="scope">
            <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
@ -101,7 +102,7 @@
        :visible.sync="editDialogVisible"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
-        width="60%"
+        width="80%"
        v-if="editDialogVisible"
      >
        <selectDetail
@ -132,7 +133,7 @@
        :visible.sync="editDiDialogVisible"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
-        width="70%"
+        width="80%"
        v-if="editDiDialogVisible"
      >
        <ProductEdit
--- a/src/views/basic/product/rel/productEdit.vue
+++ b/src/views/basic/product/rel/productEdit.vue
@ -3,7 +3,7 @@
    <el-card>
      <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border key="3"
                @current-change="handleDetail">
-        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>
        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
        <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
        <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
@ -13,7 +13,7 @@
      <el-card>
        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="注册企业:">
+            <el-form-item label="注册企业:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -24,67 +24,63 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="企业类型:">
-              <el-select
-                v-model="detailQuery.companyType"
-                placeholder="请选择企业类型"
-                clearable
+            <el-form-item label="医疗器械注册人:" class="query-form-item">
+              <el-input
                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>
+                size="small"
+                disabled
+                splaceholder="请输入内容"
+                v-model="detailQuery.ylqxzcrbarmc"
+              ></el-input>
            </el-form-item>
          </el-col>
+
        </el-row>

        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="代理起始时间:">
-              <el-date-picker
-                format="yyyy 年 MM 月 dd 日"
-                v-model="detailQuery.agengtStartDate"
-                type="date"
+            <el-form-item label="产品通用名称:" class="query-form-item">
+              <el-input
                style="width: 80%"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
+                size="small"
+                disabled
+                splaceholder="请输入内容"
+                v-model="detailQuery.cpmctymc"
+              ></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="代理截止时间:">
-              <el-date-picker
-                format="yyyy 年 MM 月 dd 日"
-                v-model="detailQuery.agengtEndDate"
-                type="date"
+            <el-form-item label="注册证/备案号:" class="query-form-item">
+              <el-input
                style="width: 80%"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
+                size="small" disabled
+                splaceholder="请输入内容"
+                v-model="detailQuery.zczbhhzbapzbh"
+              ></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row type="flex" class="edit-row">
+
          <el-col :span="12">
-            <el-form-item label="产品名称:">
+            <el-form-item label="规格型号:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
                disabled
                splaceholder="请输入内容"
-                v-model="detailQuery.cpmctymc"
+                v-model="detailQuery.ggxh"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="规格型号:">
+            <el-form-item label="产品描述:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
-                disabled
+                :disabled="true"
                splaceholder="请输入内容"
-                v-model="detailQuery.ggxh"
+                v-model="detailQuery.cpms"
              ></el-input>
            </el-form-item>
          </el-col>
@ -92,30 +88,35 @@
        </el-row>
        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="医疗器械注册人:">
-              <el-input
+            <el-form-item label="代理起始时间:" class="query-form-item">
+              <el-date-picker
+                format="yyyy 年 MM 月 dd 日"
+                v-model="detailQuery.agengtStartDate"
+                type="date"
                style="width: 80%"
-                size="small"
-                disabled
-                splaceholder="请输入内容"
-                v-model="detailQuery.ylqxzcrbarmc"
-              ></el-input>
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
            </el-form-item>
          </el-col>
+
          <el-col :span="12">
-            <el-form-item label="注册证/备案号:">
-              <el-input
+            <el-form-item label="代理截止时间:" class="query-form-item">
+              <el-date-picker
+                format="yyyy 年 MM 月 dd 日"
+                v-model="detailQuery.agengtEndDate"
+                type="date"
                style="width: 80%"
-                size="small" disabled
-                splaceholder="请输入内容"
-                v-model="detailQuery.zczbhhzbapzbh"
-              ></el-input>
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
            </el-form-item>
          </el-col>
+
        </el-row>
        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="计量单位:">
+            <el-form-item label="计量单位:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -125,7 +126,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="生产企业:">
+            <el-form-item label="生产企业:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -137,7 +138,7 @@
        </el-row>
        <el-row type="flex" class="edit-row">
          <el-col :span="12">
-            <el-form-item label="商品名称:">
+            <el-form-item label="商品名称:" class="query-form-item">
              <el-input
                style="width: 80%"
                size="small"
@ -147,13 +148,17 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="产品描述:">
-              <el-input
+            <el-form-item label="企业类型:" class="query-form-item">
+              <el-select
+                v-model="detailQuery.companyType"
+                placeholder="请选择企业类型"
+                clearable
                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="detailQuery.cpms"
-              ></el-input>
+              >
+                <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>
@ -168,7 +173,7 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>产品标识:&nbsp;</span>
+                    <span>产品DI标识:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
@ -179,21 +184,21 @@
                  ></el-input>
                </div>
              </el-col>
-
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                    <span>包含最小销售包装数量:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
-                    :disabled="!checked"
                    size="small"
+                    :disabled="true"
                    splaceholder="请输入内容"
-                    v-model="detailQuery.zxxsbzbhsydysl"
+                    v-model="detailQuery.bhzxxsbzsl"
                  ></el-input>
                </div>
              </el-col>
+
            </el-row>

            <el-row :gutter="20" class="el-row" type="flex">
@ -217,14 +222,14 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>包含最小销售包装数量:&nbsp;</span>
+                    <span>最小包装单元内包含使用单元数量:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
+                    :disabled="!checked"
                    size="small"
-                    :disabled="true"
                    splaceholder="请输入内容"
-                    v-model="detailQuery.bhzxxsbzsl"
+                    v-model="detailQuery.zxxsbzbhsydysl"
                  ></el-input>
                </div>
              </el-col>
@ -239,7 +244,7 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>产品名称:&nbsp;</span>
+                    <span>产品通用名称:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
@ -253,7 +258,7 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>产品标识:&nbsp;</span>
+                    <span>产品DI标识:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
--- a/src/views/basic/product/rel/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/rel/udilnfoManageSpDetail.vue
@ -30,21 +30,21 @@
                  ></el-input>
                </div>
              </el-col>
-
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                    <span>包含最小销售包装数量:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
-                    :disabled="!checked"
                    size="small"
+                    :disabled="true"
                    splaceholder="请输入内容"
-                    v-model="detailQuery.zxxsbzbhsydysl"
+                    v-model="detailQuery.bhzxxsbzsl"
                  ></el-input>
                </div>
              </el-col>
+
            </el-row>

            <el-row :gutter="20" class="el-row" type="flex">
@ -68,14 +68,14 @@
              <el-col :span="12" class="el-col">
                <div class="text item">
                  <div class="itemTag">
-                    <span>包含最小销售包装数量:&nbsp;</span>
+                    <span>最小包装单元内包含使用单元数量:&nbsp;</span>
                  </div>
                  <el-input
                    style="width: 65%"
+                    :disabled="!checked"
                    size="small"
-                    :disabled="true"
                    splaceholder="请输入内容"
-                    v-model="detailQuery.bhzxxsbzsl"
+                    v-model="detailQuery.zxxsbzbhsydysl"
                  ></el-input>
                </div>
              </el-col>
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@ -631,6 +631,7 @@ export default {

 <style scoped>

+
 .item .el-form-item__label {
  margin-left: 14px;
  width: 300px;