From 8f414d75100f4364d5963bc2d8bb1c47d82b3614 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 21 Oct 2022 18:12:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8D=E6=B8=85=E7=A9=BA=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userManage/param/systemPDFModule.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue index 3289970..ff55901 100644 --- a/src/views/userManage/param/systemPDFModule.vue +++ b/src/views/userManage/param/systemPDFModule.vue @@ -494,7 +494,7 @@ export default { this.$router.push({ path: "" }); - this.query = { + this.moduleQuery = { templateType: null, moduleId: null, name: "", From 62edd2a72b5352eb38f74713eeaa1dcf165e74be Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 24 Oct 2022 17:00:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=B7=AF=E7=94=B1=E5=92=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8F=8A=E5=AF=B9=E5=BA=94=E7=9A=84js=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/invCountOrder.js | 2 + src/router/index.js | 42 ++ src/views/inventory/invCountOrderAudit.vue | 444 ++++++++++++++++++ .../inventory/invCountOrderCompleted.vue | 444 ++++++++++++++++++ src/views/inventory/invCountOrderNew.vue | 349 ++++++++++++++ 5 files changed, 1281 insertions(+) create mode 100644 src/api/inventory/invCountOrder.js create mode 100644 src/views/inventory/invCountOrderAudit.vue create mode 100644 src/views/inventory/invCountOrderCompleted.vue create mode 100644 src/views/inventory/invCountOrderNew.vue diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js new file mode 100644 index 0000000..f3c1d7f --- /dev/null +++ b/src/api/inventory/invCountOrder.js @@ -0,0 +1,2 @@ +import axios from "../../utils/axios"; + diff --git a/src/router/index.js b/src/router/index.js index ac8ca9f..6a6e6df 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -81,6 +81,10 @@ import stockCode from "../views/inventory/stockCode.vue"; import stockOrderDelSearch from "../views/business/stockOrderDelSearch"; import stockOrderInvSearch from "../views/business/stockOrderInvSearch"; import stockOrderDelete from "../views/business/stockOrderDelete"; +//盘点管理 +import invCountOrderNew from "@/views/inventory/invCountOrderNew"; +import invCountOrderAudit from "@/views/inventory/invCountOrderAudit"; +import invCountOrderCompleted from "@/views/inventory/invCountOrderCompleted"; //库存 import invProducts from "../views/inventory/InvProducts.vue"; @@ -991,6 +995,44 @@ export const asyncRouterMap = [ authRule: ["inv/invProducts"] } }, + { + path: "/invCount", + component: Empty, + name: "盘点管理", + icon: "", + meta: { + authRule: ["inv/invCount"] + }, + children: [ + { + path: "countOrderNew", + component: invCountOrderNew, + name: "新增盘点单", + icon: "", + meta: { + authRule: ["invCount/countOrderNew"] + } + }, + { + path: "countOrderAudit", + component: invCountOrderAudit, + name: "盘点单审核", + icon: "", + meta: { + authRule: ["invCount/countOrderAudit"] + } + }, + { + path: "countOrderCompleted", + component: invCountOrderCompleted, + name: "已完成盘点单", + icon: "", + meta: { + authRule: ["invCount/countOrderCompleted"] + } + }, + ] + }, { path: "/invManage", component: Empty, diff --git a/src/views/inventory/invCountOrderAudit.vue b/src/views/inventory/invCountOrderAudit.vue new file mode 100644 index 0000000..aff163b --- /dev/null +++ b/src/views/inventory/invCountOrderAudit.vue @@ -0,0 +1,444 @@ +invCountOrderNew.vue + + + + diff --git a/src/views/inventory/invCountOrderCompleted.vue b/src/views/inventory/invCountOrderCompleted.vue new file mode 100644 index 0000000..1dfaf44 --- /dev/null +++ b/src/views/inventory/invCountOrderCompleted.vue @@ -0,0 +1,444 @@ + + + + + diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue new file mode 100644 index 0000000..08afc45 --- /dev/null +++ b/src/views/inventory/invCountOrderNew.vue @@ -0,0 +1,349 @@ + + + + + From 484e14e4b6e2e005f32e4a0bd1f15c06b879fb06 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 24 Oct 2022 17:11:18 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1.=E5=9B=9E=E6=BB=9A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=88=86=E6=94=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 52 +- src/views/inventory/invCountOrderAudit.vue | 444 ------------------ .../inventory/invCountOrderCompleted.vue | 444 ------------------ src/views/inventory/invCountOrderNew.vue | 349 -------------- 4 files changed, 1 insertion(+), 1288 deletions(-) delete mode 100644 src/views/inventory/invCountOrderAudit.vue delete mode 100644 src/views/inventory/invCountOrderCompleted.vue delete mode 100644 src/views/inventory/invCountOrderNew.vue diff --git a/src/router/index.js b/src/router/index.js index 6a6e6df..9050bc9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -81,10 +81,6 @@ import stockCode from "../views/inventory/stockCode.vue"; import stockOrderDelSearch from "../views/business/stockOrderDelSearch"; import stockOrderInvSearch from "../views/business/stockOrderInvSearch"; import stockOrderDelete from "../views/business/stockOrderDelete"; -//盘点管理 -import invCountOrderNew from "@/views/inventory/invCountOrderNew"; -import invCountOrderAudit from "@/views/inventory/invCountOrderAudit"; -import invCountOrderCompleted from "@/views/inventory/invCountOrderCompleted"; //库存 import invProducts from "../views/inventory/InvProducts.vue"; @@ -995,44 +991,7 @@ export const asyncRouterMap = [ authRule: ["inv/invProducts"] } }, - { - path: "/invCount", - component: Empty, - name: "盘点管理", - icon: "", - meta: { - authRule: ["inv/invCount"] - }, - children: [ - { - path: "countOrderNew", - component: invCountOrderNew, - name: "新增盘点单", - icon: "", - meta: { - authRule: ["invCount/countOrderNew"] - } - }, - { - path: "countOrderAudit", - component: invCountOrderAudit, - name: "盘点单审核", - icon: "", - meta: { - authRule: ["invCount/countOrderAudit"] - } - }, - { - path: "countOrderCompleted", - component: invCountOrderCompleted, - name: "已完成盘点单", - icon: "", - meta: { - authRule: ["invCount/countOrderCompleted"] - } - }, - ] - }, + { path: "/invManage", component: Empty, @@ -1107,15 +1066,6 @@ export const asyncRouterMap = [ }, ] }, - - // { - // path: "stockCheck", - // name: "盘点单据", - // component: stockCheck, - // meta: { - // authRule: ["inv/stockCheck"] - // } - // }, { path: "udiTrace", name: "UDI码流向", diff --git a/src/views/inventory/invCountOrderAudit.vue b/src/views/inventory/invCountOrderAudit.vue deleted file mode 100644 index aff163b..0000000 --- a/src/views/inventory/invCountOrderAudit.vue +++ /dev/null @@ -1,444 +0,0 @@ -invCountOrderNew.vue - - - - diff --git a/src/views/inventory/invCountOrderCompleted.vue b/src/views/inventory/invCountOrderCompleted.vue deleted file mode 100644 index 1dfaf44..0000000 --- a/src/views/inventory/invCountOrderCompleted.vue +++ /dev/null @@ -1,444 +0,0 @@ - - - - - diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue deleted file mode 100644 index 08afc45..0000000 --- a/src/views/inventory/invCountOrderNew.vue +++ /dev/null @@ -1,349 +0,0 @@ - - - - - From 05d962373f7916a9dfdf2d01c7231b4c799c526a Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Thu, 27 Oct 2022 16:21:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9C=AA=E9=AA=8C=E6=94=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0=E9=AA=8C=E6=94=B6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.js | 4 +- public/config.json | 10 ++-- src/views/basic/BussinessTypeModify.vue | 3 +- src/views/business/stockOrderDelSearch.vue | 5 +- src/views/business/stockOrderSearch.vue | 56 +++++++++++++++++----- src/views/home/index.vue | 34 +++++++++---- src/views/inout/IOAddOrder.vue | 5 +- src/views/inout/acceptOrder.vue | 7 +-- 8 files changed, 87 insertions(+), 37 deletions(-) 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 @@ From bd20bdff93e34d5a6fefd2b367948a3eb45b4c87 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Tue, 1 Nov 2022 17:15:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E7=AC=AC=E4=B8=89=E6=96=B9=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=97=B6=E5=80=99=E5=8F=96=E6=B6=88=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BussinessTypeLoclModify.vue | 1 + src/views/thrsys/ThrCorps.vue | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index 9ed4991..1c2a262 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -393,6 +393,7 @@ export default { key: query, onlyMain: true, } + getOriginBusType(tQuery) .then((response) => { this.originTypes = response.data.list || []; diff --git a/src/views/thrsys/ThrCorps.vue b/src/views/thrsys/ThrCorps.vue index a17f2d9..926f1f8 100644 --- a/src/views/thrsys/ThrCorps.vue +++ b/src/views/thrsys/ThrCorps.vue @@ -49,7 +49,7 @@ @@ -73,6 +73,7 @@ import { import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys"; import {ucloudUnit} from "../../api/basic/basicUnitMaintain"; import {selectIp} from "../../api/param/systemParamConfig"; +import {findConfig} from "../../api/thrsys/spsSyncStatus"; export default { data() { @@ -88,6 +89,7 @@ export default { list: [], thirdSys: [], thirdSysDetail: null, + delFalg:true, uploadFileUrl: null, fileList: [], uploadData: { @@ -252,6 +254,15 @@ export default { }); }, + getConFig(){ + findConfig().then((response) =>{ + if (response.code == 20000) { + this.delFalg=response.data.basicThirdCorp; + } else { + this.$message.error(response.message); + } + }); + }, downloadDatas() { let query = { thirdSysFk: this.filterQuery.thirdSys @@ -270,6 +281,7 @@ export default { mounted() { }, created() { + this.getConFig(); this.getBasicThirdSys(); }, }; From 46571d6261c542b81088dccb146592dff50ae1eb Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Wed, 2 Nov 2022 17:01:49 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=8D=95=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/invWarehouse.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index beca0b3..bd0b276 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -876,7 +876,7 @@ export default { bussinessTypeQuery: { enabled: true, page: 1, - limit: 100 + limit: 10 }, bussinessTypeTotal: 0, curSeleUser: null, @@ -1355,6 +1355,7 @@ export default { if (val != null) { this.bussinessTypeQuery.page = val; } + this.bussinessTypeQuery.code=this.busQuery.code; getJoinBussinessType(this.bussinessTypeQuery).then((res) => { this.selectBussinessTypeList = []; this.bussinessTypeList = res.data.list; @@ -1365,10 +1366,8 @@ export default { that.$refs.typeList.clearSelection(); } that.bussinessTypeList.forEach(row => { - for (let j in that.bussinessTypeData) { - if (row.action == that.bussinessTypeData[j].action) { + if (row.checkSelect==true) { that.$refs.typeList.toggleRowSelection(row, true); - } } }); });