diff --git a/public/config.js b/public/config.js index 3ac1b91..c2a36c1 100644 --- a/public/config.js +++ b/public/config.js @@ -1,6 +1,6 @@ window.global_config = { - "BASE_URL": "http://139.159.187.130:8080/UDI_WMS_MC", - // "BASE_URL":"http://127.0.0.1:9991", + // "BASE_URL": "http://139.159.187.130:8080/UDI_WMS_MC", + "BASE_URL":"http://127.0.0.1:9991", /** * "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", diff --git a/public/config.json b/public/config.json index 4fa0fa2..b56bd83 100644 --- a/public/config.json +++ b/public/config.json @@ -1,7 +1,7 @@ { - "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9991/", - "BASE_URL": "http://192.168.0.109:9991", - "SERVER_IP": "http://192.168.0.109:9991", - "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", - "hosp_name": "平和县医院" + "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9991/", + "BASE_URL": "http://127.0.0.1:9991", + "SERVER_IP": "http://127.0.0.1:9991", + "WEBSOCKET_URL": "ws://127.0.0.1/UDI_WMS_MC/api/websocket/", + "hosp_name": "***医院" } diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index a96ba89..4c85732 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -256,7 +256,7 @@ 出库时必须校验预验收库存 - 是否允许无库存出库 + 是否允许无库存出库 采集UDI码时进行三期校验 @@ -579,6 +579,7 @@ export default { , //获取单据类型 getOrderType() { + this.orderTypeList = []; let query = { mainAction: this.inputQuery.mainAction, diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index 2ec9f3c..2b0369e 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -24,7 +24,7 @@ - + @@ -147,7 +147,6 @@ 完成验收 + >验收 @@ -458,6 +458,20 @@ :idQuery="idQuery" > + + + @@ -474,6 +488,7 @@ import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail"; import stockOrderEditDistribution from "./stockOrderEditDistribution"; import stockQRCodeExport from "./stockQRCodeExport"; import draggable from "vuedraggable"; +import acceptOrder from "@/views/inout/acceptOrder"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; @@ -554,8 +569,10 @@ export default { detailFormLoading: false, haveDistributionVisible: true, qrcodeDetailVisible: false, + acceptOrderVisible: false, qrcodeExportVisible: false, actDateRange: [], + acceptQuery: null, isReceAble: false, pickerOptions: { shortcuts: [ @@ -739,6 +756,12 @@ export default { this.detailList = []; }); }, + parentByFn: function (childValue) { + this.getList(); + }, + acceptOrderFn: function (childValue) { + this.getList(); + }, distributionForm(index, row) { this.idQuery.id = ''; if (this.$isNotBlank(row.id)) { @@ -916,6 +939,10 @@ export default { } } }, + closeAcceptDialog() { + this.acceptOrderVisible = false; + + }, getBusType() { let query = { code: this.query.invWarehouseCode, @@ -1016,18 +1043,20 @@ export default { let query = { stockOrderId: row.billNo, }; - updateStatus(query) - .then((response) => { - if (response.code == 20000) { - this.getList(); - this.$message.success("验收成功！"); - } else { - this.$message.error(response.message); - } + this.acceptQuery = row; + this.acceptOrderVisible = true; + // updateStatus(query) + // .then((response) => { + // if (response.code == 20000) { + // this.getList(); + // this.$message.success("验收成功！"); + // } else { + // this.$message.error(response.message); + // } - }) - .catch(() => { - }); + // }) + // .catch(() => { + // }); }, rollback(row) { this.$confirm('此操作将回退单据, 是否继续?', '提示', { @@ -1054,6 +1083,7 @@ export default { stockOrderEditDistribution, stockOrderQRCodeDetail, stockQRCodeExport, + acceptOrder, } , filters: { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 12f632c..4df565b 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -62,12 +62,8 @@
- - +
+
+

+ {{ hospitalName }} + + ({{ + curInv + }}) +

+
- {{ title }} + {{ title }} 切换仓库 修改密码 @@ -264,6 +271,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {updateInv} from "@/api/auth/authAdmin"; import * as types from "../../store/mutation-types"; +import axios from "axios"; export default { data() { @@ -294,6 +302,7 @@ export default { passwordLoading: false, passwordFormVisible: false, company: "", + curInv: "", passwordFormData: { oldPassword: "", newPassword: "", @@ -329,6 +338,7 @@ export default { userInfo: {}, storageList: [], subInvList: [], + hospitalName:"", selInvVisible: false, locInvName: "", locSubInvName: "", @@ -438,7 +448,7 @@ export default { userInfo() .then((response) => { if (response.code == 20000) { - + this.userInfo = response.data; this.locInvName = this.userInfo.locInvName; this.locSubInvName = this.userInfo.locSubInvName; @@ -450,7 +460,8 @@ export default { this.$store.commit(types.RECEIVE_LOCINVNAME, this.locInvName); this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locInvName); let username = this.$store.getters.employeeName; - this.title = username + "(" + this.locInvName + " " + this.locSubInvName + ")"; + this.curInv = "仓库:" + this.locInvName + "; 分库:" + this.locSubInvName + " "; + this.title = username + "（" + this.userInfo.userName + "）"; this.getStorage(); } } @@ -550,6 +561,11 @@ export default { this.findSubInvByInv(); this.getUserInfo(); socket.init(this) + axios.get("./config.json").then(res => { + + // 基础地址 + this.hospitalName = res.data.hosp_name; + }); }, watch: { $route() { diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index c796030..6e06b0c 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -200,7 +200,7 @@ - +
使用科室： @@ -651,6 +651,7 @@ export default { code: this.formData.code.trim(), } enterCodeWeb(tQuery).then((response) => { + if (response.code === 20000) { this.$refs.inputRef.focus(); this.$refs.inputRef.select(); @@ -926,6 +927,7 @@ export default { } getLocalJoinByUser(query) .then((response) => { + this.busTypes = response.data.list || []; if (this.formData.action != null) { this.curAction = this.getActionItem(this.formData.action); @@ -1215,6 +1217,7 @@ export default { } , created() { + this.formData.code = ''; this.formData.actDate = new Date(); this.codeArray = []; diff --git a/src/views/inout/acceptOrder.vue b/src/views/inout/acceptOrder.vue index 80826a7..76cbcd4 100644 --- a/src/views/inout/acceptOrder.vue +++ b/src/views/inout/acceptOrder.vue @@ -170,9 +170,9 @@