增加扫码的功能

master
LAPTOP-R6EHHS26\86155 1 year ago
parent 4183504838
commit 6c442c25fc

@ -390,12 +390,12 @@ export default class ChangePalletNew extends BasePage {
title: '成功',
type: 'default',
});
setTimeout(() => {
uni.navigateTo({
url: `/pages/equipment/Inspection/index?listitem=`,
});
}, 1000);
uni.navigateBack({});
// setTimeout(() => {
// uni.redirectTo({
// url: `/pages/equipment/Inspection/index?listitem=`,
// });
// }, 1000);
} else {
(this.$refs.uToast as any).show({
title: '失败',

@ -680,11 +680,12 @@ export default class ChangePalletNew extends BasePage {
type: 'default',
});
this.Clear(); //
setTimeout(() => {
uni.navigateTo({
url: `/pages/equipment/Repair/index?listitem=`,
});
}, 1000);
uni.navigateBack({});
// setTimeout(() => {
// uni.redirectTo({
// url: `/pages/equipment/Repair/index?listitem=`,
// });
// }, 1000);
} else {
(this.$refs.uToast as any).show({
title: '失败',

@ -163,6 +163,8 @@ export default class ChangePalletNew extends BasePage {
} else {
this.orderNo = '';
this.orderNo = this.model.rowdata[0].equipmentCode;
this.query();
console.log('111');
}
}
async query() {

@ -218,6 +218,8 @@ export default class ChangePalletNew extends BasePage {
}
async onLoad(options) {
let str = decodeURIComponent(options.listitem);
let orderNo = decodeURIComponent(options.equipmentCode);
if (str) {
this.detailsinfo = JSON.parse(str);
let query = {
@ -225,6 +227,11 @@ export default class ChangePalletNew extends BasePage {
};
await this.model.getInspectionOrderInfo(query);
this.detailsinfolist = this.model.OrderInfList;
if (orderNo != 'null') {
this.orderNo = orderNo;
console.log(orderNo, 'qqqqq');
this.search(this.orderNo);
}
}
}
created() {
@ -389,12 +396,12 @@ export default class ChangePalletNew extends BasePage {
title: '成功',
type: 'default',
});
setTimeout(() => {
uni.navigateTo({
url: `/pages/equipment/Spotcheck/index?listitem=`,
});
}, 1000);
uni.navigateBack({});
// setTimeout(() => {
// uni.redirectTo({
// url: `/pages/equipment/Spotcheck/index?listitem=`,
// });
// }, 1000);
} else {
(this.$refs.uToast as any).show({
title: '失败',

@ -9,11 +9,16 @@
<view class="right"></view>
</view>
<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" @click="linkdetails(item)">
<view class="single-left" style="background-color: #ffffff; margin-top: 10px">
<!-- <view>扫描设备码:</view> -->
<u-search style="border: 1px solid #a19d9d" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
<!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
</view>
<view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item, isorderNo)">
<div class="list-top">
<div class="name">工单号: {{ item.planCode }}</div>
<div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
<u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
<u-icon @click="linkdetails(item, isorderNo)" name="arrow-right" color="#2979ff" size="28"></u-icon>
</div>
<div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
<div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
@ -22,11 +27,11 @@
<div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
</view>
<view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item)">
<view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item, isorderNo)">
<div class="list-top">
<div class="name">工单号: {{ item.planCode }}</div>
<div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
<u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
<u-icon @click="linkdetailscheck(item, isorderNo)" name="arrow-right" color="#2979ff" size="28"></u-icon>
</div>
<div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
<div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
@ -121,6 +126,7 @@ export default class ChangePalletNew extends BasePage {
// this.remove = e.pickerName;
// }
orderNo: any = '';
isorderNo: any = null;
location: any = '';
locationStatus: any = 1;
//
@ -138,16 +144,42 @@ export default class ChangePalletNew extends BasePage {
}
}
}
linkdetails(item) {
search(value) {
console.log(value);
let data = [];
if (this.current == 0) {
data = this.listdata.filter((v) => v.equipmentCode == value);
} else {
data = this.detailsdata.filter((v) => v.equipmentCode == value);
}
console.log(data);
if (data.length == 0) {
(this.$refs.uToast as any).show({
title: '当前设备无点检任务',
type: 'default',
});
return;
} else {
data[0].orderNoinput = value;
if (this.current == 0) {
this.linkdetails(data[0], value);
} else {
this.linkdetailscheck(data[0], value);
}
}
}
linkdetails(item, value) {
this.orderNo = null;
uni.navigateTo({
url: `/pages/equipment/Spotcheck/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
url: `/pages/equipment/Spotcheck/details?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
}
linkdetailscheck(item) {
linkdetailscheck(item, value) {
this.orderNo = null;
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({
url: `/pages/equipment/Spotcheck/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)),
url: `/pages/equipment/Spotcheck/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
}
}
@ -204,7 +236,7 @@ export default class ChangePalletNew extends BasePage {
}
.list {
margin-top: 15px;
width: 367px;
width: 360;
border-radius: 5px;
border: rgba(121, 121, 121, 1) solid 1px;
background-color: #ffffff;

@ -209,6 +209,7 @@ export default class ChangePalletNew extends BasePage {
}
async onLoad(options) {
let str = decodeURIComponent(options.listitem);
let orderNo = decodeURIComponent(options.equipmentCode);
if (str) {
this.detailsinfo = JSON.parse(str);
let query = {
@ -216,6 +217,11 @@ export default class ChangePalletNew extends BasePage {
};
await this.model.getInspectionOrderInfo(query);
this.detailsinfolist = this.model.OrderInfList;
if (orderNo != 'null') {
this.orderNo = orderNo;
console.log(orderNo, 'qqqqq');
this.search(this.orderNo);
}
}
}
created() {

@ -9,11 +9,16 @@
<view class="right"></view>
</view>
<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" @click="linkdetails(item)">
<view class="single-left" style="background-color: #ffffff; margin-top: 10px">
<!-- <view>扫描设备码:</view> -->
<u-search style="border: 1px solid #a19d9d" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
<!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
</view>
<view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item, isorderNo)">
<div class="list-top">
<div class="name">工单号: {{ item.orderCode }}</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, isorderNo)" name="arrow-right" color="#2979ff" size="28"></u-icon>
</div>
<!-- 计划编码 20231121003 计划名称 蚊香包装线保养计划
循环周期 1 工单编码 O20231121005
@ -33,11 +38,11 @@
<div class="item1">是否停机保养: {{ item.delFlag == 1 ? '是' : '否' }}</div>
</view>
<view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item)">
<view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item, isorderNo)">
<div class="list-top">
<div class="name">工单号: {{ item.workCode }}</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, isorderNo)" name="arrow-right" color="#2979ff" size="28"></u-icon>
</div>
<div class="item1">计划编码: {{ item.planCode }}</div>
<div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
@ -140,6 +145,7 @@ export default class ChangePalletNew extends BasePage {
// this.remove = e.pickerName;
// }
orderNo: any = '';
isorderNo: any = null;
location: any = '';
locationStatus: any = 1;
//
@ -172,49 +178,75 @@ export default class ChangePalletNew extends BasePage {
url: `/pages/equipment/index`,
});
}
linkdetails(item) {
linkdetails(item, value) {
this.model.rowdatanull();
this.orderNo = null;
// this.model.rowdata = []
// item.workStatus == 0 ? '' : item.workStatus == 1 ? '' : item.workStatus == 2 ? '' : '';
if (item.orderStatus == 0) {
uni.navigateTo({
url: `/pages/equipment/Upkeep/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
url: `/pages/equipment/Upkeep/details?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
} else if (item.orderStatus == 2 || item.orderStatus == 3) {
uni.navigateTo({
url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
} else {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({
url: `/pages/equipment/Upkeep/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)),
url: `/pages/equipment/Upkeep/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
}
}
linkdetailscheck(item) {
linkdetailscheck(item, value) {
this.model.rowdatanull();
this.orderNo = null;
if (item.orderStatus == 0) {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({
url: `/pages/equipment/Upkeep/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
url: `/pages/equipment/Upkeep/details?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
} 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)),
url: `/pages/equipment/Upkeep/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
} else {
this.ischecked = true;
item.ischecked = true;
uni.navigateTo({
url: `/pages/equipment/Upkeep/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)),
url: `/pages/equipment/Upkeep/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
});
}
}
search(value) {
console.log(value);
let data = [];
if (this.current == 0) {
data = this.listdata.filter((v) => v.equipmentCode == value);
} else {
data = this.detailsdata.filter((v) => v.equipmentCode == value);
}
console.log(data);
if (data.length == 0) {
(this.$refs.uToast as any).show({
title: '当前设备无保养任务',
type: 'default',
});
return;
} else {
data[0].orderNoinput = value;
if (this.current == 0) {
this.linkdetails(data[0], value);
} else {
this.linkdetailscheck(data[0], value);
}
}
}
}
</script>
<style lang="scss" scoped>

@ -633,11 +633,12 @@ export default class ChangePalletNew extends BasePage {
title: '成功',
type: 'default',
});
setTimeout(() => {
uni.navigateTo({
url: `/pages/equipment/Upkeep/index?listitem=`,
});
}, 1000);
uni.navigateBack({});
// setTimeout(() => {
// uni.redirectTo({
// url: `/pages/equipment/Upkeep/index?listitem=`,
// });
// }, 1000);
} else {
(this.$refs.uToast as any).show({
title: '失败',

@ -182,7 +182,10 @@ export default class ProductionQtyInsplist extends BasePage {
//console.log('xssss',this.rowdata);
if (JSON.stringify(this.rowdata) === '{}' || this.rowdata === undefined) {
this.customToast('请选择至少一个备件');
(this.$refs.uToast as any).show({
title: '请选择至少一个设备',
type: 'default',
});
return;
}
this.isshow = true;

@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
model = model;
src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
today = dayjs().format('YYYY-MM-DD dddd');
version = '0.0.29';
version = '0.0.30';
checkversion: any = {};
sessiondata: any = '';
onLoad() {

Loading…
Cancel
Save