diff --git a/.env.development b/.env.development
index eed92e7d..c29652c7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://127.0.0.1:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
 
-VUE_APP_SYNC_API ="http://127.0.0.1:10001"
+VUE_APP_SYNC_API ="http://192.168.0.166:10001"
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/.env.production b/.env.production
index 21ea9a52..f3e3121c 100644
--- a/.env.production
+++ b/.env.production
@@ -31,7 +31,10 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 # 漳州中医院
-VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+
+# 片仔癀诊断
+VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/package.json b/package.json
index aced9627..0530fcf2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ruoyi-vue-plus",
   "version": "4.3.0",
   "description": "UDI自助平台",
-  "author": "LionLi",
+  "author": "Glxp",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -77,7 +77,7 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
-    "html-webpack-plugin": "^5.5.1",
+    "html-webpack-plugin": "4.5.2",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",
diff --git a/public/favicon.ico b/public/favicon.ico
index 90547e4e..b47a73ce 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/auth/authDept.js b/src/api/auth/authDept.js
index ddf44b10..873cd114 100644
--- a/src/api/auth/authDept.js
+++ b/src/api/auth/authDept.js
@@ -2,7 +2,7 @@ import axios from "@/utils/request";
 
 export function filterDepts(query) {
   return axios({
-    url: "/udi/auth/dept/filter",
+    url: "/spms/inv/warehouse/filterAll",
     method: "get",
     params: query
   });
@@ -39,3 +39,8 @@ export function getDeptListByUser(params) {
     params: params
   });
 }
+
+
+
+
+
diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js
index d3d7af70..982a4d58 100644
--- a/src/api/basic/busType.js
+++ b/src/api/basic/busType.js
@@ -1,4 +1,5 @@
 import axios from "@/utils/request";
+
 //获取数据
 export function getBusTypeList(params) {
   return axios({
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 2f501fd4..903376ab 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -156,6 +156,14 @@ export function filterOrderList(query) {
   });
 }
 
+export function getUserBean(query) {
+  return axios({
+    url: "/udiwms/inout/order/getUserBean",
+    method: "get",
+    params: query
+  });
+}
+
 export function selectNew(query) {
   return axios({
     url: "/admin/warehouse/inout/order/selectNew",
diff --git a/src/api/login.js b/src/api/login.js
index 33e3e09d..2015f19a 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -69,3 +69,15 @@ 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 8c026c19..cde50455 100644
--- a/src/api/purchase/supCompany.js
+++ b/src/api/purchase/supCompany.js
@@ -172,6 +172,14 @@ export function previewImage(data) {
   });
 }
 
+export function previewFile(url) {
+  return axios({
+    url: url,
+    method: "get",
+    responseType: 'arraybuffer'
+  });
+}
+
 
 
 
diff --git a/src/api/system/invSubWarehouse.js b/src/api/system/invSubWarehouse.js
index 8c970ae7..094f492e 100644
--- a/src/api/system/invSubWarehouse.js
+++ b/src/api/system/invSubWarehouse.js
@@ -19,6 +19,16 @@ export function findInvByUser(query) {
   });
 }
 
