Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维修报修审核提交，成品生产记录修改

Browse Source
master
guoshuang 11 months ago
parent 3ebca78166
commit 2791e610a1
8 changed files with 172 additions and 101 deletions
Show Stats Download Patch File Download Diff File

82
src/pages/equipment/MaintenanceAudit/Audit.vue
Unescape Escape View File

@ -10,22 +10,25 @@
</view>
<!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> -->
<view class="list">
<div class="item-name">
<div class="quest">维修工单号: {{ detailsinfolist.workCode }}</div>
<div class="details">
<div>设备编码: {{ detailsinfolist.equipmentCode }}</div>
<div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
</div>
<div class="details">
<div>产线: {{ detailsinfolist.planProdLine }}</div>
</div>
<div class="details">
<!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> -->
<div>工作中心: {{ detailsinfolist.workshopName }}</div>
</div>
</div>
<div class="item-name item-info">
<div class="quest">报修信息</div>
<div class="details">
<div>维修工单号: {{ detailsinfolist.workCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>设备编码: {{ detailsinfolist.equipmentCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>设备名称: {{ detailsinfolist.equipmentName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>工作中心: {{ detailsinfolist.workshopName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>报修单号: {{ detailsinfolist.orderCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
@ -71,12 +74,12 @@
<view class="item" v-for="(item, index) in detailsinfolist.detailList" :key="index">
<div class="item1">检查项: {{ item.itemName }}</div>
<div class="item1">检查方法: {{ item.itemMethod }}</div>
<div @click="checkimg(item1, item1.detailReach, index, index1)" v-for="(item1, index1) in item.standardList" :key="index1">
<div class="item1 item2" v-if="item1.standardType == 'qualitative'">
<div v-for="(item1, index1) in item.standardList" :key="index1">
<div @click="checkimg(item1, item1.detailReach, index, index1)" class="item1 item2" v-if="item1.standardType == 'qualitative'">
<div>检查标准: {{ item1.standardName }}</div>
<div class="select">
<u-radio-group v-model="item1.detailReach">
<u-radio v-for="(n, indexn) in listselect" :key="indexn" :name="n.type">
<u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true">
{{ n.name }}
</u-radio>
</u-radio-group>
@ -86,7 +89,7 @@
<div>检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1">
实际值:
<input class="input" v-model="item1.actualValue" type="text" name="" id="" />
<input class="input" :disabled="item1.actualValue == null ? true : true" v-model="item1.actualValue" type="text" name="" id="" />
单位:mm
</div>
</div>
@ -129,12 +132,12 @@
</view> -->
<image class="img" :src="img" mode="aspectFit" @click="showScreenImg1(index)"></image>
</view>
<view class="itemBox chooseBtn">
<!-- <view class="inner">
<!-- <view class="itemBox chooseBtn">
<view class="inner">
<image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
<text class="desc">添加照片</text>
</view> -->
</view>
</view>
</view> -->
</view>
</scroll-view>
</u-form-item>
@ -158,11 +161,11 @@
<u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
</div> -->
<div class="details">
<div>备件编码: {{ item.materialCode }}</div>
<div>备件编码: {{ item.spareCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>备件名称: {{ item.materialDesc }}</div>
<div>备件名称: {{ item.spareName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
@ -188,7 +191,7 @@
</div>
</view>
<u-form style="margin-top: 10rpx" class="form" ref="form1" label-width="180rpx">
<u-form v-if="isshowbutton" style="margin-top: 10rpx" class="form" ref="form1" label-width="180rpx">
<view style="font-size: 30rpx; display: flex; justify-content: center">审核</view>
<u-form-item label="维修审核">
<jPicker sureColor="#ff0000" @bindpicker="selectgoneStatus" showKey="label" valKey="value" :val="gone.value" :options="goneList" />
@ -197,9 +200,19 @@
<u-input :border="true" v-model="form1.auditOpinion" placeholder="" style="overflow: hidden" />
</u-form-item>
</u-form>
<u-form v-else style="margin-top: 10rpx" class="form" ref="form1" label-width="180rpx">
<view style="font-size: 30rpx; display: flex; justify-content: center">审核</view>
<u-form-item label="维修审核">
{{ detailsinfolist.resultInspect == '2' ? '待审核' : detailsinfolist.resultInspect == '1' ? '审核通过' : '驳回' }}
</u-form-item>
<u-form-item label="审核意见">
{{ detailsinfolist.auditOpinion }}
<!-- <u-input :border="true" v-model="form1.auditOpinion" placeholder="" style="overflow: hidden" /> -->
</u-form-item>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-row v-if="isshowbutton" class="button-bar">
<!-- 确定 -->
<u-col :span="6">
<u-button @click="onSubmit" type="primary">确认</u-button>
@ -209,6 +222,11 @@
<u-button type="error" @click="uni.navigateBack({})">返回</u-button>
</u-col>
</u-row>
<u-row style="justify-content: center" v-else class="button-bar">
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack({})">返回</u-button>
</u-col>
</u-row>
</view>
<u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm">
@ -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({

21
src/pages/equipment/MaintenanceAudit/index.vue
Unescape Escape View File

@ -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,
// });
// }
}
}
</script>

1
src/pages/equipment/MaintenanceAudit/model.ts
Unescape Escape View File

@ -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;

76
src/pages/equipment/RepairAudit/Audit.vue
Unescape Escape View File

@ -86,7 +86,7 @@
</div>
</view>
<u-form style="margin-top: 10rpx" class="form" ref="form1" label-width="180rpx">
<u-form v-if="isshowbutton" style="margin-top: 10rpx" class="form" ref="form1" label-width="180rpx">
<view style="font-size: 30rpx; display: flex; justify-content: center">审核</view>
<u-form-item label="报修去向">
<jPicker sureColor="#ff0000" @bindpicker="selectgoneStatus" showKey="label" valKey="value" :val="gone.value" :options="goneList" />
@ -133,11 +133,69 @@
</u-form-item>
</view>
</u-form>
<!-- 1111回显 -->
<u-form v-else style="margin-top: 10rpx" class="form" ref="form1" label-width="180rpx">
<view style="font-size: 30rpx; display: flex; justify-content: center">审核</view>
<u-form-item label="报修去向">
{{ histroyItem.repairDestination }}
<!-- <jPicker sureColor="#ff0000" @bindpicker="selectgoneStatus" showKey="label" valKey="value" :val="gone.value" :options="goneList" /> -->
</u-form-item>
<view v-if="histroyItem.repairDestination == '计划性维修' || histroyItem.repairDestination == '立即维修'">
<u-form-item label="维修组">
{{ histroyItem.workTeam }}
<!-- <jPicker sureColor="#ff0000" @bindpicker="selectgroupStatus" showKey="label" valKey="value" :val="group.value" :options="groupList" /> -->
</u-form-item>
<u-form-item label="计划维修时间">
{{ histroyItem.workPlanTime }}
<!-- <picker mode="time" :value="startdate" @change="startchange">
<view class="uni-input">{{ startdate }}</view>
</picker> -->
</u-form-item>
<u-form-item label="是否停机">
{{ histroyItem.workDownMachine == '1' ? '是' : '否' }}
<!-- <u-radio-group v-model="isShutdown" @change="changeradio1(isShutdown)">
<u-radio v-for="(n, indexn) in listselectdetermine" :key="indexn" :name="n.type" :disabled="n.disabled">
{{ n.name }}
</u-radio>
</u-radio-group> -->
</u-form-item>
<u-form-item label="计划停机时间">
{{ histroyItem.workPlanDownTime }}
<!-- <picker mode="time" :value="stopdate" @change="stopchange">
<view class="uni-input">{{ stopdate }}</view>
</picker> -->
</u-form-item>
</view>
<view v-if="histroyItem.repairDestination == '不维修'">
<u-form-item label="审核意见">
{{ histroyItem.auditOpinion }}
<!-- <u-input :border="true" v-model="form1.auditOpinion" placeholder="" style="overflow: hidden" /> -->
</u-form-item>
</view>
<view v-if="histroyItem.repairDestination == '委外维修'">
<u-form-item label="委外单位">
{{ histroyItem.workOutsourcingUnit }}
<!-- <u-input :border="true" v-model="form1.workOutsourcingUnit" placeholder="" style="overflow: hidden" /> -->
</u-form-item>
<u-form-item label="委外维修人员">
{{ histroyItem.outSourcePerson }}
<!-- <u-input :border="true" v-model="form1.outSourcePerson" placeholder="" style="overflow: hidden" /> -->
</u-form-item>
<u-form-item label="联系方式">
{{ histroyItem.workConnection }}
<!-- <u-input :border="true" v-model="form1.workConnection" placeholder="" style="overflow: hidden" /> -->
</u-form-item>
<u-form-item label="委外原因">
{{ histroyItem.outSourceReason }}
<!-- <u-input :border="true" v-model="form1.outSourceReason" placeholder="" style="overflow: hidden" /> -->
</u-form-item>
</view>
</u-form>
</view>
<!-- <view style="height: 14rpx"></view> -->
<view class="bottom-bar">
<u-row class="button-bar">
<u-row v-if="isshowbutton" class="button-bar">
<!-- 确定 -->
<u-col :span="6">
<u-button @click="onSubmit" type="primary">确认</u-button>
@ -147,6 +205,12 @@
<u-button type="error" @click="uni.navigateBack({})">返回</u-button>
</u-col>
</u-row>
<u-row style="justify-content: center" v-else class="button-bar">
<!-- 返回 -->
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack({})">返回</u-button>
</u-col>
</u-row>
</view>
<u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false">
@ -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);

2
src/pages/login/login/index.vue
Unescape Escape View File

@ -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;

84
src/pages/wms/product/ProductionRecord/index.vue
Unescape Escape View File

@ -9,7 +9,20 @@
</view>
<view class="fiexdcontent">
<u-form class="form" ref="form" label-width="180rpx">
<view class="single">
<view class="single-left">
<view>标识码:</view>
<u-search placeholder="请扫描" v-model="attr1" @search="search()" :show-action="false"></u-search>
</view>
</view>
<!-- 单号 -->
<u-form-item label="产线"> {{ querybyattr1.prodLineName }}</u-form-item>
<u-form-item label="工单"> {{ querybyattr1.workorderCodeSap }}</u-form-item>
<u-form-item label="批次"> {{ querybyattr1.batchCode }}</u-form-item>
<u-form-item label="产品"> {{ querybyattr1.productName }}</u-form-item>
<!-- <u-form-item label="批次"> {{ session.FactoryCode }}</u-form-item> -->
<u-form-item label="数量"> <u-input border v-model="querybyattr1.quantity"></u-input></u-form-item>
<view class="single">
<view class="single-left">
<view>托盘号:</view>
@ -19,27 +32,6 @@
<u-button type="primary" @click="tidan">提单</u-button>
</view> -->
</view>
<view class="row-list">
<view class="list-item">产线: </view>
<jPicker style="width: 80%" sureColor="#ff0000" @bindpicker="arrtChange" showKey="label" valKey="value" :val="aimWl.value" :options="orderNoItemList" />
</view>
<view class="row-list">
<view class="list-item">工单: </view>
<jPicker style="width: 80%" sureColor="#ff0000" @bindpicker="warehouseChange" showKey="value" valKey="value" :val="cimWl.value" :options="warehouselist" />
</view>
<view class="row-list">
<view class="list-item">批次: </view>
<jPicker style="width: 80%" sureColor="#ff0000" @bindpicker="batchChange" showKey="value" valKey="value" :val="bimWl.value" :options="PiCilist" />
</view>
<u-form-item label="产品"> {{ production.productName }}</u-form-item>
<!-- <u-form-item label="批次"> {{ session.FactoryCode }}</u-form-item> -->
<u-form-item label="数量"> <u-input border v-model="quantity"></u-input></u-form-item>
<view class="single">
<view class="single-left">
<view>标识码:</view>
<u-search placeholder="请扫描" v-model="attr1" :show-action="false"></u-search>
</view>
</view>
</u-form>
</view>
<view style="height: 14rpx"></view>
@ -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 {

6
src/pages/wms/product/ProductionRecord/model.ts
Unescape Escape View File

@ -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);

1
src/utils/url.ts
Unescape Escape View File

@ -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: {

Write Preview
Loading…
Cancel
Save