From e84e83c09e8e299a51356c3d572a561cd9a2fc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 28 Dec 2022 14:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thirdSys/product/ThrProductsAdd.vue | 270 ++++-------
 .../thirdSys/product/ThrProductsDetail.vue    | 426 +++++++-----------
 .../product/ThrProductsImportDetail.vue       |  25 +-
 .../thirdSys/product/ThrProductsSelect.vue    |  42 +-
 .../{ThrProducts.vue => thrProducts.vue}      |  62 +--
 ...oductsExport.vue => thrProductsExport.vue} |  49 +-
 ...oductsImport.vue => thrProductsImport.vue} |  28 +-
 7 files changed, 356 insertions(+), 546 deletions(-)
 rename src/views/thirdSys/product/{ThrProducts.vue => thrProducts.vue} (86%)
 rename src/views/thirdSys/product/{ThrProductsExport.vue => thrProductsExport.vue} (87%)
 rename src/views/thirdSys/product/{ThrProductsImport.vue => thrProductsImport.vue} (93%)

diff --git a/src/views/thirdSys/product/ThrProductsAdd.vue b/src/views/thirdSys/product/ThrProductsAdd.vue
index 01992c58..1ef491b0 100644
--- a/src/views/thirdSys/product/ThrProductsAdd.vue
+++ b/src/views/thirdSys/product/ThrProductsAdd.vue
@@ -1,21 +1,13 @@
 <template>
-    <el-card class="el-card">
-        <el-form :inline="true" :model="newProductData" size="mini">
-            <div style="margin-bottom: 20px">
-
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>第三方系统:&nbsp;</span>
-                            </div>
+        <el-form  :model="newProductData"  label-width="120px">
+                <el-row  type="flex">
+                    <el-col :span="11" type="flex">
+                          <el-form-item label="第三方系统" prop="thirdSysFk">
                             <el-select
-                                style="width: 60%"
+                                style="width: 90%"
                                 v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
                             >
                                 <el-option
-
                                     v-for="item in thirdSys"
                                     :key="item.value"
                                     :label="item.thirdName"
@@ -26,264 +18,185 @@
                                         }}</span>
                                 </el-option>
                             </el-select>
-                        </div>
+                          </el-form-item>
                     </el-col>
-
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品编码:&nbsp;</span>
-                            </div>
+                <el-row type="flex">
+                    <el-col :span="11" type="flex">
+                          <el-form-item label="产品编码:" prop="code">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入产品编码"
                                 v-model.trim="newProductData.code"
                             ></el-input>
-                        </div>
+                          </el-form-item>
                     </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品名称:&nbsp;</span>
-                            </div>
+                    <el-col :span="11" type="flex">
+                      <el-form-item label="产品名称:" prop="name">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入产品名称"
                                 v-model.trim="newProductData.name"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>规格型号:&nbsp;</span>
-                            </div>
+                <el-row  type="flex">
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="规格型号:" prop="spec">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入规格型号"
                                 v-model.trim="newProductData.spec"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
 
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>计量单位:&nbsp;</span>
-                            </div>
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="计量单位:" prop="measname">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入计量单位"
                                 v-model.trim="newProductData.measname"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>生产厂家:&nbsp;</span>
-                            </div>
+                <el-row  type="flex">
+                    <el-col :span="11" class="el-col">
+                          <el-form-item label="生产厂家:" prop="manufactory">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入生产厂家"
                                 v-model.trim="newProductData.manufactory"
                             ></el-input>
-                        </div>
+                          </el-form-item>
                     </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>注册证号:&nbsp;</span>
-                            </div>
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="注册证号:" prop="registerNo">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入注册证号"
                                 v-model.trim="newProductData.registerNo"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>医疗器械注册人:&nbsp;</span>
-                            </div>
+                <el-row type="flex">
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入医疗器械注册人"
                                 v-model.trim="newProductData.ylqxzcrbarmc"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>注册人英文名称:&nbsp;</span>
