中继服务同步

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({

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
+    });
+}
+
 
 
 //第三方业务单据上传

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>
@@ -155,15 +155,15 @@
     </div>
 </template>
 <script>
-    import {
+import {
     getBasicThirdSys,
     updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys
-    } from "../../api/basic/basicThirdSys";
+} from "../../api/basic/basicThirdSys";
 
-    import modifyDialog from "./BasicThirdSysModify";
-    import modifyDetailDialog from "./BasicThirdSysDetailModify";
+import modifyDialog from "./BasicThirdSysModify";
+import modifyDetailDialog from "./BasicThirdSysDetailModify";
 
-    export default {
+export default {
     data() {
         return {
             filterQuery: {
@@ -185,8 +185,8 @@
             dataMap: {
                 0: "接口实时获取",
                 1: "文件缓存",
-                    2:"第三方上传缓存",
-                    3:"接口本地缓存"
+                2: "第三方上传缓存",
+                3: "接口本地缓存"
             },
             detailList: null,
             total: 0,
@@ -212,7 +212,12 @@
             this.modifyDetailDialogVisible = false;
         },
         handleCurrentChange(row) {
+            if (row.mainSys) {
+                this.detailList = [];
+            } else {
                 this.getDetailList(row);
+            }
+
         },
         getList() {
             this.loading = true;
@@ -308,14 +313,14 @@
     created() {
         this.getList();
     },
-    };
+};
 </script>
 <style scoped>
 
-    .el-card {
+.el-card {
     margin-right: 20px;
     /*transition: all .5s;*/
-    }
+}
 
 </style>
 

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>

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("提交成功，后台正在上传！")

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({

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,12 +97,12 @@
 </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 {
+export default {
     data() {
         return {
             filterQuery: {
@@ -264,29 +265,29 @@
         // this.getBasicThirdSys();
         this.getList();
     },
-    };
+};
 </script>
 <style>
-    .itemTag {
+.itemTag {
     float: left;
     text-align: left;
     margin-top: 10px;
     width: 100px;
-    }
+}
 
-    .text {
+.text {
     font-size: 13px;
     font-family: "Microsoft YaHei";
-    }
+}
 
-    .el-row {
+.el-row {
     display: flex;
     flex-wrap: wrap;
 
-    }
+}
 
-    .el-col {
+.el-col {
     border-radius: 4px;
     flex-wrap: wrap;
-    }
+}
 </style>

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() {

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() {

src/views/userManage/param/systemParamConfig.vue

@@ -14,9 +14,9 @@
 
             <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="paramName" ></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 label="参数值" prop="paramValue" width="100"></el-table-column>
                 <!--<el-table-column label="参数状态">-->
                 <!--<template slot-scope="scope">-->
                 <!--<el-tag :type="scope.row.paramStatus | paramStatusFilterType">{{-->

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"

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) => {