This commit is contained in:
parent
5b99b0ed83
commit
3376633198
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<view style="padding-top: 4vh; background-color: rgb(220, 244, 255)">
|
||||
<view style="background-color: rgb(220, 244, 255)">
|
||||
<uni-nav-bar
|
||||
left-icon="left"
|
||||
@clickLeft="leftClick"
|
||||
|
|
@ -167,8 +167,6 @@ const confirmAdd = () => {
|
|||
uni.showToast({ title: '请确认退料单位,退料工程!', icon: 'none' })
|
||||
} else if (backPerson.value == '') {
|
||||
uni.showToast({ title: '请确认制单人!', icon: 'none' })
|
||||
} else if (phone.value == '') {
|
||||
uni.showToast({ title: '请确认联系电话!', icon: 'none' })
|
||||
} else {
|
||||
let obj = {
|
||||
backApplyInfo: {
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@ const getMaInfo = () => {
|
|||
maCode: maCode.value,
|
||||
unitId: taskInfo.value.unitId,
|
||||
proId: taskInfo.value.proId,
|
||||
id: taskInfo.value.id,
|
||||
}
|
||||
getMachine(param)
|
||||
.then((res) => {
|
||||
|
|
@ -237,6 +238,7 @@ const getMaInfoScan = () => {
|
|||
qrCode: qrCode.value,
|
||||
unitId: taskInfo.value.unitId,
|
||||
proId: taskInfo.value.proId,
|
||||
id: taskInfo.value.id,
|
||||
}
|
||||
getMachine(param)
|
||||
.then((res) => {
|
||||
|
|
@ -272,6 +274,23 @@ const getMaInfoScan = () => {
|
|||
// }
|
||||
// });
|
||||
// }
|
||||
|
||||
// function getCamera() {
|
||||
// console.log(1)
|
||||
// navigator.camera.getPicture(this.onCameraSuccess, this.onCameraError, {
|
||||
// quality: 50,
|
||||
// destinationType: window.Camera.DestinationType.DATA_URL,
|
||||
// sourceType: window.Camera.PictureSourceType.CAMERA,
|
||||
// })
|
||||
// }
|
||||
// function getPhoto() {
|
||||
// console.log(2)
|
||||
// navigator.camera.getPicture(this.onCameraSuccess, this.onCameraError, {
|
||||
// quality: 50,
|
||||
// destinationType: window.Camera.DestinationType.DATA_URL,
|
||||
// sourceType: window.Camera.PictureSourceType.SAVEDPHOTOALBUM,
|
||||
// })
|
||||
// }
|
||||
// 编码识别按钮
|
||||
const onCodeIdentify = () => {
|
||||
console.log('编码识别--')
|
||||
|
|
@ -284,6 +303,8 @@ const submitCode = () => {
|
|||
console.log(taskInfo.value)
|
||||
if (maId.value == '') {
|
||||
uni.showToast({ title: '请先添加退料设备编码!', icon: 'none' })
|
||||
} else if(apDetection.value == '不合格') {
|
||||
uni.showToast({ title: '请上传附件!', icon: 'none' })
|
||||
} else {
|
||||
// console.log(typeList.value)
|
||||
let obj = {
|
||||
|
|
@ -409,6 +430,9 @@ onLoad((options) => {
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
::v-deep .uni-easyinput__content {
|
||||
padding: 0 !important;
|
||||
}
|
||||
/* 在style部分添加 */
|
||||
.upload-container {
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ export default {
|
|||
onReady() {
|
||||
this.cameraHeight = uni.getSystemInfoSync().screenHeight * 0.22
|
||||
console.log(this.cameraHeight)
|
||||
this.init()
|
||||
// this.init()
|
||||
},
|
||||
methods: {
|
||||
// 开始识别
|
||||
|
|
@ -217,6 +217,7 @@ export default {
|
|||
maCode: this.queryCodeParams.maCode,
|
||||
unitId: this.queryParams.unitId,
|
||||
proId: this.queryParams.proId,
|
||||
id: this.queryParams.id,
|
||||
}
|
||||
console.log(param)
|
||||
uni.request({
|
||||
|
|
|
|||
|
|
@ -125,14 +125,14 @@ const getSignList = async () => {
|
|||
auditingList.value = res.data.map((item, index) => {
|
||||
return {
|
||||
...item,
|
||||
title: index == 0 ? '供应科审核' : item.deptName || '' + '审核',
|
||||
title: index == 0 ? '供应科' : item.deptName || '',
|
||||
desc: item.auditStatusName + '\n' + (item.userName || '') + '\n' + (item.createTime || '') + '\n' + (item.auditRemark || '')
|
||||
}
|
||||
})
|
||||
activeSect.value = auditingList.value.length - 1
|
||||
const auditSteps = [
|
||||
{ title: '技术科审核', desc: '待审核' },
|
||||
{ title: '库管班审核', desc: '待审核' }
|
||||
{ title: '安全/技术科', desc: '待审核' },
|
||||
{ title: '库管班', desc: '待审核' }
|
||||
]
|
||||
if (auditingList.value.length === 1) {
|
||||
auditingList.value.push(...auditSteps)
|
||||
|
|
|
|||
|
|
@ -126,14 +126,14 @@ const getSignList = async () => {
|
|||
auditingList.value = res.data.map((item, index) => {
|
||||
return {
|
||||
...item,
|
||||
title: index == 0 ? '供应科审核' : item.deptName || '' + '审核',
|
||||
title: index == 0 ? '供应科' : item.deptName || '',
|
||||
desc: (item.auditStatusName || '') + '\n' + (item.userName || '') + '\n' + (item.createTime || '') + '\n' + (item.auditRemark || '')
|
||||
}
|
||||
})
|
||||
activeSect.value = auditingList.value.length - 1
|
||||
const auditSteps = [
|
||||
{ title: '技术科审核', desc: '待审核' },
|
||||
{ title: '库管班审核', desc: '待审核' }
|
||||
{ title: '技术科', desc: '待审核' },
|
||||
{ title: '库管班', desc: '待审核' }
|
||||
]
|
||||
if (auditingList.value.length === 1) {
|
||||
auditingList.value.push(...auditSteps)
|
||||
|
|
|
|||
Loading…
Reference in New Issue