diff --git a/public/config.json b/public/config.json index aca6ed7..61112ea 100644 --- a/public/config.json +++ b/public/config.json @@ -1,4 +1,5 @@ { - "BASE_URL": "http://139.159.187.130/SPMS_SERVER", - "SERVER_IP": "http://192.168.0.109:9996" + "BASE_URL": "http://192.168.0.109:9996", + "SERVER_IP": "http://192.168.0.109:9996", + "hosp_name": "诏安县总医院（测试）" } diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue index b2778e0..5bacc65 100644 --- a/src/views/basic/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/UdiInfoSelectLocalUdi.vue @@ -94,7 +94,6 @@ { if (response.code == 20000) { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2e2d673..e72170e 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -3,7 +3,7 @@
-

诏安县总医院

+

{{hospName}}

- - - - + + + + - - - + + + - +
- diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue index 40d6cf3..2251986 100644 --- a/src/views/userManage/param/systemPDFModule.vue +++ b/src/views/userManage/param/systemPDFModule.vue @@ -391,8 +391,6 @@ import { } from "../../../api/param/systemPDFTemplate"; import {saveAs} from 'file-saver'; import {BASE_URL, SERVER_IP} from "../../../config/app"; -import {authRoleAuthList} from "../../../api/auth/authRole"; -import {updateStockOrderDetail} from "@/api/warehouse/stockOrder"; const formJson = { id: "", diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue index fb71d6d..634d2d7 100644 --- a/src/views/warehouse/IOCheckErrOrder.vue +++ b/src/views/warehouse/IOCheckErrOrder.vue @@ -593,7 +593,7 @@ export default { curRow: null, successOrderExportPDFSettingVisible: false, total: 0, - loading: true, + loading: false, index: null, formName: null, orderId: "", diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue index c0b045e..dd2b0fc 100644 --- a/src/views/warehouse/IOErrorOrder.vue +++ b/src/views/warehouse/IOErrorOrder.vue @@ -286,7 +286,7 @@ export default { action: null, page: 1, limit: 20, - locStorageCode:null, + locStorageCode: null, }, checkStatus: { '-1': "等待提交", @@ -546,6 +546,7 @@ export default { this.storageList = response.data || []; if (this.storageList.length > 0) { this.filterQuery.locStorageCode = this.storageList[0].code; + this.getList(); } }) .catch(() => { @@ -573,7 +574,7 @@ export default { this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery.limit = parseInt(this.filterQuery.limit); // 加载表格数据 - this.getList(); + this.getStorage(); }, }; diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue index b284b97..abb5bd3 100644 --- a/src/views/warehouse/IONewOrder.vue +++ b/src/views/warehouse/IONewOrder.vue @@ -365,7 +365,7 @@ export default { addOrderVisible: false, addHosOrderVisible: false, total: 0, - loading: true, + loading: false, index: null, formName: null, errorDetail: "1111111111111", diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue index eaa5550..c82d559 100644 --- a/src/views/warehouse/IOSearchOrder.vue +++ b/src/views/warehouse/IOSearchOrder.vue @@ -498,7 +498,7 @@ export default { codeDetailVisible: false, successOrderExportPDFSettingVisible: false, total: 0, - loading: true, + loading: false, index: null, formName: null, orderId: "", diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue index 83a9b7c..686bc21 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -495,7 +495,7 @@ export default { codeDetailVisible: false, successOrderExportPDFSettingVisible: false, total: 0, - loading: true, + loading: false, index: null, formName: null, orderId: "", diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index a3633f7..fc7d19b 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -196,6 +196,7 @@ @keypress.enter.native="enterKey($event)" ref='inputRef' style="ime-mode:disabled" + type="tel" v-model="formData.code" > diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index b2c1f7d..66fb748 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -127,6 +127,7 @@ @keypress.enter.native="enterKey($event)" ref='inputRef' style="ime-mode:disabled" + type="tel" v-model="formData.code" > diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 81e7642..53deb7f 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -766,6 +766,7 @@ export default { this.loading = false; if (response.code === 20000) { this.$message.success(tMessage + "成功"); + this.formData.billNo = response.data; this.closeDialog(true); } else { this.$message.error(response.message); @@ -1196,23 +1197,23 @@ export default { intentBack() { this.$router.go(-1); }, - generateBillNo() { - let tQuery = { - action: this.formData.billType - } - this.loading = true; - stockOrderGenerateBillNo(tQuery) - .then((response) => { - this.loading = false; - if (response.code === 20000) { - this.formData.billNo = response.data; - // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}'); - this.formData.billdate = new Date(); - } else { - this.closeDialog(true); - } - }); - }, + // generateBillNo() { + // let tQuery = { + // action: this.formData.billType + // } + // this.loading = true; + // stockOrderGenerateBillNo(tQuery) + // .then((response) => { + // this.loading = false; + // if (response.code === 20000) { + // this.formData.billNo = response.data; + // // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}'); + // this.formData.billdate = new Date(); + // } else { + // this.closeDialog(true); + // } + // }); + // }, getBusType(invCode) { let query = { enabled: true, @@ -1325,7 +1326,8 @@ export default { }; this.iCount = 0; this.orderEditor = false; - this.generateBillNo(); + this.formData.billdate = new Date(); + // this.generateBillNo(); } }, }; diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index 930d209..ad24bb1 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -637,6 +637,7 @@ export default { this.loading = false; if (response.code === 20000) { this.$message.success(tMessage + "成功"); + this.formData.billNo = response.data; this.closeDialog(true); } else { this.$message.error(response.message); @@ -1064,23 +1065,23 @@ export default { intentBack() { this.$router.go(-1); }, - generateBillNo() { - let tQuery = { - action: this.formData.billType - } - this.loading = true; - stockOrderGenerateBillNo(tQuery) - .then((response) => { - this.loading = false; - if (response.code === 20000) { - this.formData.billNo = response.data; - // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}'); - this.formData.billdate = new Date(); - } else { - this.closeDialog(true); - } - }); - }, + // generateBillNo() { + // let tQuery = { + // action: this.formData.billType + // } + // this.loading = true; + // stockOrderGenerateBillNo(tQuery) + // .then((response) => { + // this.loading = false; + // if (response.code === 20000) { + // this.formData.billNo = response.data; + // // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}'); + // this.formData.billdate = new Date(); + // } else { + // this.closeDialog(true); + // } + // }); + // }, getBusType() { let query = { enabled: true, @@ -1155,7 +1156,8 @@ export default { }; this.iCount = 0; this.orderEditor = false; - this.generateBillNo(); + this.formData.billdate = new Date(); + // this.generateBillNo(); } }, };