Compare commits
No commits in common. "b9d9e240f27876bfac52709897befed10234ca16" and "3a4ee9793e03b0769c446ef93ab167e993f832cf" have entirely different histories.
b9d9e240f2
...
3a4ee9793e
|
|
@ -9,7 +9,7 @@
|
|||
class="single-fetch"
|
||||
v-for="(fetch, index) in fetchMaterialList"
|
||||
:key="index"
|
||||
@click="optionClick($event, fetch.id, fetch.modelId)"
|
||||
@click="optionClick($event, fetch.id)"
|
||||
>
|
||||
<view class="fetch-upper">
|
||||
<!-- {{ fetch.taskStatus }} -->
|
||||
|
|
@ -124,10 +124,10 @@ import { basePath } from '../../public'
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
optionClick (e, id, modelId) {
|
||||
optionClick (e, id) {
|
||||
console.log(id);
|
||||
uni.navigateTo({
|
||||
url: `/pages/seeBackMaterialDetail/seeBackMaterialDetail?id=${id}&typeId=${modelId}`
|
||||
url: `/pages/seeBackMaterialDetail/seeBackMaterialDetail?id=${id}`
|
||||
})
|
||||
},
|
||||
seeDetail (item) {
|
||||
|
|
|
|||
|
|
@ -91,15 +91,13 @@
|
|||
<uni-icons
|
||||
style="color: #AAAAAA; font-weight: bold;"
|
||||
type="closeempty"
|
||||
size="32"
|
||||
@click="closePopup"
|
||||
>
|
||||
</uni-icons>
|
||||
</view>
|
||||
<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批？</h4>
|
||||
<view class="select-area">
|
||||
<view @click="modalConfirm">通过</view>
|
||||
<view @click="modalReject">驳回</view>
|
||||
<!-- <uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
|
||||
<uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
|
||||
<uni-forms-item name="ifPass" required label="是否通过" label-width="150">
|
||||
<uni-data-select
|
||||
v-model="examFormData.ifPass"
|
||||
|
|
@ -112,7 +110,7 @@
|
|||
<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<button class="submit-btn" @click="formSubmit">确认</button>
|
||||
</uni-forms> -->
|
||||
</uni-forms>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
|
|
@ -210,8 +208,7 @@
|
|||
for (let i = 0; i < that.taskIdList.length; i++) {
|
||||
that.subArr.push(that.taskIdList[i].taskId)
|
||||
}
|
||||
that.openPopup()
|
||||
/* uni.showModal({
|
||||
uni.showModal({
|
||||
title: '审核通过',
|
||||
content: '确认审核通过吗？',
|
||||
confirmText: '通过',
|
||||
|
|
@ -225,7 +222,7 @@
|
|||
that.subInStore(that.subObj)
|
||||
}
|
||||
}
|
||||
}) */
|
||||
})
|
||||
}
|
||||
},
|
||||
subInStore (obj) {
|
||||
|
|
@ -238,7 +235,9 @@
|
|||
icon: 'none',
|
||||
title: res.data.msg,
|
||||
success: () => {
|
||||
that.closePopup()
|
||||
/* uni.redirectTo({
|
||||
url: '/pages/repairTestInStore/repairTestInStore'
|
||||
}) */
|
||||
uni.redirectTo({
|
||||
url: '/pages/crashExam/crashExam'
|
||||
})
|
||||
|
|
@ -252,29 +251,12 @@
|
|||
}
|
||||
})
|
||||
},
|
||||
openPopup () {
|
||||
this.$refs.popup.open()
|
||||
},
|
||||
closePopup () {
|
||||
this.$refs.popup.close()
|
||||
},
|
||||
modalConfirm () {
|
||||
let that = this
|
||||
that.subObj = {
|
||||
checkResult: '通过',
|
||||
taskIdList: that.taskIdList
|
||||
}
|
||||
console.log(that.subObj);
|
||||
that.subInStore(that.subObj)
|
||||
},
|
||||
modalReject () {
|
||||
let that = this
|
||||
that.subObj = {
|
||||
checkResult: '驳回',
|
||||
taskIdList: that.taskIdList
|
||||
}
|
||||
console.log(that.subObj);
|
||||
that.subInStore(that.subObj)
|
||||
seeExam (name) {
|
||||
console.log(name);
|
||||
this.$refs.popup.open()
|
||||
},
|
||||
formSubmit () {
|
||||
let that = this
|
||||
|
|
@ -472,7 +454,7 @@
|
|||
}
|
||||
.popup{
|
||||
width: 80vw;
|
||||
height: 20vh;
|
||||
height: 60vh;
|
||||
background-color: #fff;
|
||||
border-radius: 15rpx;
|
||||
overflow: hidden;
|
||||
|
|
@ -489,16 +471,9 @@
|
|||
.select-area{
|
||||
width: 85%;
|
||||
margin: 40rpx auto;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
view{
|
||||
box-sizing: border-box;
|
||||
font-size: 30rpx;
|
||||
padding: 12rpx 24rpx;
|
||||
background-color: #3788FF;
|
||||
.submit-btn{
|
||||
background-color: #409EFF;
|
||||
color: #fff;
|
||||
border-radius: 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,6 +201,43 @@
|
|||
|
||||
})
|
||||
}
|
||||
/* if (!this.lowerIpt.passedNum && !this.lowerIpt.waitRepairNum && !this.lowerIpt.waitCrashNum) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '请至少填写一个数据！'
|
||||
})
|
||||
return
|
||||
}
|
||||
that.totalNum = Number(that.lowerIpt.passedNum) + Number(that.lowerIpt.waitRepairNum) + Number(that
|
||||
.lowerIpt.waitCrashNum)
|
||||
console.log(that.totalNum);
|
||||
if (that.totalNum > that.upperInfo.num) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '接收总量不能大于退库数量！'
|
||||
})
|
||||
} else if (that.totalNum == 0) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '请确保退料总量不为0！'
|
||||
})
|
||||
} else {
|
||||
console.log(this.handleSubmitData());
|
||||
that.$api.backMaterialReceive.backMaterialSetNumBack({
|
||||
taskId: this.upperInfo.taskId,
|
||||
arr: this.handleSubmitData()
|
||||
}).then(res => {
|
||||
console.log("res===", res)
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '接收成功'
|
||||
})
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
},
|
||||
300)
|
||||
})
|
||||
} */
|
||||
},
|
||||
handleSubmitData() {
|
||||
let list = []
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
},
|
||||
onLoad(params) {
|
||||
let that = this
|
||||
console.log(params.id, params.typeId);
|
||||
console.log(params.id);
|
||||
// 初始化查询退料明细
|
||||
that.$api.backMaterialReceive.seeBackMaterialDetail({
|
||||
parentId: params.id
|
||||
|
|
|
|||
|
|
@ -87,15 +87,13 @@
|
|||
<uni-icons
|
||||
style="color: #AAAAAA; font-weight: bold;"
|
||||
type="closeempty"
|
||||
size="32"
|
||||
@click="closePopup"
|
||||
>
|
||||
</uni-icons>
|
||||
</view>
|
||||
<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批？</h4>
|
||||
<view class="select-area">
|
||||
<view @click="modalConfirm">通过</view>
|
||||
<view @click="modalReject">驳回</view>
|
||||
<!-- <uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
|
||||
<uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
|
||||
<uni-forms-item name="ifPass" required label="是否通过" label-width="150">
|
||||
<uni-data-select
|
||||
v-model="examFormData.ifPass"
|
||||
|
|
@ -108,7 +106,7 @@
|
|||
<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<button class="submit-btn" @click="formSubmit">确认</button>
|
||||
</uni-forms> -->
|
||||
</uni-forms>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
|
|
@ -206,8 +204,7 @@
|
|||
for (let i = 0; i < that.taskIdList.length; i++) {
|
||||
that.subArr.push(that.taskIdList[i].taskId)
|
||||
}
|
||||
that.openPopup()
|
||||
/* uni.showModal({
|
||||
uni.showModal({
|
||||
title: '审核通过',
|
||||
content: '确认审核通过吗？',
|
||||
confirmText: '通过',
|
||||
|
|
@ -221,7 +218,7 @@
|
|||
that.subInStore(that.subObj)
|
||||
}
|
||||
}
|
||||
}) */
|
||||
})
|
||||
}
|
||||
},
|
||||
subInStore (obj) {
|
||||
|
|
@ -234,7 +231,9 @@
|
|||
icon: 'none',
|
||||
title: res.data.msg,
|
||||
success: () => {
|
||||
that.closePopup()
|
||||
/* uni.redirectTo({
|
||||
url: '/pages/repairTestInStore/repairTestInStore'
|
||||
}) */
|
||||
uni.redirectTo({
|
||||
url: '/pages/testExam/testExam'
|
||||
})
|
||||
|
|
@ -248,29 +247,12 @@
|
|||
}
|
||||
})
|
||||
},
|
||||
openPopup () {
|
||||
this.$refs.popup.open()
|
||||
},
|
||||
closePopup () {
|
||||
this.$refs.popup.close()
|
||||
},
|
||||
modalConfirm () {
|
||||
let that = this
|
||||
that.subObj = {
|
||||
checkResult: '通过',
|
||||
taskIdList: that.subArr
|
||||
}
|
||||
console.log(that.subObj);
|
||||
that.subInStore(that.subObj)
|
||||
},
|
||||
modalReject () {
|
||||
let that = this
|
||||
that.subObj = {
|
||||
checkResult: '驳回',
|
||||
taskIdList: that.taskIdList
|
||||
}
|
||||
console.log(that.subObj);
|
||||
that.subInStore(that.subObj)
|
||||
seeExam (name) {
|
||||
console.log(name);
|
||||
this.$refs.popup.open()
|
||||
},
|
||||
formSubmit () {
|
||||
let that = this
|
||||
|
|
@ -468,7 +450,7 @@
|
|||
}
|
||||
.popup{
|
||||
width: 80vw;
|
||||
height: 20vh;
|
||||
height: 60vh;
|
||||
background-color: #fff;
|
||||
border-radius: 15rpx;
|
||||
overflow: hidden;
|
||||
|
|
@ -485,16 +467,9 @@
|
|||
.select-area{
|
||||
width: 85%;
|
||||
margin: 40rpx auto;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
view{
|
||||
box-sizing: border-box;
|
||||
font-size: 30rpx;
|
||||
padding: 12rpx 24rpx;
|
||||
background-color: #3788FF;
|
||||
.submit-btn{
|
||||
background-color: #409EFF;
|
||||
color: #fff;
|
||||
border-radius: 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue