From 02d4d6467567a97cf7ca5008d92396a5f08bfc27 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 22 Sep 2022 14:40:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A4=A7=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E9=98=B6=E6=AE=B5=E6=80=A7=E8=83=9C=E5=88=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/打包设置.txt | 19 + src/api/inventory/invCodeTrace.js | 3 + src/api/inventory/invSickTrace.js | 9 + src/router/index.js | 62 +- src/views/basic/BussinessType.vue | 17 +- src/views/basic/BussinessTypeLocl.vue | 2 +- src/views/basic/BussinessTypeLoclModify.vue | 147 ++- src/views/basic/BussinessTypeModify.vue | 69 +- src/views/basic/CorpMaintain.vue | 7 +- src/views/basic/CorpRelevance.vue | 8 +- src/views/basic/UdiInfoManage.vue | 1 - src/views/basic/UdiInfoManageSp.vue | 18 +- src/views/basic/UdiInfoSearch.vue | 573 +++++++++ src/views/basic/UdiInfoSelectLocalUdi.vue | 24 + src/views/basic/UdiInfoselectErpUdi.vue | 33 +- src/views/basic/basicUnitRelevance.vue | 7 +- src/views/basic/invWarehouse.vue | 76 +- src/views/home/index.vue | 87 +- src/views/inventory/invUdiTraceOrder.vue | 476 +------- src/views/inventory/sickerUdiTraceOrder.vue | 520 ++++++++ src/views/thrsys/ThrAddDiProductSelectUdi.vue | 206 +++- src/views/thrsys/ThrDiProductsCheck.vue | 1 - src/views/thrsys/ThrInvWarehouse.vue | 3 +- src/views/thrsys/ThrProductsAdd.vue | 42 +- src/views/thrsys/ThrProductsAddDi.vue | 4 +- src/views/thrsys/ThrProductsCheck.vue | 8 +- src/views/userManage/admin/authAdmin.vue | 1045 +++++++++-------- src/views/userManage/admin/authRole.vue | 8 + src/views/userManage/customerManage.vue | 4 +- src/views/userManage/register.vue | 35 +- src/views/warehouse/IOCheckErrOrder.vue | 13 +- src/views/warehouse/IONewOrder.vue | 11 +- src/views/warehouse/IOSearchOrder.vue | 18 +- src/views/warehouse/IOWaitOrder.vue | 13 +- src/views/warehouse/addHosOrder.vue | 44 +- src/views/warehouse/addOrder.vue | 20 +- src/views/warehouse/stockHospOrderNew.vue | 10 +- src/views/warehouse/stockOrder.vue | 11 +- src/views/warehouse/stockOrderDelSearch.vue | 11 +- src/views/warehouse/stockOrderEditor.vue | 11 +- src/views/warehouse/stockOrderNew.vue | 25 +- src/views/warehouse/stockOrderSearch.vue | 11 +- src/views/warehouse/stockOrderWaitCheck.vue | 12 +- 43 files changed, 2460 insertions(+), 1264 deletions(-) create mode 100644 src/api/inventory/invSickTrace.js create mode 100644 src/views/basic/UdiInfoSearch.vue create mode 100644 src/views/inventory/sickerUdiTraceOrder.vue diff --git a/public/打包设置.txt b/public/打包设置.txt index 9a7db7f..c423ae8 100644 --- a/public/打包设置.txt +++ b/public/打包设置.txt @@ -14,6 +14,25 @@ "hosp_name": "福建省XX市医院" +都教授： + + "BASE_URL": "http://192.168.0.66:8502/SPMS_SERVER", + "SERVER_IP": "http://192.168.0.66:8502/SPMS_SERVER", + "hosp_name": "福建省XX市医院" + + +彭怀毅： + + "BASE_URL": "http://192.168.0.66:8503/SPMS_SERVER", + "SERVER_IP": "http://192.168.0.66:8503/SPMS_SERVER", + "hosp_name": "福建省XX市医院" + +林纪裕： + + "BASE_URL": "http://192.168.0.66:8504/SPMS_SERVER", + "SERVER_IP": "http://192.168.0.66:8504/SPMS_SERVER", + "hosp_name": "福建省XX市医院" + "BASE_URL": "http://192.168.0.109:9906", "SERVER_IP": "http://192.168.0.109:9906", "hosp_name": "福建省XX市医院" diff --git a/src/api/inventory/invCodeTrace.js b/src/api/inventory/invCodeTrace.js index a74e15e..4ac1d21 100644 --- a/src/api/inventory/invCodeTrace.js +++ b/src/api/inventory/invCodeTrace.js @@ -17,3 +17,6 @@ export function filterOrderTrace(query) { }); } + + + diff --git a/src/api/inventory/invSickTrace.js b/src/api/inventory/invSickTrace.js new file mode 100644 index 0000000..a8390a4 --- /dev/null +++ b/src/api/inventory/invSickTrace.js @@ -0,0 +1,9 @@ +import axios from "@/utils/axios"; + +export function filterSickTrace(query) { + return axios({ + url: "/spms/inv/sick/order/trace", + method: "get", + params: query + }); +} diff --git a/src/router/index.js b/src/router/index.js index 6fc63a1..86919ce 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -70,7 +70,7 @@ import invWarehouse from "../views/basic/invWarehouse" import udiInfoExport from "../views/basic/UdiinfoExport.vue"; import UdiInfoManage from "../views/basic/UdiInfoManage.vue"; import UdiInfoManageSp from "../views/basic/UdiInfoManageSp.vue" - +import diSearch from "../views/basic/UdiInfoSearch.vue" import UdiInfoImport from "../views/basic/UdiInfoImport.vue"; import corpImport from "../views/basic/CorpImport.vue"; import corpExport from "../views/basic/CorpExport.vue"; @@ -106,6 +106,7 @@ import supInvPreProducts from "../views/inventory/supInvPreProducts" import supInvPreInProducts from "../views/inventory/supInvPreInProducts" import invUdiTrace from "@/views/inventory/invUdiTrace"; import invUdiTraceOrder from "@/views/inventory/invUdiTraceOrder"; +import sickerUdiTraceOrder from "@/views/inventory/sickerUdiTraceOrder"; import additionalOrder from "@/views/warehouse/AdditionalOrder"; import invStatistics from "@/views/inventory/InvStatistics"; import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse"; @@ -521,6 +522,16 @@ export const asyncRouterMap = [ authRule: ["product/UdiInfoManageSp"] } }, + { + path: "diSearch", + name: "DI信息查询", + component: diSearch, + meta: { + authRule: ["product/diSearch"] + } + }, + + { path: "thrProductsCheck", name: "新增院内产品审核", @@ -790,6 +801,15 @@ export const asyncRouterMap = [ authRule: ["inv/udiTrace"] } }, + { + path: "sickerTrace", + component: sickerUdiTraceOrder, + name: "患者使用溯源", + icon: "", + meta: { + authRule: ["inv/sickerUdiTraceOrder"] + } + }, ] }, { @@ -1178,22 +1198,36 @@ export const asyncRouterMap = [ authRule: ["basic/basicCompanyProduct"] } }, + { - path: "thrProductsSubmit", - name: "新增院内产品", - component: thrProductsSubmit, - meta: { - authRule: ["product/thrProductsSubmit"] - } - }, - { - path: "diProductsSubmit", - name: "新增DI产品", - component: thrProductsAddDi, + path: "/spDistribution", + redirect: "/spDistribution/spDistributionDi", + name: "新增配送产品", + component: Empty, meta: { - authRule: ["product/thrProductsSubmit"] - } + authRule: ["spDistribution/local"] + }, + children: [ + { + path: "spDistributionDi", + name: "新增配送产品", + component: thrProductsAddDi, + meta: { + authRule: ["product/thrProductsSubmit"] + } + }, + { + path: "spDistributionThr", + name: "维护第三方产品", + component: thrProductsSubmit, + meta: { + authRule: ["product/thrProductsAddDi"] + } + }, + ] }, + + { path: "/spInv", redirect: "/spInv/spInvProducts", diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 7a5a065..f15e131 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -176,7 +176,7 @@ export default { inputQuery: { action: "", name: "", - enable: true, + enable: null, remark: "", mainAction: "", thirdSysFk: "", @@ -282,8 +282,17 @@ export default { onAddSubmit() { + if (this.$isBlank(this.inputQuery.name)) { + this.$message.error("单据类型名称不能为空！"); + return; + } + + if (this.$isBlank(this.inputQuery.corpType)) { + this.$message.error("往来信息类型不能为空！"); + return; + } if (this.inputQuery.enable && this.inputQuery.localAction == "") { - this.$message.error("本地单据不能为空！"); + this.$message.error("本地单据类型不能为空！"); return; } if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { @@ -309,7 +318,7 @@ export default { onModifySubmit() { if (this.inputQuery.enable && this.inputQuery.localAction == "") { - this.$message.error("本地单据不能为空！"); + this.$message.error("本地单据类型不能为空！"); return; } if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { @@ -334,7 +343,7 @@ export default { }, handleAddClick() { - this.inputQuery = {enable: true, expireTip: true}; + this.inputQuery = {enable: false, expireTip: true}; this.addDialogVisible = true; }, diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index 6d44cd8..6b815e9 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -27,7 +27,7 @@ - + + + + + diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue index 545ad75..f18eea8 100644 --- a/src/views/basic/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/UdiInfoSelectLocalUdi.vue @@ -72,6 +72,11 @@ + 查询 + 查询 选入 @@ -362,9 +363,9 @@ export default { manufactory: null, thirdSys: null, supName: null, + measname: null, page: 1, limit: 10, - }, combineLoading: false, combineQuery: { @@ -377,6 +378,9 @@ export default { query: null, isRlInv: null, manufactory: null, + measname: null, + ybbm: null, + sptm: null, }, udidlList: [], @@ -392,6 +396,26 @@ export default { }; }, methods: { + + onReset() { + this.$router.push({ + path: "", + }); + this.erpQuery = { + code: null, + name: null, + spec: null, + registerNo: null, + manufactory: null, + thirdSys: null, + supName: null, + measname: null, + page: 1, + limit: 10, + }; + this.getList(); + }, + tableRowClassName({row}) { if (row.checked) return "warning-row"; return ""; @@ -494,10 +518,13 @@ export default { } this.combineQuery.thirdIds.push(row.code); this.combineQuery.manufactory = row.manufactory; + this.combineQuery.measname = row.measname; + }); if (this.currentRow != null) { this.combineQuery.manufactory = this.currentRow.manufactory; + this.combineQuery.measname = this.currentRow.measname; // this.erpQuery.manufactory = this.currentRow.manufactory; } @@ -558,7 +585,11 @@ export default { this.combineQuery.thirdId = this.currentRow.code; this.combineQuery.erpName = this.currentRow.name; this.combineQuery.manufactory = this.currentRow.manufactory; + this.combineQuery.measname = this.currentRow.measname; + this.combineQuery.ybbm = this.currentRow.ybbm; + this.combineQuery.sptm = this.currentRow.sptm; this.erpQuery.manufactory = this.currentRow.manufactory; + this.erpQuery.measname = this.currentRow.measname; this.combineQuery.price = this.currentRow.price; if (this.currentRow.checked) { diff --git a/src/views/basic/basicUnitRelevance.vue b/src/views/basic/basicUnitRelevance.vue index b753792..e1e02ff 100644 --- a/src/views/basic/basicUnitRelevance.vue +++ b/src/views/basic/basicUnitRelevance.vue @@ -1,10 +1,6 @@ - - - - - - - - - - - 查询 - - - - - - - - - - - - - - - - - - - {{ errorDetail }} - - 关 闭 - - @@ -317,12 +239,6 @@ import {filterOrderTrace} from "@/api/inventory/invCodeTrace"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import A from "@/plugin/KeyScaner"; -const formJson = { - site_id: "", - site_name: "", - describe: "", - ads: [], -}; export default { name: "invUdiTraceOrder", props: { @@ -330,12 +246,20 @@ export default { type: Boolean, default: false, }, + diloadTrue: { + type: Boolean, + default: false, + }, + udiCode: { + type: Object, + required: true, + }, }, data() { return { - query: { - code: null, + filterQuery: { + code: "", batchNo: null, productIdFk: null, customerId: null, @@ -343,6 +267,7 @@ export default { limit: 20, supId: null, }, + searchVisible: true, sitcomScan: false, checkStatus: { 1: "校验异常", @@ -351,9 +276,6 @@ export default { }, fromOptions: [], erpCheckStatus: { - // error: "校验异常", - // null: "未校验", - // success: "正常", 1: "校验异常", 0: "未校验", 2: "校验成功", @@ -367,28 +289,12 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10":"手动补单" + "10": "手动补单" }, //往来单位 - unitquery: {key: "", page: 1, limit: 20}, - unitlist: [], list: [], detailList: [], - unitUpdateQuery: { - id: "", - fromCorpId: "", - fromCorp: "", - }, - actDateRange: [], - filterQuery: { - code: null, - batchNo: null, - productIdFk: null, - customerId: null, - page: 1, - limit: 20, - supId: null, - }, + detailQuery: { orderId: "", }, @@ -400,11 +306,9 @@ export default { }, curIndex: "", adListNoDataText: "无数据", - queryAdIdAsyncLoading: false, codeDetailVisible: false, - successOrderExportPDFSettingVisible: false, total: 0, - loading: true, + loading: false, index: null, formName: null, orderId: "", @@ -412,10 +316,6 @@ export default { add: "新增", edit: "编辑", }, - exportQuery: { - orderId: "", - exportStatus: "", - }, uploadQuery: { orderId: "", @@ -425,48 +325,14 @@ export default { dialogTableVisible: false, formLoading: false, formVisible: false, - formData: formJson, deleteLoading: false, addDialogVisible: false, errDialogVisible: false, - pickerOptions: { - shortcuts: [ - { - text: "最近一周", - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); - picker.$emit("pick", [start, end]); - }, - }, - { - text: "最近一个月", - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); - picker.$emit("pick", [start, end]); - }, - }, - { - text: "最近三个月", - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); - picker.$emit("pick", [start, end]); - }, - }, - ], - }, }; }, components: { draggable, codeDetail, - successOrderExportPDFSetting, - selectErpOrder, }, methods: { onReset() { @@ -482,7 +348,6 @@ export default { limit: 20, supId: null, }; - this.actDateRange = []; this.getList(); }, @@ -505,11 +370,6 @@ export default { this.multipleSelection = val; }, - handleErrorDetail(poistion) { - var mOrder = this.list[poistion]; - this.errorDetail = mOrder.remark; - this.errDialogVisible = true; - }, findMethod(query) { this.fromOptions = []; let cQuery = { @@ -524,56 +384,6 @@ export default { this.loading = false; }); }, - mergesOrders() { - var repeatData = this.multipleSelection; - if (repeatData.length <= 1) { - this.$message.warning("选择的订单需大于1"); - return; - } - var orderid = repeatData[0].id; - var unit = repeatData[0].fromCorp; - var action = repeatData[0].action; - var orderList = []; - repeatData.forEach((obj, index) => { - if (unit !== obj.fromCorp) { - this.$message.warning("往来单位不一致！"); - return; - } - if (action !== obj.action) { - this.$message.warning("业务类型不一致！"); - return; - } - orderList.push(obj.id); - }); - var tquery = { - orderList: orderList, - }; - - this.$confirm( - "所选择的订单将会合并到订单号为" + orderid + "的订单下", - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) - .then(() => { - mergeOrder(tquery).then((response) => { - if (response.code === 20000) { - this.getList(); - this.$message({ - type: "success", - message: "合并成功", - }); - } else { - this.$message.error(response.message); - } - }); - }) - .catch(() => { - }); - }, //获取订单列表 getList() { this.loading = true; @@ -613,31 +423,6 @@ export default { }; this.refresgOrderDetail(); }, - repeatCheckClick(row) { - let tQuery = { - orderId: row.id, - }; - this.loading = true; - repeatCheck(tQuery) - .then((response) => { - this.loading = false; - if (response.code === 20000) { - this.$message.success(response.data); - this.getList(); - this.detailQuery = { - orderId: row.id, - }; - this.refresgOrderDetail(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - this.loading = false; - this.getList(); - this.$message.error(response.message); - }); - }, refresgOrderDetail() { orderDetail(this.detailQuery) .then((response) => { @@ -650,21 +435,6 @@ export default { }); }, - handleUnitClick(row) { - this.curIndex = row.id; - // this.dialogTableVisible = true; - }, - getUnitList() { - this.loading = true; - unitListBykey(this.unitquery) - .then((response) => { - this.loading = false; - this.unitlist = response.data.list || []; - }) - .catch(() => { - this.loading = false; - }); - }, intentDetail(row) { // this.$router.push({ // path: "../inout/detail", @@ -674,60 +444,11 @@ export default { this.codeDetailVisible = true; this.idQuery.id = row.id; }, - successOrderExportPDFSetting(row) { - this.idQuery.id = ''; - if (this.$isNotBlank(row.id)) { - this.idQuery.id = row.id; - } - this.successOrderExportPDFSettingVisible = true; - }, - successOrderExportPDF(row) { - let tQuery = { - orderId: row.id, - customerId: store.getters.customerId - } - this.loading = true; - inspectionOrderDetailPDFFromTemplateFile(tQuery).then((response) => { - if (response.code === 20000) { - orderDetailPDFFromTemplateFile(tQuery).then((response) => { - //将pdf文件转换为url。 - const binaryData = []; - binaryData.push(response); - //获取blob链接。 - let url = window.URL.createObjectURL( - new Blob(binaryData, {type: "application/pdf"}) - ); - this.loading = false; - window.open(url);//打开新标签页，预览pdf。 - }).catch(() => { - this.loading = false; - }); - } else { - this.loading = false; - this.$message.error(response.message); - } - }).catch(() => { - this.loading = false; - }); - }, closeDialog() { this.successOrderExportPDFSettingVisible = false; this.getList(); }, - selectUnit(row) { - this.unitUpdateQuery.id = this.curIndex; - this.unitUpdateQuery.fromCorp = row.name; - this.unitUpdateQuery.fromCorpId = row.unitid; - updateUnit(this.unitUpdateQuery) - .then((response) => { - this.dialogTableVisible = false; - this.getList(); - }) - .catch(() => { - this.dialogTableVisible = false; - }); - }, deleteOrders(data) { this.loading = true; this.deleteData.id = data; @@ -751,140 +472,6 @@ export default { } }, - exportDialog(value) { - var mOrder = value; - if (mOrder.exportStatus === "已上传") { - this.$confirm("该订单已修改, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === 0) { - this.$confirm("该订单校验异常, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === null) { - this.$confirm("该订单未校验, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else { - this.$confirm("是否确定修改ERP订单?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } - }, - - exportXml(poistion) { - this.loading = true; - var mOrder = this.list[poistion]; - var corpOrderId = mOrder.id; - var codeArry; - this.query = { - corpOrderId: corpOrderId, - page: 1, - limit: 20, - }; - findAllByOrderId(this.query) //查找该单号下的所有条码 - .then((response) => { - this.loading = false; - codeArry = response.data.list || []; - var document = - '\n' + - '\n' + - "\n" + - '' + - "\n" + - '\n' + - "Code\n" + - "CorpOrderID\n" + - "Actor\n" + - "ActDate\n" + - "ToCorpID\n" + - "\n" + - " \n" + - "\n" + - '\n' + - '\n' + - '\n' + - '\n' + - '\n' + - "\n" + - "\n"; - for (var value of codeArry) { - if (value.fromCorpId === null) { - value.fromCorpId = ""; - } - var tempdata = - ' \n'; - - document = document + tempdata; - } - document = - document + - "\n" + - "\n" + - "\n" + - "\n"; - - var blob = new Blob([document], { - type: "text/plain;charset=utf-8", - }); - saveAs(blob, mOrder.action + mOrder.corpOrderId + ".xml"); - - this.exportQuery.orderId = corpOrderId; - this.exportQuery.exportStatus = "已上传"; - updateExportStatus(this.exportQuery).then((response) => { - this.getList(); - }); - }) - .catch(() => { - this.loading = false; - this.list = []; - this.total = 0; - }); - }, uploadOrderDialog(value) { this.uploadQuery = { @@ -975,7 +562,7 @@ export default { window.sc = new A.KeyScaner(inputer); sc.onInput = function (text) { if (text.includes("delete")) { - that.formData.code = ""; + that.filterQuery.code = ""; return; } if (that.sitcomScan) { @@ -989,16 +576,17 @@ export default { }, created() { + if (this.$isNotBlank(this.udiCode)) { + + if (!this.diloadTrue) { + this.searchVisible = false; + } + console.log(this.diloadTrue + "----" + this.searchVisible); + + this.filterQuery.code = this.udiCode; + this.getList(); + } this.getBusType(); - let query = this.$route.query; - this.query = Object.assign(this.query, query); - this.query.limit = parseInt(this.query.limit); - // 加载表格数据 - this.getList(); - let end = new Date(); - let start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); - this.actDateRange = [start, end]; }, }; diff --git a/src/views/inventory/sickerUdiTraceOrder.vue b/src/views/inventory/sickerUdiTraceOrder.vue new file mode 100644 index 0000000..3d25ac2 --- /dev/null +++ b/src/views/inventory/sickerUdiTraceOrder.vue @@ -0,0 +1,520 @@ + + + + + + diff --git a/src/views/thrsys/ThrAddDiProductSelectUdi.vue b/src/views/thrsys/ThrAddDiProductSelectUdi.vue index a44d002..6269153 100644 --- a/src/views/thrsys/ThrAddDiProductSelectUdi.vue +++ b/src/views/thrsys/ThrAddDiProductSelectUdi.vue @@ -77,16 +77,15 @@ >查询 + 国家同步库查询 + 选入 - 国家同步库查询 - - @@ -99,6 +98,7 @@ highlight-current-row="true" :row-class-name="tableRowClassName" @current-change="handleErpChange" + ref="diList" @selection-change="handleSelectionUdiChange" > @@ -160,6 +160,150 @@ + + + + + +