-                            </div>
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入注册人英文名称"
                                 v-model.trim="newProductData.ylqxzcrbarywmc"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
 
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品类别:&nbsp;</span>
-                            </div>
+                <el-row  type="flex">
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="产品类别:" prop="cplb">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入产品类别"
                                 v-model.trim="newProductData.cplb"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>分类编码:&nbsp;</span>
-                            </div>
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="分类编码:" prop="flbm">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入分类编码"
                                 v-model.trim="newProductData.flbm"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>商品条码:&nbsp;</span>
-                            </div>
+                <el-row  type="flex">
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="商品条码:" prop="sptm">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入商品条码"
                                 v-model.trim="newProductData.sptm"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>医保编码:&nbsp;</span>
-                            </div>
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="医保编码:" prop="ybbm">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入医保编码"
                                 v-model.trim="newProductData.ybbm"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>统一社会信用号:&nbsp;</span>
-                            </div>
+                <el-row type="flex">
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="统一社会信用号:" prop="tyshxydm">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入统一社会信用号"
                                 v-model.trim="newProductData.tyshxydm"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>器械类别:&nbsp;</span>
-                            </div>
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="器械类别:" prop="qxlb">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                placeholder="请输入内容"
+                                placeholder="请输入器械类别"
                                 v-model.trim="newProductData.qxlb"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="20" class="el-col" style="margin-top: 12px">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品描述:&nbsp;</span>
-                            </div>
-
+                <el-row  type="flex">
+                    <el-col :span="23" class="el-col">
+                      <el-form-item label="产品描述:" prop="cpms">
                             <el-input
-                                style="width: 85%"
+                                style="width: 92%"
                                 type="textarea"
                                 size="mini"
-                                rows="4"
-                                placeholder="请输入内容"
+                                rows="3"
+                                placeholder="请输入产品描述"
                                 v-model.trim="newProductData.cpms"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
                 </el-row>
-
-<!--                <el-row :gutter="20" class="el-row" type="flex">-->
-<!--                    <el-col :span="12" class="el-col">-->
-<!--                        <div class="text item">-->
-<!--                            <div class="itemTag">-->
-<!--                                <span>进口产品代理商:&nbsp;</span>-->
-<!--                            </div>-->
-<!--                            <el-input-->
-<!--                                style="width: 60%"-->
-<!--                                size="small"-->
-<!--                                placeholder="请输入内容"-->
-<!--                                v-model.trim="newProductData.cpdls"-->
-<!--                            ></el-input>-->
-<!--                        </div>-->
-<!--                    </el-col>-->
-<!--                </el-row>-->
-
-            </div>
-
             <div style='text-align: center; margin-bottom: 10px;'>
                 <el-button type="primary" @click="saveNewProduct">提交</el-button>
                 <el-button type="primary" @click="closeAddDialog">取消</el-button>
             </div>
         </el-form>
-    </el-card>
 </template>
 
 <script>
