同步设置修改，单据权限查看等修改

src/api/thrsys/spsSyncStatus.js

@@ -43,3 +43,12 @@ export function updateConfig(query) {
     });
 }
 
+
+export function testConnect(query) {
+    return axios({
+        url: "/spssync/basic/connect/test",
+        method: "get",
+        params: query
+    });
+}
+

src/router/index.js

@@ -185,6 +185,17 @@ export const asyncRouterMap = [
         },
 
         // noDropdown: true,
+        children: [
+
+            {
+                path: "/authMange",
+                component: Empty,
+                name: "权限管理",
+                redirect: "/authMange/authAdmin",
+                icon: "",
+                meta: {
+                    authRule: ["authMange/home"]
+                },
                 children: [
                     {
                         path: "authAdmin",
@@ -192,27 +203,32 @@ export const asyncRouterMap = [
                         name: "用户管理",
                         icon: "",
                         meta: {
-                    authRule: ["admin/auth_admin"]
+                            authRule: ["authMange/auth_admin"]
                         }
                     },
+
+
                     {
                         path: "authRole",
                         component: authRole,
                         name: "角色管理",
                         icon: "",
                         meta: {
-                    authRule: ["admin/auth_role"]
+                            authRule: ["authMange/auth_role"]
                         }
                     },
                     {
                         path: "authPermissionRule",
                         component: authPermissionRule,
-                name: "权限管理",
+                        name: "功能配置",
                         icon: "",
                         meta: {
-                    authRule: ["admin/auth_permission_rule"]
+                            authRule: ["authMange/auth_permission_rule"]
                         }
                     },
+                ]
+            },
+
             {
                 path: "/systemParam",
                 component: Empty,
@@ -653,8 +669,6 @@ export const asyncRouterMap = [
                         }
                     },]
             },
-
-
             {
                 path: "/udidb",
                 redirect: "/udidb/udidbSearch",
@@ -682,14 +696,10 @@ export const asyncRouterMap = [
                     }
                 ]
             },
-
-        ]
-    },
             {
                 path: "/thrsys",
                 redirect: "/products/thrProducts",
-        component: Home,
-        icon: "tongyong",
+                component: Empty,
                 name: "第三方数据",
                 hidden: false,
                 noDropdown: false,
@@ -858,6 +868,10 @@ export const asyncRouterMap = [
 
                 ]
             },
+
+        ]
+    },
+
     {
         path: "/smp",
         redirect: "/smp/udiinfoExportSmp",

src/views/basic/UdiInfoManage.vue

@@ -1018,11 +1018,13 @@ export default {
                     removeRl(query)
                         .then((response) => {
                             if (response.code == 20000) {
-                                this.getThirdSysDetail()();
                                 this.$message({
                                     type: "success",
                                     message: "删除成功！",
                                 });
+                                this.getList();
+                                this.cancelDialog();
+                                this.getThirdSysDetail()();
                             } else {
                                 this.$message.error(response.message);
                             }

src/views/basic/UdiInfoRelevance.vue

@@ -414,6 +414,7 @@ export default {
                 this.combineQuery.thirdId = "";
             }
             this.combineQuery.manufactory = this.currentRow.manufactory;
+            this.combineQuery.price = this.currentRow.price;
             combineUdi(this.combineQuery)
                 .then((response) => {
                     if (response.code == 20000) {

src/views/basic/UdiInfoselectErpUdi.vue

@@ -557,6 +557,8 @@ export default {
                 this.combineQuery.thirdId = this.currentRow.code;
                 this.combineQuery.erpName = this.currentRow.name;
                 this.combineQuery.manufactory = this.currentRow.manufactory;
+                this.combineQuery.price = this.currentRow.price;
+                this.combineQuery.supName = this.currentRow.supName;
                 this.erpQuery.manufactory = this.currentRow.manufactory;
 
 

src/views/thrsys/SysUdimsConfig.vue

@@ -17,11 +17,15 @@
                         <div>
                             <span style="margin-left: 30px;">服务地址:&nbsp;</span>
                             <el-input
-                                style="width: 70%"
+                                style="width: 50%"
                                 size="small"
                                 v-model="configQuery.syncIp"
                                 splaceholder="请输入内容"
                             ></el-input>
+                            <el-button type="primary" size="small" @click="testConnect()" style="margin-left: 20px;"
+                                       :loading="testLoading">测试连通
+                            </el-button>
+
                         </div>
                     </el-col>
                 </el-row>
@@ -142,17 +146,6 @@
 
             </el-descriptions-item>
 
-
-            <!--      <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">-->
-            <!--        <el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange">-->
-            <!--          <el-checkbox-->
-            <!--              style="padding-top: 10px"-->
-            <!--              v-for="busType in busTypes" :label="busType" :key="busType.action"-->
-            <!--              :value="busType.action">{{ busType.name }}-->
-            <!--          </el-checkbox>-->
-            <!--        </el-checkbox-group>-->
-            <!--      </el-descriptions-item>-->
-
         </el-descriptions>
 
         <el-dialog
@@ -199,7 +192,7 @@
 </template>
 
 <script>
-import {findConfig, updateConfig} from "@/api/thrsys/spsSyncStatus";
+import {findConfig, testConnect, updateConfig} from "@/api/thrsys/spsSyncStatus";
 import store from "@/store";
 import {getBussinessType} from "@/api/basic/bussinessType";
 
@@ -222,7 +215,7 @@ export default {
                 orderScanFinish: null,
                 dbDiProducts: null,
                 downstreamEnable: null,
-                syncIp:null,
+                syncIp: null,
                 syncTime: null,
                 syncDownloadTime: null,
                 orderUnCheck: null,
@@ -238,6 +231,7 @@ export default {
             multipleSelection: [],
             addBusDialogVisible: false,
             total: 0,
+            testLoading: false,
         }
     },
     methods: {
@@ -297,6 +291,22 @@ export default {
             });
         },
 
+        testConnect() {
+            this.testLoading = true;
+            testConnect()
+                .then((response) => {
+                    this.testLoading = false;
+                    if (response.code == 20000) {
+                        this.$message.success("连接成功");
+                    }
+                })
+                .catch(() => {
+                    this.testLoading = false;
+                });
+
+
+        },
+
         handleCheckedChange(val) {
             this.multipleSelection = val;
         },
@@ -317,7 +327,7 @@ export default {
             this.multipleSelection = [];
         },
 
-        addBusType(){
+        addBusType() {
             var selectData = this.multipleSelection;
             selectData.forEach((obj) => {
                 this.checkedBusTypes.push(obj);
@@ -326,8 +336,8 @@ export default {
         },
 
 
-        remveBus(index,row){
-            this.checkedBusTypes.splice(index,1);
+        remveBus(index, row) {
+            this.checkedBusTypes.splice(index, 1);
         },
         checkSelectable(row) {
             return !row.isSelect;

src/views/thrsys/ThrCorpSelect.vue

@@ -60,7 +60,7 @@
                       @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="往来单位ID" prop="id" width="100" show-overflow-tooltip></el-table-column>
+                <el-table-column label="往来单位ID" prop="unitId" width="100" show-overflow-tooltip></el-table-column>
                 <el-table-column label="往来单位" prop="name" show-overflow-tooltip></el-table-column>
                 <el-table-column label="拼音简写" prop="spell" width="100" show-overflow-tooltip></el-table-column>
                 <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>