产品信息补齐：

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 商品条码:  +
+ +
+ + +
+
+ 医保编码:  +
+ +
+ + + + + +
+
+ 计量单位:  +
+ +
+ + +
+
+ 生产厂家:  +
+ +
+ + + + + + +
+
+ 商品名称:  +
+ +
+ + + +
+
+ 产品描述:  +
+ +
+ + + + + + { - uuids.push(item.uuid); - }); + uuids.push(this.curSelectDi.uuid); + // selectData.forEach(item => { + // uuids.push(item.uuid); + // }); let params = { uuids: uuids, customerId: store.getters.customerId @@ -378,6 +530,8 @@ export default { if (res.code === 20000) { this.$message.success("添加成功"); this.$emit("closeUdi", true); + } else { + this.$message.error(res.message); } }).catch((error) => { }); @@ -406,8 +560,14 @@ export default { }); }, - handleSelectionUdiChange(val) { - this.multipleUdiSelection = val; + handleSelectionUdiChange(selection) { + this.curSelectDi = selection[0]; + if (selection.length > 1) { + this.$refs.diList.clearSelection(); + this.$refs.diList.toggleRowSelection(selection.pop()); + } + this.multipleUdiSelection = selection; + }, findMethod(query) { let cQuery = { @@ -425,6 +585,30 @@ export default { this.fromOptions = []; }); }, + getBasicThirdSys() { + let query = { + enabled: true, + mainSys: true + }; + getBasicThirdSys(query) + .then((response) => { + if (response.code == 20000) { + this.thirdSys = response.data.list || []; + if (this.thirdSys.length > 0) { + this.editQuery.thirdSysFk = this.thirdSys[0].thirdId; + } + } + + }) + .catch(() => { + this.loading = false; + this.list = []; + }); + }, + + }, + created() { + this.getBasicThirdSys(); }, components: { selectDiDetail, diff --git a/src/views/thrsys/ThrDiProductsCheck.vue b/src/views/thrsys/ThrDiProductsCheck.vue index a1c1540..5b716ef 100644 --- a/src/views/thrsys/ThrDiProductsCheck.vue +++ b/src/views/thrsys/ThrDiProductsCheck.vue @@ -278,7 +278,6 @@ export default { this.companyNames = []; let cQuery = { key: query, - customerName: query }; filterCustomers(cQuery).then((res) => { this.companyNames = res.data.list || []; diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue index 11f6390..9692b76 100644 --- a/src/views/thrsys/ThrInvWarehouse.vue +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -34,7 +34,8 @@ 查询 添加仓库 + > + 添加仓库 diff --git a/src/views/thrsys/ThrProductsAdd.vue b/src/views/thrsys/ThrProductsAdd.vue index 4175165..ddc5e19 100644 --- a/src/views/thrsys/ThrProductsAdd.vue +++ b/src/views/thrsys/ThrProductsAdd.vue @@ -12,7 +12,7 @@ - - -
-
- 进口产品代理商:  -
- -
- - + + + + + + + + + + + + + + + @@ -321,9 +321,9 @@ export default { ybbm: null, tyshxydm: null, qxlb: null, - cplx:null, + cplx: null, cpms: null, - thirdSys: null, + thirdSysFk: null, cpdls: null }, thirdSys: [], @@ -333,7 +333,7 @@ export default { methods: { saveNewProduct() { this.addProductVisible = false; - if (this.$isBlank(this.newProductData.thirdSys)) { + if (this.$isBlank(this.newProductData.thirdSysFk)) { this.$message.warning("第三方系统不能为空！"); return; } @@ -371,6 +371,8 @@ export default { //清空弹窗数据 this.$emit("closeAddDialog", true); this.closeAddDialog(); + } else { + this.$message.error(res.message); } }).catch((error) => { this.$message.error(error.message); @@ -381,6 +383,8 @@ export default { this.$message.success("添加成功"); //清空弹窗数据 this.closeAddDialog(true); + } else { + this.$message.error(res.message); } }).catch((error) => { this.$message.error(error.message); diff --git a/src/views/thrsys/ThrProductsAddDi.vue b/src/views/thrsys/ThrProductsAddDi.vue index b009dff..5e8bf5a 100644 --- a/src/views/thrsys/ThrProductsAddDi.vue +++ b/src/views/thrsys/ThrProductsAddDi.vue @@ -5,7 +5,7 @@ @@ -110,7 +110,7 @@ - 审核意见： + 审核意见： + @@ -200,7 +201,7 @@ export default { manufactory: null, thirdSys: "", companyName: null, - supId:null, + supId: null, page: 1, limit: 20, }, @@ -387,7 +388,7 @@ export default { this.checkVisible = false; this.$message.success("操作成功"); } else { - this.$message.error(error.message); + this.$message.error(res.message); } }).catch((error) => { this.$message.error(error.message); @@ -409,7 +410,6 @@ export default { this.companyNames = []; let cQuery = { key: query, - customerName: query }; filterCustomers(cQuery).then((res) => { this.companyNames = res.data.list || []; diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index d0cb0a2..5f4f900 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -1,229 +1,229 @@ diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue index eda2e4e..5f1a45c 100644 --- a/src/views/userManage/admin/authRole.vue +++ b/src/views/userManage/admin/authRole.vue @@ -322,6 +322,7 @@ export default { this.getList(); }, onSubmit() { + this.query.page = 1; this.getList(); }, handleCurrentChange(val) { @@ -464,6 +465,13 @@ export default { } }, formSubmit() { + + + if (this.$isBlank(this.formData.name)) { + this.$message.error("请输入角色名称！"); + return; + } + this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true; diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue index 57ccbbc..4d6cb60 100644 --- a/src/views/userManage/customerManage.vue +++ b/src/views/userManage/customerManage.vue @@ -84,8 +84,8 @@ - - + +