diff --git a/src/api/basic/basicThirdSys.js b/src/api/basic/basicThirdSys.js index 78fc9c8..af970b7 100644 --- a/src/api/basic/basicThirdSys.js +++ b/src/api/basic/basicThirdSys.js @@ -25,6 +25,14 @@ export function getDetailBasicThirdSys(query) { }); } +export function filterDetailByKey(query) { + return axios({ + url: "/udiwms/basic/thirdsys/filterDetailByKey", + method: "get", + params: query + }); +} + export function updateDetailBasicThirdSys(query) { return axios({ diff --git a/src/api/inventory/inCodelog.js b/src/api/inventory/inCodelog.js new file mode 100644 index 0000000..7f56c4d --- /dev/null +++ b/src/api/inventory/inCodelog.js @@ -0,0 +1,16 @@ +import axios from "../../utils/axios"; + +export function getIncodeLogs(query) { + return axios({ + url: "/udiwms/inv/incode/filter", + method: "get", + params: query + }); +} +export function delIncodeLogs(query) { + return axios({ + url: "/udiwms/inv/incode/filter", + method: "post", + data: query + }); +} diff --git a/src/api/param/thirdSysApi.js b/src/api/param/thirdSysApi.js new file mode 100644 index 0000000..be654a6 --- /dev/null +++ b/src/api/param/thirdSysApi.js @@ -0,0 +1,9 @@ +import axios from "../../utils/axios"; + +export function findApi(query) { + return axios({ + url: "/sys/api/findAll", + method: "get", + params: query + }); +} diff --git a/src/api/thrsys/thrCorps.js b/src/api/thrsys/thrCorps.js index 21e723c..201915f 100644 --- a/src/api/thrsys/thrCorps.js +++ b/src/api/thrsys/thrCorps.js @@ -23,3 +23,10 @@ export function delAll(query) { params: query }); } +export function downloadAll(query) { + return axios({ + url: "/udiwms/thrsys/corp/downloadAll", + method: "get", + params: query + }); +} diff --git a/src/api/thrsys/thrInvProducts.js b/src/api/thrsys/thrInvProducts.js index 1cab4c3..7755baa 100644 --- a/src/api/thrsys/thrInvProducts.js +++ b/src/api/thrsys/thrInvProducts.js @@ -23,3 +23,11 @@ export function delAll(query) { params: query }); } + +export function downloadAll(query) { + return axios({ + url: "/udiwms/thrsys/invProducts/downloadAll", + method: "get", + params: query + }); +} diff --git a/src/api/thrsys/thrOrder.js b/src/api/thrsys/thrOrder.js index 4c439b7..5616af4 100644 --- a/src/api/thrsys/thrOrder.js +++ b/src/api/thrsys/thrOrder.js @@ -31,3 +31,11 @@ export function delAll(query) { params: query }); } + +export function downloadAll(query) { + return axios({ + url: "/udiwms/thrsys/orders/downloadAll", + method: "get", + params: query + }); +} diff --git a/src/api/thrsys/thrProducts.js b/src/api/thrsys/thrProducts.js index 7f76a02..9652318 100644 --- a/src/api/thrsys/thrProducts.js +++ b/src/api/thrsys/thrProducts.js @@ -23,3 +23,11 @@ export function delAll(query) { params: query }); } + +export function downloadAll(query) { + return axios({ + url: "/udiwms/thrsys/products/downloadAll", + method: "get", + params: query + }); +} diff --git a/src/router/index.js b/src/router/index.js index cb67688..603ef24 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,6 +14,7 @@ import authAdmin from "../views/userManage/admin/authAdmin.vue"; import authRole from "../views/userManage/admin/authRole.vue"; import authPermissionRule from "../views/userManage/admin/authPermissionRule.vue"; import systemParamConfig from "../views/userManage/param/systemParamConfig.vue"; +import thirdSysApi from "../views/userManage/param/ThirdSysApi.vue"; //基础数据维护 import BussinessType from "../views/basic/BussinessType.vue"; @@ -21,6 +22,7 @@ import basicUnitMaintain from "../views/basic/basicUnitMaintain.vue"; import UdiInfoManage from "../views/basic/UdiInfoManage.vue"; import company from "../views/userManage/param/company.vue"; import thirdSys from "../views/basic/BasicThirdSys.vue" +import UdiInfoSmpUpload from "../views/basic/UdiInfoSmpUpload.vue"; //出入库管理 import inout from "../views/inout/IOFinishOrder.vue"; @@ -36,6 +38,7 @@ import erpOrder from "../views/inout/IOErpOrder.vue"; //库存管理 import stockCheck from "../views/inventory/stockCheck.vue"; import onHand from "../views/inventory/OnHand.vue"; +import inCodeLog from "../views/inventory/inCodeLog.vue"; import stockPrint from "../views/inventory/stockPrint.vue"; import stockCode from "../views/inventory/stockCode.vue"; @@ -162,7 +165,15 @@ export const asyncRouterMap = [ meta: { authRule: ["admin/systemParamConfig"] } - } + }, + { + path: "bussinessType", + name: "单据类型", + component: BussinessType, + meta: { + authRule: ["product/bussinessType"] + } + }, ] }, { @@ -170,7 +181,7 @@ export const asyncRouterMap = [ component: Home, redirect: "/inout/main", icon: "tongyong", - name: "出入库管理", + name: "单据管理", noDropdown: false, meta: { authRule: ["inout"] @@ -275,15 +286,7 @@ export const asyncRouterMap = [ authRule: ["warehouse/onHand"] } }, - { - path: "stockPrint", - name: "内部码管理", - component: stockPrint, - meta: { - authRule: ["warehouse/stockPrint"] - } - }, { path: "stockCheck", @@ -336,14 +339,7 @@ export const asyncRouterMap = [ authRule: ["basic/basicUnitMaintain"] } }, - { - path: "bussinessType", - name: "单据类型维护", - component: BussinessType, - meta: { - authRule: ["product/bussinessType"] - } - }, + { path: "company", name: "本企业信息", @@ -412,6 +408,104 @@ export const asyncRouterMap = [ } }, + ] + }, + { + path: "/smp", + redirect: "/smp/udiInfoSmpUpload", + component: Home, + icon: "tongyong", + name: "供应商平台", + hidden: false, + noDropdown: false, + meta: { + authRule: ["smp"] + }, + children: [ + { + path: "udiInfoSmpUpload", + name: "产品信息上传", + component: UdiInfoSmpUpload, + + meta: { + authRule: ["thrsys/UdiInfoSmpUpload"] + } + }, + { + path: "orderSmpUpload", + name: "采购订单上传", + component: UdiInfoSmpUpload, + + meta: { + authRule: ["thrsys/UdiInfoSmpUpload"] + } + }, + { + path: "orderSmpDl", + name: "送货单下载", + component: UdiInfoSmpUpload, + + meta: { + authRule: ["thrsys/UdiInfoSmpUpload"] + } + }, + + ] + }, + { + path: "/myCode", + redirect: "/myCode/stockPrint", + component: Home, + icon: "tongyong", + name: "内部码管理", + hidden: false, + noDropdown: false, + meta: { + authRule: ["myCode"] + }, + children: [ + { + path: "stockPrint", + name: "内部码查询", + component: stockPrint, + + meta: { + authRule: ["warehouse/stockPrint"] + } + }, + { + path: "inCodeLog", + name: "内部码生成", + component: inCodeLog, + meta: { + authRule: ["warehouse/inCodeLog"] + } + }, + ] + }, + { + path: "/api", + redirect: "/api/thirdSysApi", + component: Home, + icon: "tongyong", + name: "API接口", + hidden: false, + noDropdown: false, + meta: { + authRule: ["api"] + }, + children: [ + { + path: "thirdSysApi", + name: "基础信息上传", + component: thirdSysApi, + + meta: { + authRule: ["api/thirdSysApi"] + } + }, + + ] }, ]; diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue index 464a3e0..75ba3d2 100644 --- a/src/views/basic/BasicThirdSys.vue +++ b/src/views/basic/BasicThirdSys.vue @@ -81,7 +81,7 @@ - + @@ -227,6 +227,8 @@ this.cancelDialog(); this.getList(); this.$message.success(response.data); + } else { + this.$message.error(response.message); } }) diff --git a/src/views/basic/BasicThirdSysDetailModify.vue b/src/views/basic/BasicThirdSysDetailModify.vue index c737438..63f6bf3 100644 --- a/src/views/basic/BasicThirdSysDetailModify.vue +++ b/src/views/basic/BasicThirdSysDetailModify.vue @@ -1,7 +1,7 @@ + + + diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue index d048e21..1920b9a 100644 --- a/src/views/basic/UdiInfoselectErpUdi.vue +++ b/src/views/basic/UdiInfoselectErpUdi.vue @@ -31,7 +31,13 @@ - 查询 + + 查询 + 确定 + + -
- 确定 - - 取消 - -
- +
- +
产品名称: 
- +
产品标识: 
- +
规格型号: 
- +
医疗器械注册人: 
- +
注册人英文名称: 
- +
器械类别: 
- +
产品类别: 
- +
分类编码: 
- +
商品条码: 
- +
医保编码: 
- +
统一社会信用号: 
- +
注册证/备案号: 
{ this.thirdSys = response.data.list || []; + this.thirdSys.forEach((item, i) => { + console.log(item.thirdId + this.data.thirdSysFk); + if (item.thirdId == this.data.thirdSysFk) { + this.thirdSys.splice(i, 1); + } + }); + this.thirdSysFk = this.thirdSys[0].thirdId; }) .catch(() => { diff --git a/src/views/basic/basicUnitMaintain.vue b/src/views/basic/basicUnitMaintain.vue index beb1be7..45e5222 100644 --- a/src/views/basic/basicUnitMaintain.vue +++ b/src/views/basic/basicUnitMaintain.vue @@ -49,13 +49,6 @@ width="100" v-if="erpIdColumn" > - + + + @@ -48,11 +55,19 @@
+ + + + @@ -84,7 +99,7 @@ > - +
+ + + + @@ -70,9 +78,9 @@ 查询 - 选入 - + + + @@ -84,7 +92,7 @@ style="width: 100%" > - + + + + + + + diff --git a/src/views/inventory/inCodeLog.vue b/src/views/inventory/inCodeLog.vue new file mode 100644 index 0000000..4f91fc5 --- /dev/null +++ b/src/views/inventory/inCodeLog.vue @@ -0,0 +1,315 @@ + + + + diff --git a/src/views/inventory/selectBasicUdiInfo.vue b/src/views/inventory/selectBasicUdiInfo.vue new file mode 100644 index 0000000..c752781 --- /dev/null +++ b/src/views/inventory/selectBasicUdiInfo.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/views/inventory/stockPrint.vue b/src/views/inventory/stockPrint.vue index 6e5bd8a..e52a6c5 100644 --- a/src/views/inventory/stockPrint.vue +++ b/src/views/inventory/stockPrint.vue @@ -16,6 +16,18 @@ + + + + {{ item.thirdName }} + {{ item.thirdId }} + + + @@ -108,11 +120,17 @@ show-overflow-tooltip > + { this.loading = false; if (response.code == 20000) { @@ -431,12 +461,28 @@ this.total = 0; }); }, + getBasicThirdSys() { + let query = { + enabled: true, + }; + getBasicThirdSys(query) + .then((response) => { + this.thirdSys = response.data.list || []; + this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId; + this.getList(); + }) + .catch(() => { + this.loading = false; + this.list = []; + }); + }, }, mounted() { }, components: {importErpOrder}, created() { - this.getList(); + this.getBasicThirdSys(); + // this.getList(); }, }; diff --git a/src/views/thrsys/ThrCorps.vue b/src/views/thrsys/ThrCorps.vue index 6df3ce9..32cd229 100644 --- a/src/views/thrsys/ThrCorps.vue +++ b/src/views/thrsys/ThrCorps.vue @@ -5,17 +5,19 @@ - + 查询 - 清空全部 + 清空全部 + 导入往来单位 + 导入往来单位 + - - + + - + @@ -74,18 +82,18 @@ diff --git a/src/views/thrsys/ThrProducts.vue b/src/views/thrsys/ThrProducts.vue index 1a075ce..48e13ef 100644 --- a/src/views/thrsys/ThrProducts.vue +++ b/src/views/thrsys/ThrProducts.vue @@ -33,6 +33,7 @@ 查询 清空全部 - 导入产品信息 + 导入产品信息 + + 导入产品信息 + @@ -86,10 +91,10 @@ diff --git a/src/views/thrsys/ThrProductsDetail.vue b/src/views/thrsys/ThrProductsDetail.vue index b015334..26a1529 100644 --- a/src/views/thrsys/ThrProductsDetail.vue +++ b/src/views/thrsys/ThrProductsDetail.vue @@ -3,7 +3,7 @@
- +
产品名称:  @@ -17,7 +17,7 @@ >
- +
产品标识:  @@ -35,7 +35,7 @@ - +
注册证号:  @@ -49,7 +49,7 @@ >
- +
生产厂家:  @@ -66,7 +66,7 @@ - +
规格型号:  @@ -80,7 +80,7 @@ >
- +
计量单位:  @@ -98,7 +98,7 @@ - +
医疗器械注册人:  @@ -112,7 +112,7 @@ >
- +
注册人英文名称:  @@ -129,7 +129,7 @@ - +
产品类别:  @@ -143,7 +143,7 @@ >
- +
分类编码:  @@ -161,7 +161,7 @@ - +
商品条码:  @@ -175,7 +175,7 @@ >
- +
医保编码:  @@ -192,7 +192,7 @@ - +
统一社会信用号:  @@ -206,7 +206,7 @@ >
- +
器械类别:  @@ -231,7 +231,7 @@
+
+ + + + + + + + + + + + + + +
+ + + +