diff --git a/public/config.json b/public/config.json index 45f13e4..786d4c8 100644 --- a/public/config.json +++ b/public/config.json @@ -1,5 +1,7 @@ { + "BASE_URL":"http://139.159.187.130:8080/UDI_WMS_MC", "SERVER_IP": "http://139.159.187.130:8080/", "BASE_URL2": "ws://139.159.187.130:8080/UDI_WMS_MC/api/websocket/" + } diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js new file mode 100644 index 0000000..81300ce --- /dev/null +++ b/src/api/basic/busLocalType.js @@ -0,0 +1,26 @@ +import axios from "../../utils/axios"; + +export function getLocalBusType(query) { + return axios({ + url: "/udiwms/localBusType/filter", + method: "get", + params: query + }); +} + +export function deleteLocalBusType(query) { + return axios({ + url: "/udiwms/localBusType/delete", + method: "post", + data: query + }); +} + +export function updateLocalBusType(query) { + return axios({ + url: "/udiwms/localBusType/update", + method: "post", + data: query + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 2377765..212312f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -182,13 +182,41 @@ export const asyncRouterMap = [ } }, { - path: "systemParamConfig", - component: systemParamConfig, + path: "/systemParam", + component: Empty, name: "系统参数", + redirect: "/systemParam/systemParamConfig", icon: "", meta: { - authRule: ["admin/systemParamConfig"] - } + authRule: ["systemParam/systemParamConfig"] + }, + children: [ + { + path: "systemParamConfig", + component: systemParamConfig, + name: "系统参数", + icon: "", + meta: { + authRule: ["admin/systemParamConfig"] + }, + }, + { + path: "bussinessType", + name: "单据类型", + component: BussinessType, + meta: { + authRule: ["product/bussinessType"] + } + }, + { + path: "thirdSys", + name: "第三方参数设置", + component: thirdSys, + meta: { + authRule: ["thrsys/thirdSys"] + } + }, + ] }, { path: "systemPDFTemplate", @@ -199,14 +227,14 @@ export const asyncRouterMap = [ authRule: ["admin/system_pdf_template"] } }, - { - path: "bussinessType", - name: "单据类型", - component: BussinessType, - meta: { - authRule: ["product/bussinessType"] - } - }, + // { + // path: "bussinessType", + // name: "单据类型", + // component: BussinessType, + // meta: { + // authRule: ["product/bussinessType"] + // } + // }, ] }, { @@ -584,14 +612,14 @@ export const asyncRouterMap = [ },] }, - { - path: "thirdSys", - name: "参数设置", - component: thirdSys, - meta: { - authRule: ["thrsys/thirdSys"] - } - }, + // { + // path: "thirdSys", + // name: "参数设置", + // component: thirdSys, + // meta: { + // authRule: ["thrsys/thirdSys"] + // } + // }, ] }, diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index f94b738..5d0e55a 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -31,6 +31,7 @@ {{ enableMap[scope.row.enable] }} + @@ -121,6 +122,7 @@ mainAction: "", thirdSysFk: "", id: "", + localAction: null, }, enableMap: { true: "是", @@ -218,7 +220,8 @@ name: row.name, enable: row.enable, mainAction: row.mainAction, - thirdSysFk:row.thirdSysFk, + localAction:row.localAction, + thirdSysFk: row.thirdSysFk, }; }, diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index d754c5b..5b2daf3 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -65,7 +65,27 @@ - + + +
+
+ 本地单据:  +
+ + + {{ item.name }} + {{ item.action }} + + +
+ + + +
备注:  @@ -97,6 +117,10 @@ getBasicThirdSys, } from "../../api/basic/basicThirdSys"; + import { + getLocalBusType, + } from "../../api/basic/busLocalType"; + export default { name: "inputQuery", props: { @@ -110,8 +134,11 @@ return { filterQuery: { enabled: true, + isBuType:true, }, thirdSys: [], + localTypes:[], + value: "", } }, @@ -125,11 +152,24 @@ this.loading = false; this.list = []; }); + getLocalBusType(this.filterQuery) + .then((response) => { + this.localTypes = response.data.list || []; + }) + .catch(() => { + this.loading = false; + this.localTypes = []; + }); + }, + + getLoca(){ + }, }, created() { this.getList(); + this.getLoca(); }, }; diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index e2e81a7..3b6abd7 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -343,7 +343,6 @@
+
@@ -540,6 +539,25 @@ >
+ +
+
+ 生产厂家:  +
+ +
+ + + + + + + + + + + + + + 单据日期: - + { }); - }, + } + , getBasicThirdSys() { let query = { enabled: true, @@ -304,7 +314,8 @@ // // }); - }, + } + , selectSysParam() { let query = { key: "thirdIpUrl", @@ -315,7 +326,8 @@ this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/corp/upload"; } }); - }, + } + , handleChange(response, files, fileList) { console.log(response); if (response.code != 20000) { @@ -326,7 +338,8 @@ this.$message.success("文件上传成功,请稍后刷新查看！"); this.getList(); } - }, + } + , statusFilterType(status) { const statusMap = { 0: "warning", @@ -335,7 +348,8 @@ 3: "success", }; return statusMap[status]; - }, + } + , getThirdSysDetail() { let query = { thirdSysFk: this.filterQuery.thirdSysFk, @@ -354,10 +368,12 @@ this.templateDlUrl = response + "/第三方往来单位信息导入模板.xlsx"; }); - }, + } + , jumpDl() { window.open(this.templateDlUrl, '_blank'); - }, + } + , downloadDatas() { this.$confirm("此操作从第三方系统下载全部往来单位信息, 是否继续?", "提示", { confirmButtonText: "确定", @@ -377,7 +393,8 @@ this.getList(); }); }); - }, + } + , formatterThirdSys(key) { let data = null; this.thirdSys.forEach((item, index) => { @@ -386,7 +403,8 @@ } }); return data; - }, + } + , }, mounted() { diff --git a/src/views/thrsys/ThrInvProducts.vue b/src/views/thrsys/ThrInvProducts.vue index 8c4c250..30b35f9 100644 --- a/src/views/thrsys/ThrInvProducts.vue +++ b/src/views/thrsys/ThrInvProducts.vue @@ -4,13 +4,31 @@ + + + + + + + + + @@ -32,21 +50,6 @@ 清空全部 - - - - - - - - - - - - - - - @@ -56,12 +59,16 @@ - - - + + + + + + +