diff --git a/.gitignore b/.gitignore
index de06ffba..6b5c6686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,6 @@ UDI_WMS_NEW/
 *.sln
 *.local
 
+/vue.config.js
 package-lock.json
 yarn.lock
diff --git a/src/api/sync/spsSyncStatus.js b/src/api/sync/spsSyncStatus.js
index a822d6c2..08d81b0c 100644
--- a/src/api/sync/spsSyncStatus.js
+++ b/src/api/sync/spsSyncStatus.js
@@ -50,3 +50,13 @@ export function updateConfig(query) {
   });
 }
 
+export function infoByStatus(query) {
+  return axios({
+    url: "/spssync/basic/udiinfo/infoByStatus",
+    method: "post",
+    data: query,
+    responseType: 'blob'
+  });
+}
+
+
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b9..294d90e3 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -96,7 +96,8 @@ export default {
     handleCurrentChange(val) {
       this.$emit('pagination', { page: val, limit: this.pageSize })
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        //分页向上滚动效果
+        // scrollTo(0, 800)
       }
     }
   }
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 91087b05..bdd28aa2 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -529,10 +529,10 @@
                 <el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
+                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
@@ -551,7 +551,7 @@
                 <el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@@ -573,7 +573,7 @@
                 <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@@ -595,7 +595,7 @@
                 <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@@ -617,7 +617,7 @@
                 <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@@ -639,7 +639,7 @@
                 <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@@ -660,7 +660,7 @@
                 <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@@ -682,7 +682,7 @@
                 <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
@@ -703,7 +703,7 @@
                 <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单操货(有无三期)" :value="3"></el-option>
diff --git a/src/views/basic/business/stockOrderDistribution.vue b/src/views/basic/business/stockOrderDistribution.vue
index c961f12f..dc7b316f 100644
--- a/src/views/basic/business/stockOrderDistribution.vue
+++ b/src/views/basic/business/stockOrderDistribution.vue
@@ -296,7 +296,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/basic/business/stockOrderQRCodeDetail.vue b/src/views/basic/business/stockOrderQRCodeDetail.vue
index 55c54af0..4cd5601a 100644
--- a/src/views/basic/business/stockOrderQRCodeDetail.vue
+++ b/src/views/basic/business/stockOrderQRCodeDetail.vue
@@ -436,7 +436,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/basic/business/stockQRCodeExport.vue b/src/views/basic/business/stockQRCodeExport.vue
index 71bc2ea4..78f8d54e 100644
--- a/src/views/basic/business/stockQRCodeExport.vue
+++ b/src/views/basic/business/stockQRCodeExport.vue
@@ -467,7 +467,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/basic/corpMaintain/corpExport.vue b/src/views/basic/corpMaintain/corpExport.vue
index bc5eb40e..41c9c5b4 100644
--- a/src/views/basic/corpMaintain/corpExport.vue
+++ b/src/views/basic/corpMaintain/corpExport.vue
@@ -239,7 +239,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;
diff --git a/src/views/basic/corpMaintain/corpExportSmp.vue b/src/views/basic/corpMaintain/corpExportSmp.vue
index 0b76b61f..302d2966 100644
--- a/src/views/basic/corpMaintain/corpExportSmp.vue
+++ b/src/views/basic/corpMaintain/corpExportSmp.vue
@@ -241,7 +241,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;
diff --git a/src/views/basic/corpMaintain/corpImport.vue b/src/views/basic/corpMaintain/corpImport.vue
index 2671892f..8b32e8a4 100644
--- a/src/views/basic/corpMaintain/corpImport.vue
+++ b/src/views/basic/corpMaintain/corpImport.vue
@@ -254,7 +254,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
     float: left;
     text-align: left;
