From 40924b4d5a40c39dde1ded51494f907ce58fb2ce Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 24 Mar 2022 16:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/invWarehouse.js                 |   9 +
 src/api/thrsys/smp.js                         |  16 +
 src/views/basic/BasicThirdSys.vue             | 293 ++++++++-------
 src/views/basic/CorpExport.vue                |   1 +
 src/views/basic/CorpSelect.vue                |   6 +-
 src/views/basic/UdIInfoSelect.vue             |   6 +-
 src/views/basic/UdiinfoExport.vue             | 351 +++++++++---------
 src/views/basic/invWarehouse.vue              |  37 +-
 src/views/thrsys/ThrOrderImport.vue           |   1 +
 .../userManage/param/systemParamConfig.vue    |   8 +-
 src/views/warehouse/IONewOrder.vue            |   2 +-
 .../warehouse/stockOrderNewDistribution.vue   |   9 +-
 12 files changed, 395 insertions(+), 344 deletions(-)

diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js
index 703f072..30452fb 100644
--- a/src/api/basic/invWarehouse.js
+++ b/src/api/basic/invWarehouse.js
@@ -49,6 +49,15 @@ export function deleteWarehouse(data) {
         data: data
     });
 }
+export function uploadStatus(data) {
+    return axios({
+        url: "/spms/inv/warehouse/upload",
+        method: "post",
+        data: data
+    });
+}
+
+
 
 export function exportJson(query) {
     return axios({
diff --git a/src/api/thrsys/smp.js b/src/api/thrsys/smp.js
index 7bb0690..8b208cd 100644
--- a/src/api/thrsys/smp.js
+++ b/src/api/thrsys/smp.js
@@ -17,6 +17,14 @@ export function corpUpload(query) {
         data: query
     });
 }
+export function corpUploadStatus(query) {
+    return axios({
+        url: "/udiwms/corps/importLog/exportStatus",
+        method: "post",
+        data: query
+    });
+}
+
 
 //产品信息上传
 export function udiUpload(query) {
@@ -26,6 +34,14 @@ export function udiUpload(query) {
         data: query
     });
 }
+export function udiUploadStatus(query) {
+    return axios({
+        url: "/udiwms/products/importLog/exportStatus",
+        method: "post",
+        data: query
+    });
+}
+
 
 
 //第三方业务单据上传
diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue
index a6a8209..5e5e7bf 100644
--- a/src/views/basic/BasicThirdSys.vue
+++ b/src/views/basic/BasicThirdSys.vue
@@ -65,7 +65,7 @@
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 :visible.sync="modifyDialogVisible"
-                width="70%"
+                width="60%"
                 v-if="modifyDialogVisible"
             >
                 <modifyDialog :inputQuery="inputQuery"></modifyDialog>
@@ -100,9 +100,9 @@
                 </el-table-column>
 
                 <!--<el-table-column label="本地缓存" prop="itrCache">-->
-                    <!--<template slot-scope="scope">-->
-                        <!--<span>{{ enableMap[scope.row.enabled] }}</span>-->
-                    <!--</template>-->
+                <!--<template slot-scope="scope">-->
+                <!--<span>{{ enableMap[scope.row.enabled] }}</span>-->
+                <!--</template>-->
                 <!--</el-table-column>-->
 
                 <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
@@ -147,175 +147,180 @@
             ></el-pagination>
 
 
-          <div style="margin-top: 18px ;  color: #F71616;">
-            <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
-          </div>
+            <div style="margin-top: 18px ;  color: #F71616;">
+                <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
+            </div>
         </el-card>
 
     </div>
 </template>
 <script>
-    import {
-        getBasicThirdSys,
-        updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys
-    } from "../../api/basic/basicThirdSys";
+import {
+    getBasicThirdSys,
+    updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys
+} from "../../api/basic/basicThirdSys";
 
