diff --git a/.env.production b/.env.production
index d22932e..81573f8 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,6 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
 
 #林纪裕
-# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
 VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API =  'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
diff --git a/public/favicon.ico b/public/favicon.ico
index 583039c..b47a73c 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/login.js b/src/api/login.js
index d1bde0f..e6ba982 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -75,3 +75,16 @@ export function getCodeSms() {
     timeout: 20000
   })
 }
+
+
+export function getTitleConfig() {
+  return request({
+    url: '/spms/getTitleConfig',
+    headers: {
+      isToken: false
+    },
+    method: 'get',
+    timeout: 20000
+  })
+}
+
diff --git a/src/api/purchase/supCompany.js b/src/api/purchase/supCompany.js
index 125f0c4..53776a0 100644
--- a/src/api/purchase/supCompany.js
+++ b/src/api/purchase/supCompany.js
@@ -172,6 +172,15 @@ export function previewImage(data) {
   });
 }
 
+export function previewFile(url) {
+  return axios({
+    url: url,
+    method: "get",
+    responseType: 'arraybuffer'
+  });
+}
+
+
 
 
 
diff --git a/src/api/thrsys/thrProducts.js b/src/api/thrsys/thrProducts.js
index 4a570a1..4317e2f 100644
--- a/src/api/thrsys/thrProducts.js
+++ b/src/api/thrsys/thrProducts.js
@@ -1,42 +1,50 @@
 import axios from "@/utils/request";
 
 export function getThrProducts(query) {
-    return axios({
-        url: "/udiwms/thrsys/getThrProducts",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/thrsys/getThrProducts",
+    method: "get",
+    params: query
+  });
 }
 
 export function delThrProducts(query) {
-    return axios({
-        url: "/udiwms/thrsys/delThrProducts",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/thrsys/delThrProducts",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function downloadAll(query) {
-    return axios({
-        url: "/udiwms/thrsys/products/downloadAll",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/thrsys/products/downloadAll",
+    method: "get",
+    params: query
+  });
 }
 
 export function productsDlAll(query) {
-    return axios({
-        url: "/udiwms/thrsys/products/productsDlAll",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/thrsys/products/productsDlAll",
+    method: "post",
+    data: query
+  });
 }
 
 export function saveNewProduct(data) {
-    return axios({
-        url: '/udiwms/udiinfo/erp/products/saveProduct',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: '/udiwms/udiinfo/erp/products/saveProduct',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateProduct(data) {
+  return axios({
+    url: '/udiwms/udiinfo/erp/products/update',
+    method: 'post',
+    data: data
+  })
 }
diff --git a/src/assets/images/glxplogo.png b/src/assets/images/glxplogo.png
index b5b8e2f..385e999 100644
Binary files a/src/assets/images/glxplogo.png and b/src/assets/images/glxplogo.png differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index 583039c..385e999 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index d33e525..f396f4b 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -60,7 +60,7 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 100px;
+  height: 110px;
   line-height: 50px;
   background: #2b2f3a;
   text-align: center;
@@ -72,7 +72,7 @@ export default {
 
     & .sidebar-logo {
       width: 100px;
-      height: 73px;
+      height: 100px;
       margin-top: 12px;
       vertical-align: middle;
       margin-right: 12px;
@@ -94,7 +94,7 @@ export default {
   &.collapse {
     .sidebar-logo {
       width: 44px;
-      height: 32px;
+      height: 44px;
       margin-right: 0px;
     }
   }
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 4da495c..49b13ee 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -227,7 +227,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 1,
+        inCodeStatus: 0,
       },
       detailQuery: {
         orderIdFk: "",
@@ -344,7 +344,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 1,
+        inCodeStatus: 0,
       };
       this.getList();
 
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 95b582b..959e638 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -13,8 +13,8 @@
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span style="font-size: 14px; font-weight: 500">{{
-                  node.label
-                }}</span></span
+                    node.label
+                  }}</span></span
               >
             </el-tree>
           </el-col>
@@ -183,32 +183,32 @@
           <div class="top-right-btn">
             <el-button-group>
               <el-button icon="el-icon-view" type="primary" @click="hideSearch"
-                >显示/隐藏搜索栏
+              >显示/隐藏搜索栏
               </el-button>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"
-                >重置
+              >重置
               </el-button>
               <el-button type="primary" icon="el-icon-search" @click="submit"
-                >查询
+              >查询
               </el-button>
               <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentImportUdi"
-                >选入DI信息
+              >选入DI信息
               </el-button>
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentImportErp"
-                >添加院内字典
+              >添加院内字典
               </el-button>
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentDetail"
-                >关联添加
+              >关联添加
               </el-button>
             </el-button-group>
           </div>
@@ -246,6 +246,36 @@
               width="160"
               show-overflow-tooltip
             ></el-table-column>
+            <el-table-column
+              label="商品名称"
+              prop="spmc"
+              width="160"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:spmc')"
+            ></el-table-column>
+
+            <el-table-column
+              label="商品条码"
+              prop="sptm"
+              width="160"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:sptm')"
+            ></el-table-column>
+            <el-table-column
+              label="医保编码"
+              prop="ybbm"
+              width="160"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:ybbm')"
+            ></el-table-column>
+            <el-table-column
+              label="计量单位"
+              prop="measname"
+              width="160"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:measname')"
+            ></el-table-column>
+
             <el-table-column
               label="注册/备案号"
               prop="zczbhhzbapzbh"
@@ -258,11 +288,69 @@
               width="180"
               show-overflow-tooltip
             ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle1"
+              prop="basicPrductRemak1"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak1')"
+            ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle2"
+              prop="basicPrductRemak2"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak2')"
+            ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle3"
+              prop="basicPrductRemak3"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak3')"
+            ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle4"
+              prop="basicPrductRemak4"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak4')"
+            ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle5"
+              prop="basicPrductRemak5"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak5')"
+            ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle6"
+              prop="basicPrductRemak6"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak6')"
+            ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle7"
+              prop="basicPrductRemak7"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak7')"
+            ></el-table-column>
+            <el-table-column
+              :label="productRemarkSet.remarkTitle8"
+              prop="basicPrductRemak8"
+              width="180"
+              show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:basicPrductRemak8')"
+            ></el-table-column>
+
             <el-table-column
               label="集采状态"
               prop="groupBuy"
               width="120"
               show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:groupBuy')"
             >
               <template slot-scope="scope">
                 <el-tag :type="scope.row.groupBuy | statusFilterType">
@@ -275,6 +363,7 @@
               prop="dispatch"
               width="120"
               show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:dispatch')"
             >
               <template slot-scope="scope">
                 <el-tag :type="scope.row.dispatch | statusFilterType">
@@ -289,27 +378,27 @@
                   size="small"
                   :disabled="scope.row.originUuid != null"
                   @click.native.stop="intentSelectUdi(scope.row)"
-                  >关联DI
+                >关联DI
                 </el-button>
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="handleModifyClick(scope.row)"
-                  >详情
+                >详情
                 </el-button>
 
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="diEdit(scope.row)"
-                  >编辑
+                >编辑
                 </el-button>
 
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="deleteDialog(scope.row)"
-                  >删除
+                >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -918,7 +1007,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -939,7 +1028,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -962,7 +1051,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -983,7 +1072,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1006,7 +1095,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1027,7 +1116,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1050,7 +1139,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1071,7 +1160,7 @@
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                              >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1246,7 +1335,7 @@
                           size="small"
                           @click.native.stop="selectVersion()"
                           style="margin-left: 5%"
-                          >切换版本
+                        >切换版本
                         </el-button>
                       </el-col>
                       <el-col :span="2" class="el-col">
@@ -1256,7 +1345,7 @@
                           @click.native.stop="updateVersion()"
                           :loading="updateLoading"
                           style="margin-left: 5%"
-                          >更新当前版本信息
+                        >更新当前版本信息
                         </el-button>
                       </el-col>
                     </el-row>
@@ -1291,14 +1380,14 @@
                 size="small"
                 icon="search"
                 @click="onAddSubmit(false)"
-                >提交
+              >提交
               </el-button>
               <el-button
                 type="primary"
                 size="small"
                 icon="search"
                 @click="cancelDialog"
-                >取消
+              >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1320,14 +1409,14 @@
                 size="small"
                 icon="search"
                 @click="onAddSingleSubmit(false)"
-                >提交
+              >提交
               </el-button>
               <el-button
                 type="primary"
                 size="small"
                 icon="search"
                 @click="cancelDialog"
-                >取消
+              >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1473,7 +1562,7 @@ import {
   selectSysParamByKey,
   finProductSet,
 } from "@/api/param/systemParamConfig";
-import { filterByUuid } from "@/api/basic/product/udiInfo";
+import {filterByUuid} from "@/api/basic/product/udiInfo";
 
 import selectUdi from "./UdiInfoSelectRel.vue";
 import selectErp from "./udiInfoselectErpUdi";
@@ -1484,8 +1573,8 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 import productUdiType from "@/views/basic/product/productUdiType";
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
-import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
-import { dlLastVersionByDi } from "@/api/basic/udiInfo";
+import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
+import {dlLastVersionByDi} from "@/api/basic/udiInfo";
 
 export default {
   data() {
@@ -1534,7 +1623,16 @@ export default {
         false: "不可配送",
       },
       pId: 0,
-      productRemarkSet: {},
+      productRemarkSet: {
+        remarkTitle1: "备注字段1",
+        remarkTitle2: "备注字段2",
+        remarkTitle3: "备注字段3",
+        remarkTitle4: "备注字段4",
+        remarkTitle5: "备注字段5",
+        remarkTitle6: "备注字段6",
+        remarkTitle7: "备注字段7",
+        remarkTitle8: "备注字段8",
+      },
       relevanceEdit: {
         id: null,
         thirdId: "",
@@ -1581,7 +1679,7 @@ export default {
       selectVersionVisible: false,
       selectLocalVisible: false, //关联UDI
       isUseDyCheck: false,
-      lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" },
+      lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
       activeNames: ["1"],
       useNumEnable: true,
       updateLoading: false,
@@ -1712,7 +1810,8 @@ export default {
             this.$message.error(response.message);
           }
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     deleteDialog(rowId) {
@@ -1724,7 +1823,8 @@ export default {
         .then(() => {
           this.deleteOrders(rowId);
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     intentDetail() {
@@ -1762,9 +1862,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {});
+            .catch(() => {
+            });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     removeDi() {
@@ -1791,9 +1893,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {});
+            .catch(() => {
+            });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     intentSelectErp(val) {
@@ -1973,10 +2077,10 @@ export default {
         isAdavence: row.isAdavence,
       };
       this.editFormat = JSON.parse(JSON.stringify(row));
-      if( this.editFormat.overStockNum == null){
+      if (this.editFormat.overStockNum == null) {
         this.editFormat.overStockNum = 0;
       }
-      if( this.editFormat.lowStockNum == null){
+      if (this.editFormat.lowStockNum == null) {
         this.editFormat.lowStockNum = 0;
       }
       this.editDiDialogVisible = true;
@@ -2085,7 +2189,8 @@ export default {
           var invlist = response.data || [];
           this.treeList = this.handleTree(invlist, "code", "parentCode");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     addHospProduct(data) {
@@ -2123,7 +2228,6 @@ export default {
         type: "warning",
       })
         .then(() => {
-          debugger;
           this.updateLoading = true;
           let query = {
             uuid: this.editQuery.uuid,
@@ -2145,10 +2249,12 @@ export default {
               this.total = 0;
             });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
   },
-  mounted() {},
+  mounted() {
+  },
   components: {
     ProductSingleEdit,
     ProductEdit,
@@ -2174,6 +2280,7 @@ export default {
   margin-left: -2px;
   height: 30px;
 }
+
 .tree {
   ::v-deep .el-tree-node {
     .el-tree-node__content {
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index f27d932..76df4f0 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -219,6 +219,7 @@ export default {
         });
     },
     handleSubForm(data, formName) {   //新增，编辑
+      debugger
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index 0b12a7d..6d19592 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -138,9 +138,10 @@
                 :action="this.uploadUrl"
                 :on-preview="uploadHandlePreview"
                 :on-remove="uploadHandleRemove"
+                :limit="1"
                 :headers="headers"
                 :on-exceed="uploadHandleExceed"
-                accept=".jpg,.png"
+                accept=".jpg,.png,.pdf"
                 :on-change="uploadOnchange"
                 :on-success="uploadHandleSuccess"
                 :on-error="uploadHandleError"
@@ -151,7 +152,7 @@
                 <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
                   {{ choiceFile }}
                 </el-button>
-                <div>只能上传 jpg,png 文件，且不超过 10 MB</div>
+                <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>
               </el-upload>
 
             </el-form-item>
@@ -189,9 +190,10 @@
                 :action="this.uploadUrl"
                 :on-preview="uploadHandlePreview"
                 :on-remove="uploadHandleRemove1"
+                :limit="1"
                 :headers="headers"
                 :on-exceed="uploadHandleExceed"
-                accept=".jpg,.png"
+                accept=".jpg,.png,.pdf"
                 :on-change="uploadOnchange1"
                 :on-success="uploadHandleSuccess1"
                 :on-error="uploadHandleError"
@@ -202,7 +204,7 @@
                 <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
                   {{ choiceFile1 }}
                 </el-button>
-                <div>只能上传 jpg,png 文件，且不超过 10 MB</div>
+                <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>
               </el-upload>
 
             </el-form-item>
@@ -217,8 +219,7 @@
                        style="text-align:right" @click="showImgViewerCold">
               冷链报告预览
             </el-button>
-            <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
-                             :url-list="imgListCold"/>
+            <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
 
           </el-col>
 
@@ -226,6 +227,7 @@
         </el-row>
 
 
+
       </el-card>
     </el-form>
 
@@ -236,7 +238,7 @@
 import draggable from "vuedraggable";
 import store from "@/store";
 import {updateBizById, updateById} from '@/api/inout/orderDetailBiz'
-import {previewImage} from '@/api/purchase/supCompany'
+import {previewImage,previewFile} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
@@ -261,9 +263,9 @@ export default {
   data() {
     return {
       imgList: [],
-      imgListCold: [],
+      imgListCold:[],
       imgViewerVisible: false,
-      imgViewerVisibleCold: false,
+      imgViewerVisibleCold:false,
       BASE_URL: process.env.VUE_APP_BASE_API,
       code: "",
       formData: {
@@ -290,8 +292,7 @@ export default {
       headers: {},
       choiceFile: "选取文件",
       choiceFile1: "选取文件",
-      isChangeCheck: false,
-      isChangeCold: false,
+
     };
   },
   components: {
@@ -372,7 +373,7 @@ export default {
       this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     uploadOnchange(file, fileList) {
-      // this.inputQuery.checkFileName = file.name;
+      this.inputQuery.checkFileName = file.name;
       let fileName = file.name;
       let uid = file.uid
       let pos = fileName.lastIndexOf(".");
@@ -399,7 +400,7 @@ export default {
       return isLt;
     },
     uploadOnchange1(file, fileList) {
-      // this.inputQuery.checkColdFileName = file.name;
+      this.inputQuery.checkColdFileName = file.name;
       let fileName = file.name;
       let uid = file.uid
       let pos = fileName.lastIndexOf(".");
@@ -426,37 +427,20 @@ export default {
       return isLt;
     },
     uploadHandleSuccess(response, file, fileList) {
-
       if (response.code === 20000) {
-        if (this.inputQuery.filePath == null || this.isChangeCheck == true) {
-          this.inputQuery.filePath = response.data.name + ",";
-          this.inputQuery.checkFileName = file.name + ",";
-          this.isChangeCheck = false;
-        } else {
-          this.inputQuery.filePath += response.data.name + ",";
-          this.inputQuery.checkFileName += file.name + ",";
-        }
+        this.inputQuery.filePath = response.data.name;
+        // this.onSubmit();
       } else {
         this.$message.error("文件上传失败：" + response.message);
       }
-
-
     },
     uploadHandleSuccess1(response, file, fileList) {
       if (response.code === 20000) {
-        if (this.inputQuery.coldFilePath == null || this.isChangeCold == true) {
-          this.inputQuery.coldFilePath = response.data.name + ",";
-          this.inputQuery.checkColdFileName = file.name + ",";
-          this.isChangeCold = false;
-        } else {
-          this.inputQuery.coldFilePath += response.data.name + ",";
-          this.inputQuery.checkColdFileName += file.name + ",";
-        }
+        this.inputQuery.coldFilePath = response.data.name;
+        // this.onSubmit();
       } else {
         this.$message.error("文件上传失败：" + response.message);
       }
-
-
     },
     uploadHandleError() {
 
@@ -471,36 +455,85 @@ export default {
       return isJPG || isPNG;
     },
     showImgViewer(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      if(this.inputQuery.filePath.substr(-1) == ','){
+        this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
+      }
+
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
       this.imgList = [];
-      previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList = response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
+      this.imgList.push(this.certFileUrl)
+      let index = this.inputQuery.filePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(this.inputQuery.filePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
       const m = (e) => {
-        e.preventDefault()
+        e.preventDefault();
       };
-      document.body.style.overflow = 'hidden';
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    showImgViewerCold(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+    showImgViewerCold(row){
+      if(this.inputQuery.coldFilePath.substr(-1) == ','){
+        this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;
       this.imgList = [];
-      previewImage({imageUrl: this.inputQuery.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList = response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
+      this.imgList.push(this.certFileUrl)
+      let index = this.inputQuery.coldFilePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(this.inputQuery.coldFilePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
       const m = (e) => {
-        e.preventDefault()
+        e.preventDefault();
       };
-      document.body.style.overflow = 'hidden';
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
@@ -514,11 +547,9 @@ export default {
       document.removeEventListener("touchmove", m, true);
     },
 
-    closeImgViewerCold() {
+    closeImgViewerCold(){
       this.imgViewerVisibleCold = false;
-      const m = (e) => {
-        e.preventDefault()
-      };
+      const m = (e) => { e.preventDefault() };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },
@@ -547,13 +578,11 @@ export default {
     }
     if (this.inputQuery.filePath != null) {
       this.choiceFile = "更换检验报告";
-      this.isChangeCheck = true;
     } else {
       this.choiceFile = "选取检验报告";
     }
 
     if (this.inputQuery.coldFilePath != null) {
-      this.isChangeCold = true;
       this.choiceFile1 = "更换冷链报告";
     } else {
       this.choiceFile1 = "选取冷链报告";
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 790323c..03e0b63 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -271,7 +271,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import DialogInvoice from "@/views/inout/DialogInvoice";
 import InvoiceRegister from "@/views/inout/InvoiceRegister";
 
-import {previewImage} from "@/api/purchase/supCompany";
+import {previewImage,previewFile} from "@/api/purchase/supCompany";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import store from "@/store";
 import {deleteRe} from "@/api/auth/register";
@@ -564,7 +564,6 @@ export default {
     uploadHandleError() {
     },
     uploadHandleSuccess(response, file, fileList) {
-      debugger;
       if (response.code === 20000) {
         this.inputQuery.licenseUrl = response.data.name;
         // this.onSubmit();
@@ -697,18 +696,34 @@ export default {
     showImgViewer(row) {
       this.certFileUrl =
         this.BASE_URL +
-        "/udiwms/image/register/file/getImage?type=image2&name=";
+        "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.licenseUrl;
       this.imgList = [];
-      previewImage({
-        imageUrl: this.inputQuery.licenseUrl,
-        certFileUrl: this.certFileUrl,
-      }).then((response) => {
-        if (response.code === 20000) {
-          this.imgList = response.data;
-        }
-        console.log(this.imgList);
-        this.imgViewerVisible = true;
-      });
+      this.imgList.push(this.certFileUrl)
+      let index = this.inputQuery.licenseUrl.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(this.inputQuery.licenseUrl.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
       const m = (e) => {
         e.preventDefault();
       };
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 86491e4..0929cda 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -537,7 +537,7 @@ import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDeter
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import {previewImage} from '@/api/purchase/supCompany'
+import {previewImage,previewFile} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
@@ -773,19 +773,40 @@ export default {
       this.showSearch = !this.showSearch;
     },
     showImgViewer(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.licenseUrl;
       this.imgList = [];
-      previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList = response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
+      this.imgList.push(this.certFileUrl)
+      let index = row.licenseUrl.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.licenseUrl.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
       const m = (e) => {
-        e.preventDefault()
+        e.preventDefault();
       };
-      document.body.style.overflow = 'hidden';
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
@@ -1163,6 +1184,7 @@ export default {
   }
   ,
   created() {
+    debugger
     let supId = this.$store.getters.customerId;
     if (supId == "110") {
       this.showSup = true;
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index ca4bddc..9fd0105 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -592,7 +592,7 @@ import {
   orderPDFFromTemplateFile
 } from '@/api/itextpdf/orderPrint'
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import { previewImage } from '@/api/purchase/supCompany'
+import { previewImage ,previewFile} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
@@ -794,33 +794,78 @@ export default {
       this.showSearch = !this.showSearch;
     },
     showImgViewer(row){
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      this.imgList=[];
-      previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList=response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
-      const m = (e) => { e.preventDefault() };
-      document.body.style.overflow = 'hidden';
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.filePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.filePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
     showImgViewerCold(row){
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl+"========");
-      this.imgListCold=[];
-      previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgListCold=response.data;
-        }
-        console.log(this.imgListCold)
-        this.imgViewerVisibleCold = true;
-      });
-      const m = (e) => { e.preventDefault() };
-      document.body.style.overflow = 'hidden';
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.coldFilePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.coldFilePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 78cd29c..a7fbf59 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -614,7 +614,7 @@ import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import { previewImage } from '@/api/purchase/supCompany'
+import { previewImage,previewFile } from '@/api/purchase/supCompany'
 import DialogCheck from "@/views/inout/DialogCheck";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
@@ -820,35 +820,85 @@ export default {
       this.getList();
     },
     showImgViewer(row){
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl+"========");
-      this.imgList=[];
-      previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList=response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
-      const m = (e) => { e.preventDefault() };
-      document.body.style.overflow = 'hidden';
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.filePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.filePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
 
     showImgViewerCold(row){
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl+"========");
-      this.imgListCold=[];
-      previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgListCold=response.data;
-        }
-        console.log(this.imgListCold)
-        this.imgViewerVisibleCold = true;
-      });
-      const m = (e) => { e.preventDefault() };
-      document.body.style.overflow = 'hidden';
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.coldFilePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.coldFilePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 8d5af76..dc57cdf 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -441,7 +441,7 @@ import AcceptOrder from "@/views/inout/DialogThrReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import DialogCheck from "@/views/inout/DialogCheck";
 import { getBizDetailList } from '@/api/inout/orderDetailBiz'
-import { previewImage } from '@/api/purchase/supCompany'
+import { previewFile, previewImage } from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
@@ -639,35 +639,85 @@ export default {
         });
     },
 
-    showImgViewer(row){
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl+"========");
-      this.imgList=[];
-      previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList=response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
-      const m = (e) => { e.preventDefault() };
-      document.body.style.overflow = 'hidden';
+    showImgViewer(row) {
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.filePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.filePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    showImgViewerCold(row){
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl+"========");
-      this.imgListCold=[];
-      previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgListCold=response.data;
-        }
-        console.log(this.imgListCold)
-        this.imgViewerVisibleCold = true;
-      });
-      const m = (e) => { e.preventDefault() };
-      document.body.style.overflow = 'hidden';
+    showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.coldFilePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.coldFilePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index e4ec3bc..e3079ac 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -498,7 +498,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import DialogCheck from "@/views/inout/DialogCheck";
 
 import {getDeptListByUser} from "@/api/auth/authDept";
-import {previewImage} from '@/api/purchase/supCompany'
+import {previewImage,previewFile} from '@/api/purchase/supCompany'
 import {getBizDetailList} from '@/api/inout/orderDetailBiz'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
@@ -695,53 +695,98 @@ export default {
     },
 
     showImgViewer(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl + "========");
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
       this.imgList = [];
-      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList = response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
+      this.imgList.push(this.certFileUrl)
+      let index = row.filePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.filePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
       const m = (e) => {
-        e.preventDefault()
+        e.preventDefault();
       };
-      document.body.style.overflow = 'hidden';
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
 
     showImgViewerCold(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl + "========");
-      this.imgListCold = [];
-      previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgListCold = response.data;
-        }
-        console.log(this.imgListCold)
-        this.imgViewerVisibleCold = true;
-      });
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.coldFilePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.coldFilePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
       const m = (e) => {
-        e.preventDefault()
+        e.preventDefault();
       };
-      document.body.style.overflow = 'hidden';
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    closeImgViewer() {
-      this.imgViewerVisible = false;
+    closeImgViewerCold() {
+      this.imgViewerVisibleCold = false;
       const m = (e) => {
         e.preventDefault()
       };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },
-
-    closeImgViewerCold() {
-      this.imgViewerVisibleCold = false;
+    closeImgViewer() {
+      this.imgViewerVisible = false;
       const m = (e) => {
         e.preventDefault()
       };
@@ -749,7 +794,6 @@ export default {
       document.removeEventListener("touchmove", m, true);
     },
 
-
     upload(row) {
       this.currentManufacturer = row;
       this.Upinvoice = true;
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 7ac8192..04f92d2 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -478,7 +478,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import DialogCheck from "@/views/inout/DialogCheck";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
-import {previewImage} from '@/api/purchase/supCompany'
+import { previewFile, previewImage } from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
@@ -677,36 +677,84 @@ export default {
       this.showSearch = !this.showSearch;
     },
     showImgViewer(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl + "========");
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
       this.imgList = [];
-      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgList = response.data;
-        }
-        console.log(this.imgList)
-        this.imgViewerVisible = true;
-      });
+      this.imgList.push(this.certFileUrl)
+      let index = row.filePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.filePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
       const m = (e) => {
-        e.preventDefault()
+        e.preventDefault();
       };
-      document.body.style.overflow = 'hidden';
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    showImgViewerCold(row){
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl+"========");
-      this.imgListCold=[];
-      previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
-        if (response.code === 20000) {
-          this.imgListCold=response.data;
-        }
-        console.log(this.imgListCold)
-        this.imgViewerVisibleCold = true;
-      });
-      const m = (e) => { e.preventDefault() };
-      document.body.style.overflow = 'hidden';
+    showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.coldFilePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(row.coldFilePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index a8df564..0e4c5f2 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -36,10 +36,10 @@
         <template slot-scope="scope">
           <el-input v-model="scope.row.batchNo"
                     :disabled="scope.row.index !== selectedIndex"
-                    @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
                     ref='inputBatchNoRef'
                     placeholder="请输入批次号"></el-input>
         </template>
+        <!--@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"-->
       </el-table-column>
       <el-table-column width="120" label="生产日期">
         <template slot-scope="scope">
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index cc5a34b..02e3792 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -2,7 +2,9 @@
   <div class="login-container">
     <div>
       <el-row>
-        <h3 class="toptitle">平潭协和医院</h3>
+        <!--        <h3 class="toptitle">漳州市中医院</h3>-->
+
+        <h3 class="toptitle">{{ title }}</h3>
       </el-row>
       <el-row>
         <h3 class="topSubtitle">医院UDI管理系统</h3>
@@ -121,6 +123,7 @@ import Verify from "vue2-verify";
 import axios from "axios";
 import Cookies from "js-cookie";
 import {decrypt, encrypt} from "@/utils/jsencrypt";
+import {getTitleConfig} from "@/api/login";
 
 export default {
   data() {
@@ -157,6 +160,7 @@ export default {
       showDialog: false, // 显示dialog
       redirect: null, // 回调地址
       hospName: "",
+      title: "福建省XXX医院"
     };
   },
   methods: {
@@ -266,6 +270,11 @@ export default {
         }
       });
     },
+    getTitleConfig() {
+      getTitleConfig().then(res => {
+        this.title = res.data.title;
+      });
+    },
   },
   components: {
     Verify,
@@ -281,7 +290,7 @@ export default {
     axios.get("./config.json").then((res) => {
       this.hospName = res.data.hosp_name;
     });
-
+    this.getTitleConfig();
     this.getCookie();
   },
 };
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index bd02e6d..2a8a272 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -682,7 +682,7 @@ export default {
         isUseDy: row.isUseDy,
         isDisable: row.isDisable,
         isAdavence: row.isAdavence,
-        useMuti:    row.useMuti
+        useMuti: row.useMuti
       };
     },
     sumitLockStatus(row) {
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index e41c02f..170e6e2 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -1100,7 +1100,6 @@ export default {
         type: "warning",
       })
         .then(() => {
-          debugger
           this.updateLoading = true;
           let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid};
           syncOnline(query)
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index ebb2a74..b34a85f 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -83,50 +83,94 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
-<!--        <el-row type="flex" class="edit-row">-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="库存积压预警数量:">-->
-        <!--              <el-input-->
-        <!--                style="width: 80%"-->
-        <!--                size="small"-->
-        <!--                splaceholder="请输入内容"-->
-        <!--                v-model="editQuery.overStockNum"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="低库存预警数量:">-->
-        <!--              <el-input-->
-        <!--                style="width: 80%"-->
-        <!--                size="small"-->
-        <!--                splaceholder="请输入内容"-->
-        <!--                v-model="editQuery.lowStockNum"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
-        <!--        <el-row type="flex" class="edit-row">-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="近效期预警时间:">-->
-        <!--              <el-input-->
-        <!--                style="width: 80%"-->
-        <!--                size="small"-->
-        <!--                splaceholder="请输入内容"-->
-        <!--                v-model="editQuery.recentDateTime"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="预警时间单位:">-->
-        <!--              <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>-->
-        <!--                <el-option label="天" :value="1"></el-option>-->
-        <!--                <el-option label="小时" :value="2"></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.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: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak2"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
+            <el-form-item :label="productRemarkSet.remarkTitle3+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.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: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak4"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
+            <el-form-item :label="productRemarkSet.remarkTitle5+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.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: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak6"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
+            <el-form-item :label="productRemarkSet.remarkTitle7+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.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: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak8"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="产品描述:">
@@ -134,16 +178,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item
-            label="是否可集采:"
-            prop="spUse"
-            class="query-form-item"
-          >
-            <el-radio-group v-model="editQuery.groupBuy">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
+            <el-form-item
+              label="是否可集采:"
+              prop="spUse"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.groupBuy">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-col>
 
 
@@ -251,9 +295,9 @@ export default {
         lowStockNum: this.editQuery.lowStockNum,
         recentDateTime: this.editQuery.recentDateTime,
         isDateBy: this.editQuery.isDateBy,
-        relSupId:this.editQuery.id,
-        groupBuy:this.editQuery.groupBuy,
-        uid:this.editQuery.uid,
+        relSupId: this.editQuery.id,
+        groupBuy: this.editQuery.groupBuy,
+        uid: this.editQuery.uid,
       }
 
       updateById(data).then(res => {
diff --git a/src/views/supplier/products/supProductsAddDi.vue b/src/views/supplier/products/supProductsAddDi.vue
index 4a9aec6..d8fd7e1 100644
--- a/src/views/supplier/products/supProductsAddDi.vue
+++ b/src/views/supplier/products/supProductsAddDi.vue
@@ -81,12 +81,12 @@
             @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/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index b75ce5e..36455d0 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -534,7 +534,6 @@ export default {
     },
 
     onResetintent() {
-      debugger;
       this.$router.push({
         path: "",
       });
diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue
index 7db8666..20620e5 100644
--- a/src/views/system/print/pdfTmpleateManage.vue
+++ b/src/views/system/print/pdfTmpleateManage.vue
@@ -438,7 +438,6 @@ export default {
 
 
     previewPdf(row) {
-      debugger
       let query = {id: row.id,module:row.module};
       demoPrint(query).then((response) => {
         //将pdf文件转换为url。
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index 1b6cca7..7047a67 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -5,7 +5,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="产品编码:">
-              <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable @keyup.enter.native="keyupErp_submit($event)"></el-input>
+              <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -22,7 +23,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="注册/备案号:">
-              <el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案号"></el-input>
+              <el-input v-model="filterQuery.registerNo" clearable style="width: 90%"
+                        placeholder="请输入注册/备案号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -48,14 +50,16 @@
           </el-col>
         </el-row>
       </el-form>
-        <div class="top-right-btn">
-          <el-button-group style="display:flex;">
-            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-            <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-group>
-        </div>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <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-group>
+      </div>
 
       <el-divider style="margin: 15px"></el-divider>
 
@@ -70,7 +74,9 @@
         <el-table-column label="操作" width="180px">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
-            <el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts">删除
+            <el-button type="text" @click.native.stop="editDialog(scope.row)">编辑</el-button>
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0"
+                       :disabled="!configParms.basicThirdProducts">删除
             </el-button>
           </template>
         </el-table-column>
@@ -112,21 +118,40 @@
       class="dialog-two"
       top="5vh"
     >
-
       <ThrProductsAdd
         :newType="newType"
         :closeAddDialog="closeAddDialog"></ThrProductsAdd>
     </el-dialog>
+
+
+    <el-dialog
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="产品信息编辑"
+      :visible.sync="thrProductsEditVisible"
+      width="60%"
+      class="dialog-two"
+      top="5vh"
+      v-if="thrProductsEditVisible"
+    >
+      <thrProductsEdit
+        :newProductData="thisData"
+        :closeAddDialog="closeAddDialog"
+      ></thrProductsEdit>
+    </el-dialog>
   </div>
 </template>
 <script>
-import {delThrProducts, saveNewProduct
+import {
+  delThrProducts, saveNewProduct
 } from "@/api/thrsys/thrProducts";
 import {getInvbasdoc} from "@/api/thrsys/getErps";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
 import {selectIp} from "@/api/system/systemParamConfig";
 import thrProductsDetail from "./thrProductsDetail";
 import ThrProductsAdd from "@/views/thirdSys/product/thrProductsAdd";
+import thrProductsEdit from "@/views/thirdSys/product/thrProductsEdit";
+
 import {findConfig} from "@/api/sync/spsSyncStatus";
 
 export default {
@@ -143,7 +168,7 @@ export default {
         page: 1,
         limit: 20,
       },
-      mainThirdSys:'',
+      mainThirdSys: '',
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -155,6 +180,7 @@ export default {
       },
       newType: 1,
       thrProductsDetailVisible: false,
+      thrProductsEditVisible: false,
       thisData: null,
       loading: false,
       addProductVisible: false,
@@ -206,7 +232,7 @@ export default {
       this.getList();
     },
     getList() {
-      if (this.filterQuery.thirdSys == null ) {
+      if (this.filterQuery.thirdSys == null) {
         this.$message.warning("请先选择第三方系统！")
         return;
       }
@@ -261,6 +287,12 @@ export default {
       this.thisData = row;
       this.thrProductsDetailVisible = true;
     },
+
+    editDialog(row) {
+      this.thisData = row;
+      this.thrProductsEditVisible = true;
+    },
+
     getBasicThirdSys() {
       let query = {
         enabled: true,
@@ -268,8 +300,8 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          for(var i=0;i<this.thirdSys.length;i++){
-            if(this.thirdSys[i].mainSys){
+          for (var i = 0; i < this.thirdSys.length; i++) {
+            if (this.thirdSys[i].mainSys) {
               this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
               this.mainThirdSys = this.thirdSys[i].thirdId;
             }
@@ -316,6 +348,8 @@ export default {
       })
     },
     closeAddDialog(val) {
+      this.thrProductsEditVisible = false;
+      this.thrProductsDetailVisible = false;
       this.addProductVisible = false;
       if (val) {
         this.getList();
@@ -334,7 +368,7 @@ export default {
     },
   },
   components: {
-    thrProductsDetail, ThrProductsAdd
+    thrProductsDetail, ThrProductsAdd, thrProductsEdit
   },
   mounted() {
   },
diff --git a/src/views/thirdSys/product/thrProductsEdit.vue b/src/views/thirdSys/product/thrProductsEdit.vue
new file mode 100644
index 0000000..fa68394
--- /dev/null
+++ b/src/views/thirdSys/product/thrProductsEdit.vue
@@ -0,0 +1,221 @@
+<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%"
+            disabled
+            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="请输入产品编码"
+                    disabled
+                    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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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>
+</template>
+
+<script>
+import {updateProduct} from "@/api/thrsys/thrProducts";
+
+
+import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
+
+export default {
+  name: "thrProductsEdit",
+  props: {
+    newProductData: {
+      type: Object,
+      required: true,
+    },
+    closeAddDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      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;
+      }
+      updateProduct(this.newProductData).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success("修改成功！");
+          this.closeAddDialog(true);
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+      })
+
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+  },
+  created() {
+    this.getBasicThirdSys();
+  },
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/userManage/param/basicProductConfig.vue b/src/views/userManage/param/basicProductConfig.vue
index a1f9f8b..2ad870d 100644
--- a/src/views/userManage/param/basicProductConfig.vue
+++ b/src/views/userManage/param/basicProductConfig.vue
@@ -257,8 +257,8 @@ export default {
         systemParamConfigList(this.systemQuery)
           .then((response) => {
             this.systemLoading = false;
-            this.systemLists = response.data.list || [];
-            this.systemList = this.systemLists.filter(item => item.paramValue !=0);
+            this.systemList = response.data.list || [];
+            // this.systemList = this.systemLists.filter(item => item.paramValue !=0);
             this.systemTotal = response.data.total || 0;
           })
           .catch(() => {