bug修改
This commit is contained in:
parent
aba64697fe
commit
64bfebfa72
|
|
@ -61,10 +61,10 @@
|
||||||
审核
|
审核
|
||||||
</view>
|
</view>
|
||||||
</view> -->
|
</view> -->
|
||||||
<view class="sticky-area">
|
<!-- <view class="sticky-area">
|
||||||
<image src="/static/passed.png" v-show="fetch.taskStatus == '38'" mode=""></image>
|
<image src="/static/passed.png" v-show="fetch.taskStatus == '40'" mode=""></image>
|
||||||
<!-- <image src="/static/noPass.png" v-show="fetch.status == '1'" mode=""></image> -->
|
<image src="/static/noPass.png" v-show="fetch.status == '1'" mode=""></image>
|
||||||
<image src="/static/noPass.png" v-show="fetch.taskStatus == '40'" mode=""></image>
|
<image src="/static/noPass.png" v-show="fetch.taskStatus == '40'" mode=""></image>-->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="btm-sticky">
|
<!-- <view class="btm-sticky">
|
||||||
|
|
@ -99,7 +99,7 @@ import { basePath } from '../../public'
|
||||||
methods: {
|
methods: {
|
||||||
seeDetail (item) {
|
seeDetail (item) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: `/pages/backMaterialReceiveDetail/backMaterialReceiveDetail?id=${item.id}&taskId=${item.taskId}`
|
url: `/pages/backMaterialReceiveDetail/backMaterialReceiveDetail?id=${item.id}&taskId=${item.taskId}&taskStatus=${item.taskStatus}`
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
/* checkAll() {
|
/* checkAll() {
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,8 @@
|
||||||
waitCrashNum: '',
|
waitCrashNum: '',
|
||||||
detailsId: '',
|
detailsId: '',
|
||||||
taskId: '',
|
taskId: '',
|
||||||
submitFlag:false
|
submitFlag:false,
|
||||||
|
taskStatus:''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
@ -291,8 +292,13 @@
|
||||||
taskId: that.taskId,
|
taskId: that.taskId,
|
||||||
parentId: that.detailsId
|
parentId: that.detailsId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
uni.showToast({
|
||||||
|
icon: 'none',
|
||||||
|
title: '结束任务成功'
|
||||||
|
})
|
||||||
console.log("退料结束",res)
|
console.log("退料结束",res)
|
||||||
that.submitFlag = false
|
that.submitFlag = false
|
||||||
|
uni.navigateBack()
|
||||||
}).catch(err=>{
|
}).catch(err=>{
|
||||||
that.submitFlag = false
|
that.submitFlag = false
|
||||||
}).finally(result=>{
|
}).finally(result=>{
|
||||||
|
|
@ -311,6 +317,7 @@
|
||||||
onLoad(params) {
|
onLoad(params) {
|
||||||
this.taskId = params.taskId
|
this.taskId = params.taskId
|
||||||
this.detailsId = params.id
|
this.detailsId = params.id
|
||||||
|
this.taskStatus = params.taskStatus
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
this.initListData()
|
this.initListData()
|
||||||
|
|
@ -319,6 +326,13 @@
|
||||||
console.log("点击了自定义按钮", ev);
|
console.log("点击了自定义按钮", ev);
|
||||||
const that = this
|
const that = this
|
||||||
if (ev.text == '结束任务') {
|
if (ev.text == '结束任务') {
|
||||||
|
if(this.taskStatus=="40"){
|
||||||
|
uni.showToast({
|
||||||
|
icon: 'none',
|
||||||
|
title: '请勿再点击'
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
that.backReceiveEndBackFn()
|
that.backReceiveEndBackFn()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -20578,38 +20578,6 @@ var render = function () {
|
||||||
],
|
],
|
||||||
1
|
1
|
||||||
),
|
),
|
||||||
_c(
|
|
||||||
"uni-view",
|
|
||||||
{
|
|
||||||
staticClass: _vm._$g("20-" + $30, "sc"),
|
|
||||||
attrs: { _i: "20-" + $30 },
|
|
||||||
},
|
|
||||||
[
|
|
||||||
_c("v-uni-image", {
|
|
||||||
directives: [
|
|
||||||
{
|
|
||||||
name: "show",
|
|
||||||
rawName: "v-show",
|
|
||||||
value: _vm._$g("21-" + $30, "v-show"),
|
|
||||||
expression: "_$g((\"21-\"+$30),'v-show')",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
attrs: { src: "/static/passed.png", mode: "", _i: "21-" + $30 },
|
|
||||||
}),
|
|
||||||
_c("v-uni-image", {
|
|
||||||
directives: [
|
|
||||||
{
|
|
||||||
name: "show",
|
|
||||||
rawName: "v-show",
|
|
||||||
value: _vm._$g("22-" + $30, "v-show"),
|
|
||||||
expression: "_$g((\"22-\"+$30),'v-show')",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
attrs: { src: "/static/noPass.png", mode: "", _i: "22-" + $30 },
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
1
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
1
|
1
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue