From 7d3a61b74fdc1b8a45e96ef5792e65fd9d03fc27 Mon Sep 17 00:00:00 2001 From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com> Date: Tue, 5 Dec 2023 18:15:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A8=E9=87=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 10 +- src/pages.json | 64 ++ src/pages/equipment/Inspection/details.vue | 14 +- .../equipment/Inspection/detailsview.vue | 14 +- src/pages/equipment/Inspection/index.vue | 4 +- src/pages/equipment/Inspection/model.ts | 4 +- src/pages/equipment/Repair/details.vue | 10 +- src/pages/equipment/Repair/index.vue | 4 +- src/pages/equipment/Repair/model.ts | 4 +- src/pages/equipment/Repair/repairing.vue | 30 +- src/pages/equipment/Repair/repairingview.vue | 18 +- src/pages/equipment/Repairbx/index.vue | 29 +- src/pages/equipment/Repairbx/model.ts | 17 +- src/pages/equipment/Spotcheck/details.vue | 14 +- src/pages/equipment/Spotcheck/detailsview.vue | 14 +- src/pages/equipment/Spotcheck/index.vue | 6 +- src/pages/equipment/Spotcheck/model.ts | 4 +- src/pages/equipment/Upkeep/details.vue | 10 +- src/pages/equipment/Upkeep/index.vue | 4 +- src/pages/equipment/Upkeep/model.ts | 4 +- src/pages/equipment/Upkeep/repairing.vue | 12 +- src/pages/equipment/Upkeep/repairingview.vue | 12 +- src/pages/equipment/equipmentlist.vue | 409 +++++++ src/pages/equipment/index.vue | 7 +- src/pages/mes/Pallethandling/model.ts | 4 +- src/pages/quality/Belowstandard/detail.vue | 303 +++++ src/pages/quality/Belowstandard/index.vue | 1016 +++++++++++++++++ src/pages/quality/Belowstandard/model.ts | 56 + src/pages/quality/Inspectionitem/index.vue | 414 +++++++ src/pages/quality/Inspectionitem/model.ts | 65 ++ src/pages/quality/Inspectionrule/index.vue | 401 +++++++ src/pages/quality/Inspectionrule/model.ts | 65 ++ src/pages/quality/Inspectionunit/index.vue | 393 +++++++ src/pages/quality/Inspectionunit/model.ts | 65 ++ .../quality/Materialinspection/detail.vue | 303 +++++ .../quality/Materialinspection/index.vue | 1002 ++++++++++++++++ src/pages/quality/Materialinspection/model.ts | 56 + src/pages/quality/Records/detail.vue | 303 +++++ src/pages/quality/Records/index.vue | 979 ++++++++++++++++ src/pages/quality/Records/model.ts | 56 + src/pages/quality/index.vue | 198 ++++ src/pages/shouye/index.vue | 2 +- src/pages/shouye/me.vue | 2 +- src/pages/wms/Raw/PurchaseWHPO/detail.vue | 38 +- src/pages/wms/Raw/PurchaseWHPO/index.vue | 135 ++- src/pages/wms/Raw/PurchaseWHPO/model.ts | 35 +- src/pages/wms/Raw/ReceivePO/detail.vue | 2 +- src/pages/wms/Raw/ReceivePO/index.vue | 45 +- src/pages/wms/Raw/ReceivePO/model.ts | 19 +- src/pages/wms/index.vue | 7 +- src/utils/image.ts | 3 + src/utils/url.ts | 71 +- 52 files changed, 6561 insertions(+), 195 deletions(-) create mode 100644 src/pages/equipment/equipmentlist.vue create mode 100644 src/pages/quality/Belowstandard/detail.vue create mode 100644 src/pages/quality/Belowstandard/index.vue create mode 100644 src/pages/quality/Belowstandard/model.ts create mode 100644 src/pages/quality/Inspectionitem/index.vue create mode 100644 src/pages/quality/Inspectionitem/model.ts create mode 100644 src/pages/quality/Inspectionrule/index.vue create mode 100644 src/pages/quality/Inspectionrule/model.ts create mode 100644 src/pages/quality/Inspectionunit/index.vue create mode 100644 src/pages/quality/Inspectionunit/model.ts create mode 100644 src/pages/quality/Materialinspection/detail.vue create mode 100644 src/pages/quality/Materialinspection/index.vue create mode 100644 src/pages/quality/Materialinspection/model.ts create mode 100644 src/pages/quality/Records/detail.vue create mode 100644 src/pages/quality/Records/index.vue create mode 100644 src/pages/quality/Records/model.ts create mode 100644 src/pages/quality/index.vue diff --git a/src/App.vue b/src/App.vue index 791dcc8..f476862 100644 --- a/src/App.vue +++ b/src/App.vue @@ -80,11 +80,11 @@ page { // .uni-input-input:disabled{ // background:red; // } -.uni-input-input[disabled] { - //background: rgb(233 231 231 / 38%); - background: #ecefefb3; - color: rgb(158, 157, 157); -} +// .uni-input-input[disabled] { +// //background: rgb(233 231 231 / 38%); +// background-color: #ffffff;; +// color: rgb(158, 157, 157); +// } .u-mode-center-box { padding: 5px; diff --git a/src/pages.json b/src/pages.json index 23c9b55..332981a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -52,6 +52,14 @@ "navigationBarTextStyle": "white" } }, + { + "path": "pages/equipment/equipmentlist", + "style": { + "navigationBarTitleText": "设备列表", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, { "path": "pages/equipment/Inspection/index", "style": { @@ -188,6 +196,62 @@ "navigationBarTextStyle": "white" } }, + { + "path": "pages/quality/index", + "style": { + "navigationBarTitleText": "质量管理", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/Belowstandard/index", + "style": { + "navigationBarTitleText": "不合格处置", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/Inspectionitem/index", + "style": { + "navigationBarTitleText": "检验项目", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/Inspectionrule/index", + "style": { + "navigationBarTitleText": "检验规则", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/Inspectionunit/index", + "style": { + "navigationBarTitleText": "检验单位", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/Materialinspection/index", + "style": { + "navigationBarTitleText": "质量检验", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/Records/index", + "style": { + "navigationBarTitleText": "历史记录", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, { "path": "pages/index/index", "style": { diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue index d6478fe..f649e40 100644 --- a/src/pages/equipment/Inspection/details.vue +++ b/src/pages/equipment/Inspection/details.vue @@ -18,8 +18,8 @@
设备名称: {{ detailsinfolist.equipmentName }}
-
车间: {{ detailsinfolist.planWorkshop }}
-
工作中心: {{ detailsinfolist.workCenterName }}
+
车间编码: {{ detailsinfolist.planWorkshop }}
+
车间: {{ detailsinfolist.workCenterName }}
@@ -32,7 +32,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -42,7 +42,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -461,7 +461,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -469,7 +469,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -500,7 +500,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/Inspection/detailsview.vue b/src/pages/equipment/Inspection/detailsview.vue index 577c3cd..9b1c373 100644 --- a/src/pages/equipment/Inspection/detailsview.vue +++ b/src/pages/equipment/Inspection/detailsview.vue @@ -17,8 +17,8 @@
设备名称: {{ detailsinfolist.equipmentName }}
-
车间: {{ detailsinfolist.planWorkshop }}
-
工作中心: {{ detailsinfolist.workCenterName }}
+
车间编码: {{ detailsinfolist.planWorkshop }}
+
车间: {{ detailsinfolist.workCenterName }}
@@ -31,7 +31,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -41,7 +41,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -392,7 +392,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -400,7 +400,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -431,7 +431,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue index c140fb9..87a9dab 100644 --- a/src/pages/equipment/Inspection/index.vue +++ b/src/pages/equipment/Inspection/index.vue @@ -191,7 +191,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -204,7 +204,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .list-top { diff --git a/src/pages/equipment/Inspection/model.ts b/src/pages/equipment/Inspection/model.ts index b96231a..f577350 100644 --- a/src/pages/equipment/Inspection/model.ts +++ b/src/pages/equipment/Inspection/model.ts @@ -8,7 +8,7 @@ import { url } from '@/utils/url'; store, name: 'page.equipment.Inspection', }) -export class ChangePalletNew extends VuexModule { +export class Inspection extends VuexModule { orderNoItemList: any = []; getTaskRecordList: any = []; @MutationAction @@ -56,4 +56,4 @@ export class ChangePalletNew extends VuexModule { } } -export default getModule(ChangePalletNew); +export default getModule(Inspection); diff --git a/src/pages/equipment/Repair/details.vue b/src/pages/equipment/Repair/details.vue index f4fd000..254dd4b 100644 --- a/src/pages/equipment/Repair/details.vue +++ b/src/pages/equipment/Repair/details.vue @@ -32,7 +32,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -42,7 +42,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -444,7 +444,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -452,7 +452,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -483,7 +483,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/Repair/index.vue b/src/pages/equipment/Repair/index.vue index 17de521..71280d1 100644 --- a/src/pages/equipment/Repair/index.vue +++ b/src/pages/equipment/Repair/index.vue @@ -235,7 +235,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -248,7 +248,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .list-top { diff --git a/src/pages/equipment/Repair/model.ts b/src/pages/equipment/Repair/model.ts index b0a3875..06565e9 100644 --- a/src/pages/equipment/Repair/model.ts +++ b/src/pages/equipment/Repair/model.ts @@ -8,7 +8,7 @@ import { url } from '@/utils/url'; store, name: 'page.equipment.Repair', }) -export class ChangePalletNew extends VuexModule { +export class Repair extends VuexModule { rowdata: any = []; orderNoItemList: any = []; getTaskRecordList: any = []; @@ -62,4 +62,4 @@ export class ChangePalletNew extends VuexModule { } } -export default getModule(ChangePalletNew); +export default getModule(Repair); diff --git a/src/pages/equipment/Repair/repairing.vue b/src/pages/equipment/Repair/repairing.vue index b1b7152..d31fa2a 100644 --- a/src/pages/equipment/Repair/repairing.vue +++ b/src/pages/equipment/Repair/repairing.vue @@ -5,7 +5,7 @@ - 巡检详情 + 维修详情 @@ -13,7 +13,7 @@
报修信息
-
工单号: {{ detailsinfolist.workCode }}
+
报修单号: {{ detailsinfolist.orderCode }}
@@ -21,7 +21,7 @@
-
保修时间: {{ detailsinfolist.orderTime }}
+
报修时间: {{ detailsinfolist.orderTime }}
@@ -59,7 +59,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -69,7 +69,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -83,7 +83,10 @@
点击进行备件申领
- + + +
@@ -716,7 +719,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -725,7 +728,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -847,7 +850,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { @@ -901,8 +904,13 @@ export default class ChangePalletNew extends BasePage { .Pickupclick { color: #1a99db; border-radius: 10px; - img { - width: 50px; + image { + width: 63px; + height: 57px; + } + .image { + width: 63px; + height: 57px; } } } diff --git a/src/pages/equipment/Repair/repairingview.vue b/src/pages/equipment/Repair/repairingview.vue index 27f6c6f..5a7c22a 100644 --- a/src/pages/equipment/Repair/repairingview.vue +++ b/src/pages/equipment/Repair/repairingview.vue @@ -5,14 +5,14 @@ - 巡检详情 + 维修详情
-
工单号: {{ detailsinfolist.orderCode }}
+
维修工单号: {{ detailsinfolist.workCode }}
设备编码: {{ detailsinfolist.equipmentCode }}
设备名称: {{ detailsinfolist.equipmentName }}
@@ -25,7 +25,7 @@
报修信息
-
工单号: {{ detailsinfolist.workCode }}
+
报修单号: {{ detailsinfolist.orderCode }}
@@ -33,7 +33,7 @@
-
保修时间: {{ detailsinfolist.orderTime }}
+
报修时间: {{ detailsinfolist.orderTime }}
@@ -71,7 +71,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -81,7 +81,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -627,7 +627,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -635,7 +635,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -753,7 +753,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/Repairbx/index.vue b/src/pages/equipment/Repairbx/index.vue index 21bc605..e716e85 100644 --- a/src/pages/equipment/Repairbx/index.vue +++ b/src/pages/equipment/Repairbx/index.vue @@ -12,12 +12,15 @@ - 条码: + 条码: 查询 + + 选择 + @@ -153,8 +156,12 @@ export default class ChangePalletNew extends BasePage { //this.remove = this.model.WlList[0]; } onShow() { - // this.onLoad; - // console.log(2, this.model.rowdata); + if (this.model.rowdata.length == 0) { + this.model.rowdatanull(); + } else { + this.orderNo = ''; + this.orderNo = this.model.rowdata[0].equipmentCode; + } } async query() { if (this.orderNo == '' || this.orderNo.length == 0) { @@ -186,6 +193,11 @@ export default class ChangePalletNew extends BasePage { } //console.log('this.orderNoItemList', this.orderNoItemList); } + selscteq() { + uni.navigateTo({ + url: `/pages/equipment/equipmentlist?listitem=`, + }); + } generateGUID() { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { var r = (Math.random() * 16) | 0, @@ -389,6 +401,7 @@ export default class ChangePalletNew extends BasePage { .form { background-color: #fff; padding: 40rpx; + padding-right: 10px; border-radius: 15px 15px 15px 15px; .u-form-item { @@ -416,9 +429,13 @@ export default class ChangePalletNew extends BasePage { .single-right { button { margin-top: 15rpx; - width: 140rpx; + width: 25px; height: 70rpx; background-color: #fa3534; + font-size: 12px; + } + button:first-child { + margin-left: 3px; } } } @@ -500,7 +517,7 @@ export default class ChangePalletNew extends BasePage { padding: 0px; } .list { - background-color: #f2f2f2; + background-color: #ffffff; padding: 21px; box-sizing: border-box; margin-top: 10px; @@ -511,7 +528,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; diff --git a/src/pages/equipment/Repairbx/model.ts b/src/pages/equipment/Repairbx/model.ts index 50e1f0a..f5d6844 100644 --- a/src/pages/equipment/Repairbx/model.ts +++ b/src/pages/equipment/Repairbx/model.ts @@ -8,7 +8,8 @@ import { url } from '@/utils/url'; store, name: 'page.equipment.Repairbx', }) -export class ChangePalletNew extends VuexModule { +export class Repairbx extends VuexModule { + rowdata: any = []; orderNoItemList: any = []; @MutationAction async queryOrderNo(orderNo: any) { @@ -29,6 +30,18 @@ export class ChangePalletNew extends VuexModule { const SubmitCode = result; return { SubmitCode }; } + equipmentlist: any = []; + @MutationAction + async queryhandChecklist(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repairbx.getEquipmentList, { params: params }); + const equipmentlist = result.rows; + return { equipmentlist }; + } + @MutationAction + async rowdatanull() { + const rowdata: [] = []; + return { rowdata }; + } } -export default getModule(ChangePalletNew); +export default getModule(Repairbx); diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue index 6c38d3e..c0ad3d4 100644 --- a/src/pages/equipment/Spotcheck/details.vue +++ b/src/pages/equipment/Spotcheck/details.vue @@ -18,8 +18,8 @@
设备名称: {{ detailsinfolist.equipmentName }}
-
车间: {{ detailsinfolist.planWorkshop }}
-
工作中心: {{ detailsinfolist.workCenterName }}
+
车间编码:: {{ detailsinfolist.planWorkshop }}
+
车间: {{ detailsinfolist.workCenterName }}
@@ -32,7 +32,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -42,7 +42,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -459,7 +459,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -467,7 +467,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -498,7 +498,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/Spotcheck/detailsview.vue b/src/pages/equipment/Spotcheck/detailsview.vue index a10f09b..37a3d83 100644 --- a/src/pages/equipment/Spotcheck/detailsview.vue +++ b/src/pages/equipment/Spotcheck/detailsview.vue @@ -17,8 +17,8 @@
设备名称: {{ detailsinfolist.equipmentName }}
-
车间: {{ detailsinfocontent.planWorkshop }}
-
工作中心: {{ detailsinfocontent.workCenterName }}
+
车间编码:: {{ detailsinfolist.planWorkshop }}
+
车间: {{ detailsinfolist.workCenterName }}
@@ -31,7 +31,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -41,7 +41,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -402,7 +402,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -410,7 +410,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -441,7 +441,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/Spotcheck/index.vue b/src/pages/equipment/Spotcheck/index.vue index 9c612c4..dfc2870 100644 --- a/src/pages/equipment/Spotcheck/index.vue +++ b/src/pages/equipment/Spotcheck/index.vue @@ -18,7 +18,6 @@
车间编码: {{ item.planWorkshop }}
周期: {{ item.planLoop }}
循环执行时间开始: {{ item.planLoopStart }}
-
循环执行时间结束: {{ item.planLoopEnd }}
@@ -30,7 +29,6 @@
车间编码: {{ item.planWorkshop }}
周期: {{ item.planLoop }}
循环执行时间开始: {{ item.planLoopStart }}
-
循环执行时间结束: {{ item.planLoopEnd }}
@@ -192,7 +190,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -205,7 +203,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .list-top { diff --git a/src/pages/equipment/Spotcheck/model.ts b/src/pages/equipment/Spotcheck/model.ts index 4f6e0a1..13139c3 100644 --- a/src/pages/equipment/Spotcheck/model.ts +++ b/src/pages/equipment/Spotcheck/model.ts @@ -8,7 +8,7 @@ import { url } from '@/utils/url'; store, name: 'page.equipment.Spotcheck', }) -export class ChangePalletNew extends VuexModule { +export class Spotcheck extends VuexModule { orderNoItemList: any = []; getTaskRecordList: any = []; @MutationAction @@ -56,4 +56,4 @@ export class ChangePalletNew extends VuexModule { } } -export default getModule(ChangePalletNew); +export default getModule(Spotcheck); diff --git a/src/pages/equipment/Upkeep/details.vue b/src/pages/equipment/Upkeep/details.vue index 1698f9b..78ca2a7 100644 --- a/src/pages/equipment/Upkeep/details.vue +++ b/src/pages/equipment/Upkeep/details.vue @@ -32,7 +32,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -42,7 +42,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -445,7 +445,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -453,7 +453,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -484,7 +484,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue index 8087867..ba76dd9 100644 --- a/src/pages/equipment/Upkeep/index.vue +++ b/src/pages/equipment/Upkeep/index.vue @@ -257,7 +257,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -270,7 +270,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .list-top { diff --git a/src/pages/equipment/Upkeep/model.ts b/src/pages/equipment/Upkeep/model.ts index 1ab3b2e..4cb51e0 100644 --- a/src/pages/equipment/Upkeep/model.ts +++ b/src/pages/equipment/Upkeep/model.ts @@ -8,7 +8,7 @@ import { url } from '@/utils/url'; store, name: 'page.equipment.Upkeep', }) -export class ChangePalletNew extends VuexModule { +export class Upkeep extends VuexModule { rowdata: any = []; orderNoItemList: any = []; getTaskRecordList: any = []; @@ -86,4 +86,4 @@ export class ChangePalletNew extends VuexModule { } } -export default getModule(ChangePalletNew); +export default getModule(Upkeep); diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue index e66f733..750bc59 100644 --- a/src/pages/equipment/Upkeep/repairing.vue +++ b/src/pages/equipment/Upkeep/repairing.vue @@ -47,7 +47,7 @@
检查方法: {{ item.itemMethod }}
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
@@ -57,7 +57,7 @@
-
检查标准: {{ item1.standardName }}
+
检查标准: {{ item1.standardName }}
实际值: @@ -132,7 +132,7 @@ --> - + - + @@ -597,7 +597,7 @@ export default class ChangePalletNew extends BasePage { width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; .item-name { @@ -605,7 +605,7 @@ export default class ChangePalletNew extends BasePage { // width: 367px; // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; - // background-color: #f2f2f2; + // background-color: #ffffff; padding: 7px 8px 7px 12px; box-sizing: border-box; text-align: center; @@ -723,7 +723,7 @@ export default class ChangePalletNew extends BasePage { width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; - background-color: #f2f2f2; + background-color: #ffffff; padding: 7px 8px 7px 8px; box-sizing: border-box; .item1 { diff --git a/src/pages/equipment/equipmentlist.vue b/src/pages/equipment/equipmentlist.vue new file mode 100644 index 0000000..a3e8cb3 --- /dev/null +++ b/src/pages/equipment/equipmentlist.vue @@ -0,0 +1,409 @@ + + + diff --git a/src/pages/equipment/index.vue b/src/pages/equipment/index.vue index b1b3a43..31a823d 100644 --- a/src/pages/equipment/index.vue +++ b/src/pages/equipment/index.vue @@ -2,7 +2,7 @@ - + 设备管理 @@ -46,6 +46,11 @@ export default class RawAppointment extends BasePage { this.newmenuList = this.menuList.filter((item) => item.perms == 'equipmentlist'); console.log('1234', this.menuList); } + goback() { + uni.navigateTo({ + url: `/pages/shouye/index`, + }); + } } diff --git a/src/pages/mes/Pallethandling/model.ts b/src/pages/mes/Pallethandling/model.ts index 7c10a6e..8fd841e 100644 --- a/src/pages/mes/Pallethandling/model.ts +++ b/src/pages/mes/Pallethandling/model.ts @@ -9,7 +9,7 @@ import { session } from '@/store/modules/session'; store, name: 'page.mes.Pallethandling', }) -export class ChangePalletNew extends VuexModule { +export class Pallethandling extends VuexModule { orderNoItemList: any = []; @MutationAction async queryOrderNo(orderNo: any) { @@ -91,4 +91,4 @@ export class ChangePalletNew extends VuexModule { } } -export default getModule(ChangePalletNew); +export default getModule(Pallethandling); diff --git a/src/pages/quality/Belowstandard/detail.vue b/src/pages/quality/Belowstandard/detail.vue new file mode 100644 index 0000000..c7843fb --- /dev/null +++ b/src/pages/quality/Belowstandard/detail.vue @@ -0,0 +1,303 @@ + + + diff --git a/src/pages/quality/Belowstandard/index.vue b/src/pages/quality/Belowstandard/index.vue new file mode 100644 index 0000000..f29a07e --- /dev/null +++ b/src/pages/quality/Belowstandard/index.vue @@ -0,0 +1,1016 @@ + + + diff --git a/src/pages/quality/Belowstandard/model.ts b/src/pages/quality/Belowstandard/model.ts new file mode 100644 index 0000000..088ba8e --- /dev/null +++ b/src/pages/quality/Belowstandard/model.ts @@ -0,0 +1,56 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +//import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.raw.Belowstandard', +}) +export class Belowstandard extends VuexModule { + WlList = []; + @MutationAction + async queryLocation() { + const result: any = await http.post('', { + // factoryCode: session.factoryCode, + loginName: session.loginName, + }); + const WlList = result.data.map((_: any) => ({ + label: _.locationCode, + value: _.locationCode, + })); + return { WlList }; + } + orderNoItemList: any = []; + productCodeList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.post('', { + // factoryCode: session.factoryCode, + loginName: session.loginName, + orderNo, + }); + const orderNoItemList = result.data; + // const productCodeList = result.data.map((_: any) => ({ + // label: _.productCode, + // value: _.productCode, + // })); + return { orderNoItemList }; + } + SubmitCode: any = ''; + @MutationAction + async OnSubmit(params: any) { + const result: any = await http.post('', params); + const SubmitCode = result.code; + return { SubmitCode }; + } + @MutationAction + async empty() { + const productCodeList = []; + return { productCodeList }; + } +} + +export default getModule(Belowstandard); diff --git a/src/pages/quality/Inspectionitem/index.vue b/src/pages/quality/Inspectionitem/index.vue new file mode 100644 index 0000000..1765e42 --- /dev/null +++ b/src/pages/quality/Inspectionitem/index.vue @@ -0,0 +1,414 @@ + + + diff --git a/src/pages/quality/Inspectionitem/model.ts b/src/pages/quality/Inspectionitem/model.ts new file mode 100644 index 0000000..1b822f0 --- /dev/null +++ b/src/pages/quality/Inspectionitem/model.ts @@ -0,0 +1,65 @@ +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.Inspectionitem', +}) +export class Inspectionitem extends VuexModule { + rowdata: any = []; + orderNoItemList: any = []; + getTaskRecordList: any = []; + @MutationAction + async getTodayTask(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.getTodayTask, { params: params }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async getTaskRecord(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.getTaskRecord, { params: params }); + const getTaskRecordList = result.data; + return { getTaskRecordList }; + } + //巡检列表巡检记录 + OrderInfList: any = []; + @MutationAction + async getInspectionOrderInfo(workId: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.selectPdaRepairWorkOrderDetails + '/' + workId); + const OrderInfList: [] = result.data; + return { OrderInfList }; + } + SubmitCode: any = ''; + //巡检提交 + @MutationAction + async updateInspectionRecord(params: any) { + const result: any = await http.put(url.lanjuequipment.product.Repair.updateDowntime, params); + const SubmitCode: [] = result; + return { SubmitCode }; + } + @MutationAction + async updateMaintenanceRecords(params: any) { + const result: any = await http.put(url.lanjuequipment.product.Repair.updateMaintenanceRecords, params); + const SubmitCode: [] = result; + return { SubmitCode }; + } + Checklist: any = []; + @MutationAction + async queryhandChecklist(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.list, { params: params }); + const Checklist: any = result.rows; + console.log('this.tableData', Checklist); + // debugger + return { Checklist }; + } + @MutationAction + async rowdatanull() { + const rowdata: [] = []; + return { rowdata }; + } +} + +export default getModule(Inspectionitem); diff --git a/src/pages/quality/Inspectionrule/index.vue b/src/pages/quality/Inspectionrule/index.vue new file mode 100644 index 0000000..e7a0c64 --- /dev/null +++ b/src/pages/quality/Inspectionrule/index.vue @@ -0,0 +1,401 @@ + + + diff --git a/src/pages/quality/Inspectionrule/model.ts b/src/pages/quality/Inspectionrule/model.ts new file mode 100644 index 0000000..74d2f72 --- /dev/null +++ b/src/pages/quality/Inspectionrule/model.ts @@ -0,0 +1,65 @@ +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.Inspectionrule', +}) +export class Inspectionrule extends VuexModule { + rowdata: any = []; + orderNoItemList: any = []; + getTaskRecordList: any = []; + @MutationAction + async getTodayTask(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.getTodayTask, { params: params }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async getTaskRecord(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.getTaskRecord, { params: params }); + const getTaskRecordList = result.data; + return { getTaskRecordList }; + } + //巡检列表巡检记录 + OrderInfList: any = []; + @MutationAction + async getInspectionOrderInfo(workId: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.selectPdaRepairWorkOrderDetails + '/' + workId); + const OrderInfList: [] = result.data; + return { OrderInfList }; + } + SubmitCode: any = ''; + //巡检提交 + @MutationAction + async updateInspectionRecord(params: any) { + const result: any = await http.put(url.lanjuequipment.product.Repair.updateDowntime, params); + const SubmitCode: [] = result; + return { SubmitCode }; + } + @MutationAction + async updateMaintenanceRecords(params: any) { + const result: any = await http.put(url.lanjuequipment.product.Repair.updateMaintenanceRecords, params); + const SubmitCode: [] = result; + return { SubmitCode }; + } + Checklist: any = []; + @MutationAction + async queryhandChecklist(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.list, { params: params }); + const Checklist: any = result.rows; + console.log('this.tableData', Checklist); + // debugger + return { Checklist }; + } + @MutationAction + async rowdatanull() { + const rowdata: [] = []; + return { rowdata }; + } +} + +export default getModule(Inspectionrule); diff --git a/src/pages/quality/Inspectionunit/index.vue b/src/pages/quality/Inspectionunit/index.vue new file mode 100644 index 0000000..61e48ba --- /dev/null +++ b/src/pages/quality/Inspectionunit/index.vue @@ -0,0 +1,393 @@ + + + diff --git a/src/pages/quality/Inspectionunit/model.ts b/src/pages/quality/Inspectionunit/model.ts new file mode 100644 index 0000000..eeaccf5 --- /dev/null +++ b/src/pages/quality/Inspectionunit/model.ts @@ -0,0 +1,65 @@ +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.Inspectionunit', +}) +export class Inspectionunit extends VuexModule { + rowdata: any = []; + orderNoItemList: any = []; + getTaskRecordList: any = []; + @MutationAction + async getTodayTask(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.getTodayTask, { params: params }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async getTaskRecord(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.getTaskRecord, { params: params }); + const getTaskRecordList = result.data; + return { getTaskRecordList }; + } + //巡检列表巡检记录 + OrderInfList: any = []; + @MutationAction + async getInspectionOrderInfo(workId: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.selectPdaRepairWorkOrderDetails + '/' + workId); + const OrderInfList: [] = result.data; + return { OrderInfList }; + } + SubmitCode: any = ''; + //巡检提交 + @MutationAction + async updateInspectionRecord(params: any) { + const result: any = await http.put(url.lanjuequipment.product.Repair.updateDowntime, params); + const SubmitCode: [] = result; + return { SubmitCode }; + } + @MutationAction + async updateMaintenanceRecords(params: any) { + const result: any = await http.put(url.lanjuequipment.product.Repair.updateMaintenanceRecords, params); + const SubmitCode: [] = result; + return { SubmitCode }; + } + Checklist: any = []; + @MutationAction + async queryhandChecklist(params: any) { + const result: any = await http.get(url.lanjuequipment.product.Repair.list, { params: params }); + const Checklist: any = result.rows; + console.log('this.tableData', Checklist); + // debugger + return { Checklist }; + } + @MutationAction + async rowdatanull() { + const rowdata: [] = []; + return { rowdata }; + } +} + +export default getModule(Inspectionunit); diff --git a/src/pages/quality/Materialinspection/detail.vue b/src/pages/quality/Materialinspection/detail.vue new file mode 100644 index 0000000..c7843fb --- /dev/null +++ b/src/pages/quality/Materialinspection/detail.vue @@ -0,0 +1,303 @@ + + + diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue new file mode 100644 index 0000000..c13104f --- /dev/null +++ b/src/pages/quality/Materialinspection/index.vue @@ -0,0 +1,1002 @@ + + + diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts new file mode 100644 index 0000000..cec3d3e --- /dev/null +++ b/src/pages/quality/Materialinspection/model.ts @@ -0,0 +1,56 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +//import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.raw.Materialinspection', +}) +export class Materialinspection extends VuexModule { + WlList = []; + @MutationAction + async queryLocation() { + const result: any = await http.post('', { + // factoryCode: session.factoryCode, + loginName: session.loginName, + }); + const WlList = result.data.map((_: any) => ({ + label: _.locationCode, + value: _.locationCode, + })); + return { WlList }; + } + orderNoItemList: any = []; + productCodeList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.post('', { + // factoryCode: session.factoryCode, + loginName: session.loginName, + orderNo, + }); + const orderNoItemList = result.data; + // const productCodeList = result.data.map((_: any) => ({ + // label: _.productCode, + // value: _.productCode, + // })); + return { orderNoItemList }; + } + SubmitCode: any = ''; + @MutationAction + async OnSubmit(params: any) { + const result: any = await http.post('', params); + const SubmitCode = result.code; + return { SubmitCode }; + } + @MutationAction + async empty() { + const productCodeList = []; + return { productCodeList }; + } +} + +export default getModule(Materialinspection); diff --git a/src/pages/quality/Records/detail.vue b/src/pages/quality/Records/detail.vue new file mode 100644 index 0000000..c7843fb --- /dev/null +++ b/src/pages/quality/Records/detail.vue @@ -0,0 +1,303 @@ + + + diff --git a/src/pages/quality/Records/index.vue b/src/pages/quality/Records/index.vue new file mode 100644 index 0000000..69b2d5c --- /dev/null +++ b/src/pages/quality/Records/index.vue @@ -0,0 +1,979 @@ + + + diff --git a/src/pages/quality/Records/model.ts b/src/pages/quality/Records/model.ts new file mode 100644 index 0000000..f80434a --- /dev/null +++ b/src/pages/quality/Records/model.ts @@ -0,0 +1,56 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +//import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.raw.Records', +}) +export class Records extends VuexModule { + WlList = []; + @MutationAction + async queryLocation() { + const result: any = await http.post('', { + // factoryCode: session.factoryCode, + loginName: session.loginName, + }); + const WlList = result.data.map((_: any) => ({ + label: _.locationCode, + value: _.locationCode, + })); + return { WlList }; + } + orderNoItemList: any = []; + productCodeList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.post('', { + // factoryCode: session.factoryCode, + loginName: session.loginName, + orderNo, + }); + const orderNoItemList = result.data; + // const productCodeList = result.data.map((_: any) => ({ + // label: _.productCode, + // value: _.productCode, + // })); + return { orderNoItemList }; + } + SubmitCode: any = ''; + @MutationAction + async OnSubmit(params: any) { + const result: any = await http.post('', params); + const SubmitCode = result.code; + return { SubmitCode }; + } + @MutationAction + async empty() { + const productCodeList = []; + return { productCodeList }; + } +} + +export default getModule(Records); diff --git a/src/pages/quality/index.vue b/src/pages/quality/index.vue new file mode 100644 index 0000000..a70ba22 --- /dev/null +++ b/src/pages/quality/index.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/pages/shouye/index.vue b/src/pages/shouye/index.vue index 56d44e8..4cbbd72 100644 --- a/src/pages/shouye/index.vue +++ b/src/pages/shouye/index.vue @@ -85,7 +85,7 @@ export default class RawHome extends BasePage { poolName: poolName, }); } - this.newmenuList = this.menuList.filter((item) => item.perms == 'wms' || item.perms == 'mes' || item.perms == 'equipment'); + this.newmenuList = this.menuList.filter((item) => item.perms == 'wms' || item.perms == 'mes' || item.perms == 'equipment' || item.perms == 'quality'); console.log('1234', this.menuList); } onLoad() { diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue index adda19b..809a6aa 100644 --- a/src/pages/shouye/me.vue +++ b/src/pages/shouye/me.vue @@ -65,7 +65,7 @@ export default class RawHome extends BasePage { model = model; src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg'; today = dayjs().format('YYYY-MM-DD dddd'); - version = '0.0.13'; + version = '0.0.14'; checkversion: any = {}; sessiondata: any = ''; onLoad() { diff --git a/src/pages/wms/Raw/PurchaseWHPO/detail.vue b/src/pages/wms/Raw/PurchaseWHPO/detail.vue index 0d1c7a3..7712f8e 100644 --- a/src/pages/wms/Raw/PurchaseWHPO/detail.vue +++ b/src/pages/wms/Raw/PurchaseWHPO/detail.vue @@ -14,30 +14,30 @@ 物资编码: - 4500331750 + {{ item.materialCode }} - 物资名称: - 40000006954 + 物资描述: + {{ item.materialDesc }} 托盘号: - 100 + {{ item.sn }} 批次号: - + 入库数量: - 100 + {{ item.amount }} 单位: - + {{ item.userDefined4 }} @@ -55,7 +55,7 @@ import { Component } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import jPicker from '@/components/J-Picker/jPicker.vue'; import model from './model'; -//import { session } from '@/store/modules/session'; +import { session } from '@/store/modules/session'; @Component({ components: { jPicker, @@ -63,7 +63,7 @@ import model from './model'; }) export default class PurchaseWHPO extends BasePage { model = model; - list: any = [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }]; + list: any = []; form3: any = {}; // remove: any = {}; // async onReady() { @@ -89,16 +89,20 @@ export default class PurchaseWHPO extends BasePage { value: '0', }, ]; - + orderNoItemListdes: any = ''; productCodeList: any = {}; - async query() { - if (this.orderNo == '' || this.orderNo.length == 0) { - this.customToast('请输入nficl'); - return; + detailsinfo: any = ''; + async onLoad(options) { + let str = decodeURIComponent(options.listitem); + if (str) { + this.detailsinfo = JSON.parse(str); + let query = { + poNo: this.detailsinfo.poNo, + factoryCode: session.FactoryCode, + }; + await this.model.PurchaseOrderWarehousingPda(query); + this.list = model.orderNoItemList; } - await this.model.queryOrderNo(this.orderNo); - this.productCodeList = this.model.productCodeList[0]; - this.histroyItem = this.model.orderNoItemList[0]; } histroyItem: any = {}; barcode: any = ''; diff --git a/src/pages/wms/Raw/PurchaseWHPO/index.vue b/src/pages/wms/Raw/PurchaseWHPO/index.vue index 2564c04..75069dd 100644 --- a/src/pages/wms/Raw/PurchaseWHPO/index.vue +++ b/src/pages/wms/Raw/PurchaseWHPO/index.vue @@ -20,10 +20,10 @@ - + - + @@ -40,38 +40,54 @@ - 待收货 + {{ item.activeFlag == 0 ? '未入库' : item.activeFlag == 1 ? '正在入库' : '收货入库' }} 入库单号: - 4500331750 + {{ item.poNo }} 物料编码: - 40000006954 + {{ item.materialCode }} 物料名称: - 纸箱 + {{ item.materialDesc }} + 托盘号: + {{ item.sn }} + + + + 工厂号: + {{ item.factoryCode }} + + 收货仓库: + {{ item.whCode }} + + - 应入/已入: - 100/0 + 数量: + {{ item.amount }} 单位: - + {{ item.userDefined4 }} @@ -82,11 +98,11 @@ - + - 库位码: - + 库位码: + - - - - - 确定 - - - - 取消 - - + +
+ 确定 +
+
+ 取消 +
@@ -121,7 +133,7 @@ import { Component } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import jPicker from '@/components/J-Picker/jPicker.vue'; import model from './model'; -//import { session } from '@/store/modules/session'; +import { session } from '@/store/modules/session'; @Component({ components: { jPicker, @@ -129,7 +141,7 @@ import model from './model'; }) export default class PurchaseWHPO extends BasePage { model = model; - list: any = [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }]; + list: any = []; show = false; form3: any = {}; // remove: any = {}; @@ -141,6 +153,7 @@ export default class PurchaseWHPO extends BasePage { // this.remove = e.pickerName; // } orderNo: any = ''; + materialCode: any = ''; border = true; height = 100; autoHeight = true; @@ -158,25 +171,55 @@ export default class PurchaseWHPO extends BasePage { ]; productCodeList: any = {}; + clickitem: any = ''; //收货按钮 onPass(item) { - console.log('1234567', item); + this.clickitem = item; this.show = true; + this.form3 = {}; } nopoup() { this.show = false; this.form3.barCodewl = ''; } //点击收货按钮,录入批次(或系统自动生成)、数量、托盘码进行收货。 - onOk() { - console.log('1234567'); - //await this.model.OnSubmit(this.form3.barCodewl); + async onOk() { + console.log(this.form3); + if (this.form3.wlCode == '' || this.form3.wlCode == undefined) { + (this.$refs.uToast as any).show({ + title: '库位编码不能为空', + type: 'default', + }); + return; + } + + let query = this.clickitem; + // query.applyList = this.Sparepartlist; + query.wlCode = this.form3.wlCode; + await this.model.PurchaseOrderRKPda(query); + console.log(this.model.SubmitCode); + if (this.model.SubmitCode.code == 200) { + (this.$refs.uToast as any).show({ + title: '成功', + type: 'default', + }); + this.show = false; + this.query(); + } else { + (this.$refs.uToast as any).show({ + title: '失败', + type: this.model.SubmitCode.msg, + }); + } } async onFormDoubleClick(item) { console.log('双击', item); //await this.model.OnSubmit(item.id); + // uni.navigateTo({ + // url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)), + // }); this.uni.navigateTo({ - url: this.page.wms.PurchaseWHPODetail, + url: this.page.wms.PurchaseWHPODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)), }); } //查询货单关联采购单信息 @@ -188,12 +231,30 @@ export default class PurchaseWHPO extends BasePage { }); return; } - await this.model.queryOrderNo(this.orderNo); - // this.list = model.orderNoItemList; + let query = { + poNo: this.orderNo, + materialCode: this.materialCode, + factoryCode: session.FactoryCode, + }; + await this.model.PurchaseOrderWarehousingPda(query); + this.list = model.orderNoItemList; } //提单按钮 - tidan() { - console.log('11111'); + async tidan() { + if (this.orderNo == '' || this.orderNo.length == 0) { + (this.$refs.uToast as any).show({ + title: '请输入RFID', + type: 'default', + }); + return; + } + let query = { + poNo: this.orderNo, + materialCode: this.materialCode, + factoryCode: session.FactoryCode, + }; + await this.model.PurchaseOrderWarehousingPda(query); + this.list = model.orderNoItemList; } histroyItem: any = {}; barcode: any = ''; @@ -489,7 +550,7 @@ export default class PurchaseWHPO extends BasePage { } .poupbutton { display: flex; - justify-content: center; + justify-content: space-around; } .mask { position: fixed; diff --git a/src/pages/wms/Raw/PurchaseWHPO/model.ts b/src/pages/wms/Raw/PurchaseWHPO/model.ts index ae51fec..977d00f 100644 --- a/src/pages/wms/Raw/PurchaseWHPO/model.ts +++ b/src/pages/wms/Raw/PurchaseWHPO/model.ts @@ -1,7 +1,7 @@ import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import store from '@/store'; import http from '@/utils/request'; -// import { url } from '@/utils/url'; +import { url } from '@/utils/url'; import { session } from '@/store/modules/session'; @Module({ namespaced: true, @@ -12,29 +12,34 @@ import { session } from '@/store/modules/session'; export class PurchaseWHPO extends VuexModule { WlList = []; orderNoItemList: any = []; - productCodeList: any = []; + orderNoItemListdes: any = []; @MutationAction - async queryOrderNo(orderNo: any) { - const result: any = await http.post('', { - // factoryCode: session.factoryCode, - factoryCode: session.PoolName, - procureCode: orderNo, - materialCode: '', - }); + async PurchaseOrderWarehousingPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.PurchaseWHPO.PurchaseOrderWarehousingPda, data); const orderNoItemList = result.data; return { orderNoItemList }; } SubmitCode: any = ''; @MutationAction - async OnSubmit(params: any) { - const result: any = await http.post('', params); - const SubmitCode = result.code; + async PurchaseOrderRKPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.PurchaseWHPO.PurchaseOrderRKPda, data); + const SubmitCode: [] = result; return { SubmitCode }; } + + DictTypeList: any = []; @MutationAction - async empty() { - const productCodeList = []; - return { productCodeList }; + async Stashlist() { + const result: any = await http.post(url.lanjuwms.raw.PurchaseWHPO.list, { + factoryCode: session.FactoryCode, + }); + const DictTypeListoild: [] = result.data; + const DictTypeList = DictTypeListoild.map((item: any) => ({ + label: item.warehouseName, + value: item.warehouseCode, + ...item, + })); + return { DictTypeList }; } } diff --git a/src/pages/wms/Raw/ReceivePO/detail.vue b/src/pages/wms/Raw/ReceivePO/detail.vue index cd77a23..54326cc 100644 --- a/src/pages/wms/Raw/ReceivePO/detail.vue +++ b/src/pages/wms/Raw/ReceivePO/detail.vue @@ -89,7 +89,7 @@ export default class receivePO extends BasePage { this.detailsinfo = JSON.parse(str); let query = { id: this.detailsinfo.id, - factoryCode: '1000', + factoryCode: this.session.FactoryCode, }; await this.model.PurchaseOrderdetailPda(query); this.orderNoItemListdes = this.model.orderNoItemListdes; diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index c87dfd9..382e14b 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -99,7 +99,7 @@
收货仓库: - +
@@ -133,6 +133,7 @@ export default class receivePO extends BasePage { whList: any = []; show = false; form3: any = {}; + productCodeTypeList: any = {}; moren = '选择仓库'; // remove: any = {}; // async onReady() { @@ -161,17 +162,26 @@ export default class receivePO extends BasePage { ]; clickitem: any = ''; productCodeList: any = {}; + async onReady() { + await this.model.Stashlist(); + this.whList = model.DictTypeList; + //this.remove = this.model.WlList[0]; + } //收货按钮 onPass(item) { this.clickitem = item; this.show = true; + this.form3 = {}; + this.productCodeTypeList = {}; } nopoup() { this.show = false; this.form3 = {}; + this.productCodeTypeList = {}; } //点击收货按钮,录入批次(或系统自动生成)、数量、托盘码进行收货。 async onOk() { + console.log(this.form3); if (this.form3.incomeBatchNo == '' || this.form3.incomeBatchNo == undefined) { (this.$refs.uToast as any).show({ title: '批次号不能为空', @@ -193,7 +203,7 @@ export default class receivePO extends BasePage { }); return; } - if (this.form3.whCode == '' || this.form3.whCode == undefined) { + if (this.productCodeTypeList.value == '' || this.productCodeTypeList.value == undefined) { (this.$refs.uToast as any).show({ title: '请选择仓库', type: 'default', @@ -206,22 +216,21 @@ export default class receivePO extends BasePage { query.workStatus = this.form3.workStatus; query.sn = this.form3.sn; query.planNumber = this.form3.planNumber; - query.whCode = this.form3.whCode; - await this.model.PurchaseOrderdetailPda(query); - if (this.model.SubmitCode.code == '200') { + query.whCode = this.productCodeTypeList.warehouseCode; + query.factoryCode = session.FactoryCode; + await this.model.PurchaseOrderdeliPda(query); + console.log(this.model.SubmitCode); + if (this.model.SubmitCode.code == 200) { (this.$refs.uToast as any).show({ title: '成功', type: 'default', }); - setTimeout(() => { - uni.navigateTo({ - url: `/pages/equipment/Upkeep/index?listitem=`, - }); - }, 1000); + this.show = false; + this.query(); } else { (this.$refs.uToast as any).show({ title: '失败', - type: 'default', + type: this.model.SubmitCode.msg, }); } } @@ -248,7 +257,7 @@ export default class receivePO extends BasePage { let query = { procureCode: this.procureCode, materialCode: this.materialCode, - factoryCode: '1000', + factoryCode: session.FactoryCode, }; await this.model.PurchaseOrderPda(query); this.list = model.orderNoItemList; @@ -265,7 +274,7 @@ export default class receivePO extends BasePage { let query = { procureCode: this.procureCode, materialCode: this.materialCode, - factoryCode: '1000', + factoryCode: session.FactoryCode, }; await this.model.PurchaseOrderPda(query); this.list = model.orderNoItemList; @@ -273,8 +282,14 @@ export default class receivePO extends BasePage { histroyItem: any = {}; barcode: any = ''; async selectProductlocCode(e: any) { - this.form3 = e.pickerName; - // await this.model.getpalletLocation(this.form3.value); //参数:成型区2,烘房3 + console.log(e.pickerName.warehouseName); + this.productCodeTypeList = e.pickerName; + // let params = { + // factoryCode: session.FactoryCode, + // equipmentTypeCode: this.productCodeTypeList.value, + // }; + // await this.model.getAllEquipmentsle(params); + // this.whList = model.DictTypeList; } //完成送货单 async onSubmit() { diff --git a/src/pages/wms/Raw/ReceivePO/model.ts b/src/pages/wms/Raw/ReceivePO/model.ts index 296cbc2..e267cd0 100644 --- a/src/pages/wms/Raw/ReceivePO/model.ts +++ b/src/pages/wms/Raw/ReceivePO/model.ts @@ -2,7 +2,7 @@ import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decor import store from '@/store'; import http from '@/utils/request'; import { url } from '@/utils/url'; -// import { session } from '@/store/modules/session'; +import { session } from '@/store/modules/session'; @Module({ namespaced: true, dynamic: true, @@ -19,19 +19,34 @@ export class receivePO extends VuexModule { const orderNoItemList = result.data; return { orderNoItemList }; } + SubmitCode: any = ''; @MutationAction async PurchaseOrderdeliPda(data: any) { const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdeliPda, data); const SubmitCode: [] = result; return { SubmitCode }; } - SubmitCode: any = ''; + @MutationAction async PurchaseOrderdetailPda(data: any) { const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdetailPda, data); const orderNoItemListdes = result.data; return { orderNoItemListdes }; } + DictTypeList: any = []; + @MutationAction + async Stashlist() { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.list, { + factoryCode: session.FactoryCode, + }); + const DictTypeListoild: [] = result.data; + const DictTypeList = DictTypeListoild.map((item: any) => ({ + label: item.warehouseName, + value: item.warehouseCode, + ...item, + })); + return { DictTypeList }; + } } export default getModule(receivePO); diff --git a/src/pages/wms/index.vue b/src/pages/wms/index.vue index 0ec884d..2040d97 100644 --- a/src/pages/wms/index.vue +++ b/src/pages/wms/index.vue @@ -2,7 +2,7 @@ - + wms菜单 @@ -529,6 +529,11 @@ export default class RawAppointment extends BasePage { console.log('1234', this.menuList); } + goback() { + uni.navigateTo({ + url: `/pages/shouye/index`, + }); + } // onLoad(option: { childData: any }) { // //this.childData = JSON.parse(option.childData); // } diff --git a/src/utils/image.ts b/src/utils/image.ts index 6286589..0898ca1 100644 --- a/src/utils/image.ts +++ b/src/utils/image.ts @@ -11,4 +11,7 @@ export const image = { workarea: { image1: require('@/static/images/image-01.png'), }, + equipment: { + Repairimage1: require('@/static/images/add.png'), + }, }; diff --git a/src/utils/url.ts b/src/utils/url.ts index 4a910e2..aae41bd 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用 +const qianzhuione = '/prod-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用 // const qianzhuione = '/prod-api'; export const url = { wmspda: { @@ -63,6 +63,28 @@ export const url = { out: qianzhuione + '/wms/selloutconntray/out', }, }, + raw: { + ReceivePO: { + // 手持 --包材采购单采购收货查询 + PurchaseOrderPda: qianzhuione + '/wms/order/PurchaseOrderPda', + // 手持 --包材采购单采购收货操作 + PurchaseOrderdeliPda: qianzhuione + '/wms/order/PurchaseOrderdeliPda', + // 手持 --包材采购单采购查询明细 + PurchaseOrderdetailPda: qianzhuione + '/wms/order/PurchaseOrderdetailPda', + // 手持 查询仓库管理列表 + list: qianzhuione + '/wms/order/listCK', + }, + PurchaseWHPO: { + // 手持 --包材采购单采购收货查询 + PurchaseOrderWarehousingPda: qianzhuione + '/wms/order/PurchaseOrderWarehousingPda', + // 手持 --包材采购单采购收货操作 + PurchaseOrderRKPda: qianzhuione + '/wms/order/PurchaseOrderRKPda', + // 手持 --包材采购单采购查询明细 + PurchaseOrderdetailPda: qianzhuione + '/wms/order/PurchaseOrderdetailPda', + // 手持 查询仓库管理列表 + list: qianzhuione + '/wms/order/listCK', + }, + }, }, // 设备管理 lanjuequipment: { @@ -84,6 +106,53 @@ export const url = { getInfoRepair: qianzhuione + '/device/devicePDA/queryEquipment/', // 根据订单号和产品编码查询 addRepairRecord: qianzhuione + '/device/devicePDA/addRepairRecord', + // 备件list + getEquipmentList: qianzhuione + '/device/devicePDA/getEquipmentList', + }, + // 维修 + Repair: { + // 获取今日任务 获取历史记录 + getTodayTask: qianzhuione + '/device/devicePDA/getMaintenancePendRecords', + // 获取历史记录 + getTaskRecord: qianzhuione + '/device/devicePDA/getMaintenanceRecords', + // 获取维修工单信息 + selectPdaRepairWorkOrderDetails: qianzhuione + '/device/devicePDA/selectPdaRepairWorkOrderDetails', + // 是否维修 + updateDowntime: qianzhuione + '/device/devicePDA/updateDowntime', + // 维修提交 + updateMaintenanceRecords: qianzhuione + '/device/devicePDA/updateMaintenanceRecords', + // 备件list + list: qianzhuione + '/device/sparePartsLedger/list', + }, + // 保养 + Upkeep: { + // 是否开机保养 + startMaintenanceTask: qianzhuione + '/device/devicePDA/startMaintenanceTask', + }, + }, + }, + // 质量管理 + lanjuquality: { + product: { + // 巡检 + Inspection: { + // 获取今日任务 获取历史记录 + getTodayTask: qianzhuione + '/device/devicePDA/getTodayTask', + // 获取历史记录 + getTaskRecord: qianzhuione + '/device/devicePDA/getTaskRecord', + // 获取巡检工单详情信息 + getInspectionOrderInfo: qianzhuione + '/device/devicePDA/getInspectionOrderInfo', + // 提交巡检工单详情信息 + updateInspectionRecord: qianzhuione + '/device/devicePDA/updateInspectionRecord', + }, + // 报修 + Repairbx: { + // 根据交货单号查询下面的产品编码 + getInfoRepair: qianzhuione + '/device/devicePDA/queryEquipment/', + // 根据订单号和产品编码查询 + addRepairRecord: qianzhuione + '/device/devicePDA/addRepairRecord', + // 备件list + getEquipmentList: qianzhuione + '/device/devicePDA/getEquipmentList', }, // 维修 Repair: {