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

提交设备手持功能代码

Browse Source
master
LAPTOP-R6EHHS26\86155 2 years ago
parent 21d3365df0
commit ef3c78f44a
21 changed files with 553 additions and 521 deletions
Show Stats Download Patch File Download Diff File

2
src/pages.json
Unescape Escape View File

@ -127,7 +127,7 @@
{ {
"path": "pages/equipment/Upkeep/repairingview", "path": "pages/equipment/Upkeep/repairingview",
"style": { "style": {
"navigationBarTitleText": "维修查看", "navigationBarTitleText": "保养查看",
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }

46
src/pages/equipment/Inspection/details.vue
Unescape Escape View File

@ -18,8 +18,8 @@
<div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
</div> </div>
<div class="details"> <div class="details">
<div>车间: {{ detailsinfocontent.planWorkshop }}</div> <div>车间: {{ detailsinfolist.planWorkshop }}</div>
<div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> <div style="margin-left: 42px">工作中心: {{ detailsinfolist.workCenterName }}</div>
</div> </div>
</div> </div>
<view class="single-left"> <view class="single-left">
@ -45,7 +45,7 @@
<div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
@ -131,12 +131,12 @@ export default class ChangePalletNew extends BasePage {
equipmentdata: any = []; equipmentdata: any = [];
listselect: any = [ listselect: any = [
{ {
type: 0, type: 1,
name: '符合标准', name: '符合标准',
radiovalue: null, radiovalue: null,
}, },
{ {
type: 1, type: 0,
name: '未达标', name: '未达标',
radiovalue: null, radiovalue: null,
}, },
@ -210,7 +210,7 @@ export default class ChangePalletNew extends BasePage {
} else { } else {
this.imgList = []; this.imgList = [];
} }
if (value == 1) { if (value == 0) {
this.isshow = true; this.isshow = true;
this.radiomodal = true; this.radiomodal = true;
this.form = item; this.form = item;
@ -224,8 +224,7 @@ export default class ChangePalletNew extends BasePage {
orderCode: this.detailsinfo.orderCode, orderCode: this.detailsinfo.orderCode,
}; };
await this.model.getInspectionOrderInfo(query); await this.model.getInspectionOrderInfo(query);
this.detailsinfocontent = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
this.detailsinfolist = this.model.OrderInfList.equ;
} }
} }
created() { created() {
@ -357,14 +356,18 @@ export default class ChangePalletNew extends BasePage {
} }
async onSubmit() { async onSubmit() {
if (this.orderNo == '' || this.orderNo.length == 0) { if (this.orderNo == '' || this.orderNo.length == 0) {
this.customToast('请扫码设备编码'); // this.customToast('请扫码设备编码');
(this.$refs.uToast as any).show({
title: '请扫码设备编码',
type: 'default',
});
return; return;
} }
this.detailsinfocontent.equ.detailList.forEach((item) => { this.detailsinfolist.detailList.forEach((item) => {
if (item.standardList.length > 0) { if (item.standardList.length > 0) {
item.standardList.forEach((item1) => { item.standardList.forEach((item1) => {
if (item1.standardType == 'quantify') { if (item1.standardType == 'quantify') {
if (item1.detailReach == null || item1.detailReach == '') { if (item1.actualValue == null || item1.actualValue == '') {
// console.log(this.isvalue); // console.log(this.isvalue);
this.isvalue = true; this.isvalue = true;
} }
@ -374,22 +377,29 @@ export default class ChangePalletNew extends BasePage {
}); });
// i // i
if (this.isvalue) { if (this.isvalue) {
this.customToast('检查标准不能为空'); (this.$refs.uToast as any).show({
title: '检查标准不能为空',
type: 'default',
});
return; return;
} }
this.detailsinfocontent.equ = this.detailsinfolist; let query = this.detailsinfolist;
let query = this.detailsinfocontent;
await this.model.updateInspectionRecord(query); await this.model.updateInspectionRecord(query);
if (this.model.SubmitCode == '200') { if (this.model.SubmitCode == '200') {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '成功', title: '成功',
type: 'success', type: 'default',
}); });
uni.navigateBack({});
setTimeout(() => {
uni.navigateTo({
url: `/pages/equipment/Inspection/index?listitem=`,
});
}, 1000);
} else { } else {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '失败', title: '失败',
type: 'error', type: 'default',
}); });
} }
} }
@ -639,5 +649,7 @@ export default class ChangePalletNew extends BasePage {
max-height: 15px; max-height: 15px;
font-size: 13px; font-size: 13px;
} }
// width: 240px;
// overflow-y: scroll;
} }
</style> </style>

57
src/pages/equipment/Inspection/detailsview.vue
Unescape Escape View File

@ -17,8 +17,8 @@
<div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
</div> </div>
<div class="details"> <div class="details">
<div>车间: {{ detailsinfocontent.planWorkshop }}</div> <div>车间: {{ detailsinfolist.planWorkshop }}</div>
<div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> <div style="margin-left: 42px">工作中心: {{ detailsinfolist.workCenterName }}</div>
</div> </div>
</div> </div>
<view class="single-left"> <view class="single-left">
@ -44,7 +44,7 @@
<div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" :disabled="item1.detailReach == null ? true : true" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" :disabled="item1.actualValue == null ? true : true" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
@ -55,12 +55,12 @@
<div class="item-name"> <div class="item-name">
<!-- <div class="quest">点检人: 刘XX</div> --> <!-- <div class="quest">点检人: 刘XX</div> -->
<div class="details"> <div class="details">
<div>点检人: 刘XX</div> <div>巡检人:{{ detailsinfolist.planPerson }}</div>
<div style="margin-left: 42px">点检时间: 2023-08-09</div> <div style="margin-left: 42px">巡检时间:{{ detailsinfolist.orderStart }}</div>
</div> </div>
<div class="details"> <div class="details">
<div>是否异常: 是</div> <div>是否异常: {{ detailsinfolist.workCode == null ? '否' : '是' }}</div>
<div style="margin-left: 42px">报修单: 90272931234</div> <div style="margin-left: 42px">报修单:{{ detailsinfolist.workCode }}</div>
</div> </div>
</div> </div>
</view> </view>
@ -70,7 +70,7 @@
<!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> --> <!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> -->
<scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()"> <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
<view class="photoList"> <view class="photoList">
<view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index"> <view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index">
<!-- <view class="closeBtn" @click="deleteImg(index)"> <!-- <view class="closeBtn" @click="deleteImg(index)">
<image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
</view> --> </view> -->
@ -86,6 +86,7 @@
</scroll-view> </scroll-view>
</div> </div>
</u-modal> </u-modal>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -129,12 +130,12 @@ export default class ChangePalletNew extends BasePage {
equipmentdata: any = []; equipmentdata: any = [];
listselect: any = [ listselect: any = [
{ {
type: 0, type: 1,
name: '符合标准', name: '符合标准',
radiovalue: null, radiovalue: null,
}, },
{ {
type: 1, type: 0,
name: '未达标', name: '未达标',
radiovalue: null, radiovalue: null,
}, },
@ -153,7 +154,7 @@ export default class ChangePalletNew extends BasePage {
imgUrlList: any = []; imgUrlList: any = [];
deleteimgUrlList: any = []; deleteimgUrlList: any = [];
orderNoItemList: any = {}; orderNoItemList: any = {};
picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg'; checkPictrueList: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
async onReady() { async onReady() {
//await this.model.getpalletLocation(); //await this.model.getpalletLocation();
@ -166,9 +167,8 @@ export default class ChangePalletNew extends BasePage {
this.inputmodal = false; this.inputmodal = false;
this.equipmentindex.push(index); this.equipmentindex.push(index);
this.equipmentindex.push(index1); this.equipmentindex.push(index1);
if (item.picturePath != null) { if (item.checkPictrueList != null) {
this.imgList = JSON.parse(JSON.stringify(item.picturePath)); this.imgList = JSON.parse(JSON.stringify(item.checkPictrueList));
this.imgList = this.imgList.split(',');
this.isshow = true; this.isshow = true;
this.radiomodal = true; this.radiomodal = true;
this.form = item; this.form = item;
@ -185,9 +185,9 @@ export default class ChangePalletNew extends BasePage {
if (value > item.detailUpLimit || value < item.detailDownLimit) { if (value > item.detailUpLimit || value < item.detailDownLimit) {
this.equipmentindex.push(index); this.equipmentindex.push(index);
this.equipmentindex.push(index1); this.equipmentindex.push(index1);
if (item.picturePath != null) { if (item.checkPictrueList != null) {
item.picturePath = item.picturePath.split(','); item.checkPictrueList = item.checkPictrueList.split(',');
this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath)); this.imgUrlList = JSON.parse(JSON.stringify(item.checkPictrueList));
} else { } else {
this.imgUrlList = []; this.imgUrlList = [];
} }
@ -212,9 +212,9 @@ export default class ChangePalletNew extends BasePage {
this.inputmodal = false; this.inputmodal = false;
this.equipmentindex.push(index); this.equipmentindex.push(index);
this.equipmentindex.push(index1); this.equipmentindex.push(index1);
if (item.picturePath != null) { if (item.checkPictrueList != null) {
item.picturePath = item.picturePath.split(','); item.checkPictrueList = item.checkPictrueList.split(',');
this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath)); this.imgUrlList = JSON.parse(JSON.stringify(item.checkPictrueList));
} else { } else {
this.imgUrlList = []; this.imgUrlList = [];
} }
@ -232,8 +232,7 @@ export default class ChangePalletNew extends BasePage {
orderCode: this.detailsinfo.orderCode, orderCode: this.detailsinfo.orderCode,
}; };
await this.model.getInspectionOrderInfo(query); await this.model.getInspectionOrderInfo(query);
this.detailsinfocontent = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
this.detailsinfolist = this.model.OrderInfList.equ;
} }
} }
created() { created() {
@ -245,23 +244,15 @@ export default class ChangePalletNew extends BasePage {
//模态框图片上传 //模态框图片上传
confirm() { confirm() {
console.log((this as any).uUpload, 'sssss', this.equipmentindex); console.log((this as any).uUpload, 'sssss', this.equipmentindex);
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
if (this.radiomodal) {
this.imgUrlList = this.imgUrlList.join();
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
} else if (this.inputmodal) {
this.imgUrlList = this.imgUrlList.join();
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
}
} }
cancel() { cancel() {
this.imgUrlList = this.deleteimgUrlList; // this.imgUrlList = this.deleteimgUrlList;
} }
scrollLeft() { scrollLeft() {
return 222 * (this.imgList.length + 1); return 222 * (this.imgList.length + 1);
} }
showScreenImg(i) { showScreenImg(i) {
let list = this.imgUrlList; let list = this.imgList;
uni.previewImage({ uni.previewImage({
current: i, current: i,
urls: list, urls: list,
@ -303,7 +294,7 @@ export default class ChangePalletNew extends BasePage {
} }
let data = JSON.parse(res.data); let data = JSON.parse(res.data);
console.log('123dddd', data); console.log('123dddd', data);
this.imgUrlList = [...this.imgList, data.data.url]; this.imgList = [...this.imgList, data.data.url];
//this.imgListName = [...this.imgListName,data.fileName]; //this.imgListName = [...this.imgListName,data.fileName];
// this.imgUrlList = [...this.imgUrlList, imgUrlList[index]]; // this.imgUrlList = [...this.imgUrlList, imgUrlList[index]];
//this.picUrls = this.imgList.join(","); //this.picUrls = this.imgList.join(",");

3
src/pages/equipment/Inspection/index.vue
Unescape Escape View File

@ -98,6 +98,9 @@ export default class ChangePalletNew extends BasePage {
]; ];
userinfo: any = null; userinfo: any = null;
// remove: any = {}; // remove: any = {};
onShow() {
this.onLoad;
}
async onReady() { async onReady() {
//await this.model.getpalletLocation(); //await this.model.getpalletLocation();
//this.remove = this.model.WlList[0]; //this.remove = this.model.WlList[0];

1
src/pages/equipment/Repair/Sparepartlist.vue
Unescape Escape View File

@ -169,7 +169,6 @@ export default class ProductionQtyInsplist extends BasePage {
// url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)), // url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
// }); // });
uni.navigateBack({}); uni.navigateBack({});
// uni.navigateBack({});
} }
}); });

4
src/pages/equipment/Repair/details.vue
Unescape Escape View File

@ -108,12 +108,12 @@ export default class ChangePalletNew extends BasePage {
equipmentdata: any = []; equipmentdata: any = [];
listselect: any = [ listselect: any = [
{ {
type: 0, type: 1,
name: '符合标准', name: '符合标准',
radiovalue: null, radiovalue: null,
}, },
{ {
type: 1, type: 0,
name: '未达标', name: '未达标',
radiovalue: null, radiovalue: null,
}, },

4
src/pages/equipment/Repair/index.vue
Unescape Escape View File

@ -176,14 +176,10 @@ export default class ChangePalletNew extends BasePage {
linkdetailscheck(item) { linkdetailscheck(item) {
this.model.rowdatanull(); this.model.rowdatanull();
if (item.workStatus == 0) { if (item.workStatus == 0) {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)), url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
}); });
} else if (item.workStatus == 2 || item.workStatus == 3) { } else if (item.workStatus == 2 || item.workStatus == 3) {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)), url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
}); });

71
src/pages/equipment/Repair/repairing.vue
Unescape Escape View File

@ -13,7 +13,11 @@
<div class="item-name"> <div class="item-name">
<div class="quest">报修信息</div> <div class="quest">报修信息</div>
<div class="details"> <div class="details">
<div>报修人: {{ detailsinfolist.orderRepairman }}</div> <div>工单号: {{ detailsinfolist.workCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>报修人: {{ detailsinfolist.orderRepairmanCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
@ -33,7 +37,7 @@
<div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
</div> --> </div> -->
<div class="details"> <div class="details">
<div>是否立即维修: {{ detailsinfolist.workHandle }}</div> <div>是否立即维修: {{ detailsinfolist.workHandle == 0 ? '否' : '是' }}</div>
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> --> <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
@ -68,7 +72,7 @@
<div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
@ -82,7 +86,7 @@
<img @click="linkSparepartlist(detailsinfolist)" src="../../../static/images/add.png" alt="" /> <img @click="linkSparepartlist(detailsinfolist)" src="../../../static/images/add.png" alt="" />
</div> </div>
</div> </div>
<view class="list" v-for="(item, index) in this.Sparepartlist" :key="index"> <view class="list" v-for="(item, index) in Sparepartlist" :key="index">
<div class="item-name"> <div class="item-name">
<div class="quest">备件申领单</div> <div class="quest">备件申领单</div>
<div class="deletebtn"> <div class="deletebtn">
@ -122,11 +126,11 @@
<div class="item-name"> <div class="item-name">
<div class="quest">维修单</div> <div class="quest">维修单</div>
<u-form class="form" ref="form" label-width="230rpx"> <u-form class="form" ref="form" label-width="230rpx">
<u-form-item label="负责人:"> <u-form-item label="维修人:">
{{ detailsinfolist.workPerson }} {{ detailsinfolist.workPerson }}
</u-form-item> </u-form-item>
<!-- 机台 --> <!-- 机台 -->
<u-form-item label="维修结果:"> <!-- <u-form-item label="维修结果:">
<div class="select"> <div class="select">
<u-radio-group v-model="formdata.workStatus" @change="radioGroupChange1(formdata.workStatus)"> <u-radio-group v-model="formdata.workStatus" @change="radioGroupChange1(formdata.workStatus)">
<u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type"> <u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
@ -134,7 +138,7 @@
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</div> </div>
</u-form-item> </u-form-item> -->
<!-- 单号 --> <!-- 单号 -->
<u-form-item label="维修费用:"> <u-form-item label="维修费用:">
<u-input v-model="formdata.workCost" placeholder="" /> <u-input v-model="formdata.workCost" placeholder="" />
@ -145,17 +149,13 @@
<u-form-item label="维修人员签字:"> <u-form-item label="维修人员签字:">
<u-input v-model="formdata.productName" placeholder="" /> <u-input v-model="formdata.productName" placeholder="" />
</u-form-item> --> </u-form-item> -->
<!-- 工单 --> <!-- 工单 -->
<u-form-item label="联系方式:">
<u-input v-model="formdata.workConnection" placeholder="" />
</u-form-item>
<u-form-item label="原因分析:"> <u-form-item label="原因分析:">
<u-input v-model="formdata.workReason" placeholder="" /> <u-input v-model="formdata.workReason" placeholder="" type="" />
</u-form-item> </u-form-item>
<u-form-item label="上传图片:"> <u-form-item label="上传图片:">
<scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()"> <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
<view class="photoList"> <view class="photoList photoList1">
<view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index"> <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
<view class="closeBtn" @click="deleteImg1(index)"> <view class="closeBtn" @click="deleteImg1(index)">
<image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
@ -307,10 +307,11 @@ export default class ChangePalletNew extends BasePage {
if (this.model.rowdata.length == 0) { if (this.model.rowdata.length == 0) {
this.model.rowdatanull(); this.model.rowdatanull();
} else { } else {
this.Sparepartlist = [];
this.Sparepartlist = this.model.rowdata; this.Sparepartlist = this.model.rowdata;
}
console.log(1, this.model.rowdata, this.Sparepartlist); console.log(1, this.model.rowdata, this.Sparepartlist);
} }
}
// 输入框焦点 // 输入框焦点
blur(item, value, index, index1) { blur(item, value, index, index1) {
console.log(item, value, index, index1); console.log(item, value, index, index1);
@ -458,8 +459,8 @@ export default class ChangePalletNew extends BasePage {
// }); // });
tempFilePaths.map((item) => { tempFilePaths.map((item) => {
uni.uploadFile({ uni.uploadFile({
// url: 'http://192.168.202.20:9000/prod-api/file/upload', url: 'http://192.168.202.20:9000/prod-api/file/upload',
url: '/dev-api/file/upload', // url: '/dev-api/file/upload',
fileType: 'image', fileType: 'image',
filePath: item, filePath: item,
header: { header: {
@ -538,8 +539,8 @@ export default class ChangePalletNew extends BasePage {
// }); // });
tempFilePaths.map((item) => { tempFilePaths.map((item) => {
uni.uploadFile({ uni.uploadFile({
// url: 'http://192.168.202.20:9000/prod-api/file/upload', url: 'http://192.168.202.20:9000/prod-api/file/upload',
url: '/dev-api/file/upload', // url: '/dev-api/file/upload',
fileType: 'image', fileType: 'image',
filePath: item, filePath: item,
header: { header: {
@ -602,7 +603,7 @@ export default class ChangePalletNew extends BasePage {
if (item.standardList.length > 0) { if (item.standardList.length > 0) {
item.standardList.forEach((item1) => { item.standardList.forEach((item1) => {
if (item1.standardType == 'quantify') { if (item1.standardType == 'quantify') {
if (item1.detailReach == null || item1.detailReach == '') { if (item1.actualValue == null || item1.actualValue == '') {
// console.log(this.isvalue); // console.log(this.isvalue);
this.isvalue = true; this.isvalue = true;
} }
@ -622,13 +623,7 @@ export default class ChangePalletNew extends BasePage {
}); });
return; return;
} }
if (this.formdata.workStatus == '' || this.formdata.workStatus == undefined) {
(this.$refs.uToast as any).show({
title: '请选择维修结果',
type: 'default',
});
return;
}
if (this.formdata.workCost == '' || this.formdata.workCost == undefined) { if (this.formdata.workCost == '' || this.formdata.workCost == undefined) {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '维修费用不能为空', title: '维修费用不能为空',
@ -636,28 +631,23 @@ export default class ChangePalletNew extends BasePage {
}); });
return; return;
} }
if (this.formdata.workConnection == '' || this.formdata.workConnection == undefined) {
(this.$refs.uToast as any).show({
title: '联系方式不能为空',
type: 'default',
});
return;
}
let query = this.detailsinfolist; let query = this.detailsinfolist;
query.applyList = this.Sparepartlist; query.applyList = this.Sparepartlist;
query.fileList = this.imgList.join(','); query.fileList = this.imgformList.join(',');
query.workStatus = this.formdata.workStatus;
query.workCost = this.formdata.workCost; query.workCost = this.formdata.workCost;
query.workConnection = this.formdata.workConnection;
query.workReason = this.formdata.workReason; query.workReason = this.formdata.workReason;
console.log(query, this.isvalue); console.log(query, this.isvalue);
await this.model.updateInspectionRecord(query); await this.model.updateMaintenanceRecords(query);
if (this.model.SubmitCode.code == '200') { if (this.model.SubmitCode.code == '200') {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '成功', title: '成功',
type: 'default', type: 'default',
}); });
uni.navigateBack({}); setTimeout(() => {
uni.navigateTo({
url: `/pages/equipment/Repair/index?listitem=`,
});
}, 1000);
} else { } else {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '失败', title: '失败',
@ -1050,5 +1040,10 @@ export default class ChangePalletNew extends BasePage {
::v-deep .u-form-item { ::v-deep .u-form-item {
padding: 6px 0; padding: 6px 0;
} }
.photoList1 {
width: 220px;
overflow-y: scroll;
border: 1px solid black;
}
} }
</style> </style>

79
src/pages/equipment/Repair/repairingview.vue
Unescape Escape View File

@ -25,7 +25,11 @@
<div class="item-name item-info"> <div class="item-name item-info">
<div class="quest">报修信息</div> <div class="quest">报修信息</div>
<div class="details"> <div class="details">
<div>报修人: {{ detailsinfolist.orderRepairman }}</div> <div>工单号: {{ detailsinfolist.workCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>报修人: {{ detailsinfolist.orderRepairmanCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
@ -45,7 +49,7 @@
<div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
</div> --> </div> -->
<div class="details"> <div class="details">
<div>是否立即维修: {{ detailsinfolist.workHandle }}</div> <div>是否立即维修: {{ detailsinfolist.workHandle == 0 ? '否' : '是' }}</div>
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> --> <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
@ -80,7 +84,7 @@
<div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" :disabled="item1.detailReach == null ? true : true" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" :disabled="item1.actualValue == null ? true : true" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
@ -99,11 +103,11 @@
<div class="item-name"> <div class="item-name">
<div class="quest">维修单</div> <div class="quest">维修单</div>
<u-form class="form" ref="form" label-width="230rpx"> <u-form class="form" ref="form" label-width="230rpx">
<u-form-item label="负责人:"> <u-form-item label="维修人:">
{{ detailsinfolist.workPerson }} {{ detailsinfolist.workPerson }}
</u-form-item> </u-form-item>
<!-- 机台 --> <!-- 机台 -->
<u-form-item label="维修结果:"> <!-- <u-form-item label="维修结果:">
<div class="select"> <div class="select">
<u-radio-group v-model="detailsinfolist.workStatus" @change="radioGroupChange1(formdata.workStatus)"> <u-radio-group v-model="detailsinfolist.workStatus" @change="radioGroupChange1(formdata.workStatus)">
<u-radio :disabled="detailsinfolist.detailReach == n.type ? false : true" @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type"> <u-radio :disabled="detailsinfolist.detailReach == n.type ? false : true" @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
@ -111,28 +115,17 @@
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</div> </div>
</u-form-item> </u-form-item> -->
<!-- 单号 --> <!-- 单号 -->
<u-form-item label="维修费用:"> <u-form-item label="维修费用:">
<u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" /> <u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" />
</u-form-item> </u-form-item>
<!-- <u-form-item label="维修用时(分钟):">
<u-input v-model="formdata.productSpc" placeholder="" />
</u-form-item>
<u-form-item label="维修人员签字:">
<u-input v-model="formdata.productName" placeholder="" />
</u-form-item> -->
<!-- 工单 -->
<u-form-item label="联系方式:">
<u-input :disabled="detailsinfolist.workConnection == null ? true : true" v-model="detailsinfolist.workConnection" placeholder="" />
</u-form-item>
<u-form-item label="原因分析:"> <u-form-item label="原因分析:">
<u-input :disabled="detailsinfolist.workReason == null ? true : true" v-model="detailsinfolist.workReason" placeholder="" /> <u-input :disabled="detailsinfolist.workReason == null ? true : true" v-model="detailsinfolist.workReason" placeholder="" />
</u-form-item> </u-form-item>
<u-form-item label="图片:"> <u-form-item label="图片:">
<scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()"> <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
<view class="photoList"> <view class="photoList photoList1">
<view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index"> <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
<!-- <view class="closeBtn" @click="deleteImg1(index)"> <!-- <view class="closeBtn" @click="deleteImg1(index)">
<image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
@ -159,11 +152,11 @@
<u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button> <u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
</div> --> </div> -->
<div class="details"> <div class="details">
<div>备件编码: {{ item.materialCode }}</div> <div>备件编码: {{ item.spareCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>备件名称: {{ item.materialDesc }}</div> <div>备件名称: {{ item.spareName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
@ -328,9 +321,11 @@ export default class ChangePalletNew extends BasePage {
this.inputmodal = false; this.inputmodal = false;
this.equipmentindex.push(index); this.equipmentindex.push(index);
this.equipmentindex.push(index1); this.equipmentindex.push(index1);
if (item.picturePath != null) { if (item.picturePaths.length > 0) {
this.imgList = JSON.parse(JSON.stringify(item.picturePath)); this.imgList = [];
this.imgList = this.imgList.split(','); item.picturePaths.forEach((item) => {
this.imgList.push(item.fileAddress);
});
this.isshow = true; this.isshow = true;
this.radiomodal = true; this.radiomodal = true;
this.form = item; this.form = item;
@ -375,6 +370,12 @@ export default class ChangePalletNew extends BasePage {
}; };
await this.model.getInspectionOrderInfo(query.workId); await this.model.getInspectionOrderInfo(query.workId);
this.detailsinfolist = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
if (this.detailsinfolist.files.length > 0) {
this.imgformList = [];
this.detailsinfolist.files.forEach((item) => {
this.imgformList.push(item.fileAddress);
});
}
} }
} }
created() { created() {
@ -388,32 +389,9 @@ export default class ChangePalletNew extends BasePage {
confirm() { confirm() {
console.log((this as any).uUpload, 'sssss', this.equipmentindex); console.log((this as any).uUpload, 'sssss', this.equipmentindex);
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]); console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
if (this.radiomodal) {
if (this.imgList.length == 0) {
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
} else {
this.imgList = this.imgList.join(',');
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
}
} else if (this.inputmodal) {
if (this.imgList.length == 0) {
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
} else {
this.imgList = this.imgList.join(',');
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
}
}
} }
cancel() { cancel() {
this.isshow = false; this.isshow = false;
if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
this.imgList = [];
} else {
this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
this.imgList = this.imgList.split(',');
}
} }
scrollLeft() { scrollLeft() {
return 222 * (this.imgList.length + 1); return 222 * (this.imgList.length + 1);
@ -527,8 +505,8 @@ export default class ChangePalletNew extends BasePage {
// }); // });
tempFilePaths.map((item) => { tempFilePaths.map((item) => {
uni.uploadFile({ uni.uploadFile({
// url: 'http://192.168.202.20:9000/prod-api/file/upload', url: 'http://192.168.202.20:9000/prod-api/file/upload',
url: '/dev-api/file/upload', // url: '/dev-api/file/upload',
fileType: 'image', fileType: 'image',
filePath: item, filePath: item,
header: { header: {
@ -968,5 +946,10 @@ export default class ChangePalletNew extends BasePage {
::v-deep .u-form-item { ::v-deep .u-form-item {
padding: 6px 0; padding: 6px 0;
} }
.photoList1 {
width: 220px;
overflow-y: scroll;
border: 1px solid black;
}
} }
</style> </style>

15
src/pages/equipment/Repairbx/index.vue
Unescape Escape View File

@ -33,9 +33,9 @@
</div> </div>
<u-form class="form listform" ref="form" label-width="140rpx"> <u-form class="form listform" ref="form" label-width="140rpx">
<!-- 机台 --> <!-- 机台 -->
<u-form-item label="联系方式:"> <!-- <u-form-item label="联系方式:">
<u-input v-model="formdata.orderConnection" placeholder="" type="text" /> <u-input v-model="formdata.orderConnection" placeholder="" type="text" />
</u-form-item> </u-form-item> -->
<u-form-item label="故障描述:"> <u-form-item label="故障描述:">
<u-input v-model="formdata.orderDesc" placeholder="" type="textarea" /> <u-input v-model="formdata.orderDesc" placeholder="" type="textarea" />
</u-form-item> </u-form-item>
@ -46,7 +46,7 @@
</u-form-item> </u-form-item>
<u-form-item label="上传图片:"> <u-form-item label="上传图片:">
<scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()"> <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
<view class="photoList"> <view class="photoList photoList1">
<view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index"> <view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index">
<view class="closeBtn" @click="deleteImg(index)"> <view class="closeBtn" @click="deleteImg(index)">
<image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
@ -139,7 +139,6 @@ export default class ChangePalletNew extends BasePage {
orderDesc: '', orderDesc: '',
orderBreakdownTime: '', orderBreakdownTime: '',
fileList: '', fileList: '',
orderConnection: '',
orderRepairman: '', orderRepairman: '',
}; };
orderBreakdownTime: any = ''; orderBreakdownTime: any = '';
@ -232,7 +231,6 @@ export default class ChangePalletNew extends BasePage {
fileList: fileList, fileList: fileList,
orderSource: '手持PDA', orderSource: '手持PDA',
orderRepairman: '', orderRepairman: '',
orderConnection: this.formdata.orderConnection,
//productionState: this.productCodeList.value, //productionState: this.productCodeList.value,
}; };
console.log(params, this.formdata, this.imgUrlList); console.log(params, this.formdata, this.imgUrlList);
@ -265,7 +263,7 @@ export default class ChangePalletNew extends BasePage {
this.formdata = {}; this.formdata = {};
this.imgList = []; this.imgList = [];
this.location = ''; this.location = '';
this.locationStatus = 1; (this.orderBreakdownTime = ''), (this.locationStatus = 1);
this.productCodeList = {}; this.productCodeList = {};
this.productCodelocList = {}; this.productCodelocList = {};
this.shouciFocus = false; this.shouciFocus = false;
@ -560,5 +558,10 @@ export default class ChangePalletNew extends BasePage {
width: 94%; width: 94%;
padding: 5px; padding: 5px;
} }
.photoList1 {
width: 220px;
overflow-y: scroll;
border: 1px solid black;
}
} }
</style> </style>

83
src/pages/equipment/Spotcheck/details.vue
Unescape Escape View File

@ -18,8 +18,8 @@
<div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
</div> </div>
<div class="details"> <div class="details">
<div>车间: {{ detailsinfocontent.planWorkshop }}</div> <div>车间: {{ detailsinfolist.planWorkshop }}</div>
<div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> <div style="margin-left: 42px">工作中心: {{ detailsinfolist.workCenterName }}</div>
</div> </div>
</div> </div>
<view class="single-left"> <view class="single-left">
@ -45,7 +45,7 @@
<div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
@ -86,6 +86,7 @@
</scroll-view> </scroll-view>
</div> </div>
</u-modal> </u-modal>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -130,12 +131,12 @@ export default class ChangePalletNew extends BasePage {
equipmentdata: any = []; equipmentdata: any = [];
listselect: any = [ listselect: any = [
{ {
type: 0, type: 1,
name: '符合标准', name: '符合标准',
radiovalue: null, radiovalue: null,
}, },
{ {
type: 1, type: 0,
name: '未达标', name: '未达标',
radiovalue: null, radiovalue: null,
}, },
@ -165,8 +166,10 @@ export default class ChangePalletNew extends BasePage {
console.log(item, value, index, index1); console.log(item, value, index, index1);
this.radiomodal = false; this.radiomodal = false;
this.inputmodal = false; this.inputmodal = false;
if (value == null) { if (value == null || value == '') {
this.isvalue == true; this.isvalue = true;
} else {
this.isvalue = false;
} }
if (value > item.detailUpLimit || value < item.detailDownLimit) { if (value > item.detailUpLimit || value < item.detailDownLimit) {
this.equipmentindex = []; this.equipmentindex = [];
@ -207,7 +210,7 @@ export default class ChangePalletNew extends BasePage {
} else { } else {
this.imgList = []; this.imgList = [];
} }
if (value == 1) { if (value == 0) {
this.isshow = true; this.isshow = true;
this.radiomodal = true; this.radiomodal = true;
this.form = item; this.form = item;
@ -221,8 +224,7 @@ export default class ChangePalletNew extends BasePage {
orderCode: this.detailsinfo.orderCode, orderCode: this.detailsinfo.orderCode,
}; };
await this.model.getInspectionOrderInfo(query); await this.model.getInspectionOrderInfo(query);
this.detailsinfocontent = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
this.detailsinfolist = this.model.OrderInfList.equ;
} }
} }
created() { created() {
@ -354,28 +356,51 @@ export default class ChangePalletNew extends BasePage {
} }
async onSubmit() { async onSubmit() {
if (this.orderNo == '' || this.orderNo.length == 0) { if (this.orderNo == '' || this.orderNo.length == 0) {
this.customToast('请扫码设备编码'); // this.customToast('请扫码设备编码');
(this.$refs.uToast as any).show({
title: '请扫码设备编码',
type: 'default',
});
return; return;
} }
this.detailsinfolist.detailList.forEach((item) => {
if (item.standardList.length > 0) {
item.standardList.forEach((item1) => {
if (item1.standardType == 'quantify') {
if (item1.actualValue == null || item1.actualValue == '') {
// console.log(this.isvalue);
this.isvalue = true;
}
}
});
}
});
if (this.isvalue) { if (this.isvalue) {
this.customToast('检查标准不能为空'); (this.$refs.uToast as any).show({
title: '检查标准不能为空',
type: 'default',
});
return; return;
} }
// this.detailsinfocontent.equ = this.detailsinfolist; let query = this.detailsinfolist;
// let query = this.detailsinfocontent; await this.model.updateInspectionRecord(query);
// await this.model.updateInspectionRecord(query); if (this.model.SubmitCode == '200') {
// if (this.model.SubmitCode == '200') { (this.$refs.uToast as any).show({
// (this.$refs.uToast as any).show({ title: '成功',
// title: '成功', type: 'default',
// type: 'success', });
// });
// uni.navigateBack({}); setTimeout(() => {
// } else { uni.navigateTo({
// (this.$refs.uToast as any).show({ url: `/pages/equipment/Spotcheck/index?listitem=`,
// title: '失败', });
// type: 'error', }, 1000);
// }); } else {
// } (this.$refs.uToast as any).show({
title: '失败',
type: 'default',
});
}
} }
search(value) { search(value) {
console.log(value); console.log(value);
@ -383,8 +408,8 @@ export default class ChangePalletNew extends BasePage {
this.isaccord = true; this.isaccord = true;
} else { } else {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '失败', title: '请扫码正确条码',
type: '请扫码正确条码', type: 'default',
}); });
} }
} }

94
src/pages/equipment/Spotcheck/detailsview.vue
Unescape Escape View File

@ -31,7 +31,7 @@
<div class="item1">检查方法: {{ item.itemMethod }}</div> <div class="item1">检查方法: {{ item.itemMethod }}</div>
<div v-for="(item1, index1) in item.standardList" :key="index1"> <div v-for="(item1, index1) in item.standardList" :key="index1">
<div class="item1 item2" v-if="item1.standardType == 'qualitative'"> <div class="item1 item2" v-if="item1.standardType == 'qualitative'">
<div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="select"> <div class="select">
<u-radio-group v-model="item1.detailReach" @change="radioGroupChange(item1, item1.detailReach, index, index1)"> <u-radio-group v-model="item1.detailReach" @change="radioGroupChange(item1, item1.detailReach, index, index1)">
<u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true"> <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true">
@ -41,10 +41,10 @@
</div> </div>
</div> </div>
<div class="item1 item2" v-if="item1.standardType == 'quantify'"> <div class="item1 item2" v-if="item1.standardType == 'quantify'">
<div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" :disabled="item1.detailReach == null ? true : true" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" :disabled="item1.actualValue == null ? true : true" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
@ -55,12 +55,12 @@
<div class="item-name"> <div class="item-name">
<!-- <div class="quest">点检人: 刘XX</div> --> <!-- <div class="quest">点检人: 刘XX</div> -->
<div class="details"> <div class="details">
<div>点检人: 刘XX</div> <div>点检人:{{ detailsinfolist.planPerson }}</div>
<div style="margin-left: 42px">点检时间: 2023-08-09</div> <div style="margin-left: 42px">点检时间:{{ detailsinfolist.orderStart }}</div>
</div> </div>
<div class="details"> <div class="details">
<div>是否异常: 是</div> <div>是否异常: {{ detailsinfolist.workCode == null ? '否' : '是' }}</div>
<div style="margin-left: 42px">报修单: 90272931234</div> <div style="margin-left: 42px">报修单:{{ detailsinfolist.workCode }}</div>
</div> </div>
</div> </div>
</view> </view>
@ -70,28 +70,29 @@
<!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> --> <!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> -->
<scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()"> <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
<view class="photoList"> <view class="photoList">
<view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index"> <view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index">
<view class="closeBtn" @click="deleteImg(index)"> <!-- <view class="closeBtn" @click="deleteImg(index)">
<image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
</view> </view> -->
<image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image> <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
</view> </view>
<view class="itemBox chooseBtn" @click="chooseImg"> <view class="itemBox chooseBtn">
<view class="inner"> <!-- <view class="inner">
<image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
<text class="desc">添加照片</text> <text class="desc">添加照片</text>
</view> </view> -->
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</div> </div>
</u-modal> </u-modal>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component } from 'vue-property-decorator'; import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page'; import { BasePage } from '@/components/base/page';
import model from '../Spotcheck/model'; import model from './model';
import chooseOne from '@/components/choose-one/choose-one.vue'; import chooseOne from '@/components/choose-one/choose-one.vue';
import jPicker from '@/components/J-Picker/jPicker.vue'; import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session'; import { session } from '@/store/modules/session';
@ -109,7 +110,7 @@ export default class ChangePalletNew extends BasePage {
cate_name: '今日任务', cate_name: '今日任务',
}, },
{ {
cate_name: '点检记录', cate_name: '巡检记录',
}, },
]; ];
current: any = 0; current: any = 0;
@ -129,12 +130,12 @@ export default class ChangePalletNew extends BasePage {
equipmentdata: any = []; equipmentdata: any = [];
listselect: any = [ listselect: any = [
{ {
type: 0, type: 1,
name: '符合标准', name: '符合标准',
radiovalue: null, radiovalue: null,
}, },
{ {
type: 1, type: 0,
name: '未达标', name: '未达标',
radiovalue: null, radiovalue: null,
}, },
@ -153,22 +154,42 @@ export default class ChangePalletNew extends BasePage {
imgUrlList: any = []; imgUrlList: any = [];
deleteimgUrlList: any = []; deleteimgUrlList: any = [];
orderNoItemList: any = {}; orderNoItemList: any = {};
picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg'; checkPictrueList: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
async onReady() { async onReady() {
//await this.model.getpalletLocation(); //await this.model.getpalletLocation();
//this.remove = this.model.WlList[0]; //this.remove = this.model.WlList[0];
} }
// 输入框焦点 // 输入框焦点
checkimg(item, value, index, index1) {
this.equipmentindex = [];
this.radiomodal = false;
this.inputmodal = false;
this.equipmentindex.push(index);
this.equipmentindex.push(index1);
if (item.checkPictrueList != null) {
this.imgList = JSON.parse(JSON.stringify(item.checkPictrueList));
console.log(this.imgList);
// this.imgList = this.imgList.split(',');
this.isshow = true;
this.radiomodal = true;
this.form = item;
} else {
this.imgList = [];
this.isshow = true;
this.radiomodal = true;
this.form = item;
}
}
blur(item, value, index, index1) { blur(item, value, index, index1) {
this.radiomodal = false; this.radiomodal = false;
this.inputmodal = false; this.inputmodal = false;
if (value > item.detailUpLimit || value < item.detailDownLimit) { if (value > item.detailUpLimit || value < item.detailDownLimit) {
this.equipmentindex.push(index); this.equipmentindex.push(index);
this.equipmentindex.push(index1); this.equipmentindex.push(index1);
if (item.picturePath != null) { if (item.checkPictrueList != null) {
item.picturePath = item.picturePath.split(','); item.checkPictrueList = item.checkPictrueList.split(',');
this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath)); this.imgUrlList = JSON.parse(JSON.stringify(item.checkPictrueList));
} else { } else {
this.imgUrlList = []; this.imgUrlList = [];
} }
@ -193,9 +214,9 @@ export default class ChangePalletNew extends BasePage {
this.inputmodal = false; this.inputmodal = false;
this.equipmentindex.push(index); this.equipmentindex.push(index);
this.equipmentindex.push(index1); this.equipmentindex.push(index1);
if (item.picturePath != null) { if (item.checkPictrueList != null) {
item.picturePath = item.picturePath.split(','); item.checkPictrueList = item.checkPictrueList.split(',');
this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath)); this.imgUrlList = JSON.parse(JSON.stringify(item.checkPictrueList));
} else { } else {
this.imgUrlList = []; this.imgUrlList = [];
} }
@ -213,8 +234,7 @@ export default class ChangePalletNew extends BasePage {
orderCode: this.detailsinfo.orderCode, orderCode: this.detailsinfo.orderCode,
}; };
await this.model.getInspectionOrderInfo(query); await this.model.getInspectionOrderInfo(query);
this.detailsinfocontent = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
this.detailsinfolist = this.model.OrderInfList.equ;
} }
} }
created() { created() {
@ -226,23 +246,23 @@ export default class ChangePalletNew extends BasePage {
//模态框图片上传 //模态框图片上传
confirm() { confirm() {
console.log((this as any).uUpload, 'sssss', this.equipmentindex); console.log((this as any).uUpload, 'sssss', this.equipmentindex);
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]); // console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
if (this.radiomodal) { // if (this.radiomodal) {
this.imgUrlList = this.imgUrlList.join(); // this.imgList = this.imgList.join();
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList; // this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList = this.imgUrlList;
} else if (this.inputmodal) { // } else if (this.inputmodal) {
this.imgUrlList = this.imgUrlList.join(); // this.imgUrlList = this.imgUrlList.join();
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList; // this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList = this.imgUrlList;
} // }
} }
cancel() { cancel() {
this.imgUrlList = this.deleteimgUrlList; // this.imgUrlList = this.deleteimgUrlList;
} }
scrollLeft() { scrollLeft() {
return 222 * (this.imgList.length + 1); return 222 * (this.imgList.length + 1);
} }
showScreenImg(i) { showScreenImg(i) {
let list = this.imgUrlList; let list = this.imgList;
uni.previewImage({ uni.previewImage({
current: i, current: i,
urls: list, urls: list,
@ -284,7 +304,7 @@ export default class ChangePalletNew extends BasePage {
} }
let data = JSON.parse(res.data); let data = JSON.parse(res.data);
console.log('123dddd', data); console.log('123dddd', data);
this.imgUrlList = [...this.imgList, data.data.url]; this.imgList = [...this.imgList, data.data.url];
//this.imgListName = [...this.imgListName,data.fileName]; //this.imgListName = [...this.imgListName,data.fileName];
// this.imgUrlList = [...this.imgUrlList, imgUrlList[index]]; // this.imgUrlList = [...this.imgUrlList, imgUrlList[index]];
//this.picUrls = this.imgList.join(","); //this.picUrls = this.imgList.join(",");

4
src/pages/equipment/Spotcheck/index.vue
Unescape Escape View File

@ -32,6 +32,7 @@
<div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div> <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
<div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div> <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
</view> </view>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -98,6 +99,9 @@ export default class ChangePalletNew extends BasePage {
]; ];
userinfo: any = null; userinfo: any = null;
// remove: any = {}; // remove: any = {};
onShow() {
this.onLoad;
}
async onReady() { async onReady() {
//await this.model.getpalletLocation(); //await this.model.getpalletLocation();
//this.remove = this.model.WlList[0]; //this.remove = this.model.WlList[0];

43
src/pages/equipment/Upkeep/Sparepartlist.vue
Unescape Escape View File

@ -58,22 +58,32 @@ export default class ProductionQtyInsplist extends BasePage {
width: 100, width: 100,
}, },
{ {
label: '备件名称', label: '申领单号',
key: 'materialDesc', key: 'applyCode',
width: 320, width: 320,
}, },
{ {
label: '备件编码', label: '备件编码',
key: 'materialCode', key: 'spareCode',
width: 320, width: 320,
}, },
{ {
label: '总数量', label: '备件名称',
key: 'amount', key: 'spareName',
width: 320,
}, },
{ {
label: '冻结数量', label: '申领数量',
key: 'storageAmount', key: 'spareQuantity',
},
{
label: '申领类型',
key: 'spareModel',
},
{
label: '申领时间',
key: 'applyTime',
width: 320,
}, },
// { // {
// label: '产品', // label: '产品',
@ -195,25 +205,34 @@ export default class ProductionQtyInsplist extends BasePage {
} }
goback() { goback() {
uni.redirectTo({ uni.redirectTo({
url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)), url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
}); });
} }
async onLoad(options) { async onLoad(options) {
let str = decodeURIComponent(options.listitem); let str = decodeURIComponent(options.listitem);
if (str) { if (str) {
this.detailsinfo = JSON.parse(str); this.detailsinfo = JSON.parse(str);
let query = { let query = {
pageNum: 1, orderCode: this.detailsinfo.orderCode,
pageSize: 10000,
materialDesc: this.orderNo,
}; };
await this.model.getInspectionOrderInfo(query);
await this.model.queryhandChecklist(query); await this.model.queryhandChecklist(query);
this.tableData = this.model.Checklist; this.tableData = this.model.OrderInfList.spareList;
this.tableData.map((item, index) => { this.tableData.map((item, index) => {
item.index = index + 1; item.index = index + 1;
}); });
} }
// if (str) {
// this.detailsinfo = JSON.parse(str);
// let query = {
// orderCode: this.detailsinfo.orderCode,
// };
// await this.model.getInspectionOrderInfo(query);
// this.detailsinfolist = this.model.OrderInfList;
// }
} }
changeContent(e) { changeContent(e) {
//console.log('eee', e.data); //console.log('eee', e.data);
this.rowdata = e.data[0]?.lineData; this.rowdata = e.data[0]?.lineData;

23
src/pages/equipment/Upkeep/details.vue
Unescape Escape View File

@ -5,7 +5,7 @@
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" /> <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
</view> </view>
<view class="title">维修详情</view> <view class="title">保养详情</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> --> <!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> -->
@ -19,7 +19,7 @@
</div> </div>
<div class="details"> <div class="details">
<!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> --> <!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> -->
<div>工作中心: {{ detailsinfolist.workshopName }}</div> <div>工作中心: {{ detailsinfolist.planWorkshop }}</div>
</div> </div>
</div> </div>
<view class="single-left"> <view class="single-left">
@ -54,7 +54,7 @@
</view> </view>
<u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="" :show-title="true" @cancel="cancel" @confirm="confirm(detailsinfolist)"> <u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="" :show-title="true" @cancel="cancel" @confirm="confirm(detailsinfolist)">
<div class="form"> <div class="form">
<div class="formlable">是否停机维修</div> <div class="formlable">是否停机保养</div>
<u-radio-group v-model="radio" @change="radioGroupChange1(radio)"> <u-radio-group v-model="radio" @change="radioGroupChange1(radio)">
<u-radio v-for="(item, index) in radioList" :key="index" :name="item.type" :disabled="item.disabled"> <u-radio v-for="(item, index) in radioList" :key="index" :name="item.type" :disabled="item.disabled">
{{ item.name }} {{ item.name }}
@ -140,7 +140,7 @@ export default class ChangePalletNew extends BasePage {
type: 1, type: 1,
}, },
{ {
name: '不停机', name: '开机',
disabled: false, disabled: false,
type: 0, type: 0,
}, },
@ -212,9 +212,9 @@ export default class ChangePalletNew extends BasePage {
if (str) { if (str) {
this.detailsinfo = JSON.parse(str); this.detailsinfo = JSON.parse(str);
let query = { let query = {
workId: this.detailsinfo.workId, orderCode: this.detailsinfo.orderCode,
}; };
await this.model.getInspectionOrderInfo(query.workId); await this.model.getInspectionOrderInfo(query);
this.detailsinfolist = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
} }
} }
@ -229,10 +229,11 @@ export default class ChangePalletNew extends BasePage {
this.linkrepairing(item); this.linkrepairing(item);
} }
async linkrepairing(item) { async linkrepairing(item) {
console.log(item);
console.log(this.radio); console.log(this.radio);
if (this.radio == null) { if (this.radio == null) {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '请选择是否停机维修', title: '请选择是否停机保养',
type: 'default', type: 'default',
}); });
this.isshow = true; this.isshow = true;
@ -241,19 +242,19 @@ export default class ChangePalletNew extends BasePage {
let query = { let query = {
workId: item.workId, workId: item.workId,
workCode: item.workCode, orderCode: item.orderCode,
workDownMachine: this.radio, shutDown: this.radio,
workStartTime: moment().format('YYYY-MM-DD HH:mm:ss'), workStartTime: moment().format('YYYY-MM-DD HH:mm:ss'),
}; };
console.log(query); console.log(query);
await this.model.updateInspectionRecord(query); await this.model.startMaintenanceTask(query);
if (this.model.SubmitCode.code == 200) { if (this.model.SubmitCode.code == 200) {
// (this.$refs.uToast as any).show({ // (this.$refs.uToast as any).show({
// title: '成功', // title: '成功',
// type: 'success', // type: 'success',
// }); // });
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)), url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
}); });
this.isshow = false; this.isshow = false;
} else { } else {

150
src/pages/equipment/Upkeep/index.vue
Unescape Escape View File

@ -5,39 +5,50 @@
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="goback()" /> <u-icon class="icon" name="arrow-left" @click="goback()" />
</view> </view>
<view class="title">维修</view> <view class="title">保养</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
<view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index"> <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index">
<div class="list-top"> <div class="list-top">
<div class="name">工单号: {{ item.workCode }}</div> <div class="name">工单号: {{ item.orderCode }}</div>
<div class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div> <div class="tag">{{ item.orderStatus == 0 ? '待处理' : item.orderStatus == 1 ? '已完成' : item.orderStatus == 2 ? '已逾期' : '进行中' }}</div>
<u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon> <u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
</div> </div>
<!-- 计划编码 20231121003 计划名称 蚊香包装线保养计划
循环周期 1日 工单编码 O20231121005
车间编码 WXB01 循环开始时间 2023-11-21
循环结束时间 2023-12-30 执行开始时间
执行结束时间 保养类型 内部
是否停机保养 开机保养 保养人 -->
<div class="item1">计划编码: {{ item.planCode }}</div>
<div class="item1">设备编码:{{ item.equipmentCode }}</div> <div class="item1">设备编码:{{ item.equipmentCode }}</div>
<div class="item1">维修负责人: {{ item.workPerson }}</div> <div class="item1">车间编码: {{ item.planWorkshop }}</div>
<div class="item1">故障描述: {{ item.workFaultDesc }}</div> <div class="item1">周期: {{ item.planLoop }}日</div>
<div class="item1">维修人员: {{ item.workPerson }}</div> <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
<div class="item1">维修组: {{ item.teamName }}</div> <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
<div class="item1">维修组人员: {{ item.teamPerson }}</div> <div class="item1">执行开始时间: {{ item.orderStart }}</div>
<div class="item1">是否立即维修: {{ item.workDownMachine == 1 ? '是' : '否' }}</div> <div class="item1">保养人: {{ item.planPerson }}</div>
<div class="item1">是否停机保养: {{ item.delFlag == 1 ? '是' : '否' }}</div>
</view> </view>
<view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index"> <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index">
<div class="list-top"> <div class="list-top">
<div class="name">工单号: {{ item.workCode }}</div> <div class="name">工单号: {{ item.workCode }}</div>
<div class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div> <div class="tag">{{ item.orderStatus == 0 ? '待处理' : item.orderStatus == 1 ? '已完成' : item.orderStatus == 2 ? '已逾期' : '进行中' }}</div>
<u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon> <u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
</div> </div>
<div class="item1">计划编码: {{ item.planCode }}</div>
<div class="item1">设备编码:{{ item.equipmentCode }}</div> <div class="item1">设备编码:{{ item.equipmentCode }}</div>
<div class="item1">维修负责人: {{ item.workPerson }}</div> <div class="item1">车间编码: {{ item.planWorkshop }}</div>
<div class="item1">故障描述: {{ item.workFaultDesc }}</div> <div class="item1">周期: {{ item.planLoop }}日</div>
<div class="item1">维修人员: {{ item.workPerson }}</div> <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
<div class="item1">维修组: {{ item.teamName }}</div> <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
<div class="item1">维修组人员: {{ item.teamPerson }}</div> <div class="item1">执行开始时间: {{ item.orderStart }}</div>
<div class="item1">是否立即维修: {{ item.workDownMachine == 1 ? '是' : '否' }}</div> <div class="item1">保养人: {{ item.planPerson }}</div>
<div class="item1">是否停机保养: {{ item.delFlag == 1 ? '是' : '否' }}</div>
</view> </view>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -58,10 +69,10 @@ export default class ChangePalletNew extends BasePage {
model = model; model = model;
list: any = [ list: any = [
{ {
cate_name: '待处理', cate_name: '今日任务',
}, },
{ {
cate_name: '维修记录', cate_name: '保养记录',
}, },
]; ];
current: any = 0; current: any = 0;
@ -86,18 +97,18 @@ export default class ChangePalletNew extends BasePage {
productCodelocList: any = {}; productCodelocList: any = {};
detailsdataceshi: any = [ detailsdataceshi: any = [
{ {
itemq: '维修任务1', itemq: '保养任务1',
item2: '已维修', item2: '已保养',
item3: '2023-08-01 - 2023-08-31', item3: '2023-08-01 - 2023-08-31',
item4: '每月维修', item4: '每月保养',
item5: 'XXXXX', item5: 'XXXXX',
item6: '未发现异常', item6: '未发现异常',
}, },
{ {
itemq: '维修任务1', itemq: '保养任务1',
item2: '已维修', item2: '已保养',
item3: '2023-08-01 - 2023-08-31', item3: '2023-08-01 - 2023-08-31',
item4: '每月维修', item4: '每月保养',
item5: 'XXXXX', item5: 'XXXXX',
item6: '未发现异常', item6: '未发现异常',
}, },
@ -113,12 +124,12 @@ export default class ChangePalletNew extends BasePage {
console.log(uni.getStorageSync('userinfo')); console.log(uni.getStorageSync('userinfo'));
this.userinfo = uni.getStorageSync('userinfo'); this.userinfo = uni.getStorageSync('userinfo');
if (this.userinfo) { if (this.userinfo) {
let query = { // let query = {
userId: this.userinfo.userId, // userId: this.userinfo.userId,
workStatus: '0', // workStatus: '0',
workOutsource: '0', // workOutsource: '0',
}; // };
await this.model.getTodayTask(query); await this.model.getTodayTask(this.userinfo.userId);
console.log(model.orderNoItemList); console.log(model.orderNoItemList);
this.listdata = model.orderNoItemList; this.listdata = model.orderNoItemList;
} }
@ -134,64 +145,71 @@ export default class ChangePalletNew extends BasePage {
this.current = index; this.current = index;
if (index == 0) { if (index == 0) {
if (this.userinfo) { if (this.userinfo) {
let query = { // let query = {
userId: this.userinfo.userId, // userId: this.userinfo.userId,
workStatus: '0', // workStatus: '0',
workOutsource: '0', // workOutsource: '0',
}; // };
await this.model.getTodayTask(query); await this.model.getTodayTask(this.userinfo.userId);
this.listdata = model.orderNoItemList; this.listdata = model.orderNoItemList;
} }
} else { } else {
if (this.userinfo) { if (this.userinfo) {
let query = { // let query = {
userId: this.userinfo.userId, // userId: this.userinfo.userId,
workStatus: '0', // workStatus: '0',
workOutsource: '0', // workOutsource: '0',
}; // };
await this.model.getTaskRecord(query); await this.model.getTaskRecord(this.userinfo.userId);
this.detailsdata = model.getTaskRecordList; this.detailsdata = model.getTaskRecordList;
} }
} }
} }
linkdetails(item) {
this.model.rowdatanull();
// this.model.rowdata = []
// item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成';
if (item.workStatus == 0) {
uni.navigateTo({
url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
});
} else if (item.workStatus == 2 || item.workStatus == 3) {
uni.navigateTo({
url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
});
}
}
goback() { goback() {
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/index`, url: `/pages/equipment/index`,
}); });
} }
linkdetailscheck(item) { linkdetails(item) {
this.model.rowdatanull(); this.model.rowdatanull();
if (item.workStatus == 0) { // this.model.rowdata = []
this.ischecked = true; // item.workStatus == 0 ? '待保养' : item.workStatus == 1 ? '保养完成' : item.workStatus == 2 ? '保养中' : '保养未完成';
item.ischecked = true; if (item.orderStatus == 0) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)), url: `/pages/equipment/Upkeep/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
}); });
} else if (item.workStatus == 2 || item.workStatus == 3) { } else if (item.orderStatus == 2 || item.orderStatus == 3) {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)), url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
}); });
} else { } else {
this.ischecked = true; this.ischecked = true;
item.ischecked = true; item.ischecked = true;
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)), url: `/pages/equipment/Upkeep/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)),
});
}
}
linkdetailscheck(item) {
this.model.rowdatanull();
if (item.orderStatus == 0) {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({
url: `/pages/equipment/Upkeep/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
});
} else if (item.orderStatus == 2 || item.orderStatus == 3) {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({
url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
});
} else {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({
url: `/pages/equipment/Upkeep/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)),
}); });
} }
} }

48
src/pages/equipment/Upkeep/model.ts
Unescape Escape View File

@ -6,43 +6,67 @@ import { url } from '@/utils/url';
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'page.equipment.Repair', name: 'page.equipment.Upkeep',
}) })
export class ChangePalletNew extends VuexModule { export class ChangePalletNew extends VuexModule {
rowdata: any = []; rowdata: any = [];
orderNoItemList: any = []; orderNoItemList: any = [];
getTaskRecordList: 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 };
// }
@MutationAction @MutationAction
async getTodayTask(params: any) { async getTodayTask(userId: any) {
const result: any = await http.get(url.lanjuequipment.product.Repair.getTodayTask, { params: params }); const result: any = await http.get(url.lanjuequipment.product.Inspection.getTodayTask, {
//loginName: session.loginName,
params: {
userId: userId,
planType: 'maintenance',
},
});
const orderNoItemList = result.data; const orderNoItemList = result.data;
return { orderNoItemList }; return { orderNoItemList };
} }
@MutationAction @MutationAction
async getTaskRecord(params: any) { async getTaskRecord(userId: any) {
const result: any = await http.get(url.lanjuequipment.product.Repair.getTaskRecord, { params: params }); const result: any = await http.get(url.lanjuequipment.product.Inspection.getTaskRecord, {
//loginName: session.loginName,
params: {
userId: userId,
planType: 'maintenance',
},
});
const getTaskRecordList = result.data; const getTaskRecordList = result.data;
return { getTaskRecordList }; return { getTaskRecordList };
} }
//巡检列表巡检记录 //巡检列表巡检记录
OrderInfList: any = []; OrderInfList: any = [];
@MutationAction @MutationAction
async getInspectionOrderInfo(workId: any) { async getInspectionOrderInfo(params: any) {
const result: any = await http.get(url.lanjuequipment.product.Repair.selectPdaRepairWorkOrderDetails + '/' + workId); const result: any = await http.post(url.lanjuequipment.product.Inspection.getInspectionOrderInfo, params);
const OrderInfList: [] = result.data; const OrderInfList: [] = result.data;
return { OrderInfList }; return { OrderInfList };
} }
SubmitCode: any = ''; SubmitCode: any = '';
//巡检提交 //是否开机保养
@MutationAction @MutationAction
async updateInspectionRecord(params: any) { async startMaintenanceTask(params: any) {
const result: any = await http.put(url.lanjuequipment.product.Repair.updateDowntime, params); const result: any = await http.get(url.lanjuequipment.product.Upkeep.startMaintenanceTask, { params });
const SubmitCode: [] = result; const SubmitCode: [] = result;
return { SubmitCode }; return { SubmitCode };
} }
@MutationAction @MutationAction
async updateMaintenanceRecords(params: any) { async updateInspectionRecord(params: any) {
const result: any = await http.put(url.lanjuequipment.product.Repair.updateMaintenanceRecords, params); const result: any = await http.post(url.lanjuequipment.product.Inspection.updateInspectionRecord, params);
const SubmitCode: [] = result; const SubmitCode: [] = result;
return { SubmitCode }; return { SubmitCode };
} }

149
src/pages/equipment/Upkeep/repairing.vue
Unescape Escape View File

@ -5,45 +5,37 @@
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="goback()" /> <u-icon class="icon" name="arrow-left" @click="goback()" />
</view> </view>
<view class="title">巡检详情</view> <view class="title">保养详情</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> --> <!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> -->
<view class="list"> <view class="list">
<div class="item-name"> <div class="item-name">
<div class="quest">报修信息</div> <div class="quest">保养信息</div>
<div class="details"> <div class="details">
<div>报修人: {{ detailsinfolist.orderRepairman }}</div> <div>工单编码: {{ detailsinfolist.orderCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>保修时间: {{ detailsinfolist.orderTime }}</div> <div>车间编码: {{ detailsinfolist.planWorkshop }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>故障时间: {{ detailsinfolist.orderBreakdownTime }}</div> <div>计划名称: {{ detailsinfolist.planName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>报修来源: {{ detailsinfolist.orderSource }}</div> <div>保养人: {{ detailsinfolist.planPerson }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<!-- <div class="details"> <!-- 、、
<div>故障时间: {{ detailsinfolist.planWorkshop }}</div> 计划编码 20231121003 计划名称 蚊香包装线保养计划
<div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> 循环周期 1日 工单编码 O20231122002
</div> --> 车间编码 WXB01 循环开始时间 2023-11-21
<div class="details"> 循环结束时间 2023-12-30 执行开始时间 2023-11-22
<div>是否立即维修: {{ detailsinfolist.workHandle }}</div> 执行结束时间 保养类型 内部
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> --> 是否停机保养 开机保养 保养人 mobile
</div> 报修单号 -->
<div class="details">
<div>联系方式: {{ detailsinfolist.orderConnection }}</div>
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
</div>
<div class="details">
<div>故障描述: {{ detailsinfolist.workFaultDesc }}</div>
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
</div>
</div> </div>
<view class="single-left"> <view class="single-left">
<!-- <view>扫描设备码:</view> --> <!-- <view>扫描设备码:</view> -->
@ -68,32 +60,35 @@
<div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
</div> </div>
</view> </view>
</view> </view>
<div class="Sparepart"> <!-- <div class="Sparepart">
<!-- <u-button type="success">点击进行备件申领</u-button> -->
<div class="Pickup">点击进行备件申领</div> <div class="Pickup">点击进行备件申领</div>
<div class="Pickupclick"> <div class="Pickupclick">
<img @click="linkSparepartlist(detailsinfolist)" src="../../../static/images/add.png" alt="" /> <img @click="linkSparepartlist(detailsinfolist)" src="../../../static/images/add.png" alt="" />
</div> </div>
</div> </div> -->
<view class="list" v-for="(item, index) in this.Sparepartlist" :key="index"> <view class="list" v-for="(item, index) in detailsinfolist.spareList" :key="index">
<div class="item-name"> <div class="item-name">
<div class="quest">备件申领单</div> <div class="quest">备件申领单</div>
<div class="deletebtn"> <!-- <div class="deletebtn">
<u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button> <u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
</div> </div> -->
<div class="details"> <div class="details">
<div>备件编码: {{ item.materialCode }}</div> <div>申领单号: {{ item.applyCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>备件名称: {{ item.materialDesc }}</div> <div>备件编码: {{ item.spareCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>备件名称: {{ item.spareName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
@ -101,7 +96,7 @@
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>备件费用: {{ item.equipmentCode }}</div> <div>申领时间: {{ item.applyTime }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<!-- <div class="details"> <!-- <div class="details">
@ -120,13 +115,13 @@
</view> </view>
<view class="list listbottom"> <view class="list listbottom">
<div class="item-name"> <div class="item-name">
<div class="quest">维修单</div> <div class="quest">保养单</div>
<u-form class="form" ref="form" label-width="230rpx"> <u-form class="form" ref="form" label-width="230rpx">
<u-form-item label="负责人:"> <u-form-item label="负责人:">
{{ detailsinfolist.workPerson }} {{ detailsinfolist.planPerson }}
</u-form-item> </u-form-item>
<!-- 机台 --> <!-- 机台 -->
<u-form-item label="维修结果:"> <!-- <u-form-item label="保养结果:">
<div class="select"> <div class="select">
<u-radio-group v-model="formdata.workStatus" @change="radioGroupChange1(formdata.workStatus)"> <u-radio-group v-model="formdata.workStatus" @change="radioGroupChange1(formdata.workStatus)">
<u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type"> <u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
@ -134,28 +129,18 @@
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</div> </div>
</u-form-item> </u-form-item> -->
<!-- 单号 --> <!-- 单号 -->
<u-form-item label="维修费用:"> <u-form-item label="保养费用:">
<u-input v-model="formdata.workCost" placeholder="" /> <u-input v-model="formdata.workCost" placeholder="" />
</u-form-item> </u-form-item>
<!-- <u-form-item label="维修用时(分钟):"> <!-- <u-form-item label="保养时间:">
<u-input v-model="formdata.productSpc" placeholder="" /> <u-input @blur="blur()" @focus="focus()" placeholder="" v-model="orderBreakdownTime" />
</u-form-item> <u-picker mode="time" :default-time="defaulttime" :params="params" v-model="showtime" @confirm="timeConfirm" :timeEnd="endTime"></u-picker>
<u-form-item label="维修人员签字:">
<u-input v-model="formdata.productName" placeholder="" />
</u-form-item> --> </u-form-item> -->
<!-- 工单 -->
<u-form-item label="联系方式:">
<u-input v-model="formdata.workConnection" placeholder="" />
</u-form-item>
<u-form-item label="原因分析:">
<u-input v-model="formdata.workReason" placeholder="" />
</u-form-item>
<u-form-item label="上传图片:"> <u-form-item label="上传图片:">
<scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()"> <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
<view class="photoList"> <view class="photoList photoList1">
<view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index"> <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
<view class="closeBtn" @click="deleteImg1(index)"> <view class="closeBtn" @click="deleteImg1(index)">
<image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
@ -183,7 +168,7 @@
</div> </div>
<div class="details"> <div class="details">
<div>是否异常: 是</div> <div>是否异常: 是</div>
<div style="margin-left: 42px">报修单: 90272931234</div> <div style="margin-left: 42px">保养单: 90272931234</div>
</div> </div>
</div> </div>
</view> --> </view> -->
@ -253,12 +238,12 @@ export default class ChangePalletNew extends BasePage {
equipmentdata: any = []; equipmentdata: any = [];
listselect: any = [ listselect: any = [
{ {
type: 0, type: 1,
name: '符合标准', name: '符合标准',
radiovalue: null, radiovalue: null,
}, },
{ {
type: 1, type: 0,
name: '未达标', name: '未达标',
radiovalue: null, radiovalue: null,
}, },
@ -295,6 +280,9 @@ export default class ChangePalletNew extends BasePage {
imgformList: any = []; imgformList: any = [];
deleteimgList1: any = []; deleteimgList1: any = [];
isvalue = false; isvalue = false;
orderBreakdownTime: any = '';
showtime = false;
defaulttime: any = '';
async onReady() { async onReady() {
//await this.model.getpalletLocation(); //await this.model.getpalletLocation();
//this.remove = this.model.WlList[0]; //this.remove = this.model.WlList[0];
@ -362,7 +350,7 @@ export default class ChangePalletNew extends BasePage {
} else { } else {
this.imgList = []; this.imgList = [];
} }
if (value == 1) { if (value == 0) {
this.isshow = true; this.isshow = true;
this.radiomodal = true; this.radiomodal = true;
this.form = item; this.form = item;
@ -376,15 +364,15 @@ export default class ChangePalletNew extends BasePage {
if (str) { if (str) {
this.detailsinfo = JSON.parse(str); this.detailsinfo = JSON.parse(str);
let query = { let query = {
workId: this.detailsinfo.workId, orderCode: this.detailsinfo.orderCode,
}; };
await this.model.getInspectionOrderInfo(query.workId); await this.model.getInspectionOrderInfo(query);
this.detailsinfolist = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
} }
} }
goback() { goback() {
uni.redirectTo({ uni.redirectTo({
url: `/pages/equipment/Repair/index?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)), url: `/pages/equipment/Upkeep/index?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
}); });
} }
created() { created() {
@ -458,8 +446,8 @@ export default class ChangePalletNew extends BasePage {
// }); // });
tempFilePaths.map((item) => { tempFilePaths.map((item) => {
uni.uploadFile({ uni.uploadFile({
// url: 'http://192.168.202.20:9000/prod-api/file/upload', url: 'http://192.168.202.20:9000/prod-api/file/upload',
url: '/dev-api/file/upload', // url: '/dev-api/file/upload',
fileType: 'image', fileType: 'image',
filePath: item, filePath: item,
header: { header: {
@ -538,8 +526,8 @@ export default class ChangePalletNew extends BasePage {
// }); // });
tempFilePaths.map((item) => { tempFilePaths.map((item) => {
uni.uploadFile({ uni.uploadFile({
// url: 'http://192.168.202.20:9000/prod-api/file/upload', url: 'http://192.168.202.20:9000/prod-api/file/upload',
url: '/dev-api/file/upload', // url: '/dev-api/file/upload',
fileType: 'image', fileType: 'image',
filePath: item, filePath: item,
header: { header: {
@ -602,7 +590,7 @@ export default class ChangePalletNew extends BasePage {
if (item.standardList.length > 0) { if (item.standardList.length > 0) {
item.standardList.forEach((item1) => { item.standardList.forEach((item1) => {
if (item1.standardType == 'quantify') { if (item1.standardType == 'quantify') {
if (item1.detailReach == null || item1.detailReach == '') { if (item1.actualValue == null || item1.actualValue == '') {
// console.log(this.isvalue); // console.log(this.isvalue);
this.isvalue = true; this.isvalue = true;
} }
@ -622,33 +610,17 @@ export default class ChangePalletNew extends BasePage {
}); });
return; return;
} }
if (this.formdata.workStatus == '' || this.formdata.workStatus == undefined) {
(this.$refs.uToast as any).show({
title: '请选择维修结果',
type: 'default',
});
return;
}
if (this.formdata.workCost == '' || this.formdata.workCost == undefined) { if (this.formdata.workCost == '' || this.formdata.workCost == undefined) {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '维修费用不能为空', title: '保养费用不能为空',
type: 'default',
});
return;
}
if (this.formdata.workConnection == '' || this.formdata.workConnection == undefined) {
(this.$refs.uToast as any).show({
title: '联系方式不能为空',
type: 'default', type: 'default',
}); });
return; return;
} }
let query = this.detailsinfolist; let query = this.detailsinfolist;
query.applyList = this.Sparepartlist; // query.applyList = this.Sparepartlist;
query.fileList = this.imgList.join(','); query.picturePath = this.imgformList.join(',');
query.workStatus = this.formdata.workStatus; query.workStatus = this.formdata.workStatus;
query.workCost = this.formdata.workCost;
query.workConnection = this.formdata.workConnection;
query.workReason = this.formdata.workReason; query.workReason = this.formdata.workReason;
console.log(query, this.isvalue); console.log(query, this.isvalue);
await this.model.updateInspectionRecord(query); await this.model.updateInspectionRecord(query);
@ -657,7 +629,11 @@ export default class ChangePalletNew extends BasePage {
title: '成功', title: '成功',
type: 'default', type: 'default',
}); });
uni.navigateBack({}); setTimeout(() => {
uni.navigateTo({
url: `/pages/equipment/Upkeep/index?listitem=`,
});
}, 1000);
} else { } else {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '失败', title: '失败',
@ -677,7 +653,7 @@ export default class ChangePalletNew extends BasePage {
} }
linkSparepartlist(item) { linkSparepartlist(item) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/Sparepartlist?listitem=` + encodeURIComponent(JSON.stringify(item)), url: `/pages/equipment/Upkeep/Sparepartlist?listitem=` + encodeURIComponent(JSON.stringify(item)),
}); });
} }
} }
@ -1050,5 +1026,10 @@ export default class ChangePalletNew extends BasePage {
::v-deep .u-form-item { ::v-deep .u-form-item {
padding: 6px 0; padding: 6px 0;
} }
.photoList1 {
width: 220px;
overflow-y: scroll;
border: 1px solid black;
}
} }
</style> </style>

169
src/pages/equipment/Upkeep/repairingview.vue
Unescape Escape View File

@ -5,7 +5,7 @@
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" /> <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
</view> </view>
<view class="title">巡检详情</view> <view class="title">保养详情</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> --> <!-- <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> -->
@ -19,43 +19,23 @@
</div> </div>
<div class="details"> <div class="details">
<!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> --> <!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> -->
<div>工作中心: {{ detailsinfolist.workshopName }}</div> <div>工作中心: {{ detailsinfolist.workCenterName }}</div>
</div> </div>
</div> </div>
<div class="item-name item-info"> <div class="item-name item-info">
<div class="quest">报修信息</div> <div class="quest">保养信息</div>
<div class="details"> <div class="details">
<div>报修人: {{ detailsinfolist.orderRepairman }}</div> <div>车间编码: {{ detailsinfolist.planWorkshop }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>保修时间: {{ detailsinfolist.orderTime }}</div> <div>计划名称: {{ detailsinfolist.planName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>故障时间: {{ detailsinfolist.orderBreakdownTime }}</div> <div>保养人: {{ detailsinfolist.planPerson }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details">
<div>报修来源: {{ detailsinfolist.orderSource }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<!-- <div class="details">
<div>故障时间: {{ detailsinfolist.planWorkshop }}</div>
<div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
</div> -->
<div class="details">
<div>是否立即维修: {{ detailsinfolist.workHandle }}</div>
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
</div>
<div class="details">
<div>联系方式: {{ detailsinfolist.orderConnection }}</div>
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
</div>
<div class="details">
<div>故障描述: {{ detailsinfolist.workFaultDesc }}</div>
<!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
</div>
</div> </div>
<view class="single-left"> <view class="single-left">
<!-- <view>扫描设备码:</view> --> <!-- <view>扫描设备码:</view> -->
@ -80,7 +60,7 @@
<div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div> <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
<div class="input-box" id="input-box1"> <div class="input-box" id="input-box1">
实际值: 实际值:
<input class="input" :disabled="item1.detailReach == null ? true : true" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" /> <input class="input" :disabled="item1.actualValue == null ? true : true" v-model="item1.actualValue" @blur="blur(item1, item1.actualValue, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
单位:mm 单位:mm
</div> </div>
</div> </div>
@ -97,42 +77,19 @@
<view class="list listbottom"> <view class="list listbottom">
<div class="item-name"> <div class="item-name">
<div class="quest">维修单</div> <div class="quest">保养单</div>
<u-form class="form" ref="form" label-width="230rpx"> <u-form class="form" ref="form" label-width="230rpx">
<u-form-item label="负责人:"> <u-form-item label="负责人:">
{{ detailsinfolist.workPerson }} {{ detailsinfolist.workPerson }}
</u-form-item> </u-form-item>
<!-- 机台 --> <!-- 机台 -->
<u-form-item label="维修结果:">
<div class="select">
<u-radio-group v-model="detailsinfolist.workStatus" @change="radioGroupChange1(formdata.workStatus)">
<u-radio :disabled="detailsinfolist.detailReach == n.type ? false : true" @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
{{ n.name }}
</u-radio>
</u-radio-group>
</div>
</u-form-item>
<!-- 单号 --> <!-- 单号 -->
<u-form-item label="维修费用:"> <u-form-item label="保养费用:">
<u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" /> <u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" />
</u-form-item> </u-form-item>
<!-- <u-form-item label="维修用时(分钟):">
<u-input v-model="formdata.productSpc" placeholder="" />
</u-form-item>
<u-form-item label="维修人员签字:">
<u-input v-model="formdata.productName" placeholder="" />
</u-form-item> -->
<!-- 工单 -->
<u-form-item label="联系方式:">
<u-input :disabled="detailsinfolist.workConnection == null ? true : true" v-model="detailsinfolist.workConnection" placeholder="" />
</u-form-item>
<u-form-item label="原因分析:">
<u-input :disabled="detailsinfolist.workReason == null ? true : true" v-model="detailsinfolist.workReason" placeholder="" />
</u-form-item>
<u-form-item label="图片:"> <u-form-item label="图片:">
<scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()"> <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
<view class="photoList"> <view class="photoList photoList1">
<view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index"> <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
<!-- <view class="closeBtn" @click="deleteImg1(index)"> <!-- <view class="closeBtn" @click="deleteImg1(index)">
<image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image> <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
@ -152,18 +109,19 @@
<!-- <u-button @click="onSubmit" type="primary">提交</u-button> --> <!-- <u-button @click="onSubmit" type="primary">提交</u-button> -->
</div> </div>
</view> </view>
<view class="list" v-for="(item, index) in detailsinfolist.applyList" :key="index"> <view class="list" v-for="(item, index) in detailsinfolist.spareList" :key="index">
<div class="item-name"> <div class="item-name">
<div class="quest">备件申领单</div> <div class="quest">备件申领单</div>
<!-- <div class="deletebtn">
<u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
</div> -->
<div class="details"> <div class="details">
<div>备件编码: {{ item.materialCode }}</div> <div>申领单号: {{ item.applyCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>备件名称: {{ item.materialDesc }}</div> <div>备件编码: {{ item.spareCode }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div>
<div class="details">
<div>备件名称: {{ item.spareName }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
@ -171,21 +129,9 @@
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<div class="details"> <div class="details">
<div>备件费用: {{ item.equipmentCode }}</div> <div>申领时间: {{ item.applyTime }}</div>
<!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> --> <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
</div> </div>
<!-- <div class="details">
<div>申请人: {{ item.applyPeople }}</div>
</div>
<div class="details">
<div>申请时间: {{ item.planWorkshop }}</div>
</div>
<div class="details">
<div>审核人: {{ item.planWorkshop }}</div>
</div>
<div class="details">
<div>审核时间: {{ item.planWorkshop }}</div>
</div> -->
</div> </div>
</view> </view>
<u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm"> <u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm">
@ -290,7 +236,7 @@ export default class ChangePalletNew extends BasePage {
imgformList: any = []; imgformList: any = [];
deleteimgUrlList: any = []; deleteimgUrlList: any = [];
orderNoItemList: any = {}; orderNoItemList: any = {};
picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg'; checkPictrueList: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
formdata: any = {}; formdata: any = {};
async onReady() { async onReady() {
//await this.model.getpalletLocation(); //await this.model.getpalletLocation();
@ -311,8 +257,8 @@ export default class ChangePalletNew extends BasePage {
// this.equipmentindex = []; // this.equipmentindex = [];
// this.equipmentindex.push(index); // this.equipmentindex.push(index);
// this.equipmentindex.push(index1); // this.equipmentindex.push(index1);
// if (item.picturePath != null) { // if (item.checkPictrueList != null) {
// this.imgList = JSON.parse(JSON.stringify(item.picturePath)); // this.imgList = JSON.parse(JSON.stringify(item.checkPictrueList));
// this.imgList = this.imgList.split(','); // this.imgList = this.imgList.split(',');
// } else { // } else {
// this.imgList = []; // this.imgList = [];
@ -328,9 +274,8 @@ export default class ChangePalletNew extends BasePage {
this.inputmodal = false; this.inputmodal = false;
this.equipmentindex.push(index); this.equipmentindex.push(index);
this.equipmentindex.push(index1); this.equipmentindex.push(index1);
if (item.picturePath != null) { if (item.checkPictrueList != null) {
this.imgList = JSON.parse(JSON.stringify(item.picturePath)); this.imgList = JSON.parse(JSON.stringify(item.checkPictrueList));
this.imgList = this.imgList.split(',');
this.isshow = true; this.isshow = true;
this.radiomodal = true; this.radiomodal = true;
this.form = item; this.form = item;
@ -371,10 +316,13 @@ export default class ChangePalletNew extends BasePage {
if (str) { if (str) {
this.detailsinfo = JSON.parse(str); this.detailsinfo = JSON.parse(str);
let query = { let query = {
workId: this.detailsinfo.workId, orderCode: this.detailsinfo.orderCode,
}; };
await this.model.getInspectionOrderInfo(query.workId); await this.model.getInspectionOrderInfo(query);
this.detailsinfolist = this.model.OrderInfList; this.detailsinfolist = this.model.OrderInfList;
if (this.detailsinfolist.upkeepPictures != null) {
this.imgformList = JSON.parse(JSON.stringify(this.detailsinfolist.upkeepPictures));
}
} }
} }
created() { created() {
@ -387,33 +335,33 @@ export default class ChangePalletNew extends BasePage {
confirm() { confirm() {
console.log((this as any).uUpload, 'sssss', this.equipmentindex); console.log((this as any).uUpload, 'sssss', this.equipmentindex);
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]); // console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
if (this.radiomodal) { // if (this.radiomodal) {
if (this.imgList.length == 0) { // if (this.imgList.length == 0) {
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null; // this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList = null;
} else { // } else {
this.imgList = this.imgList.join(','); // this.imgList = this.imgList.join(',');
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList; // this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList = this.imgList;
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList); // console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
} // }
} else if (this.inputmodal) { // } else if (this.inputmodal) {
if (this.imgList.length == 0) { // if (this.imgList.length == 0) {
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null; // this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList = null;
} else { // } else {
this.imgList = this.imgList.join(','); // this.imgList = this.imgList.join(',');
this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList; // this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList = this.imgList;
console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList); // console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
} // }
} // }
} }
cancel() { cancel() {
this.isshow = false; this.isshow = false;
if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) { // if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList == null) {
this.imgList = []; // this.imgList = [];
} else { // } else {
this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath; // this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList;
this.imgList = this.imgList.split(','); // this.imgList = this.imgList.split(',');
} // }
} }
scrollLeft() { scrollLeft() {
return 222 * (this.imgList.length + 1); return 222 * (this.imgList.length + 1);
@ -490,7 +438,7 @@ export default class ChangePalletNew extends BasePage {
}); });
} }
deleteImg(index) { deleteImg(index) {
this.imgList = JSON.parse(JSON.stringify(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath)); this.imgList = JSON.parse(JSON.stringify(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].checkPictrueList));
this.imgList = this.imgList.split(','); this.imgList = this.imgList.split(',');
this.imgList.splice(index, 1); this.imgList.splice(index, 1);
} }
@ -527,8 +475,8 @@ export default class ChangePalletNew extends BasePage {
// }); // });
tempFilePaths.map((item) => { tempFilePaths.map((item) => {
uni.uploadFile({ uni.uploadFile({
// url: 'http://192.168.202.20:9000/prod-api/file/upload', url: 'http://192.168.202.20:9000/prod-api/file/upload',
url: '/dev-api/file/upload', // url: '/dev-api/file/upload',
fileType: 'image', fileType: 'image',
filePath: item, filePath: item,
header: { header: {
@ -600,7 +548,7 @@ export default class ChangePalletNew extends BasePage {
} }
linkSparepartlist() { linkSparepartlist() {
uni.navigateTo({ uni.navigateTo({
url: `/pages/equipment/Repair/Sparepartlist?listitem=`, url: `/pages/equipment/Upkeep/Sparepartlist?listitem=`,
}); });
} }
} }
@ -968,5 +916,10 @@ export default class ChangePalletNew extends BasePage {
::v-deep .u-form-item { ::v-deep .u-form-item {
padding: 6px 0; padding: 6px 0;
} }
.photoList1 {
width: 220px;
overflow-y: scroll;
border: 1px solid black;
}
} }
</style> </style>

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

@ -100,6 +100,11 @@ export const url = {
// 备件list // 备件list
list: qianzhuione + '/device/sparePartsLedger/list', list: qianzhuione + '/device/sparePartsLedger/list',
}, },
// 保养
Upkeep: {
// 是否开机保养
startMaintenanceTask: qianzhuione + '/device/devicePDA/startMaintenanceTask',
},
}, },
}, },
}; };

Write Preview
Loading…
Cancel
Save