From dd43a7fa97659beeddecec49fcc227b823f81cc3 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 27 Aug 2024 15:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../return/apply/component/home1.vue | 1 + .../newAccessory/newAccessoryAccept.vue | 1415 +++++++++-------- .../newBuy/newDevices/newDevicesArrival.vue | 1135 +++++++------ src/views/store/newBuy/planAdd.vue | 953 +++++------ src/views/store/tools/toolsType.vue | 4 +- .../machinery/coding/component/MapDIalog.vue | 123 +- .../warehouseManage/machinery/type/index.vue | 4 +- .../partsAcceptance/component/addParts.vue | 13 +- .../toolsAcceptance/component/addTools.vue | 19 +- vue.config.js | 2 +- 10 files changed, 2051 insertions(+), 1618 deletions(-) diff --git a/src/views/claimAndreturn/return/apply/component/home1.vue b/src/views/claimAndreturn/return/apply/component/home1.vue index 34b824c..ee94adb 100644 --- a/src/views/claimAndreturn/return/apply/component/home1.vue +++ b/src/views/claimAndreturn/return/apply/component/home1.vue @@ -776,6 +776,7 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.$refs.mychildSon.inputValue = '' this.queryParams.time = [] this.queryParams.typeId = '' // this.resetForm("queryForm"); diff --git a/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue b/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue index c6c6c29..0b0c7a8 100644 --- a/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue +++ b/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue @@ -1,120 +1,140 @@ diff --git a/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/src/views/store/newBuy/newDevices/newDevicesArrival.vue index 925b066..7e84f67 100644 --- a/src/views/store/newBuy/newDevices/newDevicesArrival.vue +++ b/src/views/store/newBuy/newDevices/newDevicesArrival.vue @@ -1,64 +1,139 @@ \ No newline at end of file + diff --git a/src/views/store/newBuy/planAdd.vue b/src/views/store/newBuy/planAdd.vue index d6f0e8c..fcd8a3a 100644 --- a/src/views/store/newBuy/planAdd.vue +++ b/src/views/store/newBuy/planAdd.vue @@ -1,44 +1,49 @@ \ No newline at end of file + diff --git a/src/views/store/tools/toolsType.vue b/src/views/store/tools/toolsType.vue index 54bf034..e879500 100644 --- a/src/views/store/tools/toolsType.vue +++ b/src/views/store/tools/toolsType.vue @@ -757,10 +757,10 @@ export default { // }, /** 查询用户列表--库管员,维修员 */ getUserList() { - getUserByRoleList({ roleId: '101' }).then((response) => { + getUserByRoleList({ roleIds: [132, 139] }).then((response) => { this.keeperList = response.data }) - getUserByRoleList({ roleId: '102' }).then((response) => { + getUserByRoleList({ roleIds: [133] }).then((response) => { this.repairUserList = response.data }) }, diff --git a/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue b/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue index ce092c8..480e034 100644 --- a/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue +++ b/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue @@ -37,14 +37,14 @@ - + -