@@ -414,7 +327,4 @@ export default {
 </script>
 
 <style scoped>
-.el-row {
-    margin-top: 10px;
-}
 </style>
diff --git a/src/views/thirdSys/product/ThrProductsDetail.vue b/src/views/thirdSys/product/ThrProductsDetail.vue
index 2c140377..1e3f18ca 100644
--- a/src/views/thirdSys/product/ThrProductsDetail.vue
+++ b/src/views/thirdSys/product/ThrProductsDetail.vue
@@ -1,265 +1,189 @@
 <template>
-    <div>
-        <el-card class="el-card">
+  <el-form  label-width="120px">
             <div v-if="!isImport" style="margin-bottom: 20px">
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>第三方系统:&nbsp;</span>
-                            </div>
+                <el-row type="flex">
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="第三方系统" prop="thirdSysFk">
                             <el-input
-                                style="width: 60%"
+                                style="width: 90%"
                                 size="small"
-                                splaceholder="请输入内容"
                                 :disabled="true"
                                 v-model="data.thirdSysName"
                             ></el-input>
-                        </div>
+                      </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品名称:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                :disabled="true"
-                                v-model="data.name"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品编码:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.code"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>注册证号:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.registerNo"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>生产厂家:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="ylqxzcrbarmc"
-                                v-model="data.manufactory"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>规格型号:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.spec"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>计量单位:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.measname"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>医疗器械注册人:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="ylqxzcrbarmc"
-                                v-model="data.ylqxzcrbarmc"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>注册人英文名称:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.ylqxzcrbarywmc"
-                            ></el-input>
-                        </div>
-                    </el-col>
+              <el-row type="flex">
+                <el-col :span="11" type="flex">
+                  <el-form-item label="产品编码:" prop="code">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.code"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" type="flex">
+                  <el-form-item label="产品名称:" prop="name">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.name"
+                    ></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="manufactory">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.manufactory"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="注册证号:" prop="registerNo">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.registerNo"
+                    ></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="spec">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.spec"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
 
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品类别:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.cplb"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>分类编码:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.flbm"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>商品条码:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.sptm"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>医保编码:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.ybbm"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>统一社会信用号:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.tyshxydm"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>器械类别:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 60%"
-                                :disabled="true"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="data.qxlb"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="20" class="el-col" style="margin-top: 12px">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品描述:&nbsp;</span>
-                            </div>
-
-                            <el-input
-                                style="width: 85%"
-                                type="textarea"
-                                size="mini"
-                                :disabled="true"
-                                rows="4"
-                                splaceholder="请输入内容"
-                                v-model="data.cpms"
-                                @input="change()"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="计量单位:" prop="measname">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.measname"
+                    ></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="ylqxzcrbarmc">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.ylqxzcrbarmc"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.ylqxzcrbarywmc"
+                    ></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="cplb">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.cplb"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="分类编码:" prop="flbm">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.flbm"
+                    ></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="sptm">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.sptm"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="医保编码:" prop="ybbm">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.ybbm"
+                    ></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="tyshxydm">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.tyshxydm"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="器械类别:" prop="qxlb">
+                    <el-input
+                      style="width: 90%"
+                      size="small"
+                      :disabled="true"
+                      v-model.trim="data.qxlb"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row  type="flex">
+                <el-col :span="23" class="el-col">
+                  <el-form-item label="产品描述:" prop="cpms">
+                    <el-input
+                      style="width: 92%"
+                      type="textarea"
+                      size="mini"
+                      rows="3"
+                      :disabled="true"
+                      v-model.trim="data.cpms"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
             </div>
-        </el-card>
-    </div>
+  </el-form>
 </template>
 
 <script>
diff --git a/src/views/thirdSys/product/ThrProductsImportDetail.vue b/src/views/thirdSys/product/ThrProductsImportDetail.vue
index d40ae3fb..c714a656 100644
--- a/src/views/thirdSys/product/ThrProductsImportDetail.vue
+++ b/src/views/thirdSys/product/ThrProductsImportDetail.vue
@@ -6,19 +6,19 @@
                     <el-form-item class="query-form-item">
                         <el-input
                             v-model="filterQuery.code"
-                            placeholder="产品编码"
+                            placeholder="请输入产品编码"
                         ></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-input
                             v-model="filterQuery.name"
-                            placeholder="产品名称"
+                            placeholder="请输入产品名称"
                         ></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -28,6 +28,7 @@
                 v-loading="loading"
                 :data="list"
                 style="width: 100%"
+                border highlight-current-row
             >
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="产品编码" prop="code"></el-table-column>
@@ -37,13 +38,13 @@
                 <el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
             </el-table>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="filterQuery.page"
-            ></el-pagination>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="filterQuery.page"
+            :limit.sync="filterQuery.limit"
+            @pagination="getList"
+          />
 
         </el-card>
     </div>
@@ -127,10 +128,6 @@
                 };
                 return statusMap[status];
             },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
