From 5f66b56e7763867dacca4728c7cfca5f6940c17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 12 Jun 2023 16:19:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/productCategory.vue | 522 ++++++++++++++++++++ 1 file changed, 522 insertions(+) create mode 100644 src/views/basic/product/productCategory.vue diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue new file mode 100644 index 00000000..95ca225b --- /dev/null +++ b/src/views/basic/product/productCategory.vue @@ -0,0 +1,522 @@ + + + + From 3c83f74caa0b54199c12a1401ca8409024104062 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 14 Jun 2023 11:06:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/basicCaterelType.js | 40 + src/api/basic/basicProductType.js | 76 + src/views/basic/product/bindProduct.vue | 326 ++++ src/views/basic/product/productCategory.vue | 1611 +++++++++++++++++-- 4 files changed, 1887 insertions(+), 166 deletions(-) create mode 100644 src/api/basic/basicCaterelType.js create mode 100644 src/api/basic/basicProductType.js create mode 100644 src/views/basic/product/bindProduct.vue diff --git a/src/api/basic/basicCaterelType.js b/src/api/basic/basicCaterelType.js new file mode 100644 index 00000000..beae48b0 --- /dev/null +++ b/src/api/basic/basicCaterelType.js @@ -0,0 +1,40 @@ +import axios from "@/utils/request"; +import {saveSubWarehouse} from "@/api/system/invSubWarehouse"; + +export function saveRel(query) { + return axios({ + url: "/udiwms/basic/product/category/bindRel", + method: "post", + data: query + }); +} + + +export function productList(query) { + return axios({ + url: "/udiwms/basic/product/category/productList", + method: "get", + params: query + }); +} + + +export function SelectproductList(query) { + return axios({ + url: "/udiwms/basic/product/category/SelcetproductList", + method: "get", + params: query + }); +} + + + + + + + + + + + + diff --git a/src/api/basic/basicProductType.js b/src/api/basic/basicProductType.js new file mode 100644 index 00000000..6a8d9c34 --- /dev/null +++ b/src/api/basic/basicProductType.js @@ -0,0 +1,76 @@ +import axios from "@/utils/request"; + + +export function getListTree(query) { + return axios({ + url: "/udiwms/basic/product/category/getTree", + method: "get", + params: query + }); +} + +export function getOneName(query) { + return axios({ + url: "/udiwms/basic/product/category/getOneName", + method: "get", + params: query + }); +} + +export function getListMenu(query) { + return axios({ + url: "/udiwms/basic/product/category/selectList", + method: "post", + data: query + }); +} + +export function uodateBasicHospType(query) { + return axios({ + url: "/udiwms/basic/product/category/update", + method: "post", + data: query + }); +} + +export function saveBasicHospType(query) { + return axios({ + url: "/udiwms/basic/product/category/save", + method: "post", + data: query + }); +} + + +export function deleteBasicHospType(query) { + return axios({ + url: "/udiwms/basic/product/category/delect", + method: "get", + params: query + }); +} + +export function getbindList(query) { + return axios({ + url: "/udiwms/basic/product/category/bindList", + method: "get", + params: query + }); +} + +export function deleterel(query) { + return axios({ + url: "/udiwms/basic/product/category/deleterel", + method: "get", + params: query + }); +} + + + + + + + + + diff --git a/src/views/basic/product/bindProduct.vue b/src/views/basic/product/bindProduct.vue new file mode 100644 index 00000000..9f917ec4 --- /dev/null +++ b/src/views/basic/product/bindProduct.vue @@ -0,0 +1,326 @@ + + + + diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue index 95ca225b..257db0d6 100644 --- a/src/views/basic/product/productCategory.vue +++ b/src/views/basic/product/productCategory.vue @@ -3,7 +3,7 @@ - + {{ node.label - }} + + 新增 + + + 编辑 + + + 删除 + + + @@ -86,25 +108,67 @@ > - - - - - {{ item.sysName }} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -116,47 +180,6 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + +
@@ -197,6 +220,8 @@ 显示/隐藏搜索栏 重置 查询 + 新增 +
@@ -206,7 +231,6 @@ style="width: 100%" border key="1" - @selection-change="handleSelectionChange" > - - - - - - - - - + > + From 43187b14824a22f31aef98b84adf0feceb719415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 14 Jun 2023 14:51:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/basicUnitMaintain.js | 14 + src/api/userManage/platform.js | 91 +++++ src/api/userManage/unitMaintain.js | 44 +++ src/views/userManage/bindPlatform.vue | 189 ++++++++++ .../userManage/bindPlatformEditModel.vue | 288 ++++++++++++++++ src/views/userManage/bindPlatformModel.vue | 323 ++++++++++++++++++ src/views/userManage/platform.vue | 248 ++++++++++++++ 7 files changed, 1197 insertions(+) create mode 100644 src/api/userManage/platform.js create mode 100644 src/api/userManage/unitMaintain.js create mode 100644 src/views/userManage/bindPlatform.vue create mode 100644 src/views/userManage/bindPlatformEditModel.vue create mode 100644 src/views/userManage/bindPlatformModel.vue create mode 100644 src/views/userManage/platform.vue diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js index 19a5d97d..db80ab3c 100644 --- a/src/api/basic/basicUnitMaintain.js +++ b/src/api/basic/basicUnitMaintain.js @@ -112,6 +112,20 @@ export function selectCorpList(query) { }); } +export function getCorpLists(query) { + return axios({ + url: "/udiwms/basic/unit/maintain/getCorpLists", + method: "get", + params: query + }); +} +export function getPlatFormDelect(query) { + return axios({ + url: "/udiwms/platform/getPlatFormDelect", + method: "post", + data: query + }); +} diff --git a/src/api/userManage/platform.js b/src/api/userManage/platform.js new file mode 100644 index 00000000..68f2656d --- /dev/null +++ b/src/api/userManage/platform.js @@ -0,0 +1,91 @@ +import axios from '@/utils/request' + +export function getPlatform(query) { + return axios({ + url: "/udiwms/platform/list", + method: "get", + params: query + }); +} + +export function updatePlatform(data) { + return axios({ + url: "/udiwms/platform/update", + method: "post", + data: data + }); +} + +export function deletePlatform(data) { + return axios({ + url: "/udiwms/platform/remove", + method: "post", + data: data + }); +} + +export function linkPlatform(query) { + return axios({ + url: "/udiwms/platform/link", + method: "post", + data: query + }); +} + +//查询往来单位和自助平台关联数据 +export function getLinkPlatformList(query) { + return axios({ + url: "/udiwms/platform/getLinkPlatformList", + method: "get", + params: query + }); +} + +//解绑往来单位字典和自助平台 +export function unbindPlatform(query) { + return axios({ + url: "/udiwms/platform/unbind", + method: "post", + params: query + }); +} + +export function getTargetActions(query) { + return axios({ + url: "/udiwms/platform/getTargetActions", + method: "get", + params: query + }); +} + +export function getTargetInv(query) { + return axios({ + url: "/udiwms/platform/getTargetInv", + method: "get", + params: query + }); +} + +export function getTargetSubInv(query) { + return axios({ + url: "/udiwms/platform/getTargetSubInv", + method: "get", + params: query + }); +} + +export function testPlatformConnection(query) { + return axios({ + url: "/udiwms/platform/testPlatformConnection", + method: "get", + params: query + }) +} + +export function testUserInfo(data) { + return axios({ + url: "/udiwms/platform/testUserInfo", + method: "post", + data: data + }); +} diff --git a/src/api/userManage/unitMaintain.js b/src/api/userManage/unitMaintain.js new file mode 100644 index 00000000..f082818c --- /dev/null +++ b/src/api/userManage/unitMaintain.js @@ -0,0 +1,44 @@ +import axios from '@/utils/request' + +export function getUnitMaintain(query) { + return axios({ + url: "/warehouse/unitMaintain/filter", + method: "get", + params: query + }); +} + +export function combine(query) { + return axios({ + url: "/udiwms/basic/unit/maintain/combine", + method: "post", + data: query + }); +} + +export function deleteUnitMaintain(query) { + return axios({ + url: "/warehouse/unitMaintain/delete", + method: "post", + data: query + }); +} + +export function addUnit(query) { + return axios({ + url: "/warehouse/unitMaintain/add", + method: "post", + data: query + }); +} + +export function modifyUnit(query) { + return axios({ + url: "/warehouse/unitMaintain/modify", + method: "post", + data: query + }); +} + + + diff --git a/src/views/userManage/bindPlatform.vue b/src/views/userManage/bindPlatform.vue new file mode 100644 index 00000000..2b85c3d6 --- /dev/null +++ b/src/views/userManage/bindPlatform.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/src/views/userManage/bindPlatformEditModel.vue b/src/views/userManage/bindPlatformEditModel.vue new file mode 100644 index 00000000..e239febf --- /dev/null +++ b/src/views/userManage/bindPlatformEditModel.vue @@ -0,0 +1,288 @@ + + + + + diff --git a/src/views/userManage/bindPlatformModel.vue b/src/views/userManage/bindPlatformModel.vue new file mode 100644 index 00000000..67c3e742 --- /dev/null +++ b/src/views/userManage/bindPlatformModel.vue @@ -0,0 +1,323 @@ + + + + + diff --git a/src/views/userManage/platform.vue b/src/views/userManage/platform.vue new file mode 100644 index 00000000..d78ef1da --- /dev/null +++ b/src/views/userManage/platform.vue @@ -0,0 +1,248 @@ + + + From 7c5e51fa7226a5787130bd7ff7225344f6a05ebc Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 15 Jun 2023 15:11:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=ABbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/productCategory.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue index 257db0d6..c456f004 100644 --- a/src/views/basic/product/productCategory.vue +++ b/src/views/basic/product/productCategory.vue @@ -10,6 +10,7 @@ :default-expand-all="true" @node-click="handleNodeClick" :expand-on-click-node="false" + highlight-current > {{ @@ -326,7 +327,7 @@ .el-tree-node__content { + background-color: rgb(158, 213, 250) !important; + } } } From 3b8858e58334326dee5c3beb4d552bffe3153a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 15 Jun 2023 18:59:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/basicUnitMaintain.js | 2 + src/api/userManage/unitMaintain.js | 8 + src/views/inout/IoUploadOrder.vue | 1060 ++++++++++++++++++++++++++++ 3 files changed, 1070 insertions(+) create mode 100644 src/views/inout/IoUploadOrder.vue diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js index db80ab3c..c2c04052 100644 --- a/src/api/basic/basicUnitMaintain.js +++ b/src/api/basic/basicUnitMaintain.js @@ -129,3 +129,5 @@ export function getPlatFormDelect(query) { } + + diff --git a/src/api/userManage/unitMaintain.js b/src/api/userManage/unitMaintain.js index f082818c..aa85919c 100644 --- a/src/api/userManage/unitMaintain.js +++ b/src/api/userManage/unitMaintain.js @@ -40,5 +40,13 @@ export function modifyUnit(query) { }); } +export function uploadOrder(query) { + return axios({ + url: "/udiwms/platform/uploadOrder", + method: "get", + params: query + }); +} + diff --git a/src/views/inout/IoUploadOrder.vue b/src/views/inout/IoUploadOrder.vue new file mode 100644 index 00000000..b5c23ec0 --- /dev/null +++ b/src/views/inout/IoUploadOrder.vue @@ -0,0 +1,1060 @@ + + + + +