From ddfcaa3758a6a50ba95f45595583ffd7629b7e14 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 29 Mar 2024 10:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=85=A5=E9=99=A2=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  11 +-
 .../company/supCompanyAduditDialog.vue        |   1 +
 .../supplier/products/supProductsAdd.vue      | 639 +++++++++++-------
 .../supplier/products/supProductsAddDi.vue    |  13 +-
 .../supplier/products/supProductsDetail.vue   | 340 ++++++----
 src/views/thirdSys/product/thrProductsAdd.vue | 453 +++++++------
 6 files changed, 850 insertions(+), 607 deletions(-)

diff --git a/.env.production b/.env.production
index 77d7d93..74829df 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
-VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
 # 文明懂
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
@@ -23,8 +23,7 @@ VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
 
@@ -47,14 +46,16 @@ VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 # 东山
 # VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
 
+# VUE_APP_BASE_API = 'http://192.168.0.247:9150/UDI_SPMS_SERVER/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 
 # 域名
-# VUE_APP_CONTEXT_PATH = '/'
+VUE_APP_CONTEXT_PATH = '/'
 
 # 其他
-VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
+# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index bcaee49..345e69e 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -139,6 +139,7 @@
 
         </div>
 
+
         <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border
                   highlight-current-row>
           <el-table-column type="selection" width="55"></el-table-column>
diff --git a/src/views/supplier/products/supProductsAdd.vue b/src/views/supplier/products/supProductsAdd.vue
index 2202e99..1355d07 100644
--- a/src/views/supplier/products/supProductsAdd.vue
+++ b/src/views/supplier/products/supProductsAdd.vue
@@ -1,135 +1,250 @@
 <template>