-                this.getList();
-            },
         },
 
         mounted() {
diff --git a/src/views/thirdSys/product/ThrProductsSelect.vue b/src/views/thirdSys/product/ThrProductsSelect.vue
index ca9eb59b..0ac75160 100644
--- a/src/views/thirdSys/product/ThrProductsSelect.vue
+++ b/src/views/thirdSys/product/ThrProductsSelect.vue
@@ -5,32 +5,32 @@
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.code"
-            placeholder="产品编码/商品条码/医保编码"
+            placeholder="请输入产品编码/商品条码/医保编码"
             @keyup.enter.native="keyupErp_submit($event)"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.name"
-            placeholder="产品名称"
+            placeholder="请输入产品名称"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.spec" clearable="true"
-            placeholder="规格型号"
+            placeholder="请输入规格型号"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.registerNo" clearable="true"
-            placeholder="注册/备案凭证"
+            placeholder="请输入注册/备案凭证"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.manufactory" clearable="true"
-            placeholder="生产厂家"
+            placeholder="请输入生产厂家"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
@@ -49,22 +49,22 @@
           <el-button-group style="display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
             <el-button type="primary" icon="search" @click="getList">查询</el-button>
-            <el-button type="primary" icon="search" @click="selectExport" v-if="selectType==0"
+            <el-button type="primary"  icon="el-icon-top-right" @click="selectExport" v-if="selectType==0"
             >选中导出
             </el-button>
-            <el-button type="primary" icon="search" @click="allExport" v-if="selectType==0"
+            <el-button type="primary"  icon="el-icon-top-right" @click="allExport" v-if="selectType==0"
             >结果全部导出
             </el-button>
-            <el-button type="primary" icon="search" @click="uploadSmp"
+            <el-button type="primary"  icon="el-icon-top-right" @click="uploadSmp"
                        v-if="selectType==1"
             >选中上传
             </el-button>
-            <el-button type="primary" icon="search" @click="allUploadSmp"
+            <el-button type="primary"  icon="el-icon-top-right" @click="allUploadSmp"
                        v-if="selectType==1"
             >一键上传
             </el-button>
 
-            <el-button type="primary" icon="search" @click="downloadErp"
+            <el-button type="primary" icon="search"  @click="downloadErp"
                        v-if="selectType==3"
             >选中下载
             </el-button>
@@ -76,7 +76,7 @@
           </el-button-group>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index" width="80"></el-table-column>
         <el-table-column label="产品编码" prop="code"></el-table-column>
@@ -85,7 +85,7 @@
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" fixed="right">
+        <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)"
             >详情
@@ -96,18 +96,18 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
+      <pagination
+        v-show="total>0"
         :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      ></pagination>
     </el-card>
     <el-dialog
       title="产品信息详情"
       :visible.sync="thrProductsDetailVisible"