-    import modifyDialog from "./BasicThirdSysModify";
-    import modifyDetailDialog from "./BasicThirdSysDetailModify";
+import modifyDialog from "./BasicThirdSysModify";
+import modifyDetailDialog from "./BasicThirdSysDetailModify";
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    thirdId: "",
-                    thirdName: "",
-                    enabled: "1",
-                    page: 1,
-                    limit: 20,
-                },
-                modifyDialogVisible: false,
-                modifyDetailDialogVisible: false,
-                list: [],
-                inputQuery: null,
-                inputDetailQuery: null,
-                enableMap: {
-                    true: "是",
-                    false: "否",
-                },
-                dataMap: {
-                    0: "接口实时获取",
-                    1: "文件缓存",
-                    2:"第三方上传缓存",
-                    3:"接口本地缓存"
-                },
-                detailList: null,
-                total: 0,
-            };
-        },
-
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    thirdId: "",
-                    thirdName: "",
-                    enabled: null,
-                    page: 1,
-                    limit: 20,
-                };
-                this.getList();
+export default {
+    data() {
+        return {
+            filterQuery: {
+                thirdId: "",
+                thirdName: "",
+                enabled: "1",
+                page: 1,
+                limit: 20,
             },
-            cancelDialog() {
-                this.modifyDialogVisible = false;
-                this.modifyDetailDialogVisible = false;
+            modifyDialogVisible: false,
+            modifyDetailDialogVisible: false,
+            list: [],
+            inputQuery: null,
+            inputDetailQuery: null,
+            enableMap: {
+                true: "是",
+                false: "否",
             },
-            handleCurrentChange(row) {
-                this.getDetailList(row);
+            dataMap: {
+                0: "接口实时获取",
+                1: "文件缓存",
+                2: "第三方上传缓存",
+                3: "接口本地缓存"
             },
-            getList() {
-                this.loading = true;
-                getBasicThirdSys(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.detailList = [];
-                        this.total = response.data.total || 0;
-                        // this.getDetailList(this.list[0]);
+            detailList: null,
+            total: 0,
+        };
+    },
 
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                thirdId: "",
+                thirdName: "",
+                enabled: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        cancelDialog() {
+            this.modifyDialogVisible = false;
+            this.modifyDetailDialogVisible = false;
+        },
+        handleCurrentChange(row) {
+            if (row.mainSys) {
+                this.detailList = [];
+            } else {
+                this.getDetailList(row);
+            }
 
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
+        },
+        getList() {
+            this.loading = true;
+            getBasicThirdSys(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.detailList = [];
+                    this.total = response.data.total || 0;
+                    // this.getDetailList(this.list[0]);
 
 
-            getDetailList(row) {
-                let query = {
-                    thirdSysFk: row.thirdId
-                };
-                this.loading = true;
-                getDetailBasicThirdSys(query)
-                    .then((response) => {
-                        this.loading = false;
-                        this.detailList = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
 
-            onModifySubmit() {
-                updateBasicThirdSys(this.inputQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.loading = false;
-                            this.cancelDialog();
-                            this.getList();
-                            this.$message.success(response.data);
-                        } else {
-                            this.$message.error(response.message);
-                        }
+        getDetailList(row) {
+            let query = {
+                thirdSysFk: row.thirdId
+            };
+            this.loading = true;
+            getDetailBasicThirdSys(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
-                    })
-                    .catch(() => {
+
+        onModifySubmit() {
+            updateBasicThirdSys(this.inputQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
                         this.loading = false;
                         this.cancelDialog();
-                    });
-            },
-            onDetailModifySubmit() {
-                updateDetailBasicThirdSys(this.inputDetailQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.loading = false;
-                            this.cancelDialog();
-                            this.getList();
-                            this.$message.success(response.data);
-                        } else {
-                            this.$message.error(response.message);
-                        }
+                        this.getList();
+                        this.$message.success(response.data);
+                    } else {
+                        this.$message.error(response.message);
+                    }
 
-                    })
-                    .catch(() => {
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
+        onDetailModifySubmit() {
+            updateDetailBasicThirdSys(this.inputDetailQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
                         this.loading = false;
                         this.cancelDialog();
-                    });
-            },
-
+                        this.getList();
+                        this.$message.success(response.data);
+                    } else {
+                        this.$message.error(response.message);
+                    }
 
-            handleModifyClick(row) {
-                this.modifyDialogVisible = true;
-                this.inputQuery = row;
-            },
-            handleDetailModifyClick(row) {
-                this.modifyDetailDialogVisible = true;
-                this.inputDetailQuery = row;
-            },
-        },
-        components: {
-            modifyDialog, modifyDetailDialog
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
         },
-        mounted() {
+
+
+        handleModifyClick(row) {
+            this.modifyDialogVisible = true;
+            this.inputQuery = row;
         },
-        created() {
-            this.getList();
+        handleDetailModifyClick(row) {
+            this.modifyDetailDialogVisible = true;
+            this.inputDetailQuery = row;
         },
-    };
+    },
+    components: {
+        modifyDialog, modifyDetailDialog
+    },
+    mounted() {
+    },
+    created() {
+        this.getList();
+    },
+};
 </script>
 <style scoped>
 
-    .el-card {
-        margin-right: 20px;
-        /*transition: all .5s;*/
-    }
+.el-card {
+    margin-right: 20px;
+    /*transition: all .5s;*/
+}
 
 </style>
 
diff --git a/src/views/basic/CorpExport.vue b/src/views/basic/CorpExport.vue
index 3438060..776a30b 100644
--- a/src/views/basic/CorpExport.vue
+++ b/src/views/basic/CorpExport.vue
@@ -10,6 +10,7 @@
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                         <el-button type="primary" icon="search" @click="getList">查询</el-button>
                         <el-button type="primary" icon="search" @click="exportExcel">导出往来单位信息</el-button>
+                      <el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
                     </el-button-group>
                 </el-form-item>
             </el-row>
diff --git a/src/views/basic/CorpSelect.vue b/src/views/basic/CorpSelect.vue
index cceabaa..35868c0 100644
--- a/src/views/basic/CorpSelect.vue
+++ b/src/views/basic/CorpSelect.vue
@@ -33,7 +33,7 @@
                         </el-button>
                         <el-button type="primary" icon="search" @click="uploadSMP"
                                    v-if="selectType==1"
-                        >一键上传
+                        >结果全部上传
                         </el-button>
 
                     </el-button-group>
@@ -231,7 +231,7 @@
         basicUnitMaintainSave,
         deleteBasicUnitMaintain, getThrsysUnit
     } from "../../api/basic/basicUnitMaintain";
-    import {corpUpload} from "../../api/thrsys/smp"
+    import {corpUpload,corpUploadStatus} from "../../api/thrsys/smp"
     import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
     import {exportExcel} from "../../api/basic/corpExport"
 
@@ -499,7 +499,7 @@
             },
 
             allUploadSMP() {
-                corpUpload(this.query)
+                corpUploadStatus(this.query)
                     .then((response) => {
                         if (response.code == 20000) {
                             this.$message.success("提交成功，后台正在上传！")
diff --git a/src/views/basic/UdIInfoSelect.vue b/src/views/basic/UdIInfoSelect.vue
index 29decd7..af75dfb 100644
--- a/src/views/basic/UdIInfoSelect.vue
+++ b/src/views/basic/UdIInfoSelect.vue
@@ -72,7 +72,7 @@
                         </el-button>
                         <el-button type="primary" icon="search" @click="allUploadSMP"
                                    v-if="selectType==1"
-                        >一键上传
+                        >结果全部上传
                         </el-button>
                     </el-button-group>
                 </el-form-item>
@@ -541,7 +541,7 @@ import {
     updateErpProduct,
     thirdSysDetail,
 } from "../../api/basic/udiRelevance";
-import {udiUpload} from "../../api/thrsys/smp"
+import {udiUpload,udiUploadStatus} from "../../api/thrsys/smp"
 import {exportExcel} from "../../api/basic/udiInfoExport"
 import {selectSysParamByKey} from "../../api/param/systemParamConfig";
 import {filterByUuid} from "../../api/basic/udiInfo";
@@ -703,7 +703,7 @@ export default {
         },
 
         allUploadSMP() {
-            udiUpload(this.filterQuery)
+            udiUploadStatus(this.filterQuery)
                 .then((response) => {
                     if (response.code == 20000) {
                         this.$message({
diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue
index ca0535f..b1d3e8f 100644
--- a/src/views/basic/UdiinfoExport.vue
+++ b/src/views/basic/UdiinfoExport.vue
@@ -9,7 +9,8 @@
                     <el-button-group style="display:flex;">
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                         <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="exportExcel">导出医疗器械信息</el-button>
+                        <el-button type="primary" icon="search" @click="exportExcel">导出文件</el-button>
+                        <el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
                     </el-button-group>
                 </el-form-item>
             </el-row>
@@ -96,197 +97,197 @@
 </template>
 
 <script>
-    import axios from "axios";
-    import {filterLog, downloadLog, deleteLog} from "../../api/basic/udiInfoExport";
-    import udiInfoSelect from "./UdIInfoSelect";
-    import store from "@/store";
+import axios from "axios";
+import {filterLog, downloadLog, deleteLog} from "../../api/basic/udiInfoExport";
+import udiInfoSelect from "./UdIInfoSelect";
+import store from "@/store";
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    type: 1,
-                    genKey: null,
-                    status: null,
-                    fromType: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                },
-                selectType: 0,
-                udiImportDetailVisible: false,
-                list: [],
-                detailList: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                total: 0,
-                editQuery: null,
-                fromStatus: {
-                    0: "产品信息",
-                    1: "库存信息",
-                    2: "异常第三方上传"
-                },
-                status: {
-                    0: "等待处理",
-                    1: "正在处理",
-                    2: "处理异常",
-                    3: "处理完成"
-                },
-                uploadFileUrl: null,
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
+export default {
+    data() {
+        return {
+            filterQuery: {
+                type: 1,
+                genKey: null,
+                status: null,
+                fromType: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
+            },
+            selectType: 0,
+            udiImportDetailVisible: false,
+            list: [],
+            detailList: [],
+            thirdSys: [],
+            thirdSysDetail: null,
+            total: 0,
+            editQuery: null,
+            fromStatus: {
+                0: "产品信息",
+                1: "库存信息",
+                2: "异常第三方上传"
+            },
+            status: {
+                0: "等待处理",
+                1: "正在处理",
+                2: "处理异常",
+                3: "处理完成"
+            },
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                type: 1,
+                fromType: null,
+                genKey: null,
+                status: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
             };
+            this.getList();
         },
-
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
+        getList() {
+            this.loading = true;
+            filterLog(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
                 });
-                this.filterQuery = {
-                    type: 1,
-                    fromType: null,
-                    genKey: null,
-                    status: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                };
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                filterLog(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
+        },
+
+        exportExcel() {
+            this.selectType = 0;
+            this.udiImportDetailVisible = true;
+        },
+        uploadSmp() {
+            this.selectType = 1;
+            this.udiImportDetailVisible = true;
+        },
+        downloadExcel(row) {
+            axios.get("./config.json").then(res => {
+                let baseUrl = res.data.BASE_URL;
+                let href = baseUrl + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
+                let a = document.createElement("a");
+                fetch(href)
+                    .then((res) => res.blob())
+                    .then((blob) => {
+                        a.href = URL.createObjectURL(blob);
+                        console.log(a.href);
+                        a.download =
+                            row.filePath.split("/")[
+                            row.filePath.split("/").length - 1
+                                ]; //  // 下载文件的名字
+                        document.body.appendChild(a);
+                        a.click();
+                        this.getList();
                     });
-            },
+            });
+        },
 
-            exportExcel() {
-                this.selectType = 0;
-                this.udiImportDetailVisible = true;
-            },
-            uploadSmp() {
-                this.selectType = 1;
-                this.udiImportDetailVisible = true;
-            },
-            downloadExcel(row) {
-                axios.get("./config.json").then(res => {
-                    let baseUrl = res.data.BASE_URL;
-                    let href = baseUrl + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
-                    let a = document.createElement("a");
-                    fetch(href)
-                        .then((res) => res.blob())
-                        .then((blob) => {
-                            a.href = URL.createObjectURL(blob);
-                            console.log(a.href);
-                            a.download =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
-                                    ]; //  // 下载文件的名字
-                            document.body.appendChild(a);
-                            a.click();
+        cancelDialog(val) {
+            this.udiImportDetailVisible = false;
+            if (val) {
+                this.getList();
+            }
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        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(() => {
                 });
-            },
-
-            cancelDialog(val) {
-                this.udiImportDetailVisible = false;
-                if (val) {
-                    this.getList();
-                }
-            },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                 this.getList();
-            },
-            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);
-                } else {
-                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                    this.getList();
-                    this.$message.success("文件上传成功,请稍后刷新查看！");
+                this.$message.success("文件上传成功,请稍后刷新查看！");
 
-                }
-            },
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "warning",
-                    2: "danger",
-                    3: "success",
-                };
-                return statusMap[status];
-            },
-        },
-        mounted() {
+            }
         },
-        components: {udiInfoSelect},
-        created() {
-            // this.getBasicThirdSys();
-            this.getList();
+        statusFilterType(status) {
+            const statusMap = {
+                0: "warning",
+                1: "warning",
+                2: "danger",
+                3: "success",
+            };
+            return statusMap[status];
         },
-    };
+    },
+    mounted() {
+    },
+    components: {udiInfoSelect},
+    created() {
+        // this.getBasicThirdSys();
+        this.getList();
+    },
+};
 </script>
 <style>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 100px;
-    }
+.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;
+}
 </style>
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index c3b8c1d..1f0a59e 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -39,6 +39,8 @@
                         </el-upload>
                         <el-button type="primary" icon="search" @click="exportInvwarehouse">导出</el-button>
 
+                        <el-button type="primary" icon="search" @click="uploadInvwarehouse">同步至UDI管理系统</el-button>
+
                     </el-button-group>
                 </el-form-item>
             </el-form>
@@ -138,11 +140,11 @@
                     stripe
                     style="width: 100%">
                     <el-table-column label="序号" type="index"></el-table-column>
-<!--                    <el-table-column-->
-<!--                        prop="username"-->
-<!--                        label="账号"-->
-<!--                        min-width="20%">-->
-<!--                    </el-table-column>-->
+                    <!--                    <el-table-column-->
+                    <!--                        prop="username"-->
+                    <!--                        label="账号"-->
+                    <!--                        min-width="20%">-->
+                    <!--                    </el-table-column>-->
                     <el-table-column
                         prop="employeeName"
                         label="用户名"
@@ -604,7 +606,7 @@
 <script>
 import {
     filterList, filterAll,
-    saveWarehouse, exportJson,
+    saveWarehouse, exportJson, uploadStatus,
     deleteWarehouse, warehouseBussinessTypeList,
     warehouseUserList, saveWarehouseBussinessType,
     saveWarehouseUser, updateDirector,
@@ -626,7 +628,7 @@ const formJson = {
     status: 1,
     advanceType: false,
     isDefault: false,
-    level:1,
+    level: 1,
 };
 export default {
     data() {
@@ -691,7 +693,7 @@ export default {
             selectUserList: [],
             selectBussinessTypeList: [],
             bussinessTypeFormVisible: false,
-            thrWarehouseData : null,
+            thrWarehouseData: null,
             currentId: null,
             thrWareHouseVisible: false,
             sysList: [],
@@ -942,6 +944,21 @@ export default {
             }
             return CurrentDate
         },
+
+        uploadInvwarehouse() {
+            let tempQuery = {};
+            uploadStatus(tempQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message.success(response.data);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
         exportInvwarehouse() {
             let tquery = {};
             exportJson(tquery).then((response) => {
@@ -996,7 +1013,7 @@ export default {
                 });
         },
         changeLevel(row) {
-            this.formData.pcode =null;
+            this.formData.pcode = null;
             this.getParentInv(this.formData.level);
         },
 
@@ -1220,7 +1237,7 @@ export default {
                 this.$message.error("第三方仓库数据加载失败");
             });
         },
-        changeThrWarehouse(row){
+        changeThrWarehouse(row) {
             this.checkThrWarehouseRow = row;
         },
         hideThrWarehouseTable() {
diff --git a/src/views/thrsys/ThrOrderImport.vue b/src/views/thrsys/ThrOrderImport.vue
index ea49296..9f8b957 100644
--- a/src/views/thrsys/ThrOrderImport.vue
+++ b/src/views/thrsys/ThrOrderImport.vue
@@ -162,6 +162,7 @@
     import {getBussinessType} from "../../api/basic/bussinessType";
     import thrOrderImportDetail from "./ThrOrderImportDetail";
     import thrOrderSelect from "./ThrOrderSelect";
+    import store from "@/store";
 
     export default {
         data() {
diff --git a/src/views/userManage/param/systemParamConfig.vue b/src/views/userManage/param/systemParamConfig.vue
index 342be9a..ec848d0 100644
--- a/src/views/userManage/param/systemParamConfig.vue
+++ b/src/views/userManage/param/systemParamConfig.vue
@@ -13,10 +13,10 @@
 
 
             <el-table v-loading="loading" :data="list" style="width: 100%">
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="参数名" prop="paramName" width="200"></el-table-column>
-                <el-table-column label="参数键" prop="paramKey" width="200"></el-table-column>
-                <el-table-column label="参数值" prop="paramValue" width="300"></el-table-column>
+              <el-table-column type="index" label="序号" width="50"></el-table-column>
+              <el-table-column label="参数名" prop="paramName" ></el-table-column>
+              <el-table-column label="参数键" prop="paramKey" width="200"></el-table-column>
+              <el-table-column label="参数值" prop="paramValue" width="100"></el-table-column>
                 <!--<el-table-column label="参数状态">-->
                 <!--<template slot-scope="scope">-->
                 <!--<el-tag :type="scope.row.paramStatus | paramStatusFilterType">{{-->
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 7393c09..ba47c67 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -15,7 +15,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.action" placeholder="请选择业务类型">
+                        <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型">
                             <el-option
                                 v-for="item in busTypes"
                                 :key="item.name"
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 1ada8d4..331e779 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -75,7 +75,7 @@
                             <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
                             <!--</el-select>-->
                             <!--                             @change="getStorage"-->
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable>
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage" clearable>
                                 <el-option
                                     v-for="item in busTypes"
                                     :key="item.localName"
@@ -130,7 +130,8 @@
                             <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
                             <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
                             <!--</el-select>-->
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable   @change="getBusType">
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
+                                       @change="getBusType">
                                 <el-option
                                     v-for="item in storageList"
                                     :key="item.name"
@@ -451,7 +452,7 @@ import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct";
 import dialogInvProduct from "../inventory/DialogInvProduct"
 import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
 import {getBussinessType} from "../../api/basic/bussinessType";
-import {getLocalBusType, getLocalJoinBusType,getLocalJoinByUser} from "../../api/basic/busLocalType";
+import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 
 export default {
     name: "idQuery",
@@ -1083,7 +1084,7 @@ export default {
         getBusType() {
             let query = {
                 enabled: true,
-                code:this.formData.locStorageCode
+                code: this.formData.locStorageCode
             };
             getLocalJoinByUser(query)
                 .then((response) => {