From 34ddcdc0cac1f97a24e14151648d9a6da1f21801 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 28 Mar 2023 09:06:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 5 +- src/api/purchase/purOrder.js | 9 + src/api/sync/spsSyncDownload.js | 28 + src/api/sync/spsSyncStatus.js | 45 ++ src/api/thrsys/spsSyncStatus.js | 45 -- src/views/basic/busType/bussinessType.vue | 2 +- .../basic/busType/bussinessTypeModify.vue | 3 +- src/views/basic/corpMaintain/corpMaintain.vue | 2 +- src/views/inventory/supInoutSearchOrder.vue | 6 +- .../purOrder/purOrderDetailDialog.vue | 56 +- .../purchase/purOrder/purOrderSearch.vue | 15 + src/views/sync/SysUdimsConfig.vue | 441 ++++++++++++++++ src/views/sync/SysUdimsData.vue | 488 ++++++++++++++++++ src/views/sync/SysUdimsDownloadData.vue | 341 ++++++++++++ src/views/system/dept/invWarehouse.vue | 2 +- src/views/system/param/BasicEntrutsRece.vue | 2 +- src/views/system/user/authUser.vue | 2 +- src/views/thirdSys/busType/index.vue | 2 +- src/views/thirdSys/corps/thrCorps.vue | 2 +- src/views/thirdSys/inv/index.vue | 2 +- src/views/thirdSys/product/thrProducts.vue | 2 +- 21 files changed, 1431 insertions(+), 69 deletions(-) create mode 100644 src/api/sync/spsSyncDownload.js create mode 100644 src/api/sync/spsSyncStatus.js delete mode 100644 src/api/thrsys/spsSyncStatus.js create mode 100644 src/views/sync/SysUdimsConfig.vue create mode 100644 src/views/sync/SysUdimsData.vue create mode 100644 src/views/sync/SysUdimsDownloadData.vue diff --git a/.env.production b/.env.production index 0af9ca4..e171803 100644 --- a/.env.production +++ b/.env.production @@ -8,8 +8,11 @@ ENV = 'production' #林纪裕 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/' +# 测试服务器 +VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' + # 平潭 -VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/api/purchase/purOrder.js b/src/api/purchase/purOrder.js index eb75567..49dd7e6 100644 --- a/src/api/purchase/purOrder.js +++ b/src/api/purchase/purOrder.js @@ -51,6 +51,15 @@ export function auditOrder(data) { } +export function dealOrder(data) { + return axios({ + url: '/purchase/order/dealOrder', + method: 'post', + data: data + }) +} + + // 修改pur export function updateOrder(data) { return axios({ diff --git a/src/api/sync/spsSyncDownload.js b/src/api/sync/spsSyncDownload.js new file mode 100644 index 0000000..7498d4d --- /dev/null +++ b/src/api/sync/spsSyncDownload.js @@ -0,0 +1,28 @@ +import axios from "@/utils/request"; + + +export function filterLog(query) { + return axios({ + url: "/spssync/download/basic/udiinfo/filter", + method: "get", + params: query + }); +} + +export function deleteLog(query) { + return axios({ + url: "/spssync/download/basic/udiinfo/deleteByStatus", + method: "post", + data: query + }); +} + +export function findConfig(query) { + return axios({ + url: "/system/param/syncData/config", + method: "get", + params: query + }); +} + + diff --git a/src/api/sync/spsSyncStatus.js b/src/api/sync/spsSyncStatus.js new file mode 100644 index 0000000..d3425b4 --- /dev/null +++ b/src/api/sync/spsSyncStatus.js @@ -0,0 +1,45 @@ +import axios from "@/utils/request"; + + +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/api/thrsys/spsSyncStatus.js b/src/api/thrsys/spsSyncStatus.js deleted file mode 100644 index 7e6fa07..0000000 --- a/src/api/thrsys/spsSyncStatus.js +++ /dev/null @@ -1,45 +0,0 @@ -import axios from "@/utils/request"; - - -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/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index a64b37f..8438bff 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -156,7 +156,7 @@ import {getBusTypeList, deleteBusType, updateBusType, insertBusType, exportFile} import modifyDialog from "./bussinessTypeModify"; import axios from "axios"; import store from "@/store"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; import {isBlank} from "@/utils/strUtil"; export default { diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 9987877..9121f92 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -94,14 +94,13 @@ - + diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue index 5c4b3d4..ec97c4b 100644 --- a/src/views/basic/corpMaintain/corpMaintain.vue +++ b/src/views/basic/corpMaintain/corpMaintain.vue @@ -204,7 +204,7 @@ import { import selectUnit from "./corpRelevance"; import selectSingleUnit from "./corpSingleRelevance"; import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; var pinyin = require("pinyin"); diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue index ecb475c..89c406a 100644 --- a/src/views/inventory/supInoutSearchOrder.vue +++ b/src/views/inventory/supInoutSearchOrder.vue @@ -86,14 +86,14 @@ + - - + + - diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue index 4d3d1be..ba7a9b6 100644 --- a/src/views/purchase/purOrder/purOrderDetailDialog.vue +++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue @@ -4,8 +4,9 @@ - 开始配货 - 作废 + 开始配货 + + 作废 @@ -49,9 +50,9 @@ + - - + @@ -156,7 +157,7 @@ + + diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue new file mode 100644 index 0000000..528ef40 --- /dev/null +++ b/src/views/sync/SysUdimsData.vue @@ -0,0 +1,488 @@ + + + + diff --git a/src/views/sync/SysUdimsDownloadData.vue b/src/views/sync/SysUdimsDownloadData.vue new file mode 100644 index 0000000..57f4ac6 --- /dev/null +++ b/src/views/sync/SysUdimsDownloadData.vue @@ -0,0 +1,341 @@ + + + + diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 1e64681..034500b 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -344,7 +344,7 @@ import { getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse, } from "@/api/system/invSubWarehouse"; import {getJoinBussinessType} from "@/api/basic/bussinessType"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; import {selectSysParamByKey} from "@/api/system/param/systemParamConfig"; import invSpaceManage from "@/views/inventory/InvSpaceManage"; import { diff --git a/src/views/system/param/BasicEntrutsRece.vue b/src/views/system/param/BasicEntrutsRece.vue index 8f4ca44..20d2103 100644 --- a/src/views/system/param/BasicEntrutsRece.vue +++ b/src/views/system/param/BasicEntrutsRece.vue @@ -112,7 +112,7 @@ import { } from "@/api/system/param/EntrustRece"; import modifyDialog from "./BasicEntrutsReceModify"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; export default { data() { diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue index ca13d38..a544c8b 100644 --- a/src/views/system/user/authUser.vue +++ b/src/views/system/user/authUser.vue @@ -226,7 +226,7 @@ import { } from "../../../api/auth/authAdmin"; import store from "../../../store/index"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; import {isBlank} from "@/utils/strUtil"; import {listRole} from "@/api/system/role"; import {selectSysParamByKey} from "@/api/system/systemParamConfig"; diff --git a/src/views/thirdSys/busType/index.vue b/src/views/thirdSys/busType/index.vue index 89284b2..a0e2249 100644 --- a/src/views/thirdSys/busType/index.vue +++ b/src/views/thirdSys/busType/index.vue @@ -130,7 +130,7 @@ import { import modifyDialog from "./busTypeModify"; import axios from "axios"; import {filterDetailByKey, getBasicThirdSys} from "@/api/thrsys/basicThirdSys"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; import {isBlank} from "@/utils/strUtil"; export default { diff --git a/src/views/thirdSys/corps/thrCorps.vue b/src/views/thirdSys/corps/thrCorps.vue index b47c038..9914702 100644 --- a/src/views/thirdSys/corps/thrCorps.vue +++ b/src/views/thirdSys/corps/thrCorps.vue @@ -79,7 +79,7 @@ import { import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys"; import {ucloudUnit} from "@/api/basic/basicUnitMaintain"; import {selectIp} from "@/api/param/systemParamConfig"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; export default { data() { diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue index 05752bd..327833d 100644 --- a/src/views/thirdSys/inv/index.vue +++ b/src/views/thirdSys/inv/index.vue @@ -280,7 +280,7 @@ import { download } from "@/api/thrsys/thrInvWarehouse"; import {filterDetailByKey, getBasicThirdSys} from "@/api/thrsys/basicThirdSys"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; import {isBlank} from "@/utils/strUtil"; import { filterThridSubAll, diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue index 0e3f264..aeb5d4a 100644 --- a/src/views/thirdSys/product/thrProducts.vue +++ b/src/views/thirdSys/product/thrProducts.vue @@ -127,7 +127,7 @@ import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys"; import {selectIp} from "@/api/system/systemParamConfig"; import thrProductsDetail from "./thrProductsDetail"; import ThrProductsAdd from "@/views/thirdSys/product/thrProductsAdd"; -import {findConfig} from "@/api/thrsys/spsSyncStatus"; +import {findConfig} from "@/api/sync/spsSyncStatus"; export default { data() {