From 2791e610a1c7e487bd77441cb9cb9e5bf8f32e77 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Thu, 15 Aug 2024 17:38:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8A=A5=E4=BF=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=8F=90=E4=BA=A4=EF=BC=8C=E6=88=90=E5=93=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/MaintenanceAudit/Audit.vue | 82 ++++++++++++------ .../equipment/MaintenanceAudit/index.vue | 21 ----- src/pages/equipment/MaintenanceAudit/model.ts | 1 + src/pages/equipment/RepairAudit/Audit.vue | 76 ++++++++++++++++- src/pages/login/login/index.vue | 2 +- .../wms/product/ProductionRecord/index.vue | 84 ++++++++----------- .../wms/product/ProductionRecord/model.ts | 6 ++ src/utils/url.ts | 1 + 8 files changed, 172 insertions(+), 101 deletions(-) diff --git a/src/pages/equipment/MaintenanceAudit/Audit.vue b/src/pages/equipment/MaintenanceAudit/Audit.vue index 6746a68..4faefaa 100644 --- a/src/pages/equipment/MaintenanceAudit/Audit.vue +++ b/src/pages/equipment/MaintenanceAudit/Audit.vue @@ -10,22 +10,25 @@ -
-
维修工单号: {{ detailsinfolist.workCode }}
-
-
设备编码: {{ detailsinfolist.equipmentCode }}
-
设备名称: {{ detailsinfolist.equipmentName }}
-
-
-
产线: {{ detailsinfolist.planProdLine }}
-
-
- -
工作中心: {{ detailsinfolist.workshopName }}
-
-
报修信息
+
+
维修工单号: {{ detailsinfolist.workCode }}
+ +
+
+
设备编码: {{ detailsinfolist.equipmentCode }}
+ +
+
+
设备名称: {{ detailsinfolist.equipmentName }}
+ +
+
+
工作中心: {{ detailsinfolist.workshopName }}
+ +
+
报修单号: {{ detailsinfolist.orderCode }}
@@ -71,12 +74,12 @@
检查项: {{ item.itemName }}
检查方法: {{ item.itemMethod }}
-
-
+
+
检查标准: {{ item1.standardName }}
- + {{ n.name }} @@ -86,7 +89,7 @@
检查标准: {{ item1.standardName }}
实际值: - + 单位:mm
@@ -129,12 +132,12 @@ --> - - - + + --> @@ -158,11 +161,11 @@ 删除
-->
-
备件编码: {{ item.materialCode }}
+
备件编码: {{ item.spareCode }}
-
备件名称: {{ item.materialDesc }}
+
备件名称: {{ item.spareName }}
@@ -188,7 +191,7 @@
- + 审核 @@ -197,9 +200,19 @@ + + 审核 + + {{ detailsinfolist.resultInspect == '2' ? '待审核' : detailsinfolist.resultInspect == '1' ? '审核通过' : '驳回' }} + + + {{ detailsinfolist.auditOpinion }} + + + - + 确认 @@ -209,6 +222,11 @@ 返回 + + + 返回 + + @@ -334,6 +352,8 @@ export default class ChangePalletNew extends BasePage { workReason: any = {}; repairMeasures: any = {}; workReasonceshi: 'aaaaa'; + istongguostatus: any = ''; + isshowbutton = true; async onReady() { //await this.model.getpalletLocation(); //this.remove = this.model.WlList[0]; @@ -365,12 +385,20 @@ export default class ChangePalletNew extends BasePage { console.log(options, 'options'); await this.model.getTaskRecord(options.orderId); this.detailsinfolist = this.model.getTaskRecordList; - if (this.detailsinfolist.files) { + this.istongguostatus = this.detailsinfolist.resultInspect; + if (this.detailsinfolist.files == null || this.detailsinfolist.files.length == 0) { + this.imgformList = []; + } else { this.imgformList = []; this.detailsinfolist.files.forEach((item) => { this.imgformList.push(item.fileAddress); }); } + if (this.istongguostatus == '1') { + this.isshowbutton = false; + } else { + this.isshowbutton = true; + } } goback() { uni.navigateBack({ diff --git a/src/pages/equipment/MaintenanceAudit/index.vue b/src/pages/equipment/MaintenanceAudit/index.vue index 70253cb..8731d6f 100644 --- a/src/pages/equipment/MaintenanceAudit/index.vue +++ b/src/pages/equipment/MaintenanceAudit/index.vue @@ -57,7 +57,6 @@ export default class RepairAudit extends BasePage { AuditStatusList: any = [ { label: '待审核', value: '2' }, { label: '审核通过', value: '1' }, - { label: '驳回', value: '0' }, ]; AuditStatusType: any = {}; list: any = [ @@ -185,26 +184,6 @@ export default class RepairAudit extends BasePage { uni.navigateTo({ url: `/pages/equipment/MaintenanceAudit/Audit?orderId=` + item.workId, }); - // this.model.rowdatanull(); - // this.orderNo = null; - // // this.model.rowdata = [] - // // item.workStatus == 0 ? '待保养' : item.workStatus == 1 ? '保养完成' : item.workStatus == 2 ? '保养中' : '保养未完成'; - // if (item.orderStatus == 0) { - // uni.navigateTo({ - // url: `/pages/equipment/RepairAudit/Audit` - // //?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value, - // }); - // } else if (item.orderStatus == 2 || item.orderStatus == 3) { - // uni.navigateTo({ - // url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value, - // }); - // } else { - // this.ischecked = true; - // item.ischecked = true; - // uni.navigateTo({ - // url: `/pages/equipment/Upkeep/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value, - // }); - // } } } diff --git a/src/pages/equipment/MaintenanceAudit/model.ts b/src/pages/equipment/MaintenanceAudit/model.ts index 8bd19a7..8159207 100644 --- a/src/pages/equipment/MaintenanceAudit/model.ts +++ b/src/pages/equipment/MaintenanceAudit/model.ts @@ -17,6 +17,7 @@ export class MaintenanceAudit extends VuexModule { const result: any = await http.get(url.lanjuequipment.product.MaintenanceAudit.getBXList, { params: { resultInspect: params, + workStatus: '1', }, }); const orderNoItemList = result.data; diff --git a/src/pages/equipment/RepairAudit/Audit.vue b/src/pages/equipment/RepairAudit/Audit.vue index 4000b95..52b880c 100644 --- a/src/pages/equipment/RepairAudit/Audit.vue +++ b/src/pages/equipment/RepairAudit/Audit.vue @@ -86,7 +86,7 @@
- + 审核 @@ -133,11 +133,69 @@ + + + 审核 + + {{ histroyItem.repairDestination }} + + + + + {{ histroyItem.workTeam }} + + + + {{ histroyItem.workPlanTime }} + + + + {{ histroyItem.workDownMachine == '1' ? '是' : '否' }} + + + + {{ histroyItem.workPlanDownTime }} + + + + + + {{ histroyItem.auditOpinion }} + + + + + + {{ histroyItem.workOutsourcingUnit }} + + + + {{ histroyItem.outSourcePerson }} + + + + {{ histroyItem.workConnection }} + + + + {{ histroyItem.outSourceReason }} + + + + - + 确认 @@ -147,6 +205,12 @@ 返回 + + + + 返回 + + @@ -260,6 +324,8 @@ export default class RepairAudit extends BasePage { showProduceCodeList: any = []; itemdetail: any = ''; outnumber: any = 0; + istongguostatus: any = ''; + isshowbutton = true; // async onReady() { // } @@ -267,6 +333,7 @@ export default class RepairAudit extends BasePage { let orderId = options.orderId; await this.model.getTaskRecord(orderId); this.histroyItem = this.model.getTaskRecordList; + this.istongguostatus = this.histroyItem.orderStatus; if (this.histroyItem.checkList === null || this.histroyItem.checkList.length == 0) { this.noitem = true; } else { @@ -281,6 +348,11 @@ export default class RepairAudit extends BasePage { await this.model.getTeamList(); this.groupList = this.model.teamList; + if (this.istongguostatus == '0' || this.istongguostatus == '1') { + this.isshowbutton = false; + } else { + this.isshowbutton = true; + } } changeradio1(checkResult) { console.log(checkResult); diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 5869e0c..4d208ec 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.93'; //正式版本号 + version = '0.0.94'; //正式版本号 //version = '0.0.7'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/product/ProductionRecord/index.vue b/src/pages/wms/product/ProductionRecord/index.vue index 39d516b..3823667 100644 --- a/src/pages/wms/product/ProductionRecord/index.vue +++ b/src/pages/wms/product/ProductionRecord/index.vue @@ -9,7 +9,20 @@ + + + 标识码: + + + + + {{ querybyattr1.prodLineName }} + {{ querybyattr1.workorderCodeSap }} + {{ querybyattr1.batchCode }} + {{ querybyattr1.productName }} + + 托盘号: @@ -19,27 +32,6 @@ 提单 --> - - 产线: - - - - 工单: - - - - 批次: - - - {{ production.productName }} - - - - - 标识码: - - - @@ -88,6 +80,7 @@ export default class ProductionRecord extends BasePage { production: any = {}; quantity = ''; attr1 = ''; + querybyattr1: any = {}; async onReady() { await this.model.getlistBaseEquipment(); @@ -100,6 +93,16 @@ export default class ProductionRecord extends BasePage { async onShow() { // } + ///标志卡查询 + async search() { + await this.model.queryByAttr1({ factoryCode: session.FactoryCode, attr1: this.attr1 }); + this.querybyattr1 = model.queryByAttr1List; + this.orderNoItemList.map((item) => { + if (item.equipmentCode == this.querybyattr1.prodLineCode) { + this.querybyattr1.prodLineName = item.equipmentName; + } + }); + } //去重方法 uniqueArray(arr: any[], key: string) { // 使用一个对象来存储已经看到的key对应的值 @@ -159,28 +162,9 @@ export default class ProductionRecord extends BasePage { }); return; } - - if (this.aimWl.value == '') { + if (this.querybyattr1.quantity == '') { (this.$refs.uToast as any).show({ - title: '请先选择产线', - }); - return; - } - if (this.cimWl.value == '') { - (this.$refs.uToast as any).show({ - title: '请先选择工单', - }); - return; - } - if (this.bimWl.value == '') { - (this.$refs.uToast as any).show({ - title: '请先选择批次', - }); - return; - } - if (this.quantity == '') { - (this.$refs.uToast as any).show({ - title: '请输入数量', + title: '数量不能为空', }); return; } @@ -193,14 +177,14 @@ export default class ProductionRecord extends BasePage { let params = { factoryCode: session.FactoryCode, createBy: session.loginName, - workorderCodeSap: this.cimWl.value, - batchCode: this.bimWl.value, - productCode: this.production.productCode, - productName: this.production.productName, - prodLineCode: this.aimWl.value, - prodLineName: this.aimWl.label, + workorderCodeSap: this.querybyattr1.workorderCodeSap, + batchCode: this.querybyattr1.batchCode, + productCode: this.querybyattr1.productCode, + productName: this.querybyattr1.productName, + prodLineCode: this.querybyattr1.prodLineCode, + prodLineName: this.querybyattr1.prodLineName, sn: this.orderNo, - quantity: this.quantity, + quantity: this.querybyattr1.quantity, attr1: this.attr1, }; //console.log('参数',params); @@ -210,7 +194,7 @@ export default class ProductionRecord extends BasePage { title: '成功', type: 'success', }); - this.quantity = ''; + this.querybyattr1.quantity = ''; this.orderNo = ''; this.attr1 = ''; } else { diff --git a/src/pages/wms/product/ProductionRecord/model.ts b/src/pages/wms/product/ProductionRecord/model.ts index 58b4903..48a96b9 100644 --- a/src/pages/wms/product/ProductionRecord/model.ts +++ b/src/pages/wms/product/ProductionRecord/model.ts @@ -45,6 +45,12 @@ export class ProductionRecord extends VuexModule { const submitcode = result.code; return { submitcode }; } + queryByAttr1List: any = {}; + @MutationAction + async queryByAttr1(params: any) { + const result: any = await http.post(url.lanjuwms.product.ProductionRecord.queryByAttr1, params); + return { queryByAttr1List: result.data }; + } } export default getModule(ProductionRecord); diff --git a/src/utils/url.ts b/src/utils/url.ts index dae1b1d..f0277eb 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -91,6 +91,7 @@ export const url = { getlistBaseEquipment: qianzhuione + '/wms/WmsToWCSmission/listBaseEquipment', listProOrderWorkorder: qianzhuione + '/wms/WmsToWCSmission/listProOrderWorkorder', finishedProductProductionRecords: qianzhuione + '/wms/WmsToWCSmission/finishedProductProductionRecords', + queryByAttr1: qianzhuione + '/wms/WmsToWCSmission/finishedProductProductionRecordscar', }, }, raw: {