-      width="85%"
+      width="60%"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       append-to-body
@@ -299,10 +299,6 @@ export default {
         });
 
     },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
     handleChange(response, files, fileList) {
       console.log(response);
       if (response.code != 20000) {
diff --git a/src/views/thirdSys/product/ThrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
similarity index 86%
rename from src/views/thirdSys/product/ThrProducts.vue
rename to src/views/thirdSys/product/thrProducts.vue
index 9f6d7989..fc3661b1 100644
--- a/src/views/thirdSys/product/ThrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -1,36 +1,36 @@
 <template>
   <div>
-    <el-card class="el-card">
+    <el-card >
       <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.code"
-            placeholder="产品编码/商品条码/医保编码" clearable
+            placeholder="请输入产品编码/商品条码/医保编码" clearable
             @keyup.enter.native="keyupErp_submit($event)"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.name" clearable
-            placeholder="产品名称"
+            placeholder="请输入产品名称"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.spec" clearable
-            placeholder="规格型号"
+            placeholder="请输入规格型号"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.registerNo" clearable
-            placeholder="注册/备案凭证"
+            placeholder="请输入注册/备案凭证"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
           <el-input
             v-model="filterQuery.manufactory" clearable
-            placeholder="生产厂家"
+            placeholder="请输入生产厂家"
           ></el-input>
         </el-form-item>
         <el-form-item class="query-form-item">
@@ -48,30 +48,13 @@
         <el-form-item>
           <el-button-group style="display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-            <el-button type="primary" icon="search" @click="search">查询</el-button>
-            <el-button type="primary" @click="addProductVisible=true" :disabled="!configParms.basicThirdProducts">新增
+            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+            <el-button type="primary" icon="el-icon-plus"   @click="addProductVisible=true"  :disabled="!configParms.basicThirdProducts">新增
             </el-button>
-            <!--<el-button type="primary" icon="search" @click="clearAll">清空全部</el-button>-->
-            <!--<el-upload-->
-            <!--v-if="!this.thirdSysDetail.enabled"-->
-            <!--:action="uploadFileUrl"-->
-            <!--multiple-->
-            <!--:limit="3"-->
-            <!--:data="uploadData"-->
-            <!--:show-file-list="false"-->
-            <!--:on-success="handleChange"-->
-            <!--:file-list="fileList"-->
-            <!--&gt;-->
-            <!--<el-button size="mini" type="primary" >导入产品信息</el-button>-->
-            <!--</el-upload>-->
-
-            <!--<el-button type="primary" icon="search" @click="downloadDatas"-->
-            <!--v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.itrCache">导入产品信息-->
-            <!--</el-button>-->
           </el-button-group>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%">
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="80"></el-table-column>
         <el-table-column label="产品编码" prop="code"></el-table-column>
         <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
@@ -79,7 +62,7 @@
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" fixed="right">
+        <el-table-column label="操作"  width="200">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)"
             >详情
@@ -91,20 +74,22 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
+      <pagination
+        v-show="total>0"
         :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
     </el-card>
     <el-dialog
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       title="产品信息详情"
       :visible.sync="thrProductsDetailVisible"
-      width="85%"
+      width="60%"
+      class="dialog-two"
+      top="5vh"
       v-if="thrProductsDetailVisible"
     >
       <thrProductsDetail
@@ -117,9 +102,11 @@
       :close-on-press-escape="false"
       title="新增配送产品"
       :visible.sync="addProductVisible"
-      width="85%"
+      width="60%"
       v-if="addProductVisible"
       @close="closeAddDialog"
+      class="dialog-two"
+      top="5vh"
     >
 
       <ThrProductsAdd
@@ -218,6 +205,7 @@ export default {
       this.loading = true;
       getInvbasdoc(this.filterQuery)
         .then((response) => {
+          debugger
           // this.loading = false;
           if (response.code == 20000) {
             this.list = response.data.list || [];
@@ -324,10 +312,6 @@ export default {
         });
 
     },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
     handleChange(response, files, fileList) {
       console.log(response);
       if (response.code != 20000) {
diff --git a/src/views/thirdSys/product/ThrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
similarity index 87%
rename from src/views/thirdSys/product/ThrProductsExport.vue
rename to src/views/thirdSys/product/thrProductsExport.vue
index 668d1bbc..4d8fdd6e 100644
--- a/src/views/thirdSys/product/ThrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -1,15 +1,16 @@
 <template>
   <div>
+    <el-card>
     <el-form :inline="true" :model="query" class="query-form" size="mini">
       <el-row>
         <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
+          <el-input v-model="filterQuery.genKey" placeholder="请输入记录ID"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button-group style="display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-            <el-button type="primary" icon="search" @click="getList">查询</el-button>
-            <el-button type="primary" icon="search" @click="exportExcel">导出产品信息</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-top-right" @click="exportExcel">导出产品信息</el-button>
           </el-button-group>
         </el-form-item>
       </el-row>
@@ -19,6 +20,7 @@
       v-loading="loading"
       :data="list"
       style="width: 100%"
+      border highlight-current-row
       @selection-change="handleSelectionChange"
     >
       <el-table-column label="序号" type="index"></el-table-column>
@@ -72,26 +74,27 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="filterQuery.page"
+      :limit.sync="filterQuery.limit"
+      @pagination="getList"
+    ></pagination>
 
-    <el-dialog
-      title="导出产品信息"
-      :visible.sync="thrProductsSelectVisible"
-      width="85%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="thrProductsSelectVisible"
-    >
-      <thrProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
-      ></thrProductsSelect>
-    </el-dialog>
+      <el-dialog
+        title="导出产品信息"
+        :visible.sync="thrProductsSelectVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="thrProductsSelectVisible"
+      >
+        <thrProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+        ></thrProductsSelect>
+      </el-dialog>
 
-    <el-pagination
-      :page-size="filterQuery.limit"
-      @current-change="handleCurrentChange"
-      layout="prev, pager, next"
-      :total="total"
-      :current-page="filterQuery.page"
-    ></el-pagination>
+    </el-card>
   </div>
 </template>
 
@@ -206,10 +209,6 @@ export default {
       }
       this.thrProductsSelectVisible = false;
     },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
     deleteDialog(rowId) {
       this.$confirm("此操作将删除该导出记录, 是否继续?", "提示", {
         confirmButtonText: "确定",
diff --git a/src/views/thirdSys/product/ThrProductsImport.vue b/src/views/thirdSys/product/thrProductsImport.vue
similarity index 93%
rename from src/views/thirdSys/product/ThrProductsImport.vue
rename to src/views/thirdSys/product/thrProductsImport.vue
index 06c407dc..cb4a6627 100644
--- a/src/views/thirdSys/product/ThrProductsImport.vue
+++ b/src/views/thirdSys/product/thrProductsImport.vue
@@ -1,13 +1,14 @@
 <template>
   <div>
+    <el-card>
     <el-form :inline="true" :model="query" class="query-form" size="mini">
       <el-row>
         <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
+          <el-input v-model="filterQuery.genKey" placeholder="请输入记录ID"></el-input>
         </el-form-item>
 
         <el-form-item class="query-form-item">
-          <el-select v-model="filterQuery.status" placeholder="处理状态">
+          <el-select v-model="filterQuery.status" placeholder="请选择处理状态">
             <el-option label="全部" value=""></el-option>
             <el-option label="处理中" value="0"></el-option>
             <el-option label="已处理" value="1"></el-option>
@@ -30,7 +31,7 @@
         <el-form-item>
           <el-button-group style="display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
             <el-upload
               v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
               :action="uploadFileUrl"
@@ -43,9 +44,6 @@
             >
               <el-button size="mini" type="primary">导入产品信息</el-button>
             </el-upload>
-            <!--                        <el-button type="primary" icon="search" @click="jumpDl"-->
-            <!--                                   v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载-->
-            <!--                        </el-button>-->
             <el-button type="primary" icon="search" @click="downloadProducts"
                        v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
               下载产品信息
@@ -58,6 +56,7 @@
       v-loading="loading"
       :data="list"
       style="width: 100%"
+      border highlight-current-row
     >
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
@@ -103,7 +102,7 @@
         show-overflow-tooltip
       ></el-table-column>
 
-      <el-table-column label="操作" fixed="right" width="160">
+      <el-table-column label="操作"  width="160">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -122,17 +121,17 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination
-      :page-size="filterQuery.limit"
-      @current-change="handleCurrentChange"
-      layout="prev, pager, next"
+    <pagination
+      v-show="total>0"
       :total="total"
-      :current-page="filterQuery.page"
-    ></el-pagination>
+      :page.sync="filterQuery.page"
+      :limit.sync="filterQuery.limit"
+      @pagination="getList"
+    ></pagination>
     <el-dialog
       title="导入产品信息详情详情"
       :visible.sync="udiImportDetailVisible"
-      width="85%"
+      width="80%"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       v-if="udiImportDetailVisible"
@@ -154,6 +153,7 @@
       <thrProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog" :isDownThrSys="true"
       ></thrProductsSelect>
     </el-dialog>
+    </el-card>
   </div>
 </template>