From f900c5ee3d262763d19dafed64eda48f532734d7 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 24 Mar 2022 16:38:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/stockOrder.js | 27 ++ src/api/thrsys/thrCorpsExport.js | 10 + src/router/index.js | 91 +++-- src/views/basic/CorpExportSmp.vue | 2 +- src/views/basic/UdiinfoExportSmp.vue | 2 +- src/views/smp/ErpOrderSmpUpload.vue | 2 +- src/views/thrsys/ThrCorpSelect.vue | 403 ++++++++++++---------- src/views/thrsys/ThrCorpsExport.vue | 351 +++++++++---------- src/views/thrsys/ThrCorpsExportSmp.vue | 295 ++++++++++++++++ src/views/thrsys/ThrOrderExportSmp.vue | 371 ++++++++++---------- src/views/thrsys/ThrProductsExportSmp.vue | 2 +- 11 files changed, 976 insertions(+), 580 deletions(-) create mode 100644 src/views/thrsys/ThrCorpsExportSmp.vue diff --git a/src/api/inout/stockOrder.js b/src/api/inout/stockOrder.js index e8b5f79..365e711 100644 --- a/src/api/inout/stockOrder.js +++ b/src/api/inout/stockOrder.js @@ -31,6 +31,7 @@ export function stockOrderDetail(query) { } ) } + export function stockOrderDetail2(query) { return axios( { @@ -40,6 +41,7 @@ export function stockOrderDetail2(query) { } ) } + export function stockOrderDetailTemp(query) { return axios( { @@ -67,6 +69,7 @@ export function deleteStockOrderById(query) { data: query }); } + export function deleteErrorStockOrderById(query) { return axios({ url: "/udiwms/stock/order/error/delete", @@ -74,6 +77,7 @@ export function deleteErrorStockOrderById(query) { data: query }); } + export function deleteStockOrderDetailById(query) { return axios({ url: "/udiwms/stock/order/detail/delete", @@ -81,6 +85,7 @@ export function deleteStockOrderDetailById(query) { data: query }); } + export function deleteStockOrderDetailTempById(query) { return axios({ url: "/udiwms/stock/order/detail/temp/delete", @@ -97,6 +102,17 @@ export function submitStockOrder(query) { params: query }); } + + +export function updateStockOrder(query) { + return axios({ + url: "/udiwms/stock/order/update", + method: "post", + data: query + }); +} + + export function submitNewStockOrder(query) { return axios({ url: "/udiwms/stock/order/new/submit", @@ -104,6 +120,7 @@ export function submitNewStockOrder(query) { params: query }); } + export function repealSubmitNewStockOrder(query) { return axios({ url: "/udiwms/stock/order/new/repealSubmit", @@ -111,6 +128,7 @@ export function repealSubmitNewStockOrder(query) { params: query }); } + export function submitStockOrderError(query) { return axios({ url: "/udiwms/stock/order/error/submit", @@ -118,6 +136,7 @@ export function submitStockOrderError(query) { params: query }); } + export function uploadStockOrderDetailCount(query) { return axios( { @@ -127,6 +146,7 @@ export function uploadStockOrderDetailCount(query) { } ) } + export function getStockOrderDetailInstrument(query) { return axios( { @@ -136,6 +156,7 @@ export function getStockOrderDetailInstrument(query) { } ) } + export function getStockOrderDetailInstrumentById(query) { return axios( { @@ -145,6 +166,7 @@ export function getStockOrderDetailInstrumentById(query) { } ) } + export function addStockOrderDetailFromCode(query) { return axios( { @@ -154,6 +176,7 @@ export function addStockOrderDetailFromCode(query) { } ) } + export function addStockOrderDetailFromCodeById(query) { return axios( { @@ -163,6 +186,7 @@ export function addStockOrderDetailFromCodeById(query) { } ) } + export function stockOrderDetailQueryProduct(query) { return axios( { @@ -172,6 +196,7 @@ export function stockOrderDetailQueryProduct(query) { } ) } + export function stockOrderDetailFilterProduct(query) { return axios( { @@ -181,6 +206,7 @@ export function stockOrderDetailFilterProduct(query) { } ) } + export function uploadStockOrderDetail(query) { return axios( { @@ -190,6 +216,7 @@ export function uploadStockOrderDetail(query) { } ) } + export function copyStockOrderDetail(query) { return axios( { diff --git a/src/api/thrsys/thrCorpsExport.js b/src/api/thrsys/thrCorpsExport.js index 37e6dfd..afd096f 100644 --- a/src/api/thrsys/thrCorpsExport.js +++ b/src/api/thrsys/thrCorpsExport.js @@ -8,6 +8,7 @@ export function filterLog(query) { params: query }); } + export function deleteLog(query) { return axios({ url: "/udiwms/thrCorp/exportLog/deleteLog", @@ -23,6 +24,7 @@ export function downloadLog(query) { params: query }); } + export function exportExcel(query) { return axios({ url: "/udiwms/thrCorp/importLog/export", @@ -31,3 +33,11 @@ export function exportExcel(query) { }); } +export function uploadSmp(query) { + return axios({ + url: "/udiwms/thrCorp/importLog/upload", + method: "post", + data: query + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 843df94..04fe97b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -93,6 +93,9 @@ import udiinfoExportSmp from "../views/basic/UdiinfoExportSmp.vue"; import UdiInfoDonwloadSmp from "../views/basic/UdiInfoDonwloadSmp.vue"; import thrOrderExportSmp from "../views/thrsys/ThrOrderExportSmp.vue"; import thrProductsExportSmp from "../views/thrsys/ThrProductsExportSmp.vue"; +import thrCorpsExportSmp from "../views/thrsys/ThrCorpsExportSmp.vue"; + + import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse"; // Vue.use(VueRouter); @@ -513,10 +516,18 @@ export const asyncRouterMap = [ authRule: ["basic"] }, children: [ + { + path: "company", + name: "本机构信息", + component: company, + meta: { + authRule: ["product/company"] + } + }, { path: "invWarehouse", component: invWarehouse, - name: "仓库信息", + name: "仓库字典", icon: "", meta: { authRule: ["basicProduct/invWarehouse"] @@ -525,7 +536,7 @@ export const asyncRouterMap = [ { path: "/udiinfo", redirect: "/udiinfo/udiinfomg", - name: "医疗器械信息", + name: "耗材字典", component: Empty, meta: { authRule: ["basic/products"] @@ -533,7 +544,7 @@ export const asyncRouterMap = [ children: [ { path: "udiinfomg", - name: "医疗器械信息维护", + name: "耗材字典维护", component: UdiInfoManage, meta: { authRule: ["basic/products/modify"] @@ -541,7 +552,7 @@ export const asyncRouterMap = [ }, { path: "udiImport", - name: "医疗器械信息导入", + name: "耗材字典导入", component: UdiInfoImport, meta: { authRule: ["basic/products/import"] @@ -549,7 +560,7 @@ export const asyncRouterMap = [ }, { path: "udiinfoExport", - name: "医疗器械信息导出", + name: "耗材字典导出", component: udiinfoExport, meta: { authRule: ["basic/products/export"] @@ -592,14 +603,6 @@ export const asyncRouterMap = [ },] }, - { - path: "company", - name: "本机构信息", - component: company, - meta: { - authRule: ["product/company"] - } - }, { path: "/udidb", @@ -809,7 +812,7 @@ export const asyncRouterMap = [ redirect: "/smp/udiinfoExportSmp", component: Home, icon: "tongyong", - name: "供应商平台", + name: "同步自助平台", hidden: false, noDropdown: false, meta: { @@ -818,7 +821,7 @@ export const asyncRouterMap = [ children: [ { path: "udiinfoExportSmp", - name: "器械信息上传", + name: "耗材字典", component: udiinfoExportSmp, meta: { @@ -829,35 +832,63 @@ export const asyncRouterMap = [ path: "UdiInfoDonwloadSmp", name: "器械信息下载", component: UdiInfoDonwloadSmp, - + hidden: true, meta: { authRule: ["thrsys/UdiInfoDonwloadSmp"] } }, { path: "corpExportSmp", - name: "往来单位上传", + name: "往来单位信息", component: corpExportSmp, meta: { authRule: ["thrsys/corpExportSmp"] } }, { - path: "thrProductsExportSmp", - name: "第三方产品信息上传", - component: thrProductsExportSmp, - meta: { - authRule: ["thrsys/thrProductsExportSmp"] - } - }, - { - path: "thrOrderExportSmp", - name: "第三方业务单据上传", - component: thrOrderExportSmp, + path: "/thirdsysSmp", + redirect: "/thirdsysSmp/thrProductsExportSmp", + name: "第三方数据", + component: Empty, meta: { - authRule: ["thrsys/thrOrderExportSmp"] - } + authRule: ["thirdsysSmp/thirdsysSmp"] + }, + children: [ + { + path: "thrInvExportSmp", + name: "仓库信息", + component: thrProductsExportSmp, + meta: { + authRule: ["thrsys/thrProductsExportSmp"] + } + }, + { + path: "thrProductsExportSmp", + name: "产品信息", + component: thrProductsExportSmp, + meta: { + authRule: ["thrsys/thrProductsExportSmp"] + } + }, + { + path: "thrCorpsExportSmp", + name: "往来单位", + component: thrCorpsExportSmp, + meta: { + authRule: ["thrsys/thrProductsExportSmp"] + } + }, + { + path: "thrOrderExportSmp", + name: "业务单据", + component: thrOrderExportSmp, + meta: { + authRule: ["thrsys/thrOrderExportSmp"] + } + }, + ] }, + { path: "orderSmpDl", name: "送货单下载", diff --git a/src/views/basic/CorpExportSmp.vue b/src/views/basic/CorpExportSmp.vue index 08f8b0f..c8d5c02 100644 --- a/src/views/basic/CorpExportSmp.vue +++ b/src/views/basic/CorpExportSmp.vue @@ -10,7 +10,7 @@ 查询 - 上传供应商平台 + 同步至自助平台 diff --git a/src/views/basic/UdiinfoExportSmp.vue b/src/views/basic/UdiinfoExportSmp.vue index 8c3c6e2..529b97c 100644 --- a/src/views/basic/UdiinfoExportSmp.vue +++ b/src/views/basic/UdiinfoExportSmp.vue @@ -10,7 +10,7 @@ 查询 - 上传供应商平台 + 同步至自助平台 diff --git a/src/views/smp/ErpOrderSmpUpload.vue b/src/views/smp/ErpOrderSmpUpload.vue index 93f4d3d..471e394 100644 --- a/src/views/smp/ErpOrderSmpUpload.vue +++ b/src/views/smp/ErpOrderSmpUpload.vue @@ -38,7 +38,7 @@ 查询 - 上传供应商平台 + 同步至自助平台 diff --git a/src/views/thrsys/ThrCorpSelect.vue b/src/views/thrsys/ThrCorpSelect.vue index 4052253..e57713a 100644 --- a/src/views/thrsys/ThrCorpSelect.vue +++ b/src/views/thrsys/ThrCorpSelect.vue @@ -38,11 +38,11 @@ 结果全部导出 - 选中上传 - 一键上传 @@ -79,213 +79,244 @@ diff --git a/src/views/thrsys/ThrCorpsExport.vue b/src/views/thrsys/ThrCorpsExport.vue index 661ad34..c316ceb 100644 --- a/src/views/thrsys/ThrCorpsExport.vue +++ b/src/views/thrsys/ThrCorpsExport.vue @@ -95,198 +95,199 @@ diff --git a/src/views/thrsys/ThrCorpsExportSmp.vue b/src/views/thrsys/ThrCorpsExportSmp.vue new file mode 100644 index 0000000..df9bb99 --- /dev/null +++ b/src/views/thrsys/ThrCorpsExportSmp.vue @@ -0,0 +1,295 @@ + + + + diff --git a/src/views/thrsys/ThrOrderExportSmp.vue b/src/views/thrsys/ThrOrderExportSmp.vue index 6656864..53e55d8 100644 --- a/src/views/thrsys/ThrOrderExportSmp.vue +++ b/src/views/thrsys/ThrOrderExportSmp.vue @@ -10,7 +10,7 @@ 查询 - 上传供应商平台 + 同步至自助平台 @@ -57,9 +57,9 @@ diff --git a/src/views/thrsys/ThrProductsExportSmp.vue b/src/views/thrsys/ThrProductsExportSmp.vue index e52f563..fda4ef1 100644 --- a/src/views/thrsys/ThrProductsExportSmp.vue +++ b/src/views/thrsys/ThrProductsExportSmp.vue @@ -10,7 +10,7 @@ 查询 - 上传供应商平台 + 同步至自助平台