-    <el-card class="el-card">
-        <el-form :model="newProductData" size="mini" label-width="150px">
-            <div style="margin-bottom: 20px">
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="第三方系统:">
-                            <el-select
-                                style="width: 90%"
-                                v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
-                            >
-                                <el-option
-                                    v-for="item in thirdSys"
-                                    :key="item.value"
-                                    :label="item.thirdName"
-                                    :value="item.thirdId">
-                                    <span style="float: left">{{ item.thirdName }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
-                                            item.thirdId
-                                        }}</span>
-                                </el-option>
-                            </el-select>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
+  <el-card class="el-card">
+    <el-form :model="newProductData" size="mini" label-width="150px">
+      <div style="margin-bottom: 20px">
+        <!--        <el-row>-->
+        <!--          <el-col :span="12" class="el-col">-->
+        <!--            <el-form-item label="第三方系统:">-->
+        <!--              <el-select-->
+        <!--                style="width: 90%"-->
+        <!--                v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in thirdSys"-->
+        <!--                  :key="item.value"-->
+        <!--                  :label="item.thirdName"-->
+        <!--                  :value="item.thirdId">-->
+        <!--                  <span style="float: left">{{ item.thirdName }}</span>-->
+        <!--                  <span style="float: right; color: #8492a6; font-size: 13px">{{-->
+        <!--                      item.thirdId-->
+        <!--                    }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
 
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品编码:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.code"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品名称:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.name"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row>
+          <!--          <el-col :span="12" class="el-col">-->
+          <!--            <el-form-item label="产品编码:">-->
+          <!--              <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
+          <!--                        v-model.trim="newProductData.code"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品名称:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.name"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="规格型号:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.spec"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="计量单位:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.measname"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="生产企业:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.manufactory"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="注册证号:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.registerNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="医疗器械注册人:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="注册人英文名称:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品类别:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.cplb"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="分类编码:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.flbm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="商品条码:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.sptm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="医保编码:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.ybbm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="统一社会信用号:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.tyshxydm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="器械类别:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.qxlb"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品价格:">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.price"></el-input>
+            </el-form-item>
+          </el-col>
 
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="规格型号:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.spec"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="计量单位:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.measname"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
 
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="生产企业:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.manufactory"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="注册证号:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.registerNo"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'">
+              <el-input
+                style="width: 90%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="newProductData.basicPrductRemak1"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
+            <el-form-item :label="productRemarkSet.remarkTitle2+':'">
+              <el-input
+                style="width: 90%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="newProductData.basicPrductRemak2"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
+            <el-form-item :label="productRemarkSet.remarkTitle3+':'">
+              <el-input
+                style="width: 90%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="newProductData.basicPrductRemak3"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
+            <el-form-item :label="productRemarkSet.remarkTitle4+':'">
+              <el-input
+                style="width: 90%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="newProductData.basicPrductRemak4"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
+            <el-form-item :label="productRemarkSet.remarkTitle5+':'">
+              <el-input
+                style="width: 90%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="newProductData.basicPrductRemak5"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
+            <el-form-item :label="productRemarkSet.remarkTitle6+':'">
+              <el-select
+                v-model="newProductData.basicPrductRemak6"
+                placeholder="请选择"
+                clearable
+                style="width: 90%"
+              >
+                <el-option label="扣费" value="1"></el-option>
+                <el-option label="不扣费" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
+            <el-form-item :label="productRemarkSet.remarkTitle7+':'">
+              <el-select
+                v-model="newProductData.basicPrductRemak7"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
+            <el-form-item :label="productRemarkSet.remarkTitle8+':'">
+              <el-select
+                v-model="newProductData.basicPrductRemak8"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物价类别"
+                :remote-method="findHsflMethod"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in hsflOptions"
+                  :key="item.hsbm"
+                  :label="item.hsmc"
+                  :value="item.hsbm"
+                >
+                  <span style="float: left">{{ item.hsmc }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.hsbm }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23" class="el-col" style="margin-top: 12px">
+            <el-form-item label="产品描述:">
+              <el-input style="width: 100%" type="textarea" size="mini" rows="4" placeholder="请输入内容"
+                        v-model.trim="newProductData.cpms"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
 
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="医疗器械注册人:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="注册人英文名称:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品类别:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.cplb"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="分类编码:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.flbm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="商品条码:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.sptm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="医保编码:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.ybbm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="统一社会信用号:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.tyshxydm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="器械类别:">
-                            <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.qxlb"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="23" class="el-col" style="margin-top: 12px">
-                      <el-form-item label="产品描述:">
-                            <el-input style="width: 100%" type="textarea" size="mini" rows="4" placeholder="请输入内容" v-model.trim="newProductData.cpms"></el-input>
-                      </el-form-item>
-                    </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>
+      <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>
@@ -138,124 +253,178 @@ import {saveNewProduct} from "@/api/thrsys/thrProducts";
 
 import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
 import {addProduct} from "@/api/thrsys/thrProductsAdd";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import {finProductSet} from "@/api/param/systemParamConfig";
 
 export default {
-    name: "ThrProductsAdd",
-    props: {
-        newType: {
-            type: Object,
-            required: true,
-        },
-        closeAddDialog: {
-            type: Function,
-            required: true,
-        },
+  name: "ThrProductsAdd",
+  props: {
+    newType: {
+      type: Object,
+      required: true,
     },
-    data() {
-        return {
-            newProductData: {
-                name: '',
-                code: null,
-                registerNo: null,
-                manufactory: null,
-                spec: null,
-                measname: null,
-                ylqxzcrbarmc: null,
-                ylqxzcrbarywmc: null,
-                cplb: null,
-                flbm: null,
-                sptm: null,
-                ybbm: null,
-                tyshxydm: null,
-                qxlb: null,
-                cplx: null,
-                cpms: null,
-                thirdSysFk: null,
-                cpdls: null
-            },
-            thirdSys: [],
-        }
-
+    closeAddDialog: {
+      type: Function,
+      required: true,
     },
-    methods: {
-        saveNewProduct() {
-            this.addProductVisible = false;
-            if (this.$isBlank(this.newProductData.thirdSysFk)) {
-                this.$message.warning("第三方系统不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.code)) {
-                this.$message.warning("产品编码为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.name)) {
-                this.$message.warning("产品名称不能为空！");
-                return;
-            }
+  },
+  data() {
+    return {
+      newProductData: {
+        name: '',
+        code: null,
+        registerNo: null,
+        manufactory: null,
+        spec: null,
+        measname: null,
+        ylqxzcrbarmc: null,
+        ylqxzcrbarywmc: null,
+        cplb: null,
+        flbm: null,
+        sptm: null,
+        ybbm: null,
+        tyshxydm: null,
+        qxlb: null,
+        cplx: null,
+        cpms: null,
+        thirdSysFk: null,
+        cpdls: null
+      },
+      thirdSys: [],
+      hsflOptions: [],
+      thrTypeOptions: [],
+      productRemarkSet: {
+        remarkTitle1: "备注字段1",
+        remarkTitle2: "备注字段2",
+        remarkTitle3: "备注字段3",
+        remarkTitle4: "备注字段4",
+        remarkTitle5: "备注字段5",
+        remarkTitle6: "备注字段6",
+        remarkTitle7: "备注字段7",
+        remarkTitle8: "备注字段8",
+      },
+    }
+
+  },
+  methods: {
+    saveNewProduct() {
+      this.addProductVisible = false;
+      // if (this.$isBlank(this.newProductData.thirdSysFk)) {
+      //   this.$message.warning("第三方系统不能为空！");
+      //   return;
+      // }
+      // if (this.$isBlank(this.newProductData.code)) {
+      //   this.$message.warning("产品编码为空！");
+      //   return;
+      // }
+      if (this.$isBlank(this.newProductData.name)) {
+        this.$message.warning("产品名称不能为空！");
+        return;
+      }
 
-            if (this.$isBlank(this.newProductData.spec)) {
-                this.$message.warning("规格型号不能为空");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.measname)) {
-                this.$message.warning("计量单位不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.manufactory)) {
-                this.$message.warning("生产企业不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.registerNo)) {
-                this.$message.warning("注册证号不能为空！");
-                return;
-            }
+      if (this.$isBlank(this.newProductData.spec)) {
+        this.$message.warning("规格型号不能为空");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.measname)) {
+        this.$message.warning("计量单位不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.manufactory)) {
+        this.$message.warning("生产企业不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.registerNo)) {
+        this.$message.warning("注册证号不能为空！");
+        return;
+      }
 
 
-            if (this.newType == 1) {
-                saveNewProduct(this.newProductData).then((res) => {
-                    if (res.code == 20000) {
-                        this.$message.success("添加成功");
-                        //清空弹窗数据
-                        this.$emit("closeAddDialog", true);
-                        this.closeAddDialog();
-                    } else {
-                        this.$message.error(res.message);
-                    }
-                }).catch((error) => {
-                    this.$message.error(error.message);
-                })
-            } else if (this.newType == 2) {
-                addProduct(this.newProductData).then((res) => {
-                    if (res.code == 20000) {
-                        this.$message.success("添加成功");
-                        //清空弹窗数据
-                        this.closeAddDialog(true);
-                    } else {
-                        this.$message.error(res.message);
-                    }
-                }).catch((error) => {
-                    this.$message.error(error.message);
-                })
-            }
+      if (this.newType == 1) {
+        saveNewProduct(this.newProductData).then((res) => {
+          if (res.code == 20000) {
+            this.$message.success("添加成功");
+            //清空弹窗数据
+            this.$emit("closeAddDialog", true);
+            this.closeAddDialog();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch((error) => {
+          this.$message.error(error.message);
+        })
+      } else if (this.newType == 2) {
+        addProduct(this.newProductData).then((res) => {
+          if (res.code == 20000) {
+            this.$message.success("添加成功");
+            //清空弹窗数据
+            this.closeAddDialog(true);
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch((error) => {
+          this.$message.error(error.message);
+        })
+      }
 
-        },
-        getBasicThirdSys() {
-            let query = {
-                enabled: true,
-            };
-            getBasicThirdSys(query)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-        },
     },
-    created() {
-        this.getBasicThirdSys();
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+    findHsflMethod(query) {
+      this.hsflOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getHslbs(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.hsflOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data;
+        }
+      });
     },
+  },
+  created() {
+    this.findBasicProductSet();
+    this.getBasicThirdSys();
+  },
 }
 </script>
 
diff --git a/src/views/supplier/products/supProductsAddDi.vue b/src/views/supplier/products/supProductsAddDi.vue
index 25d1206..dcaeac8 100644
--- a/src/views/supplier/products/supProductsAddDi.vue
+++ b/src/views/supplier/products/supProductsAddDi.vue
@@ -164,12 +164,13 @@
             @click="addDiProductVisible = true"
             >选入DI信息</el-button
           >
-<!--          <el-button-->
-          <!--            type="primary"-->
-          <!--            icon="el-icon-plus"-->
-          <!--            @click="addProductVisible = true"-->
-          <!--            >添加院内字典</el-button-->
-          <!--          >-->
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            @click="addProductVisible = true"
+          >添加院内字典
+          </el-button
+          >
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
diff --git a/src/views/supplier/products/supProductsDetail.vue b/src/views/supplier/products/supProductsDetail.vue
index e834dcf..39b2d59 100644
--- a/src/views/supplier/products/supProductsDetail.vue
+++ b/src/views/supplier/products/supProductsDetail.vue
@@ -1,146 +1,204 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <div v-if="!isImport" style="margin-bottom: 20px">
-              <el-form :model="data" size="mini" label-width="150px">
-
-                <el-row v-if="data.isAudit!=null && data.isAudit==2" type="flex" justify="end">
-                  <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
-                    <el-button type="primary" @click="checkPass(2)">通过</el-button>
-                    <el-button type="primary" @click="checkPass(3)">不通过</el-button>
-                  </el-button-group>
-                </el-row>
-
-                <div style="margin-bottom: 20px">
-                  <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品编码:">
-                        <el-input style="width: 90%" size="small"   :disabled="true"  placeholder="请输入内容" v-model="data.code"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="物资名称:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.name"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="规格型号:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.spec"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="计量单位:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.measname"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="生产企业:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.manufactory"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="注册证号:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.registerNo"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="医疗器械注册人:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.ylqxzcrbarmc"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="注册人英文名称:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.ylqxzcrbarywmc"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品类别:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.cplb"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="分类编码:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.flbm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="商品条码:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.sptm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="医保编码:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.ybbm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="统一社会信用号:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.tyshxydm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="器械类别:">
-                        <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.qxlb"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-
-                  <el-row v-if="data.isAudit==2">
-                    <el-col :span="12">
-                      <el-form-item label="审核意见:">
-                        <el-input style="width: 90%"  size="small" splaceholder="请输入审核意见" v-model="remark"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col" >
-                      <el-form-item label="产品描述:">
-                        <el-input style="width: 90%" :disabled="true" type="textarea" size="small" rows="1" placeholder="请输入内容" v-model.trim="data.cpms"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </div>
-              </el-form>
-            </div>
-        </el-card>
-    </div>
+  <div>
+    <el-card class="el-card">
+      <div v-if="!isImport" style="margin-bottom: 20px">
+        <el-form :model="data" size="mini" label-width="150px">
+
+          <el-row v-if="data.isAudit!=null && data.isAudit==2" type="flex" justify="end">
+            <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
+              <el-button type="primary" @click="checkPass(2)">通过</el-button>
+              <el-button type="primary" @click="checkPass(3)">不通过</el-button>
+            </el-button-group>
+          </el-row>
+
+          <div style="margin-bottom: 20px">
+            <el-row>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="产品编码:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model="data.code"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="物资名称:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.name"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="规格型号:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.spec"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="计量单位:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.measname"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="生产企业:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.manufactory"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="注册证号:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.registerNo"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="医疗器械注册人:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.ylqxzcrbarmc"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="注册人英文名称:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.ylqxzcrbarywmc"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="产品类别:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.cplb"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="分类编码:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.flbm"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="商品条码:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.sptm"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="医保编码:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.ybbm"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="统一社会信用号:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.tyshxydm"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="器械类别:">
+                  <el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容"
+                            v-model.trim="data.qxlb"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="产品价格:">
+                  <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" type="number"
+                            step="0.01"
+                            v-model="data.price"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
+                <el-form-item :label="productRemarkSet.remarkTitle1 ">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak1"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
+                <el-form-item :label="productRemarkSet.remarkTitle2 ">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak2"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
+                <el-form-item :label="productRemarkSet.remarkTitle3 ">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak3"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
+                <el-form-item :label="productRemarkSet.remarkTitle4 ">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak4"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
+                <el-form-item :label="productRemarkSet.remarkTitle5 ">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak5"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
+                <el-form-item :label="productRemarkSet.remarkTitle6    ">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak6"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
+                <el-form-item :label="productRemarkSet.remarkTitle7 ">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak7"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
+                <el-form-item :label="productRemarkSet.remarkTitle8">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                            v-model="data.basicPrductRemak8"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+
+            <el-row v-if="data.isAudit==2">
+              <el-col :span="12">
+                <el-form-item label="审核意见:">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入审核意见" v-model="remark"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="产品描述:">
+                  <el-input style="width: 90%" :disabled="true" type="textarea" size="small" rows="1"
+                            placeholder="请输入内容" v-model.trim="data.cpms"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import { updateDiProduct } from '@/api/supplier/supProductsAddDi'
+import {updateDiProduct} from '@/api/supplier/supProductsAddDi'
+import {finProductSet} from "@/api/param/systemParamConfig";
 
 export default {
-    name: "ThrProductsDetail",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-      close:{
-        type:Function,
-        required: true,
-      },
+  name: "ThrProductsDetail",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    close: {
+      type: Function,
+      required: true,
     },
+  },
   data() {
     return {
-      remark:"",
+      remark: "",
+      productRemarkSet: {}
     }
   },
   methods: {
@@ -163,10 +221,20 @@ export default {
         this.$message.error(error.message)
       })
     },
-
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data
+        } else {
+          //出错了
+        }
+      })
+    },
 
   },
-
+  created() {
+    this.findBasicProductSet()
+  }
 }
 </script>
 
diff --git a/src/views/thirdSys/product/thrProductsAdd.vue b/src/views/thirdSys/product/thrProductsAdd.vue
index bc64520..e97bc17 100644
--- a/src/views/thirdSys/product/thrProductsAdd.vue
+++ b/src/views/thirdSys/product/thrProductsAdd.vue
@@ -1,122 +1,125 @@
 <template>
-        <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: 90%"
-                                v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
-                            >
-                                <el-option
-                                    v-for="item in thirdSys"
-                                    :key="item.value"
-                                    :label="item.thirdName"
-                                    :value="item.thirdId">
-                                    <span style="float: left">{{ item.thirdName }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
-                                            item.thirdId
-                                        }}</span>
-                                </el-option>
-                            </el-select>
-                          </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row type="flex">
-                    <el-col :span="11" type="flex">
-                          <el-form-item label="产品编码:" prop="code">
-                            <el-input style="width: 90%" size="small" placeholder="请输入产品编码" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入物资名称" v-model.trim="newProductData.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="spec">
-                            <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入规格型号" v-model.trim="newProductData.spec"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="11" class="el-col">
-                      <el-form-item label="计量单位:" prop="measname">
-                            <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入计量单位" v-model.trim="newProductData.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="manufactory">
-                            <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入生产企业" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入注册证号" v-model.trim="newProductData.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="ylqxzcrbarmc">
-                            <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入医疗器械注册人" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入注册人英文名称" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入产品类别" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入分类编码" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入商品条码" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入医保编码" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入统一社会信用号" v-model.trim="newProductData.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" maxlength="30" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
+  <el-form :model="newProductData" label-width="120px">
+    <!--    <el-row>-->
+    <!--      <el-col :span="11">-->
+    <!--        <el-form-item label="第三方系统" prop="thirdSysFk">-->
+    <!--          <el-select-->
+    <!--              style="width: 90%"-->
+    <!--              v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"-->
+    <!--          >-->
+    <!--            <el-option-->
+    <!--                v-for="item in thirdSys"-->
+    <!--                :key="item.value"-->
+    <!--                :label="item.thirdName"-->
+    <!--                :value="item.thirdId">-->
+    <!--              <span style="float: left">{{ item.thirdName }}</span>-->
+    <!--              <span style="float: right; color: #8492a6; font-size: 13px">{{-->
+    <!--                  item.thirdId-->
+    <!--                }}</span>-->
+    <!--            </el-option>-->
+    <!--          </el-select>-->
+    <!--        </el-form-item>-->
+    <!--      </el-col>-->
+    <!--    </el-row>-->
+    <el-row>
+      <el-col :span="11">
+        <el-form-item label="产品编码:" prop="code">
+          <el-input style="width: 90%" size="small" placeholder="请输入产品编码" v-model.trim="newProductData.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11">
+        <el-form-item label="物资名称:" prop="name">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入物资名称"
+                    v-model.trim="newProductData.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="规格型号:" prop="spec">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入规格型号"
+                    v-model.trim="newProductData.spec"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="计量单位:" prop="measname">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入计量单位"
+                    v-model.trim="newProductData.measname"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="生产企业:" prop="manufactory">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入生产企业"
+                    v-model.trim="newProductData.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" maxlength="30" placeholder="请输入注册证号"
+                    v-model.trim="newProductData.registerNo"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入医疗器械注册人"
+                    v-model.trim="newProductData.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" maxlength="30" placeholder="请输入注册人英文名称"
+                    v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="产品类别:" prop="cplb">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入产品类别"
+                    v-model.trim="newProductData.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" maxlength="30" placeholder="请输入分类编码"
+                    v-model.trim="newProductData.flbm"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="商品条码:" prop="sptm">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入商品条码"
+                    v-model.trim="newProductData.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" maxlength="30" placeholder="请输入医保编码"
+                    v-model.trim="newProductData.ybbm"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="统一社会信用号:" prop="tyshxydm">
+          <el-input style="width: 90%" size="small" maxlength="30" placeholder="请输入统一社会信用号"
+                    v-model.trim="newProductData.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" maxlength="30" placeholder="请输入器械类别"
+                    v-model.trim="newProductData.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" placeholder="请输入产品描述" v-model.trim="newProductData.cpms"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-            <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-row>
+      <el-col :span="23" class="el-col">
+        <el-form-item label="产品描述:" prop="cpms">
+          <el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
+                    v-model.trim="newProductData.cpms"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <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>
 </template>
 
 <script>
@@ -127,122 +130,122 @@ import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
 import {addProduct} from "@/api/thrsys/thrProductsAdd";
 
 export default {
-    name: "ThrProductsAdd",
-    props: {
-        newType: {
-            type: Object,
-            required: true,
-        },
-        closeAddDialog: {
-            type: Function,
-            required: true,
-        },
+  name: "ThrProductsAdd",
+  props: {
+    newType: {
+      type: Object,
+      required: true,
     },
-    data() {
-        return {
-            newProductData: {
-                name: '',
-                code: null,
-                registerNo: null,
-                manufactory: null,
-                spec: null,
-                measname: null,
-                ylqxzcrbarmc: null,
-                ylqxzcrbarywmc: null,
-                cplb: null,
-                flbm: null,
-                sptm: null,
-                ybbm: null,
-                tyshxydm: null,
-                qxlb: null,
-                cplx:null,
-                cpms: null,
-                thirdSysFk: null,
-                cpdls: null
-            },
-            thirdSys: [],
-        }
-
+    closeAddDialog: {
+      type: Function,
+      required: true,
     },
-    methods: {
-        saveNewProduct() {
-            this.addProductVisible = false;
-            if (this.$isBlank(this.newProductData.thirdSysFk)) {
-                this.$message.warning("第三方系统不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.code)) {
-                this.$message.warning("产品编码为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.name)) {
-                this.$message.warning("物资名称不能为空！");
-                return;
-            }
+  },
+  data() {
+    return {
+      newProductData: {
+        name: '',
+        code: null,
+        registerNo: null,
+        manufactory: null,
+        spec: null,
+        measname: null,
+        ylqxzcrbarmc: null,
+        ylqxzcrbarywmc: null,
+        cplb: null,
+        flbm: null,
+        sptm: null,
+        ybbm: null,
+        tyshxydm: null,
+        qxlb: null,
+        cplx: null,
+        cpms: null,
+        thirdSysFk: null,
+        cpdls: null
+      },
+      thirdSys: [],
+    }
+
+  },
+  methods: {
+    saveNewProduct() {
+      this.addProductVisible = false;
+      if (this.$isBlank(this.newProductData.thirdSysFk)) {
+        this.$message.warning("第三方系统不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.code)) {
+        this.$message.warning("产品编码为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.name)) {
+        this.$message.warning("物资名称不能为空！");
+        return;
+      }
 
-            if (this.$isBlank(this.newProductData.spec)) {
-                this.$message.warning("规格型号不能为空");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.measname)) {
-                this.$message.warning("计量单位不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.manufactory)) {
-                this.$message.warning("生产企业不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.newProductData.registerNo)) {
-                this.$message.warning("注册证号不能为空！");
-                return;
-            }
+      if (this.$isBlank(this.newProductData.spec)) {
+        this.$message.warning("规格型号不能为空");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.measname)) {
+        this.$message.warning("计量单位不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.manufactory)) {
+        this.$message.warning("生产企业不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.registerNo)) {
+        this.$message.warning("注册证号不能为空！");
+        return;
+      }
 
 
-            if (this.newType == 1) {
-                saveNewProduct(this.newProductData).then((res) => {
-                    if (res.code == 20000) {
-                        this.$message.success("添加成功");
-                        //清空弹窗数据
-                        this.$emit("closeAddDialog", true);
-                        this.closeAddDialog();
-                    } else {
-                        this.$message.error(res.message);
-                    }
-                }).catch((error) => {
-                   // this.$message.error(error.message);
-                })
-            } else if (this.newType == 2) {
-                addProduct(this.newProductData).then((res) => {
-                    if (res.code == 20000) {
-                        this.$message.success("添加成功");
-                        //清空弹窗数据
-                        this.closeAddDialog(true);
-                    }else {
-                        this.$message.error(res.message);
-                    }
-                }).catch((error) => {
-                   // this.$message.error(error.message);
-                })
-            }
+      if (this.newType == 1) {
+        saveNewProduct(this.newProductData).then((res) => {
+          if (res.code == 20000) {
+            this.$message.success("添加成功");
+            //清空弹窗数据
+            this.$emit("closeAddDialog", true);
+            this.closeAddDialog();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch((error) => {
+          // this.$message.error(error.message);
+        })
+      } else if (this.newType == 2) {
+        addProduct(this.newProductData).then((res) => {
+          if (res.code == 20000) {
+            this.$message.success("添加成功");
+            //清空弹窗数据
+            this.closeAddDialog(true);
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch((error) => {
+          // this.$message.error(error.message);
+        })
+      }
 
-        },
-        getBasicThirdSys() {
-            let query = {
-                enabled: true,
-            };
-            getBasicThirdSys(query)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-        },
     },
-    created() {
-        this.getBasicThirdSys();
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+          .then((response) => {
+            this.thirdSys = response.data.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
     },
+  },
+  created() {
+    this.getBasicThirdSys();
+  },
 }
 </script>