diff --git a/src/api/thrsys/thrProductsAddDi.js b/src/api/thrsys/thrProductsAddDi.js new file mode 100644 index 0000000..665c64f --- /dev/null +++ b/src/api/thrsys/thrProductsAddDi.js @@ -0,0 +1,42 @@ +import axios from "../../utils/axios"; + +export function getThrDiProducts(query) { + return axios({ + url: "/udiwms/thrsys/getThrProductsDiList", + method: "get", + params: query + }); +} + +export function delThrDiProducts(query) { + return axios({ + url: "/udiwms/thrsys/delThrAddDiProducts", + method: "post", + data: query + }); +} + +export function updateDiProduct(data) { + return axios({ + url: '/udiwms/thrsys/updateThrAddDiProducts', + method: 'post', + data: data + }) +} + +export function addDiProduct(data) { + return axios({ + url: '/udiwms/thrsys/addThrAddDiProducts', + method: 'post', + data: data + }) +} + +export function getDiProductDetail(query) { + return axios({ + url: "/udiwms/thrsys/getDiProductDetail", + method: "get", + params: query + }) +} + diff --git a/src/router/index.js b/src/router/index.js index 35916af..11ede65 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -79,6 +79,7 @@ import corpExport from "../views/basic/CorpExport.vue"; //第三方数据管理 import thrProducts from "../views/thrsys/ThrProducts.vue"; import thrProductsCheck from "../views/thrsys/ThrProductsCheck.vue"; +import thrDiProductsCheck from "@/views/thrsys/ThrDiProductsCheck"; import thrProductsSubmit from "../views/thrsys/ThrProductsSubmit.vue"; import thrProductsImport from "../views/thrsys/ThrProductsImport.vue"; import ThrOrders from "../views/thrsys/ThrOrder.vue"; @@ -111,6 +112,7 @@ import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse"; //同步管理 import sysUdimsDownloadData from "../views/thrsys/SysUdimsDownloadData"; +import thrProductsAddDi from "@/views/thrsys/ThrProductsAddDi"; const err401 = r => @@ -521,12 +523,20 @@ export const asyncRouterMap = [ }, { path: "thrProductsCheck", - name: "新增产品审核", + name: "新增院内产品审核", component: thrProductsCheck, meta: { authRule: ["product/thrAddProducts"] } }, + { + path: "thrDIProductsCheck", + name: "新增DI产品审核", + component: thrDiProductsCheck, + meta: { + authRule: ["product/thrAddProducts"] + } + }, ] }, @@ -1170,12 +1180,20 @@ export const asyncRouterMap = [ }, { path: "thrProductsSubmit", - name: "新增配送产品", + name: "新增院内产品", component: thrProductsSubmit, meta: { authRule: ["product/thrProductsSubmit"] } }, + { + path: "diProductsSubmit", + name: "新增DI产品", + component: thrProductsAddDi, + meta: { + authRule: ["product/thrProductsSubmit"] + } + }, { path: "/spInv", redirect: "/spInv/spInvProducts", diff --git a/src/views/basic/SelectDIDetailDialog.vue b/src/views/basic/SelectDIDetailDialog.vue index d711987..7109735 100644 --- a/src/views/basic/SelectDIDetailDialog.vue +++ b/src/views/basic/SelectDIDetailDialog.vue @@ -10,396 +10,436 @@ label-width="100px" style="margin-top: 20px" > - - -
-
- 产品名称:  -
- -
- - -
-
- 产品标识:  -
- -
- - - - - - - -
-
- 规格型号:  -
- -
- - - -
-
- 器械类别:  -
- -
- - - - -
-
- 产品类别:  -
- -
- - -
-
- 分类编码:  -
- -
- - - - - - -
-
- 商品条码:  -
- -
- - -
-
- 医保编码:  -
- -
- - - - - -
-
- 医疗器械注册人:  -
- -
- - -
-
- 注册人英文名称:  -
- -
- - - - - - -
-
- 统一社会信用号:  -
- -
- - -
-
- 注册证/备案号:  -
- -
- - - - -
-
- 上级产品编码:  -
- -
- - - -
-
- 包装级别:  -
- -
- - - - -
-
- 计量单位/包装级别:  -
- - -
- - - -
-
- 包含下级包装数量:  -
- -
- - - - -
-
- 包含下级产品编码:  -
- - -
- - - -
-
- 包含最小销售包装数量:  -
- -
- - - - - -
-
- 最小包装单元内包含使用单元数量:  -
- -
- - -
-
- 生产厂家:  -
- -
- - - - -
-
- 是否包含批号:  -
- -
- - -
-
- 是否包含序列号:  -
- -
- - - - -
-
- 是否包含生产日期:  -
- -
- - -
-
- 是否包含失效日期:  -
- -
- - - - -
-
- 产品描述:  -
- -
- - + + + + + + +
+
+ 产品标识:  +
+ +
+ + + +
+
+ 最小包装单元内包含使用单元数量:  +
+ +
+ + + + + +
+
+ 包含下级产品编码:  +
+ + +
+ + + +
+
+ 包含最小销售包装数量:  +
+ +
+ + + + + + + + + + +
+
+ 产品名称:  +
+ +
+ + + +
+
+ 规格型号:  +
+ +
+ + + + + +
+
+ 产品类别:  +
+ +
+ + +
+
+ 分类编码:  +
+ +
+ + + + + + + +
+
+ 医疗器械注册人:  +
+ +
+ + +
+
+ 注册人英文名称:  +
+ +
+ + + + + + + +
+
+ 器械类别:  +
+ +
+ + + +
+
+ 生产厂家:  +
+ +
+ + + + + + +
+
+ 商品条码:  +
+ +
+ + +
+
+ 医保编码:  +
+ +
+ + + + + +
+
+ 统一社会信用号:  +
+ +
+ + +
+
+ 注册证/备案号:  +
+ +
+ + + + + +
+
+ 产品描述:  +
+ +
+ + + + + + + + + + +
+
+ 是否包含批号:  +
+ +
+ + +
+
+ 是否包含序列号:  +
+ +
+ + + + +
+
+ 是否包含生产日期:  +
+ +
+ + +
+
+ 是否包含失效日期:  +
+ +
+ + + + + + + + + + + +
+
+ 上级产品编码:  +
+ +
+ + + +
+
+ 包装级别:  +
+ +
+ + + + +
+
+ 计量单位/包装级别:  +
+ + +
+ + + +
+
+ 包含下级包装数量:  +
+ +
+ + + + + + @@ -417,7 +457,9 @@ export default { }, }, data() { - return {} + return { + activeNames: ['1'] + } }, methods: {}, @@ -428,4 +470,12 @@ export default { diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 0029a26..b32ca31 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -1155,7 +1155,6 @@ export default { this.relId = val.id; this.isImportUdi = true; this.thisData = val; - console.log("-----" + this.uuid + "-2222--" + this.relId); this.selectLocalVisible = true; }, @@ -1167,7 +1166,6 @@ export default { handleSelectionChange(val) { - console.log("----" + val); this.multipleSelection = val; }, diff --git a/src/views/inventory/supInvPreInProducts.vue b/src/views/inventory/supInvPreInProducts.vue index a722d0f..ffb3ec9 100644 --- a/src/views/inventory/supInvPreInProducts.vue +++ b/src/views/inventory/supInvPreInProducts.vue @@ -309,7 +309,6 @@ export default { }); }, findMethod(query) { - console.log(query); this.fromOptions = []; let cQuery = { key: query, diff --git a/src/views/thrsys/ThrAddDiProductSelectUdi.vue b/src/views/thrsys/ThrAddDiProductSelectUdi.vue new file mode 100644 index 0000000..a44d002 --- /dev/null +++ b/src/views/thrsys/ThrAddDiProductSelectUdi.vue @@ -0,0 +1,468 @@ + + + + + diff --git a/src/views/thrsys/ThrDiProductsCheck.vue b/src/views/thrsys/ThrDiProductsCheck.vue new file mode 100644 index 0000000..bb7b57f --- /dev/null +++ b/src/views/thrsys/ThrDiProductsCheck.vue @@ -0,0 +1,298 @@ + + diff --git a/src/views/thrsys/ThrProductsAddDi.vue b/src/views/thrsys/ThrProductsAddDi.vue new file mode 100644 index 0000000..b009dff --- /dev/null +++ b/src/views/thrsys/ThrProductsAddDi.vue @@ -0,0 +1,284 @@ + + diff --git a/src/views/thrsys/ThrProductsCheck.vue b/src/views/thrsys/ThrProductsCheck.vue index 351edc3..843805c 100644 --- a/src/views/thrsys/ThrProductsCheck.vue +++ b/src/views/thrsys/ThrProductsCheck.vue @@ -66,6 +66,27 @@ + + + + {{ item.companyName }} + + + {{ checkMap[scope.row.checkStatus] }} + @@ -145,9 +166,17 @@ :visible.sync="checkVisible" width="45%" v-if="checkVisible"> - 取消 - 通过 - 不通过 + + + 审核意见： + + + + 取消 + 通过 + 不通过 + + @@ -158,6 +187,7 @@ import {selectIp} from "../../api/param/systemParamConfig"; import thrProductsDetail from "./ThrProductsDetail"; import ThrProductsAdd from "@/views/thrsys/ThrProductsAdd"; import {getBasicUnitMaintains2} from "@/api/basic/basicUnitMaintain"; +import {filterCustomers} from "@/api/auth/customer"; export default { data() { @@ -169,6 +199,7 @@ export default { registerNo: null, manufactory: null, thirdSys: "", + companyName: null, supId:null, page: 1, limit: 20, @@ -193,7 +224,9 @@ export default { 3: "未通过", }, fromOptions: [], + companyNames: [], curRow: null, + remark: null }; }, @@ -208,6 +241,7 @@ export default { registerNo: null, manufactory: null, name: "", + companyName: null, thirdSys: this.thirdSys[0].thirdId, page: 1, limit: 20, @@ -344,7 +378,8 @@ export default { checkPass(val) { let query = { id: this.curRow.id, - checkStatus: val + checkStatus: val, + remark: this.remark } updateProduct(query).then((res) => { if (res.code == 20000) { @@ -370,6 +405,18 @@ export default { this.fromOptions = []; }) }, + findCompany(query) { + this.companyNames = []; + let cQuery = { + key: query, + customerName: query + }; + filterCustomers(cQuery).then((res) => { + this.companyNames = res.data.list || []; + }).catch((error) => { + this.companyNames = []; + }); + }, }, components: { thrProductsDetail, ThrProductsAdd