From 516d017bd02024c9870c195255a3b308f4233817 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 3 Mar 2022 17:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SPMS_CLIENT/index.html | 4 +- src/views/basic/BussinessType.vue | 2 + src/views/basic/BussinessTypeLoclModify.vue | 2 +- src/views/basic/BussinessTypeModify.vue | 42 +- src/views/userManage/admin/authRole.vue | 1 - src/views/warehouse/IONewOrder.vue | 33 +- src/views/warehouse/addHosOrder.vue | 604 +++++ src/views/warehouse/addOrder.vue | 27 +- src/views/warehouse/stockHospOrderNew.vue | 132 +- .../warehouse/stockOrderNewDistribution.vue | 2231 +++++++++-------- 10 files changed, 1918 insertions(+), 1160 deletions(-) create mode 100644 src/views/warehouse/addHosOrder.vue diff --git a/SPMS_CLIENT/index.html b/SPMS_CLIENT/index.html index f3a9cdc..0f4bd39 100644 --- a/SPMS_CLIENT/index.html +++ b/SPMS_CLIENT/index.html @@ -1,6 +1,6 @@ -医院UDI自助管理平台
\ No newline at end of file + }); \ No newline at end of file diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 26084ac..51a5fc3 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -186,6 +186,7 @@ export default { secCheckWebNew: null, secCheckChange: null, corpType: null, + storageCode: null, }, enableMap: { true: "是", @@ -302,6 +303,7 @@ export default { secCheckWebNew: row.secCheckWebNew, secCheckChange: row.secCheckChange, corpType: row.corpType + "", + storageCode:row.storageCode, }; this.modifyDialogVisible = true; }, diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index 59a952e..3c333ab 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -261,7 +261,7 @@ export default { this.changeList = response.data || []; this.visibleChange = true; } else { - this.$message.error(response.message); + // this.$message.error(response.message); this.visibleChange = false; } diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 0d924a9..24d325b 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -100,6 +100,25 @@ + +
+
+ 默认仓库:  +
+ + + {{ item.name }} + + +
+ + + +
@@ -122,7 +141,7 @@
启用单据类型 - 允许手动输入信息 +
@@ -267,6 +286,7 @@ import { import { getLocalBusType, } from "../../api/basic/busLocalType"; +import {filterAll} from "@/api/basic/invWarehouse"; export default { name: "inputQuery", @@ -283,15 +303,20 @@ export default { enabled: true, isBuType: true, }, + storageList: [], thirdSys: [], localTypes: [], options: [{ value: '0', - label: '往来单位信息' + label: '供应商信息' }, { value: '1', label: '仓库信息' - }], + }, + { + value: '2', + label: '客户信息' + }], } }, @@ -314,10 +339,21 @@ export default { this.localTypes = []; }); }, + getStorage() { + this.storageList = []; + filterAll() + .then((response) => { + this.storageList = response.data || []; + // this.formData.locStorageCode = this.storageList[0]; + }) + .catch(() => { + }); + }, }, created() { this.getList(); + this.getStorage(); }, }; diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue index 0e1ab7f..f4edd5a 100644 --- a/src/views/userManage/admin/authRole.vue +++ b/src/views/userManage/admin/authRole.vue @@ -74,7 +74,6 @@ type="text" size="small" @click.native="handleDel(scope.$index, scope.row)" - :disabled="scope.row.id === 16" :loading="deleteLoading" >删除 + + + + +
+ + + + + + + + + + + 提交订单 + + + + + +
+ 入库单号： +
+ + + + + + + +
+ 日期： +
+ + + + + + + + + + + +
+ 往来信息： +
+ + + + + + {{ item.name }} + + + + + + + {{ item.name }} + {{ item.code }} + + + + + + + + +
+ 单据类型： +
+ + + + + + {{ item.name }} + + + + + + + + + +
+ 当前仓库： +
+ + + + + + + + + + {{ item.name }} + + + + + + + + +
+ 条码： +
+ + + + + + + + 添加 + + + +
已扫码条码：{{ total }} +
+ + + + + + + + + + + + + + +
+ + +
+ +
+ + + + + + + diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 102a750..22f959f 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -71,7 +71,7 @@ - + { this.busTypes = response.data.list || []; this.getStorage(this.formData.billType); @@ -434,12 +435,12 @@ export default { this.$router.go(-1); }, getStorage(event) { - let query = { - advanceType: this.getActionName(event), - }; + // let query = { + // advanceType: this.getActionName(event), + // }; this.storageList = []; // this.formData.locStorageCode = null; - filterAll(query) + filterAll() .then((response) => { this.storageList = response.data || []; }) @@ -453,7 +454,17 @@ export default { } } }, - + getActionItem(action) { + for (let i = 0; i < this.busTypes.length; i++) { + if (this.busTypes[i].action === action) { + return this.busTypes[i]; + } + } + }, + actionChange(item) { + this.curAction = this.getActionItem(item); + this.formData.locStorageCode = this.curAction.storageCode; + }, }, filters: {}, mounted() { @@ -469,7 +480,7 @@ export default { this.formData.fromCorp = store.getters.companyName;// store.getters.customerId === 110 ? '医院' : store.getters.companyName; this.formData.customerId = store.getters.customerId; this.getBusType(); - + this.getStorage(); if (this.$isNotBlank(this.idQuery.id)) { this.formData.actDate = new Date(this.idQuery.actDate); this.formData.corpOrderId = this.idQuery.corpOrderId; diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index da45a00..56d664e 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -65,24 +65,22 @@
- 供应商： + 往来信息：
- - + + + + + {{ item.name }} + {{ + item.code + }} + + + + + +
@@ -105,13 +134,13 @@ - + - {{ item.name }} + :key="item.localAction" + :label="item.localName" + :value="item.localAction"> + {{ item.localName }} @@ -438,7 +467,7 @@ import store from "../../store"; import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct"; import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain"; import {getBussinessType} from "../../api/basic/bussinessType"; -import {getLocalBusType} from "../../api/basic/busLocalType"; +import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {filterAll} from "@/api/basic/invWarehouse"; export default { @@ -476,12 +505,16 @@ export default { billType: [ {required: true, message: "请选择业务类型", trigger: "blur"} ], + locStorageCode: [ + {required: true, message: "请选择当前仓库", trigger: "blur"} + ], // type: [ // {required: true, message: "请选择采购类型", trigger: "blur"} // ], }, codeArray: [], fromOptions: [], + fromStorageOptions: [], total: 0, loading: false, index: null, @@ -503,6 +536,10 @@ export default { 1: "预入库", 2: "普通采购", }, + curAction: { + corpType: 0, + genUnit: false, + }, orderEditor: true, iCount: 0, sOptions: [], @@ -536,17 +573,22 @@ export default { this.$message.warning('未添加产品'); return; } - for (let i = 0; i < this.codeArray.length; i++) { - if (this.$isBlank(this.codeArray[i].batchNo)) { - return this.$message.error('批次号不能为空'); - } - if (this.$isBlank(this.codeArray[i].productDate)) { - return this.$message.error('生产日期不能为空'); - } - if (this.$isBlank(this.codeArray[i].expireDate)) { - return this.$message.error('失效日期不能为空'); + + if (status === '3') { + for (let i = 0; i < this.codeArray.length; i++) { + if (this.$isBlank(this.codeArray[i].batchNo)) { + return this.$message.error('批次号不能为空'); + } + if (this.$isBlank(this.codeArray[i].productDate)) { + return this.$message.error('生产日期不能为空'); + } + if (this.$isBlank(this.codeArray[i].expireDate)) { + return this.$message.error('失效日期不能为空'); + } } } + + if (status === '501') { this.submitFunction(status); } else { @@ -576,14 +618,20 @@ export default { } }); }, + storageChange(row) { + console.log(row); + this.formData.fromCorpId = row.code; + this.formData.fromCorp = row.name; + }, getStorage(event) { - let query = { - advanceType: this.getActionName(event), - }; + // let query = { + // advanceType: this.getActionName(event), + // }; this.storageList = []; - filterAll(query) + filterAll() .then((response) => { this.storageList = response.data || []; + // this.formData.locStorageCode = this.storageList[0]; }) .catch(() => { }); @@ -596,6 +644,19 @@ export default { } } }, + findStorageMethod(query) { + console.log(query); + this.fromStorageOptions = []; + let cQuery = { + key: query, + }; + filterAll(cQuery) + .then((response) => { + this.fromStorageOptions = response.data || []; + }) + .catch(() => { + }); + }, submitFunction(status) { let tMessage = status === '501' ? '保存' : '提交'; this.loading = true; @@ -1118,10 +1179,10 @@ export default { let query = { enabled: true, }; - getLocalBusType(query) + getLocalJoinBusType(query) .then((response) => { this.busTypes = response.data.list || []; - this.getStorage(this.formData.billType); + // this.getStorage(this.formData.billType); }) .catch(() => { }); @@ -1149,6 +1210,18 @@ export default { this.loading = false; }); }, + getActionItem(action) { + for (let i = 0; i < this.busTypes.length; i++) { + if (this.busTypes[i].localAction === action) { + return this.busTypes[i]; + } + } + }, + actionChange(item) { + this.curAction = this.getActionItem(item); + this.formData.locStorageCode = this.curAction.storageCode; + console.log(this.curAction.corpType + "---" + this.curAction.genUnit + "-----" + this.curAction.action) + }, }, filters: {}, mounted() { @@ -1159,6 +1232,7 @@ export default { }, created() { this.getBusType(); + this.getStorage(); this.formData = {}; this.codeArray = []; this.closeConfirmFunction(false); diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index dcfae87..af4366d 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -1,462 +1,462 @@