From e0fde36e7170b548786d2d363a6889575567da80 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 5 May 2022 14:38:14 +0800 Subject: [PATCH] =?UTF-8?q?udi=E7=89=88=E6=9C=AC=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/udiInfo.js | 9 + src/api/basic/udiRelevance.js | 8 + src/api/thrsys/spsSyncStatus.js | 27 ++ src/assets/image/gongan.png | Bin 0 -> 19256 bytes src/router/index.js | 11 +- src/views/basic/BussinessType.vue | 4 +- src/views/basic/BussinessTypeLocl.vue | 3 + src/views/basic/BussinessTypeLoclModify.vue | 14 + src/views/basic/BussinessTypeModify.vue | 54 ++-- src/views/basic/UdiInfoManage.vue | 69 ++++- src/views/basic/UdiInfoManageSp.vue | 25 +- src/views/basic/UdiInfoselectErpUdi.vue | 6 +- src/views/basic/UdiinfoSelectVersion.vue | 294 ++++++++++++++++++++ src/views/basic/basicCompanyProducts.vue | 71 ++++- src/views/home/index.vue | 40 +-- src/views/login/index.vue | 17 +- src/views/thrsys/SysUdimsData.vue | 293 +++++++++++++++++++ src/views/warehouse/addHosOrder.vue | 1 + src/views/warehouse/addOrder.vue | 1 + 19 files changed, 871 insertions(+), 76 deletions(-) create mode 100644 src/api/thrsys/spsSyncStatus.js create mode 100644 src/assets/image/gongan.png create mode 100644 src/views/basic/UdiinfoSelectVersion.vue create mode 100644 src/views/thrsys/SysUdimsData.vue diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js index 86b9edc..519ec61 100644 --- a/src/api/basic/udiInfo.js +++ b/src/api/basic/udiInfo.js @@ -22,5 +22,14 @@ export function filterByUuid(query) { params: query }); } +export function filterByVersion(query) { + return axios({ + url: "/udiwms/syncdi/version", + method: "get", + params: query + }); +} + + diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js index 128873a..b5df45b 100644 --- a/src/api/basic/udiRelevance.js +++ b/src/api/basic/udiRelevance.js @@ -70,6 +70,14 @@ export function combineUdi(query) { data: query }); } +export function changeVersion(query) { + return axios({ + url: "/udi/udirel/changeVersion", + method: "post", + data: query + }); +} + export function combineAllUdi(query) { return axios({ diff --git a/src/api/thrsys/spsSyncStatus.js b/src/api/thrsys/spsSyncStatus.js new file mode 100644 index 0000000..61be1dd --- /dev/null +++ b/src/api/thrsys/spsSyncStatus.js @@ -0,0 +1,27 @@ +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 + }); +} diff --git a/src/assets/image/gongan.png b/src/assets/image/gongan.png new file mode 100644 index 0000000000000000000000000000000000000000..9f763946dd6606addeab24e40e2369124d53a048 GIT binary patch literal 19256 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 literal 0 HcmV?d00001 diff --git a/src/router/index.js b/src/router/index.js index 6ab01fa..644ea24 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,7 +87,7 @@ import thrCorpsExport from "../views/thrsys/ThrCorpsExport.vue"; import thrCorpsImport from "../views/thrsys/ThrCorpsImport.vue"; import receiveOrderNew from "../views/thrsys/ThrOrdedrReceiveAdd.vue"; import receiveOrderSearch from "../views/thrsys/ThrOrdedrReceiveSearch.vue"; - +import spsSyncData from "../views/thrsys/SysUdimsData.vue"; //库存 import invProducts from "../views/inventory/InvProducts.vue"; @@ -356,6 +356,15 @@ export const asyncRouterMap = [ }, ] }, + { + path: "spsSyncData", + component: spsSyncData, + name: "数据同步", + icon: "", + meta: { + authRule: ["admin/spsSyncData"] + } + }, // { // path: "systemPDFTemplate", // component: systemPDFTemplate, diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 98d3d36..96685f9 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -204,6 +204,7 @@ export default { defaultUnit: null, useDyCount: null, expireTip: true, + prefix: null, }, enableMap: { true: "是", @@ -341,7 +342,8 @@ export default { secCheckBalacne: row.secCheckBalacne, defaultUnit: row.defaultUnit, useDyCount: row.useDyCount, - expireTip: row.expireTip + expireTip: row.expireTip, + prefix: row.prefix }; this.modifyDialogVisible = true; }, diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index 02bff2e..66300c6 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -151,6 +151,7 @@ export default { advanceType: null, changeEnable: null, spUse: null, + prefix: null, }, enableMap: { true: "是", @@ -241,6 +242,7 @@ export default { advanceType: row.advanceType, changeEnable: row.changeEnable, spUse: row.spUse, + prefix: row.prefix, }; }, @@ -257,6 +259,7 @@ export default { advanceType: null, localAction: null, changeEnable: null, + prefix: null, }; }, diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index 95c4479..398c681 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -52,6 +52,20 @@ + +
+
+ 单据前缀:  +
+ +
+ + diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index cb4c6d4..764a4eb 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -173,16 +173,34 @@ -
- 备注:  + 单据前缀: 
+
+ + + + + + + + +
+
+ 备注:  +
+
@@ -202,43 +220,15 @@ 以使用单元计量出库 - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
需要选择业务单据校验的来源类型(一次复核) diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 6bf6eb4..9404905 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -71,14 +71,6 @@ >添加产品信息 - - - - - - @@ -676,6 +668,25 @@ >
+ + +
+
+ 当前版本号:  +
+ + 切换版本 + +
+ @@ -769,6 +780,24 @@ @closeUdi="closeUdi" > + + + + + + + + { }); }, - + selectVersion() { + this.selectVersionVisible = true; + this.uuid = this.editQuery.uuid; + this.originUuid = this.editQuery.originUuid; + }, closeDialog() { this.selectErpDialogVisible = false; this.selectLocalVisible = false; + this.selectVersionVisible = false; }, onAddSubmit() { if (this.checked == true) { diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue index 9e28a10..915f9d4 100644 --- a/src/views/basic/UdiInfoselectErpUdi.vue +++ b/src/views/basic/UdiInfoselectErpUdi.vue @@ -305,7 +305,7 @@ + + diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue index 1828b4f..332ce5b 100644 --- a/src/views/basic/basicCompanyProducts.vue +++ b/src/views/basic/basicCompanyProducts.vue @@ -695,6 +695,24 @@ > + +
+
+ 当前版本号:  +
+ + 切换版本 + +
+ @@ -1232,6 +1250,23 @@ > + +
+
+ 当前版本号:  +
+ + 切换版本 + +
+ @@ -1343,7 +1378,22 @@ :closeAddDialog="closeAddDialog" :newType="newType"> - + + + @@ -1371,6 +1421,7 @@ import selectErp from "./UdiInfoselectErpUdi"; import selectLocalUdi from "./UdiInfoSelectLocalUdi"; import selectProduct from "./basicCompanyProductsImport"; import ThrProductsAdd from "@/views/thrsys/ThrProductsAdd"; +import selectUdiVersion from "./UdiinfoSelectVersion"; export default { data() { @@ -1393,6 +1444,7 @@ export default { newType: 2, selectProductVisible: false, addProductVisible: false, + selectVersionVisible: false, editQuery: null, relevanceEdit: { id: null, @@ -1418,6 +1470,7 @@ export default { total: 0, thirdNo: "", uuid: "111", + originUuid: null, thirdId: null, relId: "", thisData: { @@ -1803,8 +1856,12 @@ export default { this.selectUdiDialogVisible = false; this.selectErpDialogVisible = false; this.selectLocalVisible = false; + this.selectVersionVisible = false; this.getThirdSysDetail(); this.getList(); + if (val) { + this.cancelDialog(); + } }, getThirdSysDetail() { let query = { @@ -1848,11 +1905,18 @@ export default { .catch(() => { }); }, + selectVersion() { + this.selectVersionVisible = true; + this.uuid = this.editQuery.uuid; + this.originUuid = this.editQuery.originUuid; + this.relId = this.editQuery.rlId; + console.log(this.uuid + "\n" + this.originUuid); + }, closeDialog() { this.selectErpDialogVisible = false; this.selectLocalVisible = false; this.selectProductVisible = false; - console.log("关闭弹窗2"); + this.selectVersionVisible = false; }, onAddSubmit() { if (this.checked == true) { @@ -1938,7 +2002,8 @@ export default { selectErp, selectLocalUdi, selectProduct, - ThrProductsAdd + ThrProductsAdd, + selectUdiVersion, } , created() { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index c9d4ebf..4c978a8 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -153,26 +153,26 @@ - + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index e72170e..8c0ccd0 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -3,7 +3,7 @@
-

{{hospName}}

+

{{ hospName }}

- diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue new file mode 100644 index 0000000..fa6c894 --- /dev/null +++ b/src/views/thrsys/SysUdimsData.vue @@ -0,0 +1,293 @@ + + + + diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index fc7d19b..4d23856 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -914,6 +914,7 @@ export default { var inputer = document.getElementById("inputer"); window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 sc.onInput = function (text) { + console.log("监听掃碼："+text); //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发 if (text.includes("delete")) { that.formData.code = ""; diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 66fb748..50c32c3 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -715,6 +715,7 @@ export default { var inputer = document.getElementById("inputer"); window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 sc.onInput = function (text) { + console.log("监听掃碼："+text); //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发 if (text.includes("delete")) { that.formData.code = "";