+
+export function filterGroupBySpuse(params) {
+  return axios({
+    url: "/spms/inv/warehouse/filterGroupBySpuse",
+    method: "get",
+    params: params
+  });
+}
+
+
 //获取除了自己所有其他仓库
 export function findByFrom(query) {
   return axios({
@@ -76,6 +86,7 @@ export function deleteSubWarehouse(data) {
     data: data
   });
 }
+
 //查询第三方系统和仓库数据关联信息
 export function getSubThrsysDetail(params) {
   return axios({
diff --git a/src/api/thrsys/thrProducts.js b/src/api/thrsys/thrProducts.js
index 4a570a17..76d17b2d 100644
--- a/src/api/thrsys/thrProducts.js
+++ b/src/api/thrsys/thrProducts.js
@@ -40,3 +40,12 @@ export function saveNewProduct(data) {
         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 0ed3aa74..385e9991 100644
Binary files a/src/assets/images/glxplogo.png and b/src/assets/images/glxplogo.png differ
diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg
deleted file mode 100644
index 8a89eb82..00000000
Binary files a/src/assets/images/login-background.jpg and /dev/null differ
diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg
deleted file mode 100644
index b3a940b2..00000000
Binary files a/src/assets/images/profile.jpg and /dev/null differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index 583039c3..385e9991 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 d33e525b..f396f4b9 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 838a4681..394f8f51 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -17,11 +17,6 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item label="送货单位:">-->
-          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
 
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单据类型:">
@@ -227,7 +222,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 1,
+        inCodeStatus: 0,
       },
       detailQuery: {
         orderIdFk: "",
@@ -344,7 +339,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 91c12f33..484f172d 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -180,10 +180,10 @@
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="是否在用:">
                   <el-select
-                      v-model="filterQuery.isDisable"
-                      placeholder="请选择是否在用"
-                      clearable
-                      style="width: 90%"
+                    v-model="filterQuery.isDisable"
+                    placeholder="请选择是否在用"
+                    clearable
+                    style="width: 90%"
                   >
                     <el-option label="在用" value="false"></el-option>
                     <el-option label="停用" value="true"></el-option>
@@ -264,6 +264,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"
@@ -277,10 +307,67 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-                label="是否在用"
-                prop="isDisable"
-                width="180"
-                show-overflow-tooltip
+              :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="isDisable"
+              width="180"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-tag :type="scope.row.isDisable | isDisableFilterType">
@@ -293,6 +380,7 @@
               prop="groupBuy"
               width="120"
               show-overflow-tooltip
+              v-if="$auth.hasPermi('basic:groupBuy')"
             >
               <template slot-scope="scope">
                 <el-tag :type="scope.row.groupBuy | statusFilterType">
@@ -305,6 +393,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">
@@ -312,6 +401,7 @@
                 </el-tag>
               </template>
             </el-table-column>
+
             <el-table-column width="180" label="操作" fixed="right">
               <template slot-scope="scope">
                 <el-button
@@ -1555,7 +1645,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: "",
@@ -2058,50 +2157,6 @@ export default {
         }
       });
     },
-
-    // selectSysParam() {
-    //   let query = {
-    //     paramKey: "smp_isUploadProuct",
-    //   };
-    //   spcombie().then((response) => {
-    //     if (response.code == 20000) {
-    //       if (response.data.paramValue == "1") {
-    //         this.isSpCombine = true;
-    //       } else {
-    //         this.isSpCombine = false;
-    //       }
-    //     }
-    //   });
-    //
-    //   selectSysParamByKey(query).then((response) => {
-    //     if (response.code == 20000) {
-    //       if (response.data.paramValue == "1") {
-    //         this.isUploadSmp = true;
-    //       } else {
-    //         this.isUploadSmp = false;
-    //       }
-    //     }
-    //   });
-    //   let query1 = {
-    //     paramKey: "upload_pi_file_enabled",
-    //   };
-    //   selectSysParamByKey(query1).then((response) => {
-    //     if (response.code == 20000) {
-    //       if (response.data.paramValue == "1") {
-    //         this.isImportFile = true;
-    //       }
-    //     }
-    //   });
-    //   let query2 = {
-    //     paramKey: "upload_pi_file_url",
-    //   };
-    //   selectSysParamByKey(query2).then((response) => {
-    //     if (response.code == 20000) {
-    //       this.uploadFileUrl = response.data.paramValue;
-    //     }
-    //   });
-    // },
-
     editUdiType() {
       this.selectUdiTypeVisible = true;
     },
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 02f27e04..e4c53f00 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -69,47 +69,48 @@
           </el-col>
         </el-row>
         <el-row>
+
           <el-col :span="11">
-            <el-form-item prop="action" label="单据类型:">
+            <el-form-item prop="invCode" label="当前仓库:">
               <el-select
-                v-model="orderFormData.action"
-                placeholder="请选择单据类型"
-                :disabled="corpOrderIdDisabled"
+                v-model="orderFormData.invCode"
+                placeholder="当前仓库"
                 style="width: 90%"
-                @change="actionChange"
+                :disabled="corpOrderIdDisabled"
+                @change="changeInv"
+                filterable
               >
                 <el-option
-                  v-for="item in busTypeOptions"
+                  v-for="item in curInvOptions"
                   :key="item.name"
                   :label="item.name"
-                  :value="item.action"
+                  :value="item.code"
                 >
                   <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.warehouseName
+                    }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="11">
-            <el-form-item prop="invCode" label="当前仓库:">
+            <el-form-item prop="action" label="单据类型:">
               <el-select
-                v-model="orderFormData.invCode"
-                placeholder="当前仓库"
-                style="width: 90%"
+                v-model="orderFormData.action"
+                placeholder="请选择单据类型"
                 :disabled="corpOrderIdDisabled"
-                @change="changeInv"
-                filterable
+                style="width: 90%"
+                @change="actionChange"
               >
                 <el-option
-                  v-for="item in curInvOptions"
+                  v-for="item in busTypeOptions"
                   :key="item.name"
                   :label="item.name"
-                  :value="item.code"
+                  :value="item.action"
                 >
                   <span style="float: left">{{ item.name }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.warehouseName
-                    }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -797,7 +798,11 @@ export default {
         cQuery.corpType = 2;
       } else if (this.curAction.corpType == 0) {
         cQuery.corpType = 2;
-      } else return;
+      } else if (this.curAction.corpType == 1) {
+        cQuery.corpType = 1;
+        cQuery.outType = 2;
+      } else
+        return;
       getBasicUnitMaintains(cQuery)
         .then((response) => {
           this.loading = false;
@@ -817,7 +822,10 @@ export default {
       if ((this.curAction.checkEnable && this.curAction.checkWebNew != 0) || this.viewType == 1) {
         //单据类型需要一次校验 或 单据类型为1，显示业务单据页面
         this.bizShow = true;
-      } else this.bizShow = false;
+      } else {
+        this.bizShow = false;
+      }
+
       if (
         this.curAction.corpType == 0 ||
         this.curAction.corpType == 2 ||
@@ -1183,7 +1191,7 @@ export default {
     },
 
     submit(val) {
-      if(this.$isBlank(this.orderFormData.action)){
+      if (this.$isBlank(this.orderFormData.action)) {
         this.$message.warning("单据类型不能为空！");
         return
       }
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 0604724e..447d3d75 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -273,7 +273,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";
 
@@ -613,8 +613,29 @@ export default {
       );
     },
     uploadHandlePreview(file) {
-      console.log(file);
-      console.log(this.fileList);
+      // console.log(file.raw.type);
+      // console.log(this.fileList);
+      // let pdf = "application/pdf"
+      // let type = file.raw.type
+      // if(type==pdf){
+      //
+      //   this.certFileUrl =
+      //     this.BASE_URL +
+      //     "/udiwms/image/register/file/getImage?type=image2&name=";
+      //   this.imgList = [];
+      //   previewImage({
+      //     imageUrl: this.inputQuery.licenseUrl,
+      //     certFileUrl: this.certFileUrl,
+      //   }).then((response) => {
+      //     if (response.code === 20000) {
+      //       this.imgList = response.data;
+      //       window.open(this.imgList[0])
+      //     }
+      //     console.log(this.imgList);
+      //   });
+      // }else{
+      //
+      // }
     },
     uploadHandleRemove(file, fileList) {
       this.inputQuery.licenseUrl = null;
@@ -698,18 +719,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 296b7308..d7066054 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -529,7 +529,7 @@
 <script>
 import {
   deleteByOrderId,
-  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList
+  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList, getUserBean
 } from '../../api/inout/order'
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -552,7 +552,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 {previewFile, previewImage} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
@@ -567,6 +567,7 @@ export default {
   name: "IoCheckSuccessOrder",
   data() {
     return {
+      users:{},
       defaultSort: {prop: 'createTime', order: 'desc'},
       savebillno: null,
       invoiceRow: [],
@@ -795,29 +796,42 @@ 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); // 禁止页面滑动
-    },
 
-    closeImgViewer() {
-      this.imgViewerVisible = false;
-      const m = (e) => {
-        e.preventDefault()
-      };
-      document.body.style.overflow = 'auto';
-      document.removeEventListener("touchmove", m, true);
     },
 
 
@@ -915,6 +929,17 @@ export default {
       this.getList();
     },
 
+    getUser(){
+      getUserBean()
+        .then((res) => {
+          if(res.code == 20000){
+            if ( res.data.customerId == "110") {
+              this.showSup = true;
+            }
+          }
+        })
+    },
+
 
     //获取订单列表
     getList() {
@@ -996,6 +1021,7 @@ export default {
       getInvListByUser()
         .then((response) => {
           this.invList = response.data || [];
+
         })
         .catch(() => {
         });
@@ -1081,6 +1107,8 @@ export default {
         this.bizQuery.batchNo = row.batchNo;
         this.bizQuery.relId = row.bindRlFk;
         // this.bizQuery.bizIdFk = row.id;
+      }else{
+        this.bizQuery = {}
       }
       filterListInvoice(this.bizQuery).then((res) => {
         this.invoiceLoading = false;
@@ -1195,10 +1223,7 @@ export default {
   ,
   created() {
 
-    let supId = this.$store.getters.customerId;
-    if (supId == "110") {
-      this.showSup = true;
-    }
+    this.getUser();
     this.getInvList();
     this.getDeptList();
     this.getBusType();
diff --git a/src/views/inout/IoCheckAuditNewOrder.vue b/src/views/inout/IoCheckAuditNewOrder.vue
index 603124c7..e6a59c10 100644
--- a/src/views/inout/IoCheckAuditNewOrder.vue
+++ b/src/views/inout/IoCheckAuditNewOrder.vue
@@ -515,7 +515,6 @@ export default {
     this.getBusType();
     this.getList();
     this.lotType = this.$route.query.name;
-    debugger
     if (this.lotType == 'NO_LOT') {
       this.viewType = 5;
     } else {
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 61030093..a0616924 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -36,9 +36,9 @@
         <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>
+          <!--@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"-->
         </template>
       </el-table-column>
       <el-table-column width="120" label="生产日期">
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 17bd3a13..8a5706fe 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -341,7 +341,6 @@ export default {
     },
 
     handleSortChange(column, prop, order) {
-      debugger
       if (column.order === 'descending') {
         this.filterQuery.sort = 'desc'
       } else {
diff --git a/src/views/inventory/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue
index c3d17684..bf1a8b6b 100644
--- a/src/views/inventory/InvMAOrderAudit.vue
+++ b/src/views/inventory/InvMAOrderAudit.vue
@@ -93,22 +93,17 @@
         <el-table-column width="150" label="养护数量" prop="count"></el-table-column>
         <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
           <template slot-scope="scope">
-            <el-radio disabled="true" v-model="scope.row.maStatus"
-                      :label="0">未养护
-            </el-radio>
-            <el-radio disabled="true" v-model="scope.row.maStatus"
-                      :label="1">已养护
-            </el-radio>
+            <el-tag :type="statusFilterType(scope.row.maStatus)">
+              {{status[scope.row.maStatus]}}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column width="150" label="设备状态" prop="deviceStatus">
           <template slot-scope="scope">
-            <el-radio v-model="scope.row.deviceStatus" :label="1" disabled="true">
-              正常
-            </el-radio>
-            <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
-              异常
-            </el-radio>
+            <el-tag :type="statusFilterType(scope.row.deviceStatus)"
+            >
+              {{deviceStatus[scope.row.deviceStatus]}}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column width="200" label="养护备注" prop="remark">
@@ -162,6 +157,14 @@ export default {
         1: "未审核",
         2: "已审核"
       },
+      status:{
+        0:"未养护",
+        1:"已养护",
+      },
+      deviceStatus:{
+        1:"正常",
+        0:"异常",
+      },
       detailQuery: {
         orderIdFk: null,
         page: 1,
@@ -320,6 +323,15 @@ export default {
         this.detailTotal = 0;
       });
     },
+
+    statusFilterType(status) {
+      const statusMap = {
+        1: "success",
+        0: "danger",
+      };
+      return statusMap[status];
+    },
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inventory/InvMAOrderCompleted.vue b/src/views/inventory/InvMAOrderCompleted.vue
index 138eb3e5..372d93b4 100644
--- a/src/views/inventory/InvMAOrderCompleted.vue
+++ b/src/views/inventory/InvMAOrderCompleted.vue
@@ -76,22 +76,17 @@
         <el-table-column width="150" label="养护数量" prop="count"></el-table-column>
         <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
           <template slot-scope="scope">
-            <el-radio disabled="true" v-model="scope.row.maStatus"
-                      :label="0">未养护
-            </el-radio>
-            <el-radio disabled="true" v-model="scope.row.maStatus"
-                      :label="1">已养护
-            </el-radio>
+            <el-tag :type="statusFilterType(scope.row.maStatus)">
+              {{status[scope.row.maStatus]}}
+            </el-tag>
+
           </template>
         </el-table-column>
         <el-table-column width="150" label="设备状态" prop="deviceStatus">
           <template slot-scope="scope">
-            <el-radio v-model="scope.row.deviceStatus" :label="1" disabled="true">
-              正常
-            </el-radio>
-            <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
-              异常
-            </el-radio>
+            <el-tag :type="statusFilterType(scope.row.maStatus)">
+              {{deviceStatus[scope.row.maStatus]}}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column width="200" label="养护备注" prop="remark">
@@ -145,6 +140,14 @@ export default {
         1: "未审核",
         2: "已审核"
       },
+      status:{
+        0:"未养护",
+        1:"已养护",
+      },
+      deviceStatus:{
+        1:"正常",
+        0:"异常",
+      },
       detailList: [],
       detailLoading: false,
       detailQuery: {
@@ -237,6 +240,15 @@ export default {
         this.detailTotal = 0;
       });
     },
+    statusFilterType(status){
+      const statusMap ={
+        1:"success",
+        0:"danger"
+      }
+      return statusMap[status];
+    },
+
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index 0492616f..c9ac47fe 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -118,6 +118,7 @@
                 :loading="corpLoading"
                 @change="corpChange"
                 style="width: 90%"
+                @clear="getcorp"
               >
                 <el-option
                   v-for="item in fromOptions"
@@ -293,6 +294,7 @@ export default {
         limit: 10,
       };
       this.getList();
+      this.findMethod();
     },
     onSubmit() {
       this.filterQuery.page = 1;
@@ -374,6 +376,9 @@ export default {
         this.findMethod(value);
       }
     },
+    getcorp(){
+      this.findMethod();
+    },
     detailDialog(row) {
       this.detailDialogVisible = true;
       this.inputQuery = {
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 98674804..d40e81be 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -117,6 +117,7 @@
                 :loading="corpLoading"
                 @change="corpChange"
                 style="width: 90%"
+                @clear="getcorp"
               >
                 <el-option
                   v-for="item in fromOptions"
@@ -314,6 +315,7 @@ export default {
         limit: 10,
       };
       this.getList();
+      this.findMethod();
     },
 
     keyup_submit(event) {
@@ -391,6 +393,9 @@ export default {
         this.findMethod(value);
       }
     },
+    getcorp(){
+      this.findMethod();
+    },
     detailDialog(row) {
       this.inputQuery = {
         code: row.code,
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index e34e5ff1..103fd3fe 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -117,6 +117,7 @@
                 :loading="corpLoading"
                 @change="corpChange"
                 style="width: 90%"
+                @clear="getcorp"
               >
                 <el-option
                   v-for="item in fromOptions"
@@ -288,6 +289,7 @@ export default {
         invCode: null,
       };
       this.getList();
+      this.findMethod();
     },
     onSubmit() {
       this.filterQuery.page = 1;
@@ -370,6 +372,9 @@ export default {
         this.findMethod(value);
       }
     },
+    getcorp(){
+      this.findMethod();
+    },
     detailDialog(row) {
       this.detailDialogVisible = true;
       this.inputQuery = {
diff --git a/src/views/login.vue b/src/views/login.vue
index 916a8a73..6f7dd6e9 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -162,7 +162,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/login.jpg");
   background-size: cover;
 }
 
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index 69ad7abb..64080d7a 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="textTitle">
       <!--      <h3 class="toptitle">平潭协和医院</h3>-->
-      <h3 class="toptitle">漳州市中医院</h3>
+      <h3 class="toptitle">{{ title }}</h3>
       <h3 class="topSubtitle">医院UDI管理系统</h3>
     </div>
     <el-form
@@ -12,6 +12,7 @@
       :rules="rules"
       ref="ruleForm"
       label-position="left"
+      @submit.native.prevent
     >
       <el-card class="box-card">
         <div style="text-align: center; margin-top: 10px">
@@ -98,6 +99,7 @@ import Verify from "vue2-verify";
 import axios from "axios";
 import Cookies from "js-cookie";
 import {decrypt, encrypt} from "@/utils/jsencrypt";
+import {getCodeImg, getTitleConfig} from "@/api/login";
 
 export default {
   data() {
@@ -134,6 +136,7 @@ export default {
       showDialog: false, // 显示dialog
       redirect: null, // 回调地址
       hospName: "",
+      title: "福建省XXX医院"
     };
   },
   methods: {
@@ -238,6 +241,11 @@ export default {
         }
       });
     },
+    getTitleConfig() {
+      getTitleConfig().then(res => {
+        this.title = res.data.title;
+      });
+    },
   },
   components: {
     Verify,
@@ -249,7 +257,7 @@ export default {
       // URL Encode
       this.redirect = decodeURIComponent(query.redirect);
     }
-
+    this.getTitleConfig();
     axios.get("./config.json").then((res) => {
       this.hospName = res.data.hosp_name;
     });
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 4f42bc13..b20c477e 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -1,513 +1,521 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form  :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="申购单号">
-                    <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
-                  </el-form-item>
-                </el-col>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="申购单号">
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
+            </el-form-item>
+          </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="申购部门">
-                    <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList" style="width: 90%">
-                      <el-option
-                        v-for="item in deptList"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                      >
-                        <span style="float: left">{{ item.name }}</span>
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+          <el-col :span="8">
+            <el-form-item label="申购部门">
+              <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList"
+                         style="width: 90%">
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="申购仓库">
-                    <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable  placeholder="请选择所属仓库">
-                      <el-option
-                        v-for="item in invList"
-                        :key="item.name"
-                        :label="item.name"
-                        :value="item.code">
-                        <span style="float: left">{{ item.name }}</span>
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+          <el-col :span="8">
+            <el-form-item label="申购仓库">
+              <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="紧急程度：" prop="emergency">
-                    <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
-                      <el-option label="正常" :value=1></el-option>
-                      <el-option label="较急" :value=2></el-option>
-                      <el-option label="特急" :value=3></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="创建时间:">
-                    <el-date-picker
-                      :picker-options="pickerOptions"
-                      v-model="actDateRange"
-                      type="daterange"
-                      format="yyyy 年 MM 月 dd 日"
-                      style="width: 90%"
-                      value-format="yyyy-MM-dd"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="紧急程度：" prop="emergency">
+              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-            </el-form>
+      </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="onSubmitFind">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据</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="onSubmitFind">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据
+          </el-button>
+        </el-button-group>
+      </div>
 
-          <el-divider style="margin: 15px"></el-divider>
+      <el-divider style="margin: 15px"></el-divider>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%"  @current-change="handleDetail" border highlight-current-row
-                      :default-sort="defaultSort"  @sort-change="handleSortChange">
-                <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="申购单号" prop="billNo"></el-table-column>
-                <el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
-                <el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
-                <el-table-column label="紧急程度" prop="emergency" >
-                  <template slot-scope="scope">
-                    {{ emergencyMap[scope.row.emergency] }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="到货截止" prop="arrivalTime" ></el-table-column>
-                <el-table-column label="单据状态" prop="status">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.status) | statusFilterType">
-                            {{ statusMap[scope.row.status] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-              <el-table-column label="备注" prop="remark"></el-table-column>
-              <el-table-column label="创建时间" prop="createTime"
-                               sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
-                <el-table-column label="操作" width="120px">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+      <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border
+                highlight-current-row
+                :default-sort="defaultSort" @sort-change="handleSortChange">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="申购单号" prop="billNo"></el-table-column>
+        <el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
+        <el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency">
+          <template slot-scope="scope">
+            {{ emergencyMap[scope.row.emergency] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
+        <el-table-column label="单据状态" prop="status">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ statusMap[scope.row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime"
+                         sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+        <el-table-column label="操作" width="120px">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
+            </el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
 
-          ></pagination>
-        </el-card>
+      ></pagination>
+    </el-card>
 
-        <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-              <el-table-column label="序号" type="index" width="60"></el-table-column>
-              <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
-              <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
-              <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-              <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
-              <el-table-column label="申购数量" prop="count"></el-table-column>
-              <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
-              <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
-              <el-table-column label="供应商" prop="supName"></el-table-column>
-            </el-table>
-        </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
+      </el-table>
+    </el-card>
 
-        <el-dialog
-            :title="formMap[formName]"
-            :visible.sync="newSpDistributionVisible"
-            width="80%"
-            v-if="newSpDistributionVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :before-close ="handleClose"
-        >
-            <pureApplyEdit
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-                 v-on:cancelDialog="getId"
-                :isChang="isChang"
-            ></pureApplyEdit>
-        </el-dialog>
-    </div>
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="handleClose"
+    >
+      <pureApplyEdit
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+        v-on:cancelDialog="getId"
+        :isChang="isChang"
+      ></pureApplyEdit>
+    </el-dialog>
+  </div>
 </template>
 <script>
 import pureApplyEdit from "./purApplyEditDiaolog";
 import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
-import { getInvListByUser } from '@/api/system/invWarehouse'
-import { getDeptListByUser } from '@/api/auth/authDept'
-import {filterSubAll} from "@/api/system/invSubWarehouse";
+import {getInvListByUser} from '@/api/system/invWarehouse'
+import {filterDepts, getDeptListByUser} from '@/api/auth/authDept'
+import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
-    data() {
-        return {
-          defaultSort: {prop: 'createTime', order: 'desc'},
-            showSearch: true,
-            pId:null,
-            filterQuery: {
-                billAction: null,
-                billNo: "",
-                originType: null,
-                thirdSysFk: "",
-                page: 1,
-                limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 1,
-                emergency:'',
-                targetDeptCode:'',
-                targetInvCode:null
-            },
-            isChang:false,
-            formName: null,
-            formMap: {
-                add: "新增申购单据",
-                update: "编辑申购单据",
-            },
-            statusMap: {
-                1: "草稿",
-                2: "未审核",
-                3: "已审核",
-                4: "已拒绝"
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      showSearch: true,
+      pId: null,
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+        emergency: '',
+        targetDeptCode: '',
+        targetInvCode: null
+      },
+      isChang: false,
+      formName: null,
+      formMap: {
+        add: "新增申购单据",
+        update: "编辑申购单据",
+      },
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      emergencyMap: {
+        1: "正常",
+        2: "较急",
+        3: "特急",
+      },
+      idQuery: {},
+      total: 0,
+      thirdSys: [],
+      invList: {},
+      invCodebe: null,
+      deptList: {},
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      createTimes: null,
+      detailLoading: false,
+      detailList: [],
+      loading: false,
+      actDateRange: [],
+      newSpDistributionVisible: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            emergencyMap:{
-              1: "正常",
-              2: "较急",
-              3: "特急",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            idQuery: {},
-            total: 0,
-            thirdSys: [],
-            invList:{},
-            invCodebe:null,
-            deptList:{},
-            thirdSysDetail: null,
-            busTypes: [],
-            originTypes: [],
-            list: [],
-            createTimes:null,
-            detailLoading: false,
-            detailList: [],
-            loading: false,
-            actDateRange: [],
-            newSpDistributionVisible: false,
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
-    },
+          },
+        ],
+      },
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            let deptCode = this.filterQuery.targetDeptCode
-            this.filterQuery = {
-                billNo: "",
-                thirdSysFk: "",
-                billFlag: null,
-                billAction: null,
-                startDate: null,
-                endDate: null,
-                page: 1,
-                limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 1,
-                targetDeptCode: this.invCodebe,
-                targetInvCode:null
-            };
-            this.initActDateRange()
-            if(deptCode!=this.invCodebe){
-              this.getInvList()
-            }
-            this.actDateRange = [];
-            this.getList();
-        },
-      getId(id){
-        if( this.formName=='add' && id!=null){
-          var data={
-            id:id
-          }
-          this.pId=id
-          //当在新增时取消添加操作删除掉这次的数据
-          delApplyDetailAll(data).then((response)=>{
-            if(response.code==20000){
-              this.newSpDistributionVisible=false
-            }
-          });
-        }else{
-          this.newSpDistributionVisible=false
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      let deptCode = this.filterQuery.targetDeptCode
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+        targetDeptCode: this.invCodebe,
+        targetInvCode: null
+      };
+      this.initActDateRange()
+      if (deptCode != this.invCodebe) {
+        this.getInvList()
+      }
+      this.actDateRange = [];
+      this.getList();
+    },
+    getId(id) {
+      if (this.formName == 'add' && id != null) {
+        var data = {
+          id: id
         }
+        this.pId = id
+        //当在新增时取消添加操作删除掉这次的数据
+        delApplyDetailAll(data).then((response) => {
+          if (response.code == 20000) {
+            this.newSpDistributionVisible = false
+          }
+        });
+      } else {
+        this.newSpDistributionVisible = false
+      }
 
-      },
-        onSubmitFind() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
+    },
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
 
-      handleSortChange(column, prop, order) {
-        if (column.order === 'descending') {
-          this.filterQuery.sort = 'desc'
-        } else {
-          this.filterQuery.sort = 'asc'
-        }
-        this.filterQuery.orderBy = column.prop;
-        this.getList();
-      },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop;
+      this.getList();
+    },
 
-        getList() {
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
-            } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
-            }
-            this.loading = true;
-            console.log(this.filterQuery)
-            listApply(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                        this.detailList=[]
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
-            let query = {orderIdFk: row.id};
-            this.detailLoading = true;
-            listApplyDetail(query) //查找该单号下的所有条码
-                .then((response) => {
-                    this.detailList = response.data.list || [];
-                    this.detailLoading = false;
-                })
-                .catch(() => {
-                    this.detailLoading = false;
-                    this.detailList = [];
-                });
-        },
-        handleClose(){
-          if( this.formName=='add'){
-            this.isChang=!this.isChang
-          }else{
-            this.newSpDistributionVisible=false
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      console.log(this.filterQuery)
+      listApply(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = []
+          } else {
+            this.$message.error(response.message);
           }
-        },
-        submitOrder(row) {
-            this.loading = true;
-            let tQuery = {
-                editStatus: 2,
-                purApplyEntity: row,
-            }
-            inserThrOrderWeb(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success("提交成功！");
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    delApply(row.id)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
-
-                })
-                .catch(() => {
-                });
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      let query = {orderIdFk: row.id};
+      this.detailLoading = true;
+      listApplyDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.detailLoading = false;
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+    handleClose() {
+      if (this.formName == 'add') {
+        this.isChang = !this.isChang
+      } else {
+        this.newSpDistributionVisible = false
+      }
+    },
+    submitOrder(row) {
+      this.loading = true;
+      let tQuery = {
+        editStatus: 2,
+        purApplyEntity: row,
+      }
+      inserThrOrderWeb(tQuery)
+        .then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功！");
             this.getList();
-        },
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delApply(row.id)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
 
-        closeDialog() {
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-        },
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
 
+    closeDialog() {
+      this.newSpDistributionVisible = false;
+      this.getList();
+      this.detailList = [];
+    },
 
-        newDistributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.formName = "update";
-            } else
-                this.formName = "add";
-            this.newSpDistributionVisible = true;
-        },
-        getInvList() {
-          var query={
-            parentId:this.filterQuery.targetDeptCode
-          }
-          this.filterQuery.targetInvCode = null
-          this.$forceUpdate()
-          filterSubAll(query).then((res) => {
-            this.invList = res.data || [];
-          })
-        },
-        getDeptList() {
-          getDeptListByUser().then((res) => {
-            this.deptList = res.data || [];
-            if(this.deptList.length>0){
-              this.filterQuery.targetDeptCode=this.deptList[0].code
-              this.invCodebe=this.filterQuery.targetDeptCode
-            }
-            this.getList();
-            this. getInvList();
-          });
-        },
-        initActDateRange(){
 
-          let end = new Date();
-          let start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-          this.actDateRange = [start, end];
+    newDistributionForm(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.formName = "update";
+      } else
+        this.formName = "add";
+      this.newSpDistributionVisible = true;
+    },
+    getInvList() {
+      var query = {
+        parentId: this.filterQuery.targetDeptCode,
+        spUse: true,
+      }
+      this.filterQuery.targetInvCode = null
+      this.$forceUpdate()
+      filterGroupBySpuse(query).then((res) => {
+        this.invList = res.data || [];
+      })
+    },
+    getDeptList() {
+      let query = {
+        spUse: true,
+      };
+      filterDepts(query).then((res) => {
+        this.deptList = res.data || [];
+        if (this.deptList.length > 0) {
+          this.filterQuery.targetDeptCode = this.deptList[0].code
+          this.invCodebe = this.filterQuery.targetDeptCode
         }
+        this.getList();
+        this.getInvList();
+      });
+    },
+    initActDateRange() {
 
+      let end = new Date();
+      let start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      this.actDateRange = [start, end];
     }
-    ,
-    components: {
-        pureApplyEdit,
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                1: "warning",
-                2: "success",
-            };
-            return statusMap[status];
-        }
-        ,
-    }
-    ,
-    mounted() {
-    }
-    ,
-    created() {
-      this.initActDateRange()
-        this.getDeptList();
+
+  }
+  ,
+  components: {
+    pureApplyEdit,
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        1: "warning",
+        2: "success",
+      };
+      return statusMap[status];
     }
     ,
+  }
+  ,
+  mounted() {
+  }
+  ,
+  created() {
+    this.initActDateRange()
+    this.getDeptList();
+  }
+  ,
 }
 ;
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
 
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 2ceb8074..bf8ce623 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -61,7 +61,7 @@
         <el-row style="margin-top: -10px">
           <el-col :span="11">
             <el-form-item label="申购仓库：" prop="locStorageCode">
-              <el-select v-model="formData.targetInvCode" placeholder="请选择当前申购仓库" @change="setWarehouseName"
+              <el-select v-model="formData.targetInvCode" placeholder="请选择申购仓库" @change="setWarehouseName"
                          style="width: 90%" clearable>
                 <el-option
                   v-for="item in subInvList"
@@ -97,7 +97,7 @@
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
-<!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>-->
+              <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>-->
             </el-button-group>
           </el-button-group>
         </el-row>
@@ -184,7 +184,7 @@ import {
   addApplyId,
   updateDetail
 } from "@/api/purchase/purApply";
-import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {filterGroupBySpuse, filterSubByInv} from "@/api/system/invSubWarehouse";
 import {addPlanId} from "@/api/purchase/purPlan";
 import SelectRecelveListDialog from "@/views/inout/receive/selectReveiceListDialog";
 import {parseTime} from "@/utils/coTools";
@@ -297,7 +297,7 @@ export default {
             if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
               return this.$message.error("到货时间不能为空！");
             }
-            if (this.formData.arrivalTime<this.formData.createTime) {
+            if (this.formData.arrivalTime < this.formData.createTime) {
               return this.$message.error("到货时间不能比单据日期早！！！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
@@ -426,7 +426,7 @@ export default {
       }
     },
     deleteCodeArray(index, row) {
-      this.orderEditor=true;
+      this.orderEditor = true;
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -489,9 +489,10 @@ export default {
     findSubInvs() {
       this.subInvList = [];
       let query = {
-        filter: 3
+        filter: 3,
+        spUse: true,
       };
-      filterSubByInv(query)
+      filterGroupBySpuse(query)
         .then((response) => {
           this.subInvList = response.data || [];
           if (this.subInvList != null && this.subInvList.length == 1) {
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index fe7f6b12..d1362745 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="listQuery" label-width="120px" v-show="showSearch">
         <el-row>
-          <el-col :span="15">
+          <el-col :span="18">
             <el-form-item label="UDI码:" class="query-form-item">
               <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
                         @keyup.enter.native="keyup_submit($event)"></el-input>
@@ -12,26 +12,26 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="物资简称:" class="query-form-item">
-              <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 90%" placeholder="请输入物资拼音简写"
+            <el-form-item label="拼音简写:" class="query-form-item">
+              <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="第三方物资编码:" class="query-form-item">
-              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="第三方物资编码"
+              <el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分类编码:" class="query-form-item">
-              <el-input v-model="listQuery.flbm" style="width: 90%" placeholder="请输入分类编码"
+              <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="供应商:" class="query-form-item">
-              <el-input v-model="listQuery.companyName" style="width: 90%" placeholder="请输入供应商"
+              <el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -39,24 +39,39 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="物品编码:" class="query-form-item">
-              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+              <el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="产品通用名:" class="query-form-item">
-              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+              <el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号:" class="query-form-item">
-              <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+              <el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生产企业:" class="query-form-item">
-              <el-input v-model="listQuery.manufactory" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+              <el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
+              <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%" :placeholder="productRemarkSet.remarkTitle1"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
+            <el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
+              <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%" :placeholder="productRemarkSet.remarkTitle2"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -109,7 +124,6 @@
       ></pagination>
     </el-card>
 
-
     <el-dialog
       title="耗材字典详情"
       :visible.sync="udiRlDetailVisible"
@@ -126,7 +140,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-            <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -144,6 +161,7 @@ import {filterCompanyProductplanRelevance, filterCompanyProductRelevance} from "
 import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {finProductSet} from "@/api/param/systemParamConfig";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -211,6 +229,7 @@ export default {
         orderIdFk: "",
         supId: "",
       },
+      productRemarkSet: {},
       pickerOptions: {
         shortcuts: [
           {
@@ -353,7 +372,6 @@ export default {
         this.$message.error('未选择产品');
         return;
       }
-      debugger
       // if (this.ids.length > 0) {
       //   for (var i = 0; i < this.ids.length; i++) {
       //     if (this.ids[i] == this.multipleSelection.id) {
@@ -401,13 +419,19 @@ export default {
         this.multipleSelection.zczbhhzbapzbh = this.currentCert;
         this.combine();
       }
-
+    },
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data;
+        }
+      });
     },
   },
   components: {udiRlDetailDialog},
 
   created() {
-    console.log(this.data)
+    this.findBasicProductSet();
     if (this.$isNotBlank(this.data)) {
       this.ids = [];
       if (this.data.stockOrderLists.length > 0) {
@@ -416,13 +440,17 @@ export default {
         }
       }
     }
-
   },
 };
 </script>
 
 <style scoped>
 
+.query-form-item {
+  display: block !important;
+  margin-right: 1px;
+  margin-bottom: 5px;
+}
 
 div /deep/ .el-table .warning-row {
   background: #bebebe;
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index 35120f76..ef9470e7 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -1,152 +1,156 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form  :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="申购单号">
-                    <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
-                  </el-form-item>
-                </el-col>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="申购单号">
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
+            </el-form-item>
+          </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="申购部门">
-                    <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%"
-                      @change="getInvList"
-                    >
-                      <el-option
-                        v-for="item in deptList"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                      >
-                        <span style="float: left">{{ item.name }}</span>
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+          <el-col :span="8">
+            <el-form-item label="申购部门">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" style="width: 90%"
+                         @change="getInvList"
+              >
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="申购仓库">
-                    <el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable  placeholder="请选择所属仓库">
-                      <el-option
-                        v-for="item in invList"
-                        :key="item.name"
-                        :label="item.name"
-                        :value="item.code">
-                        <span style="float: left">{{ item.name }}</span>
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+          <el-col :span="8">
+            <el-form-item label="申购仓库">
+              <el-select v-model="filterQuery.invCode" @change="getList" style="width: 90%" clearable
+                         placeholder="请选择所属仓库">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="紧急程度：" prop="emergency">
-                    <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
-                      <el-option label="正常" :value=1></el-option>
-                      <el-option label="较急" :value=2></el-option>
-                      <el-option label="特急" :value=3></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="创建时间:">
-                    <el-date-picker
-                      :picker-options="pickerOptions"
-                      v-model="actDateRange"
-                      type="daterange"
-                      format="yyyy 年 MM 月 dd 日"
-                      style="width: 90%"
-                      value-format="yyyy-MM-dd"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="紧急程度：" prop="emergency">
+              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </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="onSubmitFind">查询</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="onSubmitFind">查询</el-button>
+        </el-button-group>
+      </div>
 
-          <el-divider style="margin: 15px"></el-divider>
+      <el-divider style="margin: 15px"></el-divider>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @current-change="handleDetail"
-                      :default-sort="defaultSort"   @sort-change="handleSortChange">
-              <el-table-column label="序号" type="index" width="60"></el-table-column>
-              <el-table-column label="申购单号" prop="billNo"></el-table-column>
-              <el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
-              <el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
-              <el-table-column label="紧急程度" prop="emergency" >
-                <template slot-scope="scope">
-                  {{ emergencyMap[scope.row.emergency] }}
-                </template>
-              </el-table-column>
-              <el-table-column label="到货截止" prop="arrivalTime" ></el-table-column>
-              <el-table-column label="单据状态" prop="status">
-                <template slot-scope="scope">
-                  <el-tag :type="(scope.row.status) | statusFilterType">
-                    {{ statusMap[scope.row.status] }}
-                  </el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column label="创建时间" prop="createTime"
-                               sortable="custom"   :sort-orders="['ascending', 'descending']"></el-table-column>
-                <el-table-column label="操作" width="60px">
-                    <template slot-scope="scope">
-                        <el-button type="text" :disabled="scope.row.status!=2"  @click.native="newDistributionForm(scope.$index, scope.row)">审核</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @current-change="handleDetail"
+                :default-sort="defaultSort" @sort-change="handleSortChange">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="申购单号" prop="billNo"></el-table-column>
+        <el-table-column label="申购部门" prop="deptName"></el-table-column>
+        <el-table-column label="申购仓库" prop="invName"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency">
+          <template slot-scope="scope">
+            {{ emergencyMap[scope.row.emergency] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
+        <el-table-column label="单据状态" prop="status">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ statusMap[scope.row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime"
+                         sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+        <el-table-column label="操作" width="60px">
+          <template slot-scope="scope">
+            <el-button type="text" :disabled="scope.row.status!=2"
+                       @click.native="newDistributionForm(scope.$index, scope.row)">审核
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
 
-        </el-card>
-        <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-              <el-table-column label="序号" type="index" width="60"></el-table-column>
-              <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
-              <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
-              <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-              <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
-              <el-table-column label="申购数量" prop="count"></el-table-column>
-              <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
-              <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
-              <el-table-column label="供应商" prop="supName"></el-table-column>
-            </el-table>
-        </el-card>
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
+      </el-table>
+    </el-card>
 
-        <el-dialog
-            :title="formMap[formName]"
-            :visible.sync="newSpDistributionVisible"
-            width="80%"
-            v-if="newSpDistributionVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <pureApplyDetail
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-                :editType="editType"
-            ></pureApplyDetail>
-        </el-dialog>
-    </div>
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <pureApplyDetail
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+        :editType="editType"
+      ></pureApplyDetail>
+    </el-dialog>
+  </div>
 </template>
 <script>
 import pureApplyDetail from "./pureApplyDetailDialog";
@@ -156,321 +160,323 @@ import {getDeptListByUser} from "@/api/auth/authDept";
 import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
-    data() {
-        return {
-          defaultSort: {prop: 'createTime', order: 'desc'},
-            showSearch: true,
-            filterQuery: {
-                billAction: null,
-                billNo: "",
-                originType: null,
-                thirdSysFk: "",
-                page: 1,
-                limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 1,
-                emergency:'',
-                targetDeptCode:'',
-                targetInvCode: null
-            },
-            formName: null,
-            formMap: {
-                add: "新增申购单据",
-                update: "审核申购单据",
-            },
-            statusMap: {
-                1: "草稿",
-                2: "未审核",
-                3: "已审核",
-                4: "已拒绝"
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      showSearch: true,
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+        emergency: '',
+        targetDeptCode: '',
+        targetInvCode: null,
+        deptCode: null,
+        invCode: null,
+      },
+      formName: null,
+      formMap: {
+        add: "新增申购单据",
+        update: "审核申购单据",
+      },
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      emergencyMap: {
+        1: "正常",
+        2: "较急",
+        3: "特急",
+      },
+      idQuery: {},
+      editType: 1,
+      total: 0,
+      thirdSys: [],
+      invCodebe: null,
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      invList: {},
+      deptList: {},
+      list: [],
+      detailList: [],
+      loading: false,
+      actDateRange: [],
+      newSpDistributionVisible: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            emergencyMap:{
-             1: "正常",
-             2: "较急",
-             3: "特急",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            idQuery: {},
-            editType: 1,
-            total: 0,
-            thirdSys: [],
-            invCodebe:null,
-            thirdSysDetail: null,
-            busTypes: [],
-            originTypes: [],
-            invList:{},
-            deptList:{},
-            list: [],
-            detailList: [],
-            loading: false,
-            actDateRange: [],
-            newSpDistributionVisible: false,
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
-    },
+          },
+        ],
+      },
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            let deptCode = this.filterQuery.targetDeptCode
-            this.filterQuery = {
-                billNo: "",
-                thirdSysFk: "",
-                billFlag: null,
-                billAction: null,
-                startDate: null,
-                endDate: null,
-                page: 1,
-                limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 1,
-                targetDeptCode: this.invCodebe,
-                targetInvCode: null
-            };
-            if(deptCode!=this.invCodebe){
-              this.getInvList()
-            }
-            this.actDateRange = [];
-            this.getList();
-        },
-        hideSearch() {
-           this.showSearch = !this.showSearch;
-        },
-        onSubmitFind() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      let deptCode = this.filterQuery.targetDeptCode
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+        targetDeptCode: this.invCodebe,
+        targetInvCode: null
+      };
+      if (deptCode != this.invCodebe) {
+        this.getInvList()
+      }
+      this.actDateRange = [];
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
 
-      handleSortChange(column, prop, order) {
-        if (column.order === 'descending') {
-          this.filterQuery.sort = 'desc'
-        } else {
-          this.filterQuery.sort = 'asc'
-        }
-        this.filterQuery.orderBy = column.prop;
-        this.getList();
-      },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop;
+      this.getList();
+    },
 
-        getList() {
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
-            } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
-            }
-            this.loading = true;
-            auditListApply(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                        this.detailList=[]
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
-            let query = {orderIdFk: row.id};
-            this.loading = true;
-            listApplyDetail(query) //查找该单号下的所有条码
-                .then((response) => {
-                    this.detailList = response.data.list || [];
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                    this.total = 0;
-                });
-        },
-        submitOrder(row) {
-            this.loading = true;
-            let tQuery = {
-                editStatus: 2,
-                purApplyEntity: row,
-            }
-            auditOrder(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success("提交成功！");
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      auditListApply(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = []
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      let query = {orderIdFk: row.id};
+      this.loading = true;
+      listApplyDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+    submitOrder(row) {
+      this.loading = true;
+      let tQuery = {
+        editStatus: 2,
+        purApplyEntity: row,
+      }
+      auditOrder(tQuery)
+        .then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功！");
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delApply(row.id)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
             })
-                .then(() => {
-                    delApply(row.id)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
+            .catch(() => {
+              this.loading = false;
+            });
 
-                })
-                .catch(() => {
-                });
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
-            this.getList();
-        },
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
 
-        closeDialog() {
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-        },
+    closeDialog() {
+      this.newSpDistributionVisible = false;
+      this.getList();
+      this.detailList = [];
+    },
 
 
-        newDistributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.formName = "update";
-            } else
-                this.formName = "add";
-            this.newSpDistributionVisible = true;
-        },
-        deptChange(){
+    newDistributionForm(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.formName = "update";
+      } else
+        this.formName = "add";
+      this.newSpDistributionVisible = true;
+    },
+    deptChange() {
 
-          this. getInvList();
-          this.getList();
-        },
-      getInvList() {
-        var query={
-          parentId:this.filterQuery.targetDeptCode
-        }
-        this.filterQuery.targetInvCode = null
-        filterSubAll(query).then((res) => {
-          this.invList = res.data || [];
-        })
-      },
-      getDeptList() {
-        filterAll().then((res) => {
-          this.deptList = res.data || [];
-          this. getInvList();
-          this.getList();
-        });
-      },
-    }
-    ,
-    components: {
-        pureApplyDetail,
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                2: "warning",
-                3: "success",
-                4: "danger",
-            };
-            return statusMap[status];
-        }
-        ,
-    }
-    ,
-    mounted() {
-    }
-    ,
-    created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getDeptList();
+      this.getInvList();
+      this.getList();
+    },
+    getInvList() {
+      var query = {
+        parentId: this.filterQuery.targetDeptCode
+      }
+      this.filterQuery.targetInvCode = null
+      filterSubAll(query).then((res) => {
+        this.invList = res.data || [];
+      })
+    },
+    getDeptList() {
+      filterAll().then((res) => {
+        this.deptList = res.data || [];
+        this.getInvList();
+        this.getList();
+      });
+    },
+  }
+  ,
+  components: {
+    pureApplyDetail,
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        3: "success",
+        4: "danger",
+      };
+      return statusMap[status];
     }
     ,
+  }
+  ,
+  mounted() {
+  }
+  ,
+  created() {
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getDeptList();
+  }
+  ,
 }
 ;
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
 
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index 2a133b15..302e4e22 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -104,18 +104,13 @@
           </template>
         </el-table-column>
         <el-table-column label="到货截止" prop="arrivalTime" ></el-table-column>
-        <el-table-column label="单据状态" prop="status">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
-              {{ statusMap[scope.row.status] }}
-            </el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="创建时间" prop="createTime"
                          sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column>
         <el-table-column label="审核时间" prop="auditTime"
                          sortable="custom" :sort-orders="['ascending', 'descending']"  ></el-table-column>
-        <el-table-column label="状态" prop="status">
+        <el-table-column label="审核人" prop="auditByName"></el-table-column>
+
+        <el-table-column label="审核状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status) | statusFilterType">
               {{ statusMap[scope.row.status] }}
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 5909929c..ae5782b6 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -81,17 +81,19 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
                 @current-change="handleDetail" :default-sort="defaultSort"   @sort-change="handleSortChange">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="采购单号" prop="billNo"></el-table-column>
-        <el-table-column label="采购部门" prop="deptName"></el-table-column>
-        <el-table-column label="采购仓库" prop="invName"></el-table-column>
-        <el-table-column label="供应商" prop="supName"></el-table-column>
-        <el-table-column label="紧急程度" prop="emergency">
+        <el-table-column label="采购单号" prop="billNo" width="160"></el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120"></el-table-column>
+        <el-table-column label="采购仓库" prop="invName" width="120"></el-table-column>
+        <el-table-column label="申购仓库" prop="applyInvName" width="120"></el-table-column>
+        <el-table-column label="申购人" prop="applyCreateBy" width="120"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency" width="120">
           <template slot-scope="scope">
             {{ emergencyMap[scope.row.emergency] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
-        <el-table-column label="单据状态" prop="status">
+        <el-table-column label="到货截止" prop="arrivalTime" width="160"></el-table-column>
+        <el-table-column label="单据状态" prop="status"  width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status) | statusFilterType">
               {{ statusMap[scope.row.status] }}
@@ -99,10 +101,10 @@
           </template>
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime"
-                         sortable="custom"  :sort-orders="['ascending', 'descending']"></el-table-column>
+                         sortable="custom"  :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
 
 
-        <el-table-column label="操作" width="120">
+        <el-table-column label="操作" width="120" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
             </el-button>
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 5c2bf5b6..d54faa35 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -11,7 +11,7 @@
 
           <el-col :span="8">
             <el-form-item label="采购部门">
-              <el-select v-model="filterQuery.deptCode" @change="getInvList"  placeholder="请选择采购部门" style="width: 90%">
+              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择采购部门" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -26,7 +26,7 @@
 
           <el-col :span="8">
             <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.invCode" clearable style="width: 90%"  placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" clearable style="width: 90%" placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -78,19 +78,22 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
-                @current-change="handleDetail"  :default-sort="defaultSort"  @sort-change="handleSortChange">
+                @current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="采购单号" prop="billNo"></el-table-column>
-        <el-table-column label="采购部门" prop="deptName"></el-table-column>
-        <el-table-column label="采购仓库" prop="invName"></el-table-column>
-        <el-table-column label="供应商" prop="supName"></el-table-column>
-        <el-table-column label="紧急程度" prop="emergency">
+        <el-table-column label="采购单号" prop="billNo" width="160"></el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120"></el-table-column>
+        <el-table-column label="采购仓库" prop="invName" width="120"></el-table-column>
+        <el-table-column label="申购仓库" prop="applyInvName" width="120"></el-table-column>
+        <el-table-column label="申购人" prop="applyCreateBy" width="120"></el-table-column>
+        <el-table-column label="审核人" prop="auditUserName"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency" width="120">
           <template slot-scope="scope">
             {{ emergencyMap[scope.row.emergency] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
-        <el-table-column label="单据状态" prop="status">
+        <el-table-column label="到货截止" prop="arrivalTime" width="160"></el-table-column>
+        <el-table-column label="单据状态" prop="status" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status) | statusFilterType">
               {{ statusMap[scope.row.status] }}
@@ -98,8 +101,8 @@
           </template>
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime"
-                         sortable="custom"  :sort-orders="['ascending', 'descending']"></el-table-column>
-        <el-table-column label="操作" width="60px">
+                         sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
+        <el-table-column label="操作" width="60px" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.status!=2"
                        @click.native="newDistributionForm(scope.$index, scope.row)">审核
@@ -173,11 +176,11 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        emergency:'',
-        deptCode:'',
+        emergency: '',
+        deptCode: '',
       },
       formName: null,
-      invCodebe:null,
+      invCodebe: null,
       formMap: {
         add: "新增采购计划",
         update: "采购计划审核",
@@ -188,7 +191,7 @@ export default {
         3: "已审核",
         4: "已拒绝"
       },
-      emergencyMap:{
+      emergencyMap: {
         1: "正常",
         2: "较急",
         3: "特急",
@@ -297,7 +300,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
-            this.detailList=[]
+            this.detailList = []
           } else {
             this.$message.error(response.message);
           }
@@ -358,8 +361,8 @@ export default {
       this.detailList = [];
     },
     getInvList() {
-      var query={
-        parentId:this.filterQuery.deptCode
+      var query = {
+        parentId: this.filterQuery.deptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -368,12 +371,12 @@ export default {
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
-        if(this.deptList.length>0){
-          this.filterQuery.deptCode=this.deptList[0].code
-          this.invCodebe=this.filterQuery.deptCode
+        if (this.deptList.length > 0) {
+          this.filterQuery.deptCode = this.deptList[0].code
+          this.invCodebe = this.filterQuery.deptCode
         }
         this.getList();
-        this. getInvList();
+        this.getInvList();
       });
     },
 
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 0b316f38..fb9d58ca 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -94,19 +94,22 @@
 
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
-                @current-change="handleDetail"  :default-sort="defaultSort"  @sort-change="handleSortChange" >
+                @current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="采购单号" prop="billNo"></el-table-column>
-        <el-table-column label="采购部门" prop="deptName"></el-table-column>
-        <el-table-column label="采购仓库" prop="invName"></el-table-column>
-        <el-table-column label="供应商" prop="supName"></el-table-column>
-        <el-table-column label="紧急程度" prop="emergency">
+        <el-table-column label="采购单号" prop="billNo" width="160"></el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120"></el-table-column>
+        <el-table-column label="采购仓库" prop="invName" width="120"></el-table-column>
+        <el-table-column label="申购仓库" prop="applyInvName" width="120"></el-table-column>
+        <el-table-column label="申购人" prop="applyCreateBy" width="120"></el-table-column>
+        <el-table-column label="审核人" prop="auditUserName"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency" width="120">
           <template slot-scope="scope">
             {{ emergencyMap[scope.row.emergency] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
-        <el-table-column label="状态" prop="status">
+        <el-table-column label="到货截止" prop="arrivalTime" width="160"></el-table-column>
+        <el-table-column label="单据状态" prop="status" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status) | statusFilterType">
               {{ statusMap[scope.row.status] }}
@@ -114,12 +117,12 @@
           </template>
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime"
-                         sortable="custom"     :sort-orders="['ascending', 'descending']"></el-table-column>
+                         sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
         <el-table-column label="审核时间" prop="auditTime"
-                         sortable="custom"     :sort-orders="['ascending', 'descending']"></el-table-column>
+                         sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
 
 
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="60px" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
             >删除
diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue
index dfd79c83..b7736608 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -116,7 +116,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-            <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -175,6 +178,9 @@ export default {
         limit: 10,
         zczbhhzbapzbh: null,
         manufactory: null,
+
+        basicPrductRemak1: null,
+        basicPrductRemak2: null,
       },
       combineQuery: {
         thirdId: "",
@@ -351,7 +357,7 @@ export default {
         orderIdFk: this.pId,
         supId: this.multipleSelection.customerId,
         zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
-        price:this.multipleSelection.price
+        price: this.multipleSelection.price
       };
       addOrderDetail(tQuery).then((response) => {
         this.loading = false;
diff --git a/src/views/register.vue b/src/views/register.vue
index 3f21986a..eb55503c 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -154,7 +154,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/login.jpg");
   background-size: cover;
 }
 .title {
diff --git a/src/views/system/dept/invRelBusType.vue b/src/views/system/dept/invRelBusType.vue
index 35f6d9d1..f9f22a59 100644
--- a/src/views/system/dept/invRelBusType.vue
+++ b/src/views/system/dept/invRelBusType.vue
@@ -4,6 +4,7 @@
     <el-transfer v-model="value" :data="data"
                  class="edit_dev"
                  @change="transferChange"
+                 @mouseover.native="addTitle"
                  filterable
                  :titles="['未选入单据类型', '已选入单据类型']"
 
@@ -123,6 +124,13 @@ export default {
       this.multipleSelection = val;
     },
 
+    addTitle(e) {
+      // 手动给鼠标滑过的元素加一个title
+      let target_el = e.target;
+      if (target_el.title) return;
+      target_el.title = target_el.innerText;
+    },
+
 
     transferChange(value, direction, keyArr) {
       this.keyArr=value;
diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index e842f4c7..7bb18229 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -102,7 +102,8 @@
           <el-row type="flex">
             <el-col :span="11" type="flex">
               <el-form-item label="用户账号" prop="userName">
-                <el-input v-model="formData.userName" size="small" style="width: 90%" :disabled="formData.id == 1"></el-input>
+                <el-input v-model="formData.userName" size="small" style="width: 90%"
+                          :disabled="formData.id == 1"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
@@ -206,7 +207,7 @@
           <el-row :gutter="20" type="flex">
             <el-col :span="11" type="flex">
               <el-form-item label="角色" prop="roles">
-                <el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1" >
+                <el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1">
                   <el-checkbox
                     v-for="item in roles"
                     :key="item.roleId"
@@ -258,7 +259,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
 import {isBlank} from "@/utils/strUtil";
 import {listRole} from "@/api/system/role";
 import {selectSysParamByKey} from "@/api/system/systemParamConfig";
-import {filterList, selectInvById,getDeptById} from '@/api/system/invWarehouse'
+import {filterList, selectInvById, getDeptById} from '@/api/system/invWarehouse'
 
 const formJson = {
   id: "",
@@ -384,7 +385,7 @@ export default {
       this.query.page = 1;
       this.getList();
     },
-    change(){
+    change() {
       this.$forceUpdate();
     },
     findInv(val) {
@@ -403,7 +404,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.query.key='key';
+      this.query.key = 'key';
       authAdminList(this.query)
         .then(response => {
           this.loading = false;
@@ -465,7 +466,7 @@ export default {
           roles: row.roles,
           depts: row.depts,
           dept: row.dept,
-          locInvCode:row.locInvCode
+          locInvCode: row.locInvCode
         };
       }
       this.formName = "add";
@@ -570,10 +571,10 @@ export default {
       };
       filterList(query)
         .then((response) => {
-          var deptList=[];
+          var deptList = [];
           this.loading = false;
-          for(var i=0;i<response.data.list.length;i++){
-            if(response.data.list[i].id!=1){
+          for (var i = 0; i < response.data.list.length; i++) {
+            if (response.data.list[i].id != 1) {
               deptList.push(response.data.list[i]);
             }
           }
diff --git a/src/views/test.vue b/src/views/test.vue
index 35d58e2a..0c06ce4a 100644
--- a/src/views/test.vue
+++ b/src/views/test.vue
@@ -16,7 +16,6 @@ export default {
     var lastTime, nextTime // 上次时间、最新时间
     var lastCode, nextCode // 上次按键、最新按键
     document.onkeypress = (e) => {
-      debugger
       // 获取按键
       if (window.event) { // IE
         nextCode = e.keyCode
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index bd9647a3..f56c6680 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>
 
@@ -69,8 +73,9 @@
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <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="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>
           </template>
         </el-table-column>
@@ -89,16 +94,17 @@
     <el-dialog
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      title="产品信息详情"
+      title="产品信息编辑"
       :visible.sync="thrProductsDetailVisible"
       width="60%"
       class="dialog-two"
       top="5vh"
       v-if="thrProductsDetailVisible"
     >
-      <thrProductsDetail
-        :data="thisData"
-      ></thrProductsDetail>
+      <thrProductsEdit
+        :newProductData="thisData"
+        :closeAddDialog="closeAddDialog"
+      ></thrProductsEdit>
     </el-dialog>
 
     <el-dialog
@@ -120,12 +126,13 @@
   </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 thrProductsEdit from "./thrProductsEdit";
 import ThrProductsAdd from "@/views/thirdSys/product/thrProductsAdd";
 import {findConfig} from "@/api/sync/spsSyncStatus";
 
@@ -143,7 +150,7 @@ export default {
         page: 1,
         limit: 20,
       },
-      mainThirdSys:'',
+      mainThirdSys: '',
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -206,7 +213,7 @@ export default {
       this.getList();
     },
     getList() {
-      if (this.filterQuery.thirdSys == null ) {
+      if (this.filterQuery.thirdSys == null) {
         this.$message.warning("请先选择第三方系统！")
         return;
       }
@@ -268,8 +275,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 +323,7 @@ export default {
       })
     },
     closeAddDialog(val) {
+      this.thrProductsDetailVisible = false;
       this.addProductVisible = false;
       if (val) {
         this.getList();
@@ -334,7 +342,7 @@ export default {
     },
   },
   components: {
-    thrProductsDetail, ThrProductsAdd
+    thrProductsEdit, ThrProductsAdd
   },
   mounted() {
   },
diff --git a/src/views/thirdSys/product/thrProductsEdit.vue b/src/views/thirdSys/product/thrProductsEdit.vue
new file mode 100644
index 00000000..323f0ac3
--- /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>