diff --git a/src/pages.json b/src/pages.json index f65664e..684b45a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -591,6 +591,22 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/equipment/MaintenanceAudit/index", + "style": { + "navigationBarTitleText": "维修审核", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/equipment/MaintenanceAudit/Audit", + "style": { + "navigationBarTitleText": "维修审核", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/equipment/MaintenanceAudit/Audit.vue b/src/pages/equipment/MaintenanceAudit/Audit.vue new file mode 100644 index 0000000..6746a68 --- /dev/null +++ b/src/pages/equipment/MaintenanceAudit/Audit.vue @@ -0,0 +1,855 @@ + + + + diff --git a/src/pages/equipment/MaintenanceAudit/index.vue b/src/pages/equipment/MaintenanceAudit/index.vue new file mode 100644 index 0000000..70253cb --- /dev/null +++ b/src/pages/equipment/MaintenanceAudit/index.vue @@ -0,0 +1,321 @@ + + + + diff --git a/src/pages/equipment/MaintenanceAudit/model.ts b/src/pages/equipment/MaintenanceAudit/model.ts new file mode 100644 index 0000000..8bd19a7 --- /dev/null +++ b/src/pages/equipment/MaintenanceAudit/model.ts @@ -0,0 +1,60 @@ +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.MaintenanceAudit', +}) +export class MaintenanceAudit extends VuexModule { + rowdata: any = []; + orderNoItemList: any = []; + getTaskRecordList: any = {}; + @MutationAction + async getTodayTask(params: any) { + const result: any = await http.get(url.lanjuequipment.product.MaintenanceAudit.getBXList, { + params: { + resultInspect: params, + }, + }); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + @MutationAction + async getTaskRecord(params: any) { + const result: any = await http.get(url.lanjuequipment.product.MaintenanceAudit.getBXDetail + '/' + params); + const getTaskRecordList = result.data; + return { getTaskRecordList }; + } + teamList: any = []; + //是否开机保养 + @MutationAction + async getTeamList() { + const result: any = await http.get(url.lanjuequipment.product.MaintenanceAudit.getMaintenanceTeamList); + const oldteamList: [] = result.rows; + const teamList = oldteamList.map((item: any) => { + return { + value: item.teamCode, + label: item.teamName, + ...item, + }; + }); + return { teamList }; + } + Checkcode: any = ''; + @MutationAction + async updateTaskRecord(params: any) { + const result: any = await http.post(url.lanjuequipment.product.MaintenanceAudit.check, params); + const Checkcode = result.code; + return { Checkcode }; + } + @MutationAction + async rowdatanull() { + const rowdata: [] = []; + return { rowdata }; + } +} + +export default getModule(MaintenanceAudit); diff --git a/src/pages/equipment/RepairAudit/Audit.vue b/src/pages/equipment/RepairAudit/Audit.vue index 511acd0..4000b95 100644 --- a/src/pages/equipment/RepairAudit/Audit.vue +++ b/src/pages/equipment/RepairAudit/Audit.vue @@ -48,44 +48,50 @@ - + - + - + - + - - - - 检验项: - {{ item.materialCode }} - - - 检验方法: - {{ item.materialDesc }} - - - 检验标准: - {{ item.materialDesc }} - - - 是否符合标准: - {{ item.materialDesc }} - - + + +
检查项: {{ item.itemName }}
+
检查方法: {{ item.itemMethod }}
+
+
+
检查标准: {{ item1.standardName }}
+
+ + + {{ n.name }} + + +
+
+
+
检查标准: {{ item1.standardName }}
+
+ 实际值: + + 单位:mm +
+
+
- + + 审核 - + @@ -107,23 +113,23 @@ - + - + - + - + - + - + - + @@ -142,6 +148,20 @@ + + +
+
检查标准:{{ picstandardName }}
+ + + + + + + + +
+ @@ -162,11 +182,14 @@ interface OptionType { jPicker, }, }) -export default class ProductionREQ extends BasePage { +export default class RepairAudit extends BasePage { model = model; + picstandardName: any = ''; noitem = true; + isshow = false; isshowpic = false; - imgList: any = ['/Users/guoshuang/Documents/KHD/榄菊/lanju-app/src/static/images/add.png', '/Users/guoshuang/Documents/KHD/榄菊/lanju-app/src/static/images/iconCloseGray.svg', '/Users/guoshuang/Documents/KHD/榄菊/lanju-app/src/static/logo.png', '/Users/guoshuang/Documents/KHD/榄菊/lanju-app/src/static/images/iconCloseGray.svg']; + imgList: any = []; + imgList1: any = []; listselectdetermine: any = [ { type: '1', @@ -179,24 +202,36 @@ export default class ProductionREQ extends BasePage { radiovalue: null, }, ]; + listselect: any = [ + { + type: 1, + name: '符合标准', + radiovalue: null, + }, + { + type: 0, + name: '未达标', + radiovalue: null, + }, + ]; isShutdown: any = '1'; gone: any = {}; goneList: any = [ { label: '计划性维修', - value: '1', + value: '计划性维修', }, { label: '立即维修', - value: '2', + value: '立即维修', }, { label: '不维修', - value: '3', + value: '不维修', }, { label: '委外维修', - value: '4', + value: '委外维修', }, ]; group: any = {}; @@ -232,8 +267,20 @@ export default class ProductionREQ extends BasePage { let orderId = options.orderId; await this.model.getTaskRecord(orderId); this.histroyItem = this.model.getTaskRecordList; - this.imgList = this.histroyItem.files; + if (this.histroyItem.checkList === null || this.histroyItem.checkList.length == 0) { + this.noitem = true; + } else { + this.noitem = false; + } + console.log('00009999', this.histroyItem); + if (this.histroyItem.files == null || this.histroyItem.files.length == 0) { + this.imgList = []; + } else { + this.imgList = this.histroyItem.files; + } + await this.model.getTeamList(); + this.groupList = this.model.teamList; } changeradio1(checkResult) { console.log(checkResult); @@ -248,8 +295,18 @@ export default class ProductionREQ extends BasePage { } } showpicture() { - this.isshowpic = true; + if (this.imgList.length == 0 || this.imgList == null) { + this.isshowpic = false; + this.uni.showToast({ + title: '无照片', + icon: 'none', + duration: 1000, + }); + } else { + this.isshowpic = true; + } } + showScreenImg(i) { let list = this.imgList.map((item) => { return item.fileAddress; @@ -260,6 +317,16 @@ export default class ProductionREQ extends BasePage { // loop: true }); } + showScreenImg1(i) { + let list = this.imgList1.map((item) => { + return item.fileAddress; + }); + uni.previewImage({ + current: i, + urls: list, + // loop: true + }); + } scrollLeft() { return 222 * (this.imgList.length + 1); } @@ -279,47 +346,70 @@ export default class ProductionREQ extends BasePage { this.list = []; } - //查询货单关联采购单信息 - async query() { - // if (this.orderNo == '' || this.orderNo.length == 0) { - // (this.$refs.uToast as any).show({ - // title: '请输入领料单号', - // // url: '/pages/user/index' - // }); - // return; - // } - // await this.model.ProductionMaterialRequisition(this.orderNo); - // if (model.orderNoItemList) { - // this.materilist = []; - // // let a: any = {}; - // // model.orderNoItemList.forEach((item) => { - // // a.label = item.productName; - // // a.value = item.productCode; - // // this.materilist.push(a); - // // }); - // this.materilist = model.orderNoItemList; - // this.aimWl = this.materilist[0]; - // this.queryinformation(); - // //this.getlist(); - // } else { - // this.materilist = []; - // } - } - //查询批次 - async onSubmit() { - //// + let params = {}; + if (this.gone.value == '计划性维修' || this.gone.value == '立即维修') { + params = { + ...this.histroyItem, + repairDestination: this.gone.value, + workTeam: this.group.value, + workPlanTime: this.startdate, + workPlanDownTime: this.stopdate, + workDownMachine: this.isShutdown, + }; + } else if (this.gone.value == '不维修') { + params = { + ...this.histroyItem, + auditOpinion: this.form1.auditOpinion, + repairDestination: this.gone.value, + }; + } else { + params = { + ...this.histroyItem, + workOutsourcingUnit: this.form1.workOutsourcingUnit, + outSourcePerson: this.form1.outSourcePerson, + workConnection: this.form1.workConnection, + outSourceReason: this.form1.outSourceReason, + repairDestination: this.gone.value, + }; + } + await this.model.updateTaskRecord(params); + if (this.model.Checkcode == 200) { + (this.$refs.uToast as any).show({ + title: '成功', + // url: '/pages/user/index' + }); + this.mepty(); + uni.navigateBack({ + delta: 1, + }); + } else { + (this.$refs.uToast as any).show({ + title: '失败', + // url: '/pages/user/index' + }); + } } mepty() { - this.orderNo = ''; - this.list = []; - this.aimWl = {} as OptionType; - this.bimWl = {} as OptionType; - this.materilist = []; - this.userDefined1list = []; - //this.model.mepty(); - this.boxnumber = ''; - this.TraysList = []; + this.form1 = {}; + this.group = {}; + this.gone = {}; + } + checkimg(item) { + //console.log('111199990000',item, value); + this.picstandardName = item.standardName; + if (item.picturePaths == null || item.picturePaths.length == 0) { + this.imgList1 = []; + this.isshow = false; + this.uni.showToast({ + title: '无照片', + icon: 'none', + duration: 1000, + }); + } else { + this.imgList1 = item.picturePaths; + this.isshow = true; + } } } @@ -373,6 +463,52 @@ body { width: 100%; //box-shadow: 0 0 14px 0 rgb(128 128 128 / 46%); z-index: 100; + .item { + margin-top: 15px; + width: 344px; + border-radius: 5px; + border: rgba(121, 121, 121, 1) solid 1px; + background-color: #ffffff; + padding: 7px 8px 7px 8px; + box-sizing: border-box; + .item1 { + margin-bottom: 3px; + white-space: 1px; + font-size: 15px; + font-weight: 600; + } + .item2 { + display: flex; + align-content: center; + justify-content: space-between; + .select { + font-size: 15px; + font-weight: 400; + display: flex; + // margin-left: 19px; + } + .input-box { + font-size: 13px; + font-weight: 400; + display: flex; + align-content: center; + margin-top: 2px; + .input { + font-size: 12px; + width: 65px; + padding: 1px 8px; + height: 20px; + box-sizing: border-box; + border: 1px solid #b6b6b6; + margin-left: 6px; + display: inline-block; + margin-right: 6px; + border-radius: 4px; + position: relative; + } + } + } + } } .form { background-color: #fff; diff --git a/src/pages/equipment/RepairAudit/index.vue b/src/pages/equipment/RepairAudit/index.vue index aa89923..dedec02 100644 --- a/src/pages/equipment/RepairAudit/index.vue +++ b/src/pages/equipment/RepairAudit/index.vue @@ -17,9 +17,12 @@ +
+
{{ item.orderStatus == 2 ? '待审核' : item.orderStatus == 1 ? '审核通过' : '驳回' }}
+
报修单号: {{ item.orderCode }}
-
{{ item.orderStatus == 0 ? '待处理' : item.orderStatus == 1 ? '已完成' : item.orderStatus == 2 ? '已逾期' : '进行中' }}
+
报修来源: {{ item.orderSource }}
@@ -115,45 +118,47 @@ export default class RepairAudit extends BasePage { } async onShow() { this.AuditStatusType = this.AuditStatusList[0]; - // await this.model.getTodayTask(this.AuditStatusType.value); - // this.listdata = model.orderNoItemList; + await this.model.getTodayTask(this.AuditStatusType.value); + this.listdata = model.orderNoItemList; //模拟数据 - this.listdata = [ - { - orderNo: '123456789', - orderStatus: 0, - orderSource: '0000dfcdcs', - equipmentCode: '123456789', - equipmentName: '2023-08-01', - orderBreakdownTime: 'jnnihnninin', - orderDesc: 'xscxdcdc', - orderRepairmanName: 'dwdxdwx', - }, - { - orderNo: '123456789', - orderStatus: 0, - orderSource: '0000dfcdcs', - equipmentCode: '123456789', - equipmentName: '2023-08-01', - orderBreakdownTime: 'jnnihnninin', - orderDesc: 'xscxdcdc', - orderRepairmanName: 'dwdxdwx', - }, - { - orderNo: '123456789', - orderStatus: 0, - orderSource: '0000dfcdcs', - equipmentCode: '123456789', - equipmentName: '2023-08-01', - orderBreakdownTime: 'jnnihnninin', - orderDesc: 'xscxdcdc', - orderRepairmanName: 'dwdxdwx', - }, - ]; + // this.listdata = [ + // { + // orderNo: '123456789', + // orderStatus: 0, + // orderSource: '0000dfcdcs', + // equipmentCode: '123456789', + // equipmentName: '2023-08-01', + // orderBreakdownTime: 'jnnihnninin', + // orderDesc: 'xscxdcdc', + // orderRepairmanName: 'dwdxdwx', + // }, + // { + // orderNo: '123456789', + // orderStatus: 0, + // orderSource: '0000dfcdcs', + // equipmentCode: '123456789', + // equipmentName: '2023-08-01', + // orderBreakdownTime: 'jnnihnninin', + // orderDesc: 'xscxdcdc', + // orderRepairmanName: 'dwdxdwx', + // }, + // { + // orderNo: '123456789', + // orderStatus: 0, + // orderSource: '0000dfcdcs', + // equipmentCode: '123456789', + // equipmentName: '2023-08-01', + // orderBreakdownTime: 'jnnihnninin', + // orderDesc: 'xscxdcdc', + // orderRepairmanName: 'dwdxdwx', + // }, + // ]; } - selectAuditStatus(e: any) { - this.AuditStatusType = e; + async selectAuditStatus(e: any) { + this.AuditStatusType = e.pickerName; + await this.model.getTodayTask(this.AuditStatusType.value); + this.listdata = model.orderNoItemList; } clear() { this.createTime = null; @@ -172,8 +177,8 @@ export default class RepairAudit extends BasePage { location: any = ''; locationStatus: any = 1; goback() { - uni.navigateTo({ - url: `/pages/equipment/index`, + uni.navigateBack({ + delta: 1, }); } linkdetails(item) { diff --git a/src/pages/equipment/RepairAudit/model.ts b/src/pages/equipment/RepairAudit/model.ts index 8f126ef..50e5279 100644 --- a/src/pages/equipment/RepairAudit/model.ts +++ b/src/pages/equipment/RepairAudit/model.ts @@ -24,7 +24,7 @@ export class RepairAudit extends VuexModule { } @MutationAction async getTaskRecord(params: any) { - const result: any = await http.get(url.lanjuequipment.product.RepairAudit.getBXDetail + params); + const result: any = await http.get(url.lanjuequipment.product.RepairAudit.getBXDetail + '/' + params); const getTaskRecordList = result.data; return { getTaskRecordList }; } @@ -33,17 +33,22 @@ export class RepairAudit extends VuexModule { @MutationAction async getTeamList() { const result: any = await http.get(url.lanjuequipment.product.RepairAudit.getMaintenanceTeamList); - const teamList: [] = result.data; + const oldteamList: [] = result.rows; + const teamList = oldteamList.map((item: any) => { + return { + value: item.teamCode, + label: item.teamName, + ...item, + }; + }); return { teamList }; } - Checklist: any = []; + Checkcode: 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 }; + async updateTaskRecord(params: any) { + const result: any = await http.put(url.lanjuequipment.product.RepairAudit.check, params); + const Checkcode = result.code; + return { Checkcode }; } @MutationAction async rowdatanull() { diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index c5a4d3b..5869e0c 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.92'; //正式版本号 + version = '0.0.93'; //正式版本号 //version = '0.0.7'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index cf9786a..559aa30 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -301,7 +301,7 @@ - + @@ -936,9 +936,9 @@ export default class PurchaseWHSRM extends BasePage { this.formdata.sfxvzq = this.selectischeckType.value; if (this.formdata.sfxvzq == '1') { this.selectpgzgList = {}; - this.selectZLType = {}; + //this.selectZLType = {}; this.formdata.pgzg = null; - this.formdata.pgzr = null; + // this.formdata.pgzr = null; } } async selectpgzgCode(e: any) { @@ -1178,7 +1178,7 @@ export default class PurchaseWHSRM extends BasePage { }); return; } - if (this.selectischeckType.value === '0' && !this.formdata.pgzr) { + if (this.formdata.pgzr == null || this.formdata.pgzr == '') { (this.$refs.uToast as any).show({ title: '请选择质量主管', type: 'default', diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue index 6607c92..1b5b861 100644 --- a/src/pages/wms/Raw/ProductionREQ/index.vue +++ b/src/pages/wms/Raw/ProductionREQ/index.vue @@ -102,7 +102,7 @@ - 确认 + 确认出库 diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index d9264a4..eb4a120 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -114,7 +114,7 @@ - 确定 + 确认收货 diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue index 18c01d7..aeae722 100644 --- a/src/pages/wms/Raw/ReceiveSRM/index.vue +++ b/src/pages/wms/Raw/ReceiveSRM/index.vue @@ -122,7 +122,7 @@ - 确定 + 确认收货 diff --git a/src/utils/url.ts b/src/utils/url.ts index d677b3b..dae1b1d 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -254,6 +254,14 @@ export const url = { getBXList: qianzhuione + '/device/devicePDA/getBXList', //审核列表查询 getBXDetail: qianzhuione + '/device/devicePDA/getBXDetail', //审核详情查询 getMaintenanceTeamList: qianzhuione + '/device/equTeam/getMaintenanceTeamList', //维修班组 + check: qianzhuione + '/device/devicePDA/checkBX', //审核 + }, + //维修审核 + MaintenanceAudit: { + getBXList: qianzhuione + '/device/devicePDA/getWXList', //审核列表查询 + getBXDetail: qianzhuione + '/device/devicePDA/selectPdaRepairWorkOrderDetails', //审核详情查询 + getMaintenanceTeamList: qianzhuione + '/device/equTeam/getMaintenanceTeamList', //维修班组 + check: qianzhuione + '/device/devicePDA/checkWX', //审核 }, }, },