diff --git a/SPMS_CLIENT/config.js b/SPMS_CLIENT/config.js index 1dfbca8..10e1fe1 100644 --- a/SPMS_CLIENT/config.js +++ b/SPMS_CLIENT/config.js @@ -5,8 +5,8 @@ window.global_config = { "BASE_URL": "http://139.159.187.130:8080", /** - "BASE_URL":"http://139.159.187.130/SPMS_SERVER", - "SERVER_IP": "http://139.159.187.130/" + "BASE_URL":"http://192.168.192.201/SPMS_SERVER", + "SERVER_IP": "http://192.168.192.201/SPMS_SERVER" "BASE_URL":"http://192.168.0.109:9996", diff --git a/SPMS_CLIENT/index.html b/SPMS_CLIENT/index.html index 0f4bd39..2e17ede 100644 --- a/SPMS_CLIENT/index.html +++ b/SPMS_CLIENT/index.html @@ -1,6 +1,6 @@ -医院UDI自助管理平台
\ No newline at end of file + }); diff --git a/public/config.js b/public/config.js index 1dfbca8..10e1fe1 100644 --- a/public/config.js +++ b/public/config.js @@ -5,8 +5,8 @@ window.global_config = { "BASE_URL": "http://139.159.187.130:8080", /** - "BASE_URL":"http://139.159.187.130/SPMS_SERVER", - "SERVER_IP": "http://139.159.187.130/" + "BASE_URL":"http://192.168.192.201/SPMS_SERVER", + "SERVER_IP": "http://192.168.192.201/SPMS_SERVER" "BASE_URL":"http://192.168.0.109:9996", diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 6bf3bcd..c705736 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -60,7 +60,7 @@ {{ enableMap[scope.row.secCheckEnable] }} - + diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index 1994432..f5b8671 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -123,7 +123,7 @@ + + diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue index d38ee0a..7cc5c29 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -427,9 +427,9 @@ export default { // error: "校验异常", // null: "未校验", // success: "正常", - 1: "校验异常", - 0: "未校验", - 2: "校验成功", + 1: "等待校验", + 0: "等待校验", + 2: "等待校验", }, //往来单位 unitquery: {key: "", page: 1, limit: 20}, diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index aaa2110..572f9cf 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -318,6 +318,8 @@ export default { orderId: this.idQuery.id, locStorageCode: this.formData.locStorageCode, action: this.formData.action, + fromCorp: this.formData.fromCorp, + fromCorpId: this.formData.fromCorpId, } submitOrderWeb(tQuery) .then((response) => { diff --git a/src/views/warehouse/stockDeliveryAdd.vue b/src/views/warehouse/stockDeliveryAdd.vue index 1bb6777..cce40de 100644 --- a/src/views/warehouse/stockDeliveryAdd.vue +++ b/src/views/warehouse/stockDeliveryAdd.vue @@ -78,16 +78,16 @@ - -
- 采购类型： -
- - - - - - + + + + + + + + + + diff --git a/src/views/warehouse/stockDeliveryOrder.vue b/src/views/warehouse/stockDeliveryOrder.vue index 7b5f701..2b93a9b 100644 --- a/src/views/warehouse/stockDeliveryOrder.vue +++ b/src/views/warehouse/stockDeliveryOrder.vue @@ -50,11 +50,11 @@ {{ getActionName(scope.row.billType) }} - - - + + + + + - + - + @@ -336,16 +375,16 @@ oninput="value=value.replace(/[^\d]/g,'')"> - - - + + + + + + + + + + @@ -446,17 +500,12 @@ import { stockOrderDetail, submitStockOrder, - submitStockOrderError, - uploadStockOrderDetailCount, stockOrderGenerateBillNo, getStockOrderDetailInstrument, - deleteStockOrderById, insertStockOrderWeb, - stockOrderDetailTemp, deleteStockOrderDetailById, addStockOrderDetailFromCode, uploadStockOrderDetail, - copyStockOrderDetail, stockOrderDetailQueryProduct, getStockOrderDetailInstrumentById, stockOrderDetail2 } from "../../api/warehouse/stockOrder"; @@ -469,6 +518,7 @@ import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/bas import {getBussinessType} from "../../api/basic/bussinessType"; import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {filterAll} from "@/api/basic/invWarehouse"; +import dialogInvProduct from "../inventory/DialogInvProduct" export default { name: "idQuery", @@ -494,7 +544,7 @@ export default { page: 1, limit: 10, }, - formData: {}, + formData: {noInvOut: false,}, formRules: { corpName: [ {required: true, message: "请输入供应商", trigger: "blur"} @@ -550,6 +600,7 @@ export default { currentRow: {}, selectedIndex: "", selectProductVisible: false, + selectInvProductVisible: false, thisData: {}, storageList: [], }; @@ -557,6 +608,7 @@ export default { components: { draggable, stockOrderNewSelectProduct, + dialogInvProduct, }, methods: { saveOrder(status) { @@ -574,17 +626,47 @@ export default { return; } + for (let i = 0; i < this.codeArray.length; i++) { + if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) { + return this.$message.error('生产日期格式错误'); + } + if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) { + return this.$message.error('失效日期格式错误'); + } + + } + if (status === '3') { for (let i = 0; i < this.codeArray.length; i++) { + if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { + return this.$message.error('单据数量不能为0'); + } 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].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { + return this.$message.error('生产日期与失效日期不能全部为空'); } - if (this.$isBlank(this.codeArray[i].expireDate)) { - return this.$message.error('失效日期不能为空'); + // if (this.$isBlank(this.codeArray[i].expireDate)) { + // return this.$message.error('失效日期不能为空'); + // } + + + } + } + if (status === '2') { + for (let i = 0; i < this.codeArray.length; i++) { + if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { + return this.$message.error('单据数量不能为0'); } + + // if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) { + // return this.$message.error('生产日期格式错误'); + // } + // if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) { + // return this.$message.error('失效日期不能为空'); + // } + } } @@ -620,13 +702,10 @@ export default { }, storageChange(row) { console.log(row); - this.formData.fromCorpId = row.code; - this.formData.fromCorp = row.name; + this.formData.corpId = row.code; + this.formData.corpName = row.name; }, getStorage(event) { - // let query = { - // advanceType: this.getActionName(event), - // }; this.storageList = []; filterAll() .then((response) => { @@ -719,8 +798,15 @@ export default { if (event == null) { this.$refs.inputRef.focus(); - } else event.target.select(); + } else { + event.target.select(); + } if (this.$isBlank(event)) { + + if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) { + this.$message.error("往来信息和单据类型不能为空！") + return; + } this.code = ""; this.$refs.multipleTable.setCurrentRow(); this.currentRow = {}; @@ -733,7 +819,18 @@ export default { this.thisData.orderId = this.formData.id } this.thisData.stockOrderLists = this.codeArray; - this.selectProductVisible = true; + this.thisData.formData = this.formData; + + + let item = this.getActionItem(this.formData.billType); + console.log(item.mainAction + "----" + this.formData.noInvOut); + if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true)//内部单 + { + this.selectInvProductVisible = true; + } else { + this.selectProductVisible = true; + } + return; } this.code = this.code.trim(); @@ -830,6 +927,7 @@ export default { }, closeDialogC2(rData) { this.selectProductVisible = false; + this.selectInvProductVisible = false; this.thisData = {}; if (this.$isNotBlank(rData)) { @@ -1019,12 +1117,12 @@ export default { if (this.$isBlank(row.batchNo)) { return this.$message.error('批次号不能为空'); } - if (this.$isBlank(row.productDate)) { - return this.$message.error('生产日期不能为空'); - } - if (this.$isBlank(row.expireDate)) { - return this.$message.error('失效日期不能为空'); - } + // if (this.$isBlank(row.productDate)) { + // return this.$message.error('生产日期不能为空'); + // } + // if (this.$isBlank(row.expireDate)) { + // return this.$message.error('失效日期不能为空'); + // } this.$refs.multipleTable.setCurrentRow(); this.currentRow = {}; @@ -1182,7 +1280,6 @@ export default { getLocalJoinBusType(query) .then((response) => { this.busTypes = response.data.list || []; - // this.getStorage(this.formData.billType); }) .catch(() => { }); @@ -1220,7 +1317,9 @@ export default { actionChange(item) { this.curAction = this.getActionItem(item); this.formData.locStorageCode = this.curAction.storageCode; - console.log(this.curAction.corpType + "---" + this.curAction.genUnit + "-----" + this.curAction.action) + console.log(this.curAction.corpType + "---" + this.curAction.genUnit + "-----" + this.curAction.action); + // this.formData.corpName = ''; + // this.formData.corpId = ''; }, }, filters: {}, diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue index bc52079..c09b826 100644 --- a/src/views/warehouse/stockOrder.vue +++ b/src/views/warehouse/stockOrder.vue @@ -85,11 +85,17 @@ {{ getActionName(scope.row.billType) }} - + + + + + + + - + + + + + +