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 0000000..9f76394 Binary files /dev/null and b/src/assets/image/gongan.png differ 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 @@ -
- - 技术支持：厦门高立新鹏软件科技有限公司   闽公网安备35020302034269号  - - 闽ICP备17019234号 -
+ + + + + + + + + + + + + + + + + + + + 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 }}

-
- 闽ICP备17019234号-4 + +
+ + +

+ 闽公网安备 35020302034268号   闽ICP备17019234号

+
+
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 = "";