From 6d9a913d4f5db3480f210e9f3c03b75278f54e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?= <10034423+lihaoyuelijing@user.noreply.gitee.com> Date: Thu, 4 Jul 2024 14:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/attrs-setup/attrs-setup.vue | 140 ++++++ src/pages.json | 16 + src/pages/equipment/Inspection/details.vue | 12 +- .../equipment/Inspection/detailsview.vue | 33 +- src/pages/equipment/Inspection/index.vue | 102 +++- src/pages/equipment/Inspection/model.ts | 10 +- src/pages/equipment/Repair/details.vue | 2 +- src/pages/equipment/Repair/index.vue | 4 +- src/pages/equipment/Repair/model.ts | 6 +- src/pages/equipment/Repair/repairing.vue | 3 +- src/pages/equipment/Repair/repairingview.vue | 2 +- src/pages/equipment/Repairbx/index.vue | 4 +- src/pages/equipment/SparepartsInto/index.vue | 445 ++++++++++++++++++ src/pages/equipment/SparepartsInto/model.ts | 36 ++ .../equipment/SparepartsIntoOut/index.vue | 445 ++++++++++++++++++ .../equipment/SparepartsIntoOut/model.ts | 36 ++ src/pages/equipment/Spotcheck/details.vue | 2 + src/pages/equipment/Spotcheck/detailsview.vue | 19 +- src/pages/equipment/Spotcheck/index.vue | 104 +++- src/pages/equipment/Spotcheck/model.ts | 10 +- src/static/images/Time.png | Bin 0 -> 173724 bytes src/utils/url.ts | 10 +- 22 files changed, 1375 insertions(+), 66 deletions(-) create mode 100644 src/components/attrs-setup/attrs-setup.vue create mode 100644 src/pages/equipment/SparepartsInto/index.vue create mode 100644 src/pages/equipment/SparepartsInto/model.ts create mode 100644 src/pages/equipment/SparepartsIntoOut/index.vue create mode 100644 src/pages/equipment/SparepartsIntoOut/model.ts create mode 100644 src/static/images/Time.png diff --git a/src/components/attrs-setup/attrs-setup.vue b/src/components/attrs-setup/attrs-setup.vue new file mode 100644 index 0000000..c4d3508 --- /dev/null +++ b/src/components/attrs-setup/attrs-setup.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/src/pages.json b/src/pages.json index 9b81ecf..ae44ee0 100644 --- a/src/pages.json +++ b/src/pages.json @@ -196,6 +196,22 @@ "navigationBarTextStyle": "white" } }, + { + "path": "pages/equipment/SparepartsInto/index", + "style": { + "navigationBarTitleText": "备品备件入库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/equipment/SparepartsIntoOut/index", + "style": { + "navigationBarTitleText": "备品备件出库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, { "path": "pages/quality/index", "style": { diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue index 76c6669..94f34d6 100644 --- a/src/pages/equipment/Inspection/details.vue +++ b/src/pages/equipment/Inspection/details.vue @@ -6,7 +6,7 @@ 巡检详情 - + @@ -31,15 +31,15 @@ --> - +
检查项: {{ item.itemName }}
检查方法: {{ item.itemMethod }}
-
+
检查标准: {{ item1.standardName }}
- + {{ n.name }} @@ -74,7 +74,7 @@ - + @@ -454,6 +454,8 @@ export default class ChangePalletNew extends BasePage { }); return; } + this.detailsinfolist.planPersonName = session.nickName; + this.detailsinfolist.planPerson = session.userName; let query = this.detailsinfolist; await this.model.updateInspectionRecord(query); if (this.model.SubmitCode == '200') { diff --git a/src/pages/equipment/Inspection/detailsview.vue b/src/pages/equipment/Inspection/detailsview.vue index a9f0615..98b88da 100644 --- a/src/pages/equipment/Inspection/detailsview.vue +++ b/src/pages/equipment/Inspection/detailsview.vue @@ -26,15 +26,15 @@ - +
检查项: {{ item.itemName }}
检查方法: {{ item.itemMethod }}
-
+
检查标准: {{ item1.standardName }}
- + {{ n.name }} @@ -54,13 +54,14 @@
-
-
巡检人:{{ detailsinfolist.planPerson }}
-
巡检时间:{{ detailsinfolist.orderStart }}
+ +
+
巡检人:{{ detailsinfolist.planPersonName }}
+
是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}
-
是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}
-
报修单:{{ detailsinfolist.repairCode }}
+
巡检时间:{{ detailsinfolist.orderStart }}
+
报修单:{{ detailsinfolist.repairCode }}
@@ -70,7 +71,7 @@ - + @@ -352,7 +353,7 @@ export default class ChangePalletNew extends BasePage { .page-product-receipt { background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat; background-size: 100% 600rpx; - padding: 118rpx 30rpx 162rpx; + padding: 118rpx 30rpx 192rpx; min-height: 100%; .header { @@ -395,6 +396,7 @@ export default class ChangePalletNew extends BasePage { background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; + margin-bottom: 16px; .item-name { .quest { // width: 367px; @@ -493,7 +495,16 @@ export default class ChangePalletNew extends BasePage { margin-bottom: 17px; } .details { - justify-content: space-around; + // justify-content: space-around; + // display: flex; + font-size: 17px; + font-weight: 600; + // justify-content: space-between; + align-items: center; + margin-bottom: 8px; + } + .details1 { + justify-content: space-between; display: flex; font-size: 17px; font-weight: 600; diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue index 321df85..33376fa 100644 --- a/src/pages/equipment/Inspection/index.vue +++ b/src/pages/equipment/Inspection/index.vue @@ -6,15 +6,24 @@ 巡检 - + + + - - - - - - +
+ + + + + + +
+
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
@@ -28,7 +37,7 @@
循环执行时间结束: {{ item.planLoopEnd }}
- +
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
@@ -42,6 +51,8 @@
循环执行时间结束: {{ item.planLoopEnd }}
+ + + diff --git a/src/pages/equipment/SparepartsInto/model.ts b/src/pages/equipment/SparepartsInto/model.ts new file mode 100644 index 0000000..c11f93c --- /dev/null +++ b/src/pages/equipment/SparepartsInto/model.ts @@ -0,0 +1,36 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.equipment.SparepartsInto', +}) +export class SparepartsInto extends VuexModule { + rowdata: any = []; + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode + orderNo); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + getsparePartsInOutList: any = []; + SubmitCode: any = ''; + @MutationAction + // 点检:spotInspection + // 巡检:inspection + // 保养:maintenance + async sparePartsInOutStorage(query: any) { + const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.sparePartsInOutStorage, { + //loginName: session.loginName, + params: query, + }); + const SubmitCode: [] = result; + return { SubmitCode }; + } +} + +export default getModule(SparepartsInto); diff --git a/src/pages/equipment/SparepartsIntoOut/index.vue b/src/pages/equipment/SparepartsIntoOut/index.vue new file mode 100644 index 0000000..2c21df0 --- /dev/null +++ b/src/pages/equipment/SparepartsIntoOut/index.vue @@ -0,0 +1,445 @@ + + + + diff --git a/src/pages/equipment/SparepartsIntoOut/model.ts b/src/pages/equipment/SparepartsIntoOut/model.ts new file mode 100644 index 0000000..c11f93c --- /dev/null +++ b/src/pages/equipment/SparepartsIntoOut/model.ts @@ -0,0 +1,36 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.equipment.SparepartsInto', +}) +export class SparepartsInto extends VuexModule { + rowdata: any = []; + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode + orderNo); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + getsparePartsInOutList: any = []; + SubmitCode: any = ''; + @MutationAction + // 点检:spotInspection + // 巡检:inspection + // 保养:maintenance + async sparePartsInOutStorage(query: any) { + const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.sparePartsInOutStorage, { + //loginName: session.loginName, + params: query, + }); + const SubmitCode: [] = result; + return { SubmitCode }; + } +} + +export default getModule(SparepartsInto); diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue index ce6f948..2bb7127 100644 --- a/src/pages/equipment/Spotcheck/details.vue +++ b/src/pages/equipment/Spotcheck/details.vue @@ -389,6 +389,8 @@ export default class ChangePalletNew extends BasePage { }); return; } + this.detailsinfolist.planPersonName = session.nickName; + this.detailsinfolist.planPerson = session.userName; let query = this.detailsinfolist; await this.model.updateInspectionRecord(query); if (this.model.SubmitCode == '200') { diff --git a/src/pages/equipment/Spotcheck/detailsview.vue b/src/pages/equipment/Spotcheck/detailsview.vue index 04adc41..519014b 100644 --- a/src/pages/equipment/Spotcheck/detailsview.vue +++ b/src/pages/equipment/Spotcheck/detailsview.vue @@ -54,13 +54,13 @@
-
-
点检人:{{ detailsinfolist.planPerson }}
-
点检时间:{{ detailsinfolist.orderStart }}
+
+
点检人:{{ detailsinfolist.planPersonName }}
+
是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}
-
是否异常: {{ detailsinfolist.repairCode == null ? '否' : '是' }}
-
报修单:{{ detailsinfolist.repairCode }}
+
点检时间:{{ detailsinfolist.orderStart }}
+
报修单:{{ detailsinfolist.repairCode }}
@@ -511,6 +511,15 @@ export default class ChangePalletNew extends BasePage { align-items: center; margin-bottom: 8px; } + .details1 { + justify-content: space-between; + display: flex; + font-size: 17px; + font-weight: 600; + // justify-content: space-between; + align-items: center; + margin-bottom: 8px; + } } } .modal { diff --git a/src/pages/equipment/Spotcheck/index.vue b/src/pages/equipment/Spotcheck/index.vue index b49e1ff..534b0db 100644 --- a/src/pages/equipment/Spotcheck/index.vue +++ b/src/pages/equipment/Spotcheck/index.vue @@ -9,12 +9,23 @@ - - + - - + --> +
+ + + + + + 日期: + + + + + +
+
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
@@ -27,7 +38,7 @@
创建时间: {{ item.createTime }}
循环执行时间开始: {{ item.planLoopStart }}
- +
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
@@ -41,6 +52,7 @@
点检时间: {{ item.orderStart }}
+