From d63186a06984af3ebebd2b9b03e2874b4f01d5a0 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 17 May 2022 09:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E8=BF=BD=E9=9A=8F=EF=BC=8Cudi=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 4 +- src/api/basic/companyProductRelevance.js | 29 + src/api/thrsys/spsSyncStatus.js | 45 ++ src/router/index.js | 21 +- src/views/basic/BussinessTypeLocl.vue | 10 +- src/views/basic/UdiInfoManageSp.vue | 82 +-- src/views/basic/UdiInfoRelevance.vue | 36 +- src/views/business/stockOrder.vue | 8 + .../business/stockOrderEditDistribution.vue | 179 +---- src/views/business/stockOrderEditor.vue | 74 +- src/views/business/stockOrderNew.vue | 58 +- .../business/stockOrderNewDistribution.vue | 18 - src/views/business/stockOrderWaitCheck.vue | 9 + src/views/inventory/InvProducts.vue | 674 +++++++++--------- src/views/inventory/InvStatistics.vue | 18 +- src/views/inventory/UdiCodeTrace.vue | 1 + src/views/inventory/invPreProducts.vue | 12 +- src/views/inventory/invUdiTraceOrder.vue | 1 + src/views/thrsys/SysUdimsConfig.vue | 139 ++++ src/views/userManage/admin/authAdmin.vue | 15 +- 20 files changed, 709 insertions(+), 724 deletions(-) create mode 100644 src/api/basic/companyProductRelevance.js create mode 100644 src/api/thrsys/spsSyncStatus.js create mode 100644 src/views/thrsys/SysUdimsConfig.vue diff --git a/public/config.json b/public/config.json index 7ca6b5f..07fe4ff 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", - "BASE_URL":"http://192.168.0.109:9991/", - "SERVER_IP": "http://192.168.0.109:9991/", + "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/", + "SERVER_IP": "http://139.9.178.73:8080/", "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/" } diff --git a/src/api/basic/companyProductRelevance.js b/src/api/basic/companyProductRelevance.js new file mode 100644 index 0000000..a281b21 --- /dev/null +++ b/src/api/basic/companyProductRelevance.js @@ -0,0 +1,29 @@ +import axios from "../../utils/axios"; + +export function filterCompanyProductRelevance(query) { + return axios( + { + url: "/sale/info/company/product/relevance/filter", + method: "get", + params: query + } + ) +} +export function insertFilter(query) { + return axios( + { + url: "/sale/info/insertFilter", + method: "post", + data: query + } + ); +} + + + + + + + + + diff --git a/src/api/thrsys/spsSyncStatus.js b/src/api/thrsys/spsSyncStatus.js new file mode 100644 index 0000000..a6ca2e2 --- /dev/null +++ b/src/api/thrsys/spsSyncStatus.js @@ -0,0 +1,45 @@ +import axios from "../../utils/axios"; + + +export function filterLog(query) { + return axios({ + url: "/spssync/basic/udiinfo/filter", + method: "get", + params: query + }); +} + + +export function deleteLog(query) { + return axios({ + url: "/spssync/basic/udiinfo/deleteByStatus", + method: "post", + data: query + }); +} + +export function createSchedule(query) { + return axios({ + url: "/spssync/basic/schedule/create", + method: "post", + data: query + }); +} + + +export function findConfig(query) { + return axios({ + url: "/system/param/syncData/config", + method: "get", + params: query + }); +} + +export function updateConfig(query) { + return axios({ + url: "/system/param/syncData/save", + method: "post", + data: query + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 706d26d..6548e20 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -92,6 +92,7 @@ import thrCorpsImport from "../views/thrsys/ThrCorpsImport.vue"; //供应商管理 import corpExportSmp from "../views/basic/CorpExportSmp.vue"; import udiinfoExportSmp from "../views/basic/UdiinfoExportSmp.vue"; +import UdiInfoManageSp from "../views/basic/UdiInfoManageSp.vue" import UdiInfoDonwloadSmp from "../views/basic/UdiInfoDonwloadSmp.vue"; import thrOrderExportSmp from "../views/thrsys/ThrOrderExportSmp.vue"; import thrProductsExportSmp from "../views/thrsys/ThrProductsExportSmp.vue"; @@ -99,6 +100,7 @@ import thrCorpsExportSmp from "../views/thrsys/ThrCorpsExportSmp.vue"; import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse"; +import syncConfig from "../views/thrsys/SysUdimsConfig.vue"; // Vue.use(VueRouter); const err401 = r => @@ -227,6 +229,14 @@ export const asyncRouterMap = [ authRule: ["system/systemParamConfig"] }, }, + { + path: "syncConfig", + name: "同步设置", + component: syncConfig, + meta: { + authRule: ["systemConfig/syncConfig"] + } + }, { path: "bussinessType", name: "扫码单据类型", @@ -567,7 +577,16 @@ export const asyncRouterMap = [ meta: { authRule: ["basic/products/export"] } - },] + }, + { + path: "UdiInfoManageSp", + name: "供应商器械信息", + component: UdiInfoManageSp, + meta: { + authRule: ["product/UdiInfoManageSp"] + } + }, + ] }, { path: "/unit", diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index 85e323f..b31619c 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -49,11 +49,11 @@ {{ enableMap[scope.row.changeEnable] }} - - - + + + + + diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue index d23d2e6..f1a078a 100644 --- a/src/views/basic/UdiInfoManageSp.vue +++ b/src/views/basic/UdiInfoManageSp.vue @@ -2,9 +2,7 @@
- - - {{ item.companyName }} + {{ item.name }} @@ -37,8 +35,6 @@ - - @@ -72,20 +68,6 @@ 查询 - - - - - - - - - - - - - - 锁定 退回 - @@ -170,29 +149,12 @@ @@ -225,23 +187,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - { this.loading = false; - this.fromOptions = response.data.list || []; + this.fromOptions = response.data.page.list || []; }) .catch(() => { this.loading = false; diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue index 2184057..58ad486 100644 --- a/src/views/basic/UdiInfoRelevance.vue +++ b/src/views/basic/UdiInfoRelevance.vue @@ -213,6 +213,18 @@ prop="zczbhhzbapzbh" show-overflow-tooltip > + + + +
+ + + + - @@ -230,6 +255,7 @@ import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo"; import {combineUdi} from "../../api/basic/udiRelevance"; import {getBasicThirdSys} from "../../api/basic/basicThirdSys"; import {getInvbasdoc} from "../../api/basic/getErps"; +import selectDiDetail from "@/views/basic/SelectDIDetailDialog"; export default { name: "closeDialog", @@ -279,6 +305,8 @@ export default { multipleUdiSelection: [], thirdSys: [], thirdSysFk: null, + diDetails: null, + selectDialog: false, }; }, methods: { @@ -333,7 +361,10 @@ export default { // this.unionQuery.zczbhhzbapzbh = this.currentRow.registerNo; // this.unionQuery.ggxh = this.currentRow.spec; }, - + diDetail(row) { + this.diDetails = row; + this.selectDialog = true; + }, searchErpList() { this.erpQuery.page = 1; this.getErpList(); @@ -483,6 +514,9 @@ export default { created() { this.getBasicThirdSys(); }, + components: { + selectDiDetail, + }, }; diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 480feb3..8f71974 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -482,6 +482,14 @@ export default { this.actDateRange = []; }, onSubmit() { + if (this.actDateRange !== null) { + this.filterQuery.startTime = this.actDateRange[0]; + this.filterQuery.endTime = this.actDateRange[1]; + } else { + this.filterQuery.startTime = null; + this.filterQuery.endTime = null; + } + this.getList(); if (this.query.status === "202" || this.query.status === "502") { this.haveDistributionVisible = true; diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue index ca905e7..d382446 100644 --- a/src/views/business/stockOrderEditDistribution.vue +++ b/src/views/business/stockOrderEditDistribution.vue @@ -10,15 +10,6 @@ :loading="loading" >保存 - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -98,14 +70,13 @@ - - {{ item.name }} + :value="item.localAction"> + {{ item.localName }} @@ -113,19 +84,6 @@ - - - - - - - - - - - - -
当前仓库： @@ -134,9 +92,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -