From b01f424e4d22069a339a772a853d6126066a8451 Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Mon, 11 Mar 2024 14:57:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/assetAttributeAllocation/index.vue | 4 +- .../base/assetAttributeManagement/index.vue | 2 +- sgzb-ui/src/views/base/comeAndGo/index.vue | 4 +- sgzb-ui/src/views/base/comeAndGo/people.vue | 4 +- sgzb-ui/src/views/base/project/index.vue | 6 +- sgzb-ui/src/views/base/section/index.vue | 8 +- sgzb-ui/src/views/base/unit/index.vue | 4 +- .../constructionSite/constructionSite.vue | 29 ++-- .../claimAndRefund/receive/agreement.vue | 10 +- .../claimAndRefund/receive/receiveApply.vue | 2 +- .../receive/receiveApplyAdd.vue | 10 +- .../claimAndRefund/receive/receiveExamine.vue | 4 +- .../claimAndRefund/return/returnApply.vue | 4 +- .../secondStore/inStoreBook.vue | 2 +- .../secondStore/outStoreBook.vue | 2 +- .../secondStore/secondStore.vue | 12 +- .../cost/csotSettlement/costApplyAdd.vue | 2 +- .../views/repairTest/brokenExamine/index.vue | 6 +- .../views/repairTest/repair/dialogOneForm.vue | 10 +- .../repairTest/repair/dialogThreeForm.vue | 6 +- .../views/repairTest/repair/dialogTwoForm.vue | 14 +- sgzb-ui/src/views/repairTest/repair/index.vue | 8 +- .../views/repairTest/testExamine/index.vue | 6 +- .../src/views/store/label/labelBinding.vue | 4 +- .../views/store/label/labelBindingHistory.vue | 2 +- .../newAccessory/newAccessoryAccept.vue | 8 +- .../newBuy/newAccessory/newAccessoryList.vue | 2 +- .../newBuy/newDevices/newDevicesAccept.vue | 2 +- .../newBuy/newDevices/newDevicesArrival.vue | 2 +- .../newBuy/newDevices/newDevicesCode.vue | 4 +- .../newBuy/newDevices/newDevicesList.vue | 2 +- .../newDevices/newDevicesWarehousing.vue | 4 +- .../store/newBuy/newTools/newToolsAccept.vue | 2 +- sgzb-ui/src/views/store/newBuy/plan.vue | 12 +- sgzb-ui/src/views/store/newBuy/planSecond.vue | 8 +- .../src/views/store/shelves/shelvesConfig.vue | 4 +- .../src/views/store/shelves/shelvesList.vue | 4 +- sgzb-ui/src/views/store/tools/accessory.vue | 6 +- sgzb-ui/src/views/store/tools/devices.vue | 16 +- sgzb-ui/src/views/store/tools/keeper.vue | 140 +---------------- sgzb-ui/src/views/store/tools/repair.vue | 141 +----------------- sgzb-ui/src/views/store/tools/safeTools.vue | 4 +- .../src/views/store/tools/toolsSupplier.vue | 14 +- sgzb-ui/src/views/store/tools/toolsType.vue | 10 +- .../warehousing/accessoryWarehousing.vue | 4 +- .../store/warehousing/devicesWarehousing.vue | 2 +- .../store/warehousing/repairWarehousing.vue | 4 +- 47 files changed, 147 insertions(+), 413 deletions(-) diff --git a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue index 07ae9699..fe4ecdb3 100644 --- a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue +++ b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue @@ -7,7 +7,7 @@ diff --git a/sgzb-ui/src/views/base/assetAttributeManagement/index.vue b/sgzb-ui/src/views/base/assetAttributeManagement/index.vue index 600b3c66..d53de42e 100644 --- a/sgzb-ui/src/views/base/assetAttributeManagement/index.vue +++ b/sgzb-ui/src/views/base/assetAttributeManagement/index.vue @@ -5,7 +5,7 @@ diff --git a/sgzb-ui/src/views/base/comeAndGo/index.vue b/sgzb-ui/src/views/base/comeAndGo/index.vue index 892556ce..f3f712c2 100644 --- a/sgzb-ui/src/views/base/comeAndGo/index.vue +++ b/sgzb-ui/src/views/base/comeAndGo/index.vue @@ -12,7 +12,7 @@ @@ -189,7 +189,7 @@ diff --git a/sgzb-ui/src/views/base/comeAndGo/people.vue b/sgzb-ui/src/views/base/comeAndGo/people.vue index 7cd1a27c..d4d23adf 100644 --- a/sgzb-ui/src/views/base/comeAndGo/people.vue +++ b/sgzb-ui/src/views/base/comeAndGo/people.vue @@ -8,7 +8,7 @@ v-model="userName" placeholder="请输入人员名称" clearable - size="small" + size="small" maxlength="50" prefix-icon="el-icon-search" @input="getUserList" style="margin-bottom: 20px" @@ -42,7 +42,7 @@ diff --git a/sgzb-ui/src/views/base/project/index.vue b/sgzb-ui/src/views/base/project/index.vue index 1acab343..c4d51aff 100644 --- a/sgzb-ui/src/views/base/project/index.vue +++ b/sgzb-ui/src/views/base/project/index.vue @@ -5,7 +5,7 @@ @@ -89,7 +89,7 @@ - + @@ -107,7 +107,7 @@ - + diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue index 5b39aeb4..0882176b 100644 --- a/sgzb-ui/src/views/base/section/index.vue +++ b/sgzb-ui/src/views/base/section/index.vue @@ -12,7 +12,7 @@ @@ -148,7 +148,7 @@ - + @@ -174,7 +174,7 @@ @@ -182,7 +182,7 @@ @@ -222,7 +222,7 @@ @@ -230,7 +230,7 @@ @@ -240,7 +240,7 @@ @@ -255,7 +255,7 @@ - + @@ -506,15 +506,16 @@ export default { this.resetForm("dialogForm"); this.getDialogList(); }, - /** 新增按钮操作 */ + /** 工地直转--打开弹窗 */ handleAdd() { this.resetForm("dialogForm"); this.open = true; this.title = "工地直转"; + this.deviceList = [] }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.dictId) + this.ids = selection.map(item => item) this.single = selection.length!=1 this.multiple = !selection.length }, diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index 3cee0723..23d996e6 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue @@ -5,7 +5,7 @@ @@ -14,7 +14,7 @@ @@ -135,7 +135,8 @@ - + @@ -190,7 +191,8 @@ > - + diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue index 4c0d6965..2142e258 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue @@ -36,7 +36,7 @@ v-model="queryParams.keyWord" placeholder="请输入关键字" clearable - :maxlength="20" + :maxlength="50" style="width: 240px" @keyup.enter.native="handleQuery" /> diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue index 75663fc3..ce851b7a 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue @@ -23,7 +23,7 @@ - + - - - diff --git a/sgzb-ui/src/views/store/tools/repair.vue b/sgzb-ui/src/views/store/tools/repair.vue index 4abbc7bb..6aa81bae 100644 --- a/sgzb-ui/src/views/store/tools/repair.vue +++ b/sgzb-ui/src/views/store/tools/repair.vue @@ -7,7 +7,7 @@ @@ -156,142 +156,7 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{dict.label}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
将文件拖到此处,或点击上传
-
-
- 是否更新已经存在的用户数据 -
- 仅允许导入xls、xlsx格式文件。 - 下载模板 -
-
- -
+ diff --git a/sgzb-ui/src/views/store/tools/safeTools.vue b/sgzb-ui/src/views/store/tools/safeTools.vue index 9973c5b7..e3e72eef 100644 --- a/sgzb-ui/src/views/store/tools/safeTools.vue +++ b/sgzb-ui/src/views/store/tools/safeTools.vue @@ -5,7 +5,7 @@ @@ -115,7 +115,7 @@ - + diff --git a/sgzb-ui/src/views/store/tools/toolsSupplier.vue b/sgzb-ui/src/views/store/tools/toolsSupplier.vue index ee928628..18b0f4bf 100644 --- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue +++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue @@ -5,7 +5,7 @@ @@ -124,22 +124,22 @@ - + - + - + - + - + - + - + @@ -239,7 +239,7 @@ - + - + @@ -317,7 +317,7 @@ - + diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue index 95cdb41d..069ac90d 100644 --- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue +++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue @@ -5,7 +5,7 @@ @@ -167,7 +167,7 @@ diff --git a/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue b/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue index 478135f0..c8eda2b0 100644 --- a/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue +++ b/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue @@ -5,7 +5,7 @@ diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue index cd49998d..56462e24 100644 --- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue +++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue @@ -5,7 +5,7 @@ @@ -165,7 +165,7 @@