diff --git a/src/views/basic/corpMaintain/corpImportDetail.vue b/src/views/basic/corpMaintain/corpImportDetail.vue
index 994184b4..10695a8c 100644
--- a/src/views/basic/corpMaintain/corpImportDetail.vue
+++ b/src/views/basic/corpMaintain/corpImportDetail.vue
@@ -147,7 +147,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index aee35ab9..c1239c22 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -558,15 +558,17 @@ export default {
       let selectData = this.multipleUdiSelection;
       let selected = null;
       if (this.multipleUdiSelection.length == 0) {
-        this.$message.warning('请选入产品!');
         if (this.relId != null) {
           this.combineQuery.relId = this.relId;
           this.combineQuery.keys.push(this.currentRow.uuid);
           if (this.currentRow.check) {
             selected = this.currentRow;
           }
-        } else
+        } else{
+          this.$message.warning('请选入产品!');
           return;
+        }
+
 
       } else {
         selectData.forEach((obj) => {
diff --git a/src/views/basic/product/basicCompanyProductsImport.vue b/src/views/basic/product/basicCompanyProductsImport.vue
index 4e7c7bdd..f2bb7580 100644
--- a/src/views/basic/product/basicCompanyProductsImport.vue
+++ b/src/views/basic/product/basicCompanyProductsImport.vue
@@ -435,6 +435,10 @@ export default {
 
         selectExport() {
             var selectData = this.multipleSelection;
+            if(selectData.length==0){
+              this.$message.error("请先选择产品！");
+              return
+            }
             selectData.forEach((obj) => {
                 this.filterQuery.rlIds.push(obj.id);
                  this.filterQuery.nameCode=obj.nameCode;
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 89a39656..3ff8622b 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1,61 +1,88 @@
 <template>
   <div>
     <el-card>
-      <el-row>
-        <el-col :span="3" v-show="showSearch">
+      <el-row type="flex">
+        <el-col v-show="showSearch" style="width: 300px">
           <div style="height: 100%">
-            <el-tree :data="treeList"
-                     class="tree"
-                     :default-expand-all="true"
-                     @node-click="handleNodeClick"
-                     :expand-on-click-node="false">
-                 <span class="custom-tree-node" slot-scope="{ node, data }">
-                   <span style="font-size: 14px;font-weight: 500;">{{ node.label }}</span></span>
+            <el-tree
+              :data="treeList"
+              class="tree"
+              :default-expand-all="true"
+              @node-click="handleNodeClick"
+              :expand-on-click-node="false"
+            >
+              <span class="custom-tree-node" slot-scope="{ node, data }">
+                <span style="font-size: 14px; font-weight: 500">{{
+                  node.label
+                }}</span></span
+              >
             </el-tree>
           </div>
         </el-col>
-        <el-col :span="21" style="border-left:  3px solid #dddddd">
-          <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
+        <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
+          <el-form
+            :model="filterQuery"
+            size="mini"
+            label-width="100px"
+            v-show="showSearch"
+          >
             <el-row>
               <el-col :span="18">
                 <el-form-item class="query-form-item" label="UDI码:">
-                  <el-input v-model="filterQuery.udiCode"
-                            style="width: 97%"
-                            placeholder="请扫描或输入UDI码"
-                            clearable="true"
-                            @keyup.enter.native="keyup_submit($event)"></el-input>
+                  <el-input
+                    v-model="filterQuery.udiCode"
+                    style="width: 97%"
+                    placeholder="请扫描或输入UDI码"
+                    clearable="true"
+                    @keyup.enter.native="keyup_submit($event)"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="最小销售标识:">
-                  <el-input v-model="filterQuery.unionCode" placeholder="请输入最小销售标识"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.unionCode"
+                    placeholder="请输入最小销售标识"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="物资名称:">
-                  <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称" clearable="true"
-                            style="width: 90%"></el-input>
+                  <el-input
+                    v-model="filterQuery.cpmctymc"
+                    placeholder="请输入物资名称"
+                    clearable="true"
+                    style="width: 90%"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="规格型号:">
-                  <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号" clearable="true"
-                            style="width: 90%"></el-input>
+                  <el-input
+                    v-model="filterQuery.ggxh"
+                    placeholder="请输入规格型号"
+                    clearable="true"
+                    style="width: 90%"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="对照条件:">
-                  <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件"
-                             style="width: 90%">
+                  <el-select
+                    v-model="filterQuery.filterType"
+                    placeholder="请选择过滤对照条件"
+                    style="width: 90%"
+                  >
                     <el-option
                       v-for="item in filterList"
                       :key="item.filterType"
                       :label="item.sysName"
-                      :value="item.filterType">
+                      :value="item.filterType"
+                    >
                       <span style="float: left">{{ item.sysName }}</span>
                     </el-option>
                   </el-select>
@@ -65,21 +92,32 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册备案人:">
-                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入注册备案人"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.ylqxzcrbarmc"
+                    placeholder="请输入注册备案人"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="第三方编码:">
-                  <el-input v-model="filterQuery.thrPiId" placeholder="请输入第三方主系统编码"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.thrPiId"
+                    placeholder="请输入第三方主系统编码"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="集采状态:">
-                  <el-select v-model="filterQuery.groupBuy" placeholder="请选择集采状态" clearable style="width: 90%">
+                  <el-select
+                    v-model="filterQuery.groupBuy"
+                    placeholder="请选择集采状态"
+                    clearable
+                    style="width: 90%"
+                  >
                     <el-option label="全部" value=""></el-option>
                     <el-option label="集采" value="true"></el-option>
                     <el-option label="非集采" value="false"></el-option>
@@ -88,7 +126,12 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="可配送状态:">
-                  <el-select v-model="filterQuery.dispatch" placeholder="请选择可配送状态" clearable style="width: 90%">
+                  <el-select
+                    v-model="filterQuery.dispatch"
+                    placeholder="请选择可配送状态"
+                    clearable
+                    style="width: 90%"
+                  >
                     <el-option label="全部" value=""></el-option>
                     <el-option label="可配送" value="true"></el-option>
                     <el-option label="不可配送" value="false"></el-option>
@@ -100,57 +143,124 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册/备案号:">
-                  <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.zczbhhzbapzbh"
+                    placeholder="请输入注册/备案号"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="生产企业:">
-                  <el-input v-model="filterQuery.manufactory" placeholder="请输入生产企业"
-                            style="width: 90%"
-                            clearable="true"></el-input>
+                  <el-input
+                    v-model="filterQuery.manufactory"
+                    placeholder="请输入生产企业"
+                    style="width: 90%"
+                    clearable="true"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
           <div class="top-right-btn">
             <el-button-group>
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="submit">查询</el-button>
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch"
+                >显示/隐藏搜索栏</el-button
+              >
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"
+                >重置</el-button
+              >
+              <el-button type="primary" icon="el-icon-search" @click="submit"
+                >查询</el-button
+              >
               <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">选入DI信息</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加院内字典</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                @click="intentImportUdi"
+                >选入DI信息</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                @click="intentImportErp"
+                >添加院内字典</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                @click="intentDetail"
+                >关联添加</el-button
+              >
             </el-button-group>
           </div>
           <el-divider style="margin: 15px"></el-divider>
           <el-table
             v-loading="loading"
             :data="list"
-            style="width: 100%;"
+            style="width: 100%"
             border
             key="1"
             @selection-change="handleSelectionChange"
           >
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-            <el-table-column label="主系统编码" prop="mainId" width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" width="180" show-overflow-tooltip></el-table-column>
-            <el-table-column label="集采状态" prop="groupBuy" width="120" show-overflow-tooltip>
+            <el-table-column
+              label="最小销售产品标识"
+              prop="nameCode"
+              width="140"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="主系统编码"
+              prop="mainId"
+              width="120"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="物资名称"
+              prop="cpmctymc"
+              width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="规格型号"
+              prop="ggxh"
+              width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="注册/备案号"
+              prop="zczbhhzbapzbh"
+              width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="注册/备案人"
+              prop="ylqxzcrbarmc"
+              width="180"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              label="集采状态"
+              prop="groupBuy"
+              width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag :type="(scope.row.groupBuy) | statusFilterType">
+                <el-tag :type="scope.row.groupBuy | statusFilterType">
                   {{ groupBuyMap[scope.row.groupBuy] }}
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="可配送状态" prop="dispatch" width="120" show-overflow-tooltip>
+            <el-table-column
+              label="可配送状态"
+              prop="dispatch"
+              width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag :type="(scope.row.dispatch) | statusFilterType">
+                <el-tag :type="scope.row.dispatch | statusFilterType">
                   {{ dispatchMap[scope.row.dispatch] }}
                 </el-tag>
               </template>
@@ -162,24 +272,27 @@
                   size="small"
                   :disabled="scope.row.originUuid != null"
                   @click.native.stop="intentSelectUdi(scope.row)"
-                >关联DI
+                  >关联DI
                 </el-button>
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="handleModifyClick(scope.row)"
-                >详情
+                  >详情
                 </el-button>
 
                 <el-button
                   type="text"
                   size="small"
                   @click.native.stop="diEdit(scope.row)"
-                >编辑
+                  >编辑
                 </el-button>
 
-                <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-                >删除
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="deleteDialog(scope.row)"
+                  >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -193,31 +306,87 @@
             v-if="editDialogVisible"
           >
             <el-card>
-              <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
+              <el-table
+                :data="sysList"
+                style="width: 100%; margin-bottom: 8px"
+                key="2"
+                border
+              >
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="第三方系统物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-                <el-table-column label="第三方系统物资名称" prop="thirdName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="第三方系统规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-
-                <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
+                <el-table-column
+                  label="第三方系统名称"
+                  prop="sysName"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="第三方系统物资编码"
+                  prop="thirdId"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="第三方系统物资名称"
+                  prop="thirdName"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="第三方系统规格型号"
+                  prop="spec"
+                  show-overflow-tooltip
+                ></el-table-column>
+
+                <el-table-column
+                  label="注册/备案号"
+                  prop="registerNo"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="生产企业"
+                  prop="manufactory"
+                  show-overflow-tooltip
+                ></el-table-column>
               </el-table>
             </el-card>
             <el-card>
-              <div style=" float: left;
-                        text-align: left;
-                        font-weight: bold;
-                        margin-bottom: 8px">
+              <div
+                style="
+                  float: left;
+                  text-align: left;
+                  font-weight: bold;
+                  margin-bottom: 8px;
+                "
+              >
                 <span>产品标识:</span>
               </div>
 
-              <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
-                        highlight-current-row @current-change="handleDetail">
-                <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
+              <el-table
+                v-loading="loading"
+                :data="detailList"
+                style="width: 100%"
+                border
+                key="3"
+                highlight-current-row
+                @current-change="handleDetail"
+              >
+                <el-table-column
+                  label="产品最小销售标识"
+                  prop="nameCode"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="物资名称"
+                  prop="cpmctymc"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="包装级别"
+                  prop="packLevel"
+                  show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                  label="包装单位"
+                  prop="packUnit"
+                  show-overflow-tooltip
+                ></el-table-column>
               </el-table>
             </el-card>
             <el-card>
@@ -227,10 +396,9 @@
                 ref="editQuery"
                 border
                 label-width="140px"
-                style="margin-top: 20px;  "
+                style="margin-top: 20px"
               >
                 <el-collapse v-model="activeNames">
-
                   <el-collapse-item name="1">
                     <template slot="title">
                       <p class="form-title">产品属性</p>
@@ -242,7 +410,12 @@
                           <div class="itemTag">
                             <span>产品是否禁用:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.isDisable" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.isDisable"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -254,7 +427,12 @@
                           <div class="itemTag">
                             <span>是否寄售:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.isAdavence" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.isAdavence"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -268,7 +446,12 @@
                           <div class="itemTag">
                             <span>允许无批次号:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoBatch" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoBatch"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -280,7 +463,12 @@
                           <div class="itemTag">
                             <span>允许无失效日期:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoExpire" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoExpire"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -294,7 +482,12 @@
                           <div class="itemTag">
                             <span>允许无生产日期:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoProduct" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoProduct"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -306,7 +499,12 @@
                           <div class="itemTag">
                             <span>允许无序列号:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.allowNoSerial" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.allowNoSerial"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -320,7 +518,12 @@
                           <div class="itemTag">
                             <span>启用使用单元:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.isUseDy" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.isUseDy"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -332,7 +535,12 @@
                           <div class="itemTag">
                             <span>允许科室多次使用出库:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.useMuti" disabled style="width: 65%" size="small">
+                          <el-select
+                            v-model="editQuery.useMuti"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -342,7 +550,6 @@
                     </el-row>
                   </el-collapse-item>
 
-
                   <el-collapse-item name="2">
                     <template slot="title">
                       <p class="form-title">产品标识基本信息</p>
@@ -377,7 +584,6 @@
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -393,7 +599,6 @@
                             :disabled="true"
                             splaceholder="请输入内容"
                             v-model="editQuery.bhxjcpbm"
-
                           ></el-input>
                         </div>
                       </el-col>
@@ -415,7 +620,6 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -482,7 +686,6 @@
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -578,7 +781,6 @@
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
                       <el-col :span="12" class="el-col">
@@ -588,7 +790,8 @@
                           </div>
                           <el-input
                             style="width: 65%"
-                            size="small" :disabled="true"
+                            size="small"
+                            :disabled="true"
                             splaceholder="请输入内容"
                             v-model="editQuery.ybbm"
                           ></el-input>
@@ -632,13 +835,13 @@
                           </div>
                           <el-input
                             style="width: 65%"
-                            size="small" :disabled="true"
+                            size="small"
+                            :disabled="true"
                             splaceholder="请输入内容"
                             v-model="editQuery.sptm"
                           ></el-input>
                         </div>
                       </el-col>
-
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -650,7 +853,8 @@
                           <el-input
                             style="width: 65%"
                             size="small"
-                            splaceholder="请输入内容" :disabled="true"
+                            splaceholder="请输入内容"
+                            :disabled="true"
                             v-model="editQuery.measname"
                           ></el-input>
                         </div>
@@ -672,8 +876,6 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
-
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -691,11 +893,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable1"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -707,10 +914,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable2"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -724,11 +937,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable3"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -740,10 +958,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable4"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -757,11 +981,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable5"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -773,10 +1002,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable6"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -790,10 +1025,16 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable7"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -805,10 +1046,16 @@
                         </div>
                       </el-col>
 
-                      <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable8"
+                      >
                         <div class="text item">
                           <div class="itemTag">
-                            <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
+                            <span
+                              >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
+                            >
                           </div>
                           <el-input
                             style="width: 65%"
@@ -820,10 +1067,8 @@
                         </div>
                       </el-col>
                     </el-row>
-
                   </el-collapse-item>
 
-
                   <el-collapse-item name="4">
                     <template slot="title">
                       <p class="form-title">生产标识基本信息</p>
@@ -938,7 +1183,6 @@
                             splaceholder="请输入内容"
                             v-model="editQuery.bzcj"
                             :disabled="true"
-
                           ></el-input>
                         </div>
                       </el-col>
@@ -966,7 +1210,6 @@
                     </template>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -979,14 +1222,16 @@
                             splaceholder="请输入内容"
                             v-model="editQuery.versionNumber"
                           ></el-input>
-                          <el-button type="text" size="small" @click.native.stop="selectVersion()"
-                                     style="margin-left: 5%"
-                          >切换版本
+                          <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="selectVersion()"
+                            style="margin-left: 5%"
+                            >切换版本
                           </el-button>
                         </div>
                       </el-col>
                     </el-row>
-
                   </el-collapse-item>
                 </el-collapse>
               </el-form>
@@ -1012,12 +1257,20 @@
               @closePre="closeUdi"
             ></product-edit>
 
-            <div style="text-align: center;margin-top: 12px">
-              <el-button type="primary" size="small" icon="search" @click="onAddSubmit(false)"
-              >提交
+            <div style="text-align: center; margin-top: 12px">
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="onAddSubmit(false)"
+                >提交
               </el-button>
-              <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-              >取消
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="cancelDialog"
+                >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1033,12 +1286,20 @@
               :editQuery="editSingleFormat"
             ></product-single-edit>
 
-            <div style="text-align: center;margin-top: 12px">
-              <el-button type="primary" size="small" icon="search" @click="onAddSingleSubmit(false)"
-              >提交
+            <div style="text-align: center; margin-top: 12px">
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="onAddSingleSubmit(false)"
+                >提交
               </el-button>
-              <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-              >取消
+              <el-button
+                type="primary"
+                size="small"
+                icon="search"
+                @click="cancelDialog"
+                >取消
               </el-button>
             </div>
           </el-dialog>
@@ -1050,7 +1311,10 @@
             width="85%"
             v-if="selectUdiDialogVisible"
           >
-            <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
+            <selectUdi
+              @closeUdi="closeUdi"
+              :isImportUdi="isImportUdi"
+            ></selectUdi>
           </el-dialog>
           <el-dialog
             title="耗材字典-从指定系统添加器械信息"
@@ -1105,7 +1369,7 @@
             ></selectUdiVersion>
           </el-dialog>
           <pagination
-            v-show="total>0"
+            v-show="total > 0"
             :total="total"
             :limit.sync="filterQuery.limit"
             :page.sync="filterQuery.page"
@@ -1154,8 +1418,6 @@
               :rId="rId"
             ></selectUnBindHospProduct>
           </el-dialog>
-
-
         </el-col>
       </el-row>
     </el-card>
@@ -1171,10 +1433,18 @@ import {
   updateErpProduct,
   uploadSmp,
   thirdSysDetail,
-  removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
+  removeRl,
+  sysFilter,
+  spcombie,
+  lockStatus,
+  removeDiRl,
+  disableUdi,
 } from "@/api/basic/product/udiRelevance";
-import {selectSysParamByKey, finProductSet} from "@/api/param/systemParamConfig";
-import {filterByUuid} from "@/api/basic/product/udiInfo";
+import {
+  selectSysParamByKey,
+  finProductSet,
+} from "@/api/param/systemParamConfig";
+import { filterByUuid } from "@/api/basic/product/udiInfo";
 
 import selectUdi from "./UdiInfoSelectRel.vue";
 import selectErp from "./udiInfoselectErpUdi";
@@ -1182,11 +1452,10 @@ import selectLocalUdi from "./UdiInfoSelectLocalUdi";
 import selectUdiVersion from "./UdiinfoSelectVersion";
 import ProductEdit from "@/views/basic/product/productEdit";
 import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
-import productUdiType from "@/views/basic/product/productUdiType"
+import productUdiType from "@/views/basic/product/productUdiType";
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
-import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
-
+import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
 
 export default {
   data() {
@@ -1223,15 +1492,15 @@ export default {
         sptm: null,
         packUnit: null,
         measname: null,
-        nameCode: null
+        nameCode: null,
       },
       groupBuyMap: {
         true: "集采",
-        false: "非集采"
+        false: "非集采",
       },
       dispatchMap: {
         true: "可配送",
-        false: "不可配送"
+        false: "不可配送",
       },
       pId: 0,
       productRemarkSet: {},
@@ -1270,24 +1539,23 @@ export default {
       thisData: {
         nameCode: null,
         cpmctymc: null,
-        ggxh: null
+        ggxh: null,
       },
       multipleSelection: [],
-      editDialogVisible: false,       //详情
+      editDialogVisible: false, //详情
       editDiDialogVisible: false,
       editSingleDiDialogVisible: false,
-      selectUdiDialogVisible: false,  //关联选入
-      selectErpDialogVisible: false,  //选入ERP产品
+      selectUdiDialogVisible: false, //关联选入
+      selectErpDialogVisible: false, //选入ERP产品
       selectVersionVisible: false,
-      selectLocalVisible: false,      //关联UDI
+      selectLocalVisible: false, //关联UDI
       isUseDyCheck: false,
-      lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
-      activeNames: ['1'],
+      lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" },
+      activeNames: ["1"],
       useNumEnable: true,
     };
   },
   filters: {
-
     statusFilterType(status) {
       const statusMap = {
         false: "warning",
@@ -1307,12 +1575,13 @@ export default {
         unionCode: null,
         udiCode: null,
         ylqxzcrbarmc: "",
-        cpmctymc: "", thrPiId: null,
+        cpmctymc: "",
+        thrPiId: null,
         nameCode: "",
         ggxh: null,
         page: 1,
         limit: 20,
-        addType: 1
+        addType: 1,
       };
       this.getList();
     },
@@ -1411,8 +1680,7 @@ export default {
             this.$message.error(response.message);
           }
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     deleteDialog(rowId) {
@@ -1424,8 +1692,7 @@ export default {
         .then(() => {
           this.deleteOrders(rowId);
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     intentDetail() {
@@ -1447,7 +1714,7 @@ export default {
         .then(() => {
           let query = {
             relId: this.pId,
-            thirdSys: row.sysId
+            thirdSys: row.sysId,
           };
           removeRl(query)
             .then((response) => {
@@ -1463,14 +1730,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {
-            });
+            .catch(() => {});
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
-
     removeDi() {
       this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -1495,11 +1759,9 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {
-            });
+            .catch(() => {});
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     intentSelectErp(val) {
@@ -1556,20 +1818,18 @@ export default {
       this.selectLocalVisible = true;
     },
 
-
     intentImportUdi() {
       this.relId = null;
       this.thisData = {
         nameCode: null,
         cpmctymc: null,
         ggxh: null,
-        ylqxzcrbarmc: null
+        ylqxzcrbarmc: null,
       };
       this.isImport = false;
       this.selectLocalVisible = true;
     },
 
-
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -1600,7 +1860,6 @@ export default {
       };
       this.checked = row.isUseDy == 1;
 
-
       this.editQuery = row;
       //获取产品标识列表
       let ttquery = {
@@ -1611,13 +1870,12 @@ export default {
       this.getThirdSysDetail();
     },
 
-
     lockProducts(status) {
       let selectData = this.multipleSelection;
       let postQuery = {
         ids: [],
         lockStatus: status,
-      }
+      };
       selectData.forEach((row) => {
         postQuery.ids.push(row.id);
       });
@@ -1630,7 +1888,6 @@ export default {
           } else {
             this.$message.error(response.message);
           }
-
         })
         .catch(() => {
           this.loading = false;
@@ -1659,7 +1916,6 @@ export default {
           this.loading = false;
           this.filterList = [];
         });
-
     },
     singleDiEdit() {
       let temp = JSON.parse(JSON.stringify(this.editQuery));
@@ -1696,7 +1952,7 @@ export default {
     },
     onAddSubmit(relSubmit) {
       this.editFormat.relSubmit = relSubmit;
-      console.log(this.editFormat)
+      console.log(this.editFormat);
       updatetUdiInfos(this.editFormat)
         .then((response) => {
           if (response.code == 20000) {
@@ -1728,11 +1984,9 @@ export default {
         });
     },
 
-
     findBasicProductSet() {
       finProductSet().then((response) => {
         if (response.code == 20000) {
-
           this.productRemarkSet = response.data;
         } else {
           //出错了
@@ -1793,40 +2047,38 @@ export default {
           var invlist = response.data || [];
           this.treeList = this.handleTree(invlist, "code", "parentCode");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     addHospProduct(data) {
-      this.rId = data.code
+      this.rId = data.code;
       if (data.code != 10000) {
-        this.filterQuery.relCode = data.code
+        this.filterQuery.relCode = data.code;
       } else {
         this.filterQuery.relCode = null;
       }
       this.selectHospProductVisible = true;
     },
     removeHospProduct(data) {
-      this.rId = data.code
+      this.rId = data.code;
       if (data.code != 10000) {
-        this.filterQuery.relCode = data.code
+        this.filterQuery.relCode = data.code;
       } else {
         this.filterQuery.relCode = null;
       }
       this.selectUnBindHospProductVisible = true;
     },
     handleNodeClick(data) {
-      this.rId = data.code
+      this.rId = data.code;
       if (data.code != 10000) {
-        this.filterQuery.relCode = data.code
+        this.filterQuery.relCode = data.code;
       } else {
         this.filterQuery.relCode = null;
       }
       this.getList();
-    }
-  },
-  mounted() {
+    },
   },
+  mounted() {},
   components: {
     ProductSingleEdit,
     ProductEdit,
@@ -1836,7 +2088,7 @@ export default {
     selectUdiVersion,
     productUdiType,
     selectHospProduct,
-    selectUnBindHospProduct
+    selectUnBindHospProduct,
   },
   created() {
     this.findBasicProductSet();
@@ -1847,7 +2099,16 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style scoped lang="scss">
+.tree {
+  ::v-deep .el-tree-node {
+    white-space: normal;
+    .el-tree-node__content {
+      height: 100%;
+      align-items: start;
+    }
+  }
+}
 .itemTag {
   float: left;
   text-align: right;
@@ -1873,7 +2134,7 @@ export default {
   margin-bottom: 0px;
 }
 
-.el-row {
+/* .el-row {
   display: flex;
   flex-wrap: wrap;
   margin-bottom: 6px;
@@ -1882,7 +2143,7 @@ export default {
 .el-col {
   border-radius: 4px;
   flex-wrap: wrap;
-}
+} */
 
 .el-table .cell.el-tooltip {
   white-space: pre-wrap;
@@ -1896,6 +2157,4 @@ export default {
   padding-bottom: 17px;
   padding-top: 17px;
 }
-
-
 </style>
diff --git a/src/views/basic/product/udiInfoImport.vue b/src/views/basic/product/udiInfoImport.vue
index f1ef664f..541dc9f8 100644
--- a/src/views/basic/product/udiInfoImport.vue
+++ b/src/views/basic/product/udiInfoImport.vue
@@ -265,7 +265,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;
diff --git a/src/views/basic/product/udiInfoImportDetail.vue b/src/views/basic/product/udiInfoImportDetail.vue
index b35c8d02..74792812 100644
--- a/src/views/basic/product/udiInfoImportDetail.vue
+++ b/src/views/basic/product/udiInfoImportDetail.vue
@@ -151,7 +151,7 @@ export default {
     filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
     float: left;
     text-align: left;
diff --git a/src/views/basic/product/udiinfoExport.vue b/src/views/basic/product/udiinfoExport.vue
index 61cc9e67..295354f9 100644
--- a/src/views/basic/product/udiinfoExport.vue
+++ b/src/views/basic/product/udiinfoExport.vue
@@ -246,7 +246,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
     float: left;
     text-align: left;
diff --git a/src/views/basic/product/udiinfoExportSmp.vue b/src/views/basic/product/udiinfoExportSmp.vue
index 306e9370..b89f37ea 100644
--- a/src/views/basic/product/udiinfoExportSmp.vue
+++ b/src/views/basic/product/udiinfoExportSmp.vue
@@ -242,7 +242,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;
diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index 5871f0c8..367fc3e4 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -402,7 +402,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index d1d9b649..c071ee84 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px; margin-top: -20px">
+    <el-card style="margin: 5px;">
       <el-form
         :model="orderFormData"
         :rules="formRules"
@@ -39,7 +39,7 @@
                 auto-complete="off"
                 style="width: 90%"
                 clearable
-                :disabled="corpOrderIdDisabled"
+                :disabled="true"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -643,6 +643,24 @@ export default {
         this.$message.warning("请选择单据类型！");
         return;
       }
+      if(this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)){
+        if(this.$isBlank(this.orderFormData.fromCorp)){
+          this.$message.warning("请选择往来单位！");
+          return;
+        }
+      }
+      if(this.curAction.corpType == 3){
+        if(this.$isBlank(this.orderFormData.fromInvCode)){
+          this.$message.warning("请选择往来单位！");
+          return;
+        }
+      }
+      if(this.curAction.corpType === 1 && this.curAction.genUnit){
+        if(this.$isBlank(this.orderFormData.fromCorp)){
+          this.$message.warning("请选择往来单位！");
+          return;
+        }
+      }
       if (this.$isBlank(this.orderFormData.corpOrderId)) {
         let date = new Date();
         this.orderFormData.corpOrderId =
@@ -1052,7 +1070,7 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
 #inputer {
   width: 100%;
   min-height: 30px;
diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue
index 6773dc09..7b979b6e 100644
--- a/src/views/inout/DialogInvoice.vue
+++ b/src/views/inout/DialogInvoice.vue
@@ -345,7 +345,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue
index 685d6766..a4f2be6c 100644
--- a/src/views/inout/DialogNewReviewOrder.vue
+++ b/src/views/inout/DialogNewReviewOrder.vue
@@ -180,6 +180,8 @@ export default {
         page: 1,
         limit: 10,
       },
+
+      isEntrust: false,
     }
   },
 
@@ -267,6 +269,7 @@ export default {
             this.detailList = response.data.orderDetailEntities || [];
             this.formData = response.data.orderEntity;
             this.orderQuery = this.formData;
+            this.isEntrust = response.data.entrust;
           } else {
             this.$message.error(response.message);
           }
@@ -371,6 +374,7 @@ export default {
     postAccept() {
       let query = {
         orderId: this.orderQuery.billNo,
+        entrust: this.isEntrust,
       };
       if (this.reviewType != null && this.reviewType == 2) {
         thirdUpdateStatus(query)
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index e6e4f0e8..278c7254 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -65,6 +65,8 @@ import {
 } from "@/api/inventory/invPorduct";
 import {addDetail} from "@/api/inout/receiveOrder";
 import {addBizProduct} from "@/api/inout/orderDetailCode";
+import {getInvPreInProduct} from "@/api/inventory/invPreInSearch";
+import {getInvPreProduct} from "@/api/inventory/invPreProduct";
 
 
 export default {
@@ -162,19 +164,51 @@ export default {
     },
 
     getList() {
+      debugger
       this.loading = true;
-      getInvProduct(this.filterQuery)
-        .then((response) => {
-          this.showSup = response.data.showSup;
-          this.loading = false;
-          this.list = response.data.list || [];
-          this.total = response.data.total || 0;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+      //寄售
+      if(this.invQueryData.advanceType==3){
+        getInvPreProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+      //预验收
+      }else if(this.invQueryData.advanceType==2){
+        getInvPreInProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+
+      }else{
+        getInvProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+      }
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 0cdc26ab..52703d6a 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -119,10 +119,10 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="审核时间" prop="checkTime" show-overflow-tooltip width="150">
+        <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
-            <span>{{ scope.row.checkTime }}</span>
+            <span>{{ scope.row.auditTime }}</span>
           </template>
         </el-table-column>
 
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 414a4269..a4cc3a6e 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -84,7 +84,7 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-search" @click="newReview"
+          <el-button type="primary" icon="el-icon-plus" @click="newReview"
           >新增单据审核
           </el-button
           >
@@ -1022,6 +1022,7 @@ export default {
     //验收结束
     closeAcceptDialog() {
       this.acceptOrderVisible = false;
+      this.newAcceptOrderVisible = false;
     },
 
     //开始验收
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index eb730af7..23037cc8 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -588,6 +588,8 @@ export default {
       })
         .then(() => {
           this.deleteOrders(rowId);
+          this.currentRow=null;
+          this.bizDetailList=[];
         })
         .catch(() => {
         });
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 54cd29d0..28e51889 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -72,7 +72,7 @@
 
       <el-table-column width="100"
                        label="扫码数量"
-                       prop="scanCount"
+                       prop="reCount"
                        v-if="viewType!=2"
                        show-overflow-tooltip
       ></el-table-column>
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index bdaaa4d3..b96a73f2 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -59,7 +59,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
-              <el-select v-model="formData.targetInvCode"  placeholder="请选择往来信息"
+              <el-select v-model="formData.targetInvCode"  placeholder="请选择往来信息" @change="getTargerType"
                          clearable="true"
                          style="width: 100%"
               >
@@ -277,6 +277,7 @@ export default {
     findFromInv() {
       let cQuery = {
         locInvCode: this.formData.invCode,
+        type:1,
       };
       findByFrom(cQuery)
         .then((response) => {
@@ -301,7 +302,10 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-
+    getTargerType(){
+      this.formData.advanceType= this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
+      console.log(this.formData)
+    },
     saveOrder(status) {
       this.code = "";
       this.$refs.multipleTable.setCurrentRow();
@@ -528,7 +532,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index aad1f874..ccd4bf49 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -22,7 +22,20 @@
           </el-col>
           <el-col :span="8">
           <el-form-item label="往来信息:">
-            <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
+            <el-select v-model="filterQuery.corpName"  placeholder="请输入往来信息"
+                       filterable
+                       remote
+                       reserve-keyword
+                       :remote-method="finCorpList"
+                       :loading="loading"
+                       style="width: 100%;">
+              <el-option
+                v-for="item in corpList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code">
+              </el-option>
+            </el-select>
           </el-form-item>
           </el-col>
 <!--          <el-col :span="6">-->
@@ -67,7 +80,7 @@
           <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="search" @click="newDistributionForm()" :loading="loading">
+          <el-button type="primary"  icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">
             新增单据
           </el-button>
         </el-button-group>
@@ -147,7 +160,7 @@ import {selectIp} from "@/api/param/systemParamConfig";
 import thrOrderNew from "./DialogNewReceive";
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 import {getBusChange} from "@/api/basic/busTypeChange";
-import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -178,6 +191,7 @@ export default {
         4: "已拒绝"
       },
       idQuery: {},
+      corpList: [],
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -373,6 +387,23 @@ export default {
         .catch(() => {
         });
     },
+    finCorpList(val){
+      let query ={
+        name : val,
+        page : 1,
+        limit : 10,
+      }
+      filterSubAll(query)
+        .then((response) => {
+          this.loading = false;
+          this.corpList = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.corpList = [];
+        });
+    },
+
   },
   components: {
     thrOrderNew,
@@ -382,6 +413,7 @@ export default {
   created() {
     this.finCurInv();
     this.getBusType();
+   // this.finCorpList();
   },
 };
 </script>
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 456e2787..1601c3ab 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -22,7 +22,20 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="往来信息:">
-              <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
+              <el-select v-model="filterQuery.corpName"  placeholder="请输入往来信息"
+                         filterable
+                         remote
+                         reserve-keyword
+                         :remote-method="finCorpList"
+                         :loading="loading"
+                         style="width: 100%;">
+                <el-option
+                  v-for="item in corpList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <!--          <el-col :span="6">-->
@@ -135,7 +148,7 @@
 
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
-import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -164,6 +177,7 @@ export default {
       total: 0,
       thirdSys: [],
       invList:[],
+      corpList:[],
       thirdSysDetail: null,
       busTypes: [],
       originTypes: [],
@@ -291,6 +305,23 @@ export default {
       this.idQuery=row;
       this.newSpDistributionVisible = true;
     },
+    finCorpList(val){
+      let query ={
+        name : val,
+        page : 1,
+        limit : 10,
+      }
+      filterSubAll(query)
+        .then((response) => {
+          this.loading = false;
+          this.corpList = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.corpList = [];
+        });
+    },
+
     finCurInv() {
       this.invList = [];
       let query = {
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index d3fad3c9..c63bd0ba 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -155,7 +155,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 4d380b9d..c475d870 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -22,7 +22,20 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="往来信息:">
-              <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
+              <el-select v-model="filterQuery.corpName"  placeholder="请输入往来信息"
+                         filterable
+                         remote
+                         reserve-keyword
+                         :remote-method="finCorpList"
+                         :loading="loading"
+                         style="width: 100%;">
+                <el-option
+                  v-for="item in corpList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <!--          <el-col :span="6">-->
@@ -154,7 +167,7 @@
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
 import {delReceive} from "@/api/thrsys/thrOrderReceive";
-import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -188,6 +201,7 @@ export default {
       busTypes: [],
       originTypes: [],
       list: [],
+      corpList:[],
       detailList: [],
       uploadFileUrl: null,
       fileList: [],
@@ -369,6 +383,23 @@ export default {
       this.filterQuery.page = val.page;
       this.getList();
     },
+    finCorpList(val){
+      let query ={
+        name : val,
+        page : 1,
+        limit : 10,
+      }
+      filterSubAll(query)
+        .then((response) => {
+          this.loading = false;
+          this.corpList = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.corpList = [];
+        });
+    },
+
     finCurInv() {
       this.invList = [];
       let query = {
diff --git a/src/views/inventory/InvOrderPlaceModify.vue b/src/views/inventory/InvOrderPlaceModify.vue
index 12205a78..fc12f847 100644
--- a/src/views/inventory/InvOrderPlaceModify.vue
+++ b/src/views/inventory/InvOrderPlaceModify.vue
@@ -71,13 +71,13 @@
                 border max-height="300" height="300">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column>
-        <el-table-column label="物资名称" prop="productName" width="150"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
         <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
         <el-table-column label="计量单位" prop="measname" width="150"></el-table-column>
         <el-table-column label="货位" prop="invSpaceName" width="150"></el-table-column>
-        <el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150"></el-table-column>
+        <el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150" show-tooltip-when-overflow></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory" width="150"></el-table-column>
         <el-table-column label="供应商" prop="supName" width="150"></el-table-column>
       </el-table>
@@ -96,7 +96,7 @@
       <invPlaceSelectOrder
         :closeDialog="closeDialog"
         :formData="selectFormData"
-        :getInvProductInfogetInvProductInfogetInvProductInfo="getInvProductInfo"
+        :getInvProductInfo="getInvProductInfo"
       >
       </invPlaceSelectOrder>
     </el-dialog>
@@ -260,8 +260,7 @@ export default {
     getInvProductInfo(orderId) {
       let params = {
         invCode: this.formData.invCode,
-        invSpaceCode: this.formData.invSpaceCode,
-        code: orderId
+        orderId: orderId
       };
       getInvProductInfo(params).then((res) => {
         if (res.data !== null) {
diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue
index 5d2d56e2..2403e8a8 100644
--- a/src/views/inventory/InvPlace.vue
+++ b/src/views/inventory/InvPlace.vue
@@ -42,16 +42,18 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="仓库" prop="invName" width="180"></el-table-column>
         <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
-        <el-table-column label="产品名称" prop="productName"></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>
+        <el-table-column label="产品名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="批准文号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
+        <el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
+                         width="200"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
+                         width="200"></el-table-column>
+        <el-table-column label="供应商" prop="ylqxzcrbarmc" show-overflow-tooltip
+                         width="200"></el-table-column>
       </el-table>
       <pagination
         v-show="total>0"
@@ -131,39 +133,48 @@ export default {
       this.getList();
     },
     onSubmit() {
+      if (isBlank(this.filterQuery.invSpaceCode)) {
+        this.$message.error("请选择指定货位");
+        return;
+      }
       this.filterQuery.page = 1;
       this.getList();
     },
     getList() {
-      this.loading = true;
-      getPlaceDetailList(this.filterQuery).then((res) => {
-        this.loading = false;
-        if (res.code === 20000) {
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-        } else {
-          this.$message.error(res.message);
+      if (isBlank(this.filterQuery.invSpaceCode) && this.spaceList.length > 0) {
+        this.filterQuery.invSpaceCode = this.spaceList[0].code;
+      }
+
+      if (!isBlank(this.filterQuery.invSpaceCode)) {
+        this.loading = true;
+        getPlaceDetailList(this.filterQuery).then((res) => {
+          this.loading = false;
+          if (res.code === 20000) {
+            this.list = res.data.list || [];
+            this.total = res.data.total || 0;
+          } else {
+            this.$message.error(res.message);
+            this.list = [];
+            this.total = 0;
+          }
+        }).catch((error) => {
+          this.loading = false;
+          this.$message.error(error.message);
           this.list = [];
           this.total = 0;
-        }
-      }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
-        this.list = [];
-        this.total = 0;
-      })
+        });
+      }
     },
     invChange() {
       this.spaceList = [];
+      this.filterQuery.invSpaceCode = null;
       this.getSpaceList();
-      this.getList();
     },
     getInvList() {
       getInvListByUser()
         .then((response) => {
           this.invList = response.data || [];
           this.getSpaceList();
-          this.getList();
         })
         .catch(() => {
         });
@@ -175,6 +186,7 @@ export default {
       };
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
+        this.getList();
       })
     },
     invPlace(type) {
diff --git a/src/views/inventory/InvPlaceSelectOrder.vue b/src/views/inventory/InvPlaceSelectOrder.vue
index 63465c93..78992bd1 100644
--- a/src/views/inventory/InvPlaceSelectOrder.vue
+++ b/src/views/inventory/InvPlaceSelectOrder.vue
@@ -125,7 +125,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      getInvPlaceOrderList().then((res) => {
+      getInvPlaceOrderList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];
@@ -153,7 +153,7 @@ export default {
     },
   },
   created() {
-    this.getInvList();
+    this.getList();
   },
 }
 </script>
diff --git a/src/views/inventory/InvProductPlaceModify.vue b/src/views/inventory/InvProductPlaceModify.vue
index 2d029203..bbe336ca 100644
--- a/src/views/inventory/InvProductPlaceModify.vue
+++ b/src/views/inventory/InvProductPlaceModify.vue
@@ -69,13 +69,13 @@
               border max-height="300" height="300">
       <el-table-column label="序号" type="index" width="50"></el-table-column>
       <el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column>
-      <el-table-column label="物资名称" prop="productName" width="150"></el-table-column>
+      <el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column>
       <el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
       <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
       <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
       <el-table-column label="计量单位" prop="measname" width="150"></el-table-column>
       <el-table-column label="货位" prop="invSpaceName" width="150"></el-table-column>
-      <el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150"></el-table-column>
+      <el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150" show-tooltip-when-overflow></el-table-column>
       <el-table-column label="生产厂家" prop="manufactory" width="150"></el-table-column>
       <el-table-column label="供应商" prop="supName" width="150"></el-table-column>
     </el-table>
@@ -234,7 +234,6 @@ export default {
     getInvProductInfo(code) {
       let params = {
         invCode: this.formData.invCode,
-        invSpaceCode: this.formData.invSpaceCode,
         code: code
       };
       getInvProductInfo(params).then((res) => {
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index 51a311bd..c8e28584 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -435,7 +435,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index 8c02f18f..66309fc7 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -444,7 +444,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index 9b4202b7..c1dac658 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -752,7 +752,7 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
 .el-table .warning-row {
   background: #ffb5b5;
 }
diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue
index 7d8f5e8e..af631e1a 100644
--- a/src/views/purchase/cert/supCertAddDialog.vue
+++ b/src/views/purchase/cert/supCertAddDialog.vue
@@ -379,7 +379,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue
index 9ad25aaa..823c928f 100644
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@@ -165,15 +165,21 @@
         <el-card class="el-card">
             <el-form  :model="registrationQuery" class="query-form" label-width="100px"  v-show="showSearch2">
                 <el-row style="width: 100%">
+                  <el-col :span="6">
                     <el-form-item label="物资名称:">
                         <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true" placeholder="请输入物资名称"></el-input>
                     </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
                     <el-form-item label="注册备案号:">
                         <el-input v-model="registrationQuery.recordCode" style="width: 90%"  clearable="true" placeholder="请输入注册备案号"></el-input>
                     </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
                     <el-form-item label="注册备案人:">
                         <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%"  clearable="true" placeholder="请输入注册备案人"></el-input>
                     </el-form-item>
+                  </el-col>
                 </el-row>
             </el-form>
 
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index 1e957ef1..d41c1319 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -813,7 +813,7 @@ export default {
   },
 }
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue
index 8b77c742..0e109212 100644
--- a/src/views/purchase/company/supCompanyEditDialog.vue
+++ b/src/views/purchase/company/supCompanyEditDialog.vue
@@ -667,7 +667,7 @@ export default {
 }
 ;
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 1955e047..5f06891c 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -887,7 +887,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
index 84cabe63..ba37ab31 100644
--- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
@@ -735,7 +735,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index a4b40a98..e1b0cb2c 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -861,7 +861,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index 6432d07c..77b9831a 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -798,7 +798,7 @@ export default {
 
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 19bdd36d..c1aac5fb 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -527,7 +527,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue
index 09de8255..b41c015f 100644
--- a/src/views/purchase/purApply/pureApplyDetailDialog.vue
+++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue
@@ -419,7 +419,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 
 
 
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 3b85c849..ed342193 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -491,7 +491,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
     width: 100%;
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index cc9781ff..8f31ee49 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -521,7 +521,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index bca97d88..63419ab1 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -272,6 +272,7 @@ export default {
       } else {
         this.newSpDistributionVisible = false
       }
+      this.getList();
     },
     getId(id) {
       if (this.formName == 'add' && id != null) {
diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
index 4ea41493..4cb857b5 100644
--- a/src/views/purchase/purPlan/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue
@@ -479,7 +479,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
     width: 100%;
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index a7af1471..240649e2 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -459,6 +459,8 @@ export default {
           this.invCodeList = response.data || [];
           if (this.invCodeList != null && this.invCodeList.length == 1) {
             this.formData.invCode = this.invCodeList[0].code;
+            this.formData.deptCode = this.invCodeList[0].parentId;
+
           }
         })
         .catch(() => {
@@ -515,7 +517,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index 575914b2..6c2e899a 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -18,24 +18,24 @@
           </el-form-item>
           <el-form-item class="query-form-item">
             <el-date-picker v-model="filterQuery.syncTime" type="datetime" format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
+                            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button-group style="display:flex;">
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
               <el-button type="primary" icon="search" @click="getList">查询</el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(1)"
-                v-if="configParms.orderScanFinish==1 || configParms.orderUnReceive==1 || configParms.orderUnCheck==1">
-                同步单据
-              </el-button>
-           <!--   <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
-                v-if="configParms.typeBus==1||configParms.typeScan==1||configParms.typeThird==1">
-                同步单据类型
-              </el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="configParms.basicProducts==1||configParms.basicCorp==1||configParms.basicInv==1||configParms.basicThirdProducts==1||
-              configParms.basicThirdCorp==1||configParms.basicThirdInv==1||configParms.basicThirdBusOrder==1||configParms.sysUser==1">同步基础信息
-              </el-button> -->
+              <!--              <el-button type="primary" icon="search" @click="createScheduleDialog(1)"-->
+              <!--                v-if="configParms.orderScanFinish==1 || configParms.orderUnReceive==1 || configParms.orderUnCheck==1">-->
+              <!--                同步单据-->
+              <!--              </el-button>-->
+              <!--   <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
+                   v-if="configParms.typeBus==1||configParms.typeScan==1||configParms.typeThird==1">
+                   同步单据类型
+                 </el-button>
+                 <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="configParms.basicProducts==1||configParms.basicCorp==1||configParms.basicInv==1||configParms.basicThirdProducts==1||
+                 configParms.basicThirdCorp==1||configParms.basicThirdInv==1||configParms.basicThirdBusOrder==1||configParms.sysUser==1">同步基础信息
+                 </el-button> -->
             </el-button-group>
           </el-form-item>
         </el-row>
@@ -58,24 +58,31 @@
         </el-table-column>
         <el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
         <el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
-
-        <el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
+        <el-table-column label="同步文件" prop="cacheFilePath" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="同步信息" prop="remark" width="180" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="操作" fixed="right" width="160">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row.id)">详情
-            </el-button>
+
+            <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了' class="mr10"
+                           icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" v-if="scope.row.cacheFilePath">
+              <el-button type="text" size="small" slot="reference">下载
+              </el-button>
+            </el-popconfirm>
+
+            <!--            <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row.id)">详情-->
+            <!--            </el-button>-->
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row.id)">删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination :page-size="filterQuery.limit" @current-change="handleCurrentChange" layout="prev, pager, next"
-        :total="total" :current-page="filterQuery.page"></el-pagination>
+                     :total="total" :current-page="filterQuery.page"></el-pagination>
     </el-card>
 
     <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
-      :visible.sync="syncVisible">
+               :visible.sync="syncVisible">
       <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
     </el-dialog>
 
@@ -83,286 +90,308 @@
 </template>
 
 <script>
-  import {
-    filterLog,
-    deleteLog,
-    createSchedule,
-    findConfig,
-    updateConfig
-  } from "@/api/sync/spsSyncStatus";
-  import store from "@/store";
-
-  export default {
-    data() {
-      return {
-        filterQuery: {
-          id: null,
-          status: "1",
-          page: 1,
-          limit: 10,
-          syncTime: null,
-        },
-        list: [],
-        headers: {},
-        detailList: [],
-        thirdSys: [],
-        thirdSysDetail: null,
-        total: 0,
-        currentRow: null,
-        editQuery: null,
-        status: {
-          1: "处理异常",
-          2: "处理完成",
-        },
-
-        configQuery: {
-          id: null,
-          typeBus: null,
-          typeScan: null,
-          typeThird: null,
-          basicProducts: null,
-          basicCorp: null,
-          basicInv: null,
-          basicThirdProducts: null,
-          basicThirdCorp: null,
-          basicThirdInv: null,
-          basicThirdBusOrder: null,
-          orderScanFinish: null,
-          dbDiProducts: null,
-          downstreamEnable: null,
-          syncTime: null,
-        },
-        uploadFileUrl: null,
-        uploadData: {
-          thirdSys: "thirdId",
-        },
-        templateDlUrl: null,
-        checked: false,
-        configParms: {},
-        syncInfo: null,
-        syncVisible: false
-      };
-    },
+import {
+  filterLog,
+  deleteLog,
+  createSchedule,
+  findConfig,
+  updateConfig
+} from "@/api/sync/spsSyncStatus";
+import store from "@/store";
 
-    methods: {
-      onReset() {
-        this.$router.push({
-          path: "",
-        });
-        this.filterQuery = {
-          syncTime: null,
-          id: null,
-          status: null,
-          page: 1,
-          limit: 20,
-        };
-        this.syncTime = null;
-        this.getList();
+export default {
+  data() {
+    return {
+      filterQuery: {
+        id: null,
+        status: null,
+        page: 1,
+        limit: 10,
+        syncTime: null,
       },
-      getList() {
-        this.loading = true;
-        filterLog(this.filterQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.list = response.data.list || [];
-              this.total = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+      list: [],
+      headers: {},
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      currentRow: null,
+      editQuery: null,
+      status: {
+        1: "处理异常",
+        2: "处理完成",
       },
 
-      getConfig() {
-        findConfig()
-          .then((response) => {
-            if (response.code == 20000) {
-              this.configQuery = response.data;
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+      configQuery: {
+        id: null,
+        typeBus: null,
+        typeScan: null,
+        typeThird: null,
+        basicProducts: null,
+        basicCorp: null,
+        basicInv: null,
+        basicThirdProducts: null,
+        basicThirdCorp: null,
+        basicThirdInv: null,
+        basicThirdBusOrder: null,
+        orderScanFinish: null,
+        dbDiProducts: null,
+        downstreamEnable: null,
+        syncTime: null,
       },
-      saveConfig() {
-        updateConfig(this.configQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("更新成功！");
-              this.getConfig();
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
       },
+      templateDlUrl: null,
+      checked: false,
+      configParms: {},
+      syncInfo: null,
+      syncVisible: false
+    };
+  },
 
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        syncTime: null,
+        id: null,
+        status: null,
+        page: 1,
+        limit: 20,
+      };
+      this.syncTime = null;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      filterLog(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
 
-      cancelDialog(val) {
-        this.udiImportDetailVisible = false;
-        this.thrCorpSelectVisible = false;
-        if (val) {
-          this.getList();
-        }
-      },
-      handleCurrentChange(val) {
-        this.filterQuery.page = val;
-        this.getList();
-      },
-
+    getConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configQuery = response.data;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    saveConfig() {
+      updateConfig(this.configQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.$message.success("更新成功！");
+            this.getConfig();
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
-      createScheduleDialog(type) {
-        if (this.$isNotBlank(this.filterQuery.syncTime)) {
-          this.$confirm("此操作将从" + this.filterQuery.syncTime + "开始同步最新数据，是否继续", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning",
-            })
-            .then(() => {
-              this.createSchedule(type);
-            })
-            .catch(() => {});
-        } else {
-          this.createSchedule(type);
-        }
 
-      },
+    cancelDialog(val) {
+      this.udiImportDetailVisible = false;
+      this.thrCorpSelectVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
 
-      createSchedule(type) {
-        let query = {
-          createType: type,
-          syncTime: this.filterQuery.syncTime,
-        }
 
-        createSchedule(query)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("创建成功！");
-            } else if (response.code == 501) {
-              this.$message.warning(response.message);
-            } else {
-              this.$message.error(response.message);
-            }
-            this.getList();
+    createScheduleDialog(type) {
+      if (this.$isNotBlank(this.filterQuery.syncTime)) {
+        this.$confirm("此操作将从" + this.filterQuery.syncTime + "开始同步最新数据，是否继续", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.createSchedule(type);
           })
           .catch(() => {
-            this.loading = false;
           });
-      },
-      deleteDialog(rowId) {
-        this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            let dQuery = {
-              id: rowId,
-            };
-            deleteLog(dQuery)
-              .then((response) => {
-                this.loading = false;
-                if (response.code == 20000) {
-                  this.$message.success("删除成功");
-                } else {
-                  this.$message.error(response.message);
-                }
-                this.getList();
-              })
-              .catch(() => {
-                this.loading = false;
-              });
-          })
-          .catch(() => {});
-      },
-      handleChange(response, files, fileList) {
-        console.log(response);
-        if (response.code != 20000) {
-          this.$message.error(response.message);
-          this.getList();
-        } else {
-          // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-          this.$message.success(response.data);
-          this.getList();
-        }
-      },
-      statusFilterType(status) {
-        const statusMap = {
-          2: "success",
-          1: "danger",
-        };
-        return statusMap[status];
-      },
-      getSyncConfig() {
-        findConfig()
-          .then((response) => {
-            if (response.code == 20000) {
-              this.configParms = response.data;
-            }
-          })
-          .catch(() => {});
-      },
-      detailDialog(id) {
-        this.syncVisible = true;
-        this.list.forEach(item => {
-          if (id === item.id) {
-            this.syncInfo = item.remark;
+      } else {
+        this.createSchedule(type);
+      }
+
+    },
+
+    createSchedule(type) {
+      let query = {
+        createType: type,
+        syncTime: this.filterQuery.syncTime,
+      }
+
+      createSchedule(query)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.$message.success("创建成功！");
+          } else if (response.code == 501) {
+            this.$message.warning(response.message);
+          } else {
+            this.$message.error(response.message);
           }
+          this.getList();
         })
-      }
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: rowId,
+          };
+          deleteLog(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.message);
+              }
+              this.getList();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {
+        });
+    },
+
+    downFile(rows) {
+      infoByStatus({
+        'id': rows.id
+      }).then(res => {
+        let blob = new Blob([res])
+        let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
+        let link = document.createElement("a")
+        link.href = window.URL.createObjectURL(blob)
+        link.download = fileName
+        link.style.display = 'none'
+        document.body.appendChild(link)
+        link.click()
+        window.URL.revokeObjectURL(link.href)
+        document.body.removeChild(link)
+      })
     },
 
-    mounted() {},
-    components: {},
-    created() {
-      this.headers = {
-        ADMIN_ID: store.getters.adminId,
-        ADMIN_TOKEN: store.getters.token,
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+        this.getList();
+      } else {
+        // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+        this.$message.success(response.data);
+        this.getList();
+      }
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        2: "success",
+        1: "danger",
       };
-      this.getSyncConfig();
-      this.getList();
-      this.getConfig();
+      return statusMap[status];
     },
-  };
+    getSyncConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configParms = response.data;
+          }
+        })
+        .catch(() => {
+        });
+    },
+    detailDialog(id) {
+      this.syncVisible = true;
+      this.list.forEach(item => {
+        if (id === item.id) {
+          this.syncInfo = item.remark;
+        }
+      })
+    }
+  },
+
+  mounted() {
+  },
+  components: {},
+  created() {
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    this.getSyncConfig();
+    this.getList();
+    this.getConfig();
+  },
+};
 </script>
-<style>
-  .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 100px;
-  }
+<style scoped>
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
+}
 
-  .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-  }
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
 
-  .el-row {
-    display: flex;
-    flex-wrap: wrap;
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
 
-  }
+}
 
-  .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
-  }
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
 
-  .syncInfo {
-    font-size: medium;
-    font-family: "Microsoft YaHei";
-    line-height: 25px;
-  }
+.syncInfo {
+  font-size: medium;
+  font-family: "Microsoft YaHei";
+  line-height: 25px;
+}
 </style>
diff --git a/src/views/sync/SysUdimsDownloadData.vue b/src/views/sync/SysUdimsDownloadData.vue
index be97f35d..76cba185 100644
--- a/src/views/sync/SysUdimsDownloadData.vue
+++ b/src/views/sync/SysUdimsDownloadData.vue
@@ -355,7 +355,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 3029dc7e..8e91105b 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -559,6 +559,7 @@ export default {
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
         this.subData.advanceType = this.subData.advanceType.toString();
+        this.query.advanceType=1;
         if (this.subData.parentCode != null && this.subData.parentCode != "") {
           this.isAdvanceTypeShow = true;
           this.isShow = false;
@@ -612,6 +613,7 @@ export default {
     },
 
     hideForm() {    // 新增，编辑---取消
+      this.query.advanceType=null;
       this.formVisible = false;
       this.subFormVisible = false;
       this.resetForm();
@@ -628,6 +630,7 @@ export default {
       }
     },
     forInvSubmit() {    // 新增，编辑---提交
+      this.subData.advanceType=1;
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           saveSubWarehouse(this.subData, this.formName).then((response) => {
diff --git a/src/views/system/param/addhelpSettings.vue b/src/views/system/param/addhelpSettings.vue
index f7aea5e8..db8462b8 100644
--- a/src/views/system/param/addhelpSettings.vue
+++ b/src/views/system/param/addhelpSettings.vue
@@ -302,7 +302,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;
diff --git a/src/views/thirdSys/corps/thrCorpsExport.vue b/src/views/thirdSys/corps/thrCorpsExport.vue
index 633e3086..f16e86c8 100644
--- a/src/views/thirdSys/corps/thrCorpsExport.vue
+++ b/src/views/thirdSys/corps/thrCorpsExport.vue
@@ -234,7 +234,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/corps/thrCorpsExportSmp.vue b/src/views/thirdSys/corps/thrCorpsExportSmp.vue
index 02398d7f..dc68186b 100644
--- a/src/views/thirdSys/corps/thrCorpsExportSmp.vue
+++ b/src/views/thirdSys/corps/thrCorpsExportSmp.vue
@@ -239,7 +239,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/corps/thrCorpsImportDetail.vue b/src/views/thirdSys/corps/thrCorpsImportDetail.vue
index 1256786d..1a5af352 100644
--- a/src/views/thirdSys/corps/thrCorpsImportDetail.vue
+++ b/src/views/thirdSys/corps/thrCorpsImportDetail.vue
@@ -143,7 +143,7 @@ export default {
   filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/invProducts/thrInvProductsExport.vue b/src/views/thirdSys/invProducts/thrInvProductsExport.vue
index f01ea114..c588f57b 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsExport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsExport.vue
@@ -275,7 +275,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/invProducts/thrInvProductsImport.vue b/src/views/thirdSys/invProducts/thrInvProductsImport.vue
index cb2dcff9..1adb4313 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsImport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsImport.vue
@@ -428,7 +428,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue b/src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue
index f72901c6..53bae769 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue
@@ -152,7 +152,7 @@ export default {
   filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/order/thrOrderExport.vue b/src/views/thirdSys/order/thrOrderExport.vue
index ba21141e..ee915bbd 100644
--- a/src/views/thirdSys/order/thrOrderExport.vue
+++ b/src/views/thirdSys/order/thrOrderExport.vue
@@ -238,7 +238,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/order/thrOrderExportSmp.vue b/src/views/thirdSys/order/thrOrderExportSmp.vue
index 81f98be8..d4076be0 100644
--- a/src/views/thirdSys/order/thrOrderExportSmp.vue
+++ b/src/views/thirdSys/order/thrOrderExportSmp.vue
@@ -240,7 +240,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/order/thrOrderImport.vue b/src/views/thirdSys/order/thrOrderImport.vue
index af1cd95d..eff9f957 100644
--- a/src/views/thirdSys/order/thrOrderImport.vue
+++ b/src/views/thirdSys/order/thrOrderImport.vue
@@ -404,7 +404,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/order/thrOrderImportDetail.vue b/src/views/thirdSys/order/thrOrderImportDetail.vue
index c8b2caca..a8a93408 100644
--- a/src/views/thirdSys/order/thrOrderImportDetail.vue
+++ b/src/views/thirdSys/order/thrOrderImportDetail.vue
@@ -145,7 +145,7 @@ export default {
   filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/product/thrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
index 1777bf1c..9b910b15 100644
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -238,7 +238,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/src/views/thirdSys/product/thrProductsImport.vue b/src/views/thirdSys/product/thrProductsImport.vue
index 391c4c75..25c45b03 100644
--- a/src/views/thirdSys/product/thrProductsImport.vue
+++ b/src/views/thirdSys/product/thrProductsImport.vue
@@ -384,7 +384,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;
diff --git a/vue.config.js b/vue.config.js
index eef5677e..ae993d86 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.166:9991/`,
+        target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",