bug修复
This commit is contained in:
zmj
parent
47a517b653
commit
0c93989f39
@ -307,6 +307,9 @@
|
||||
takeGoods,
|
||||
doneDelivery
|
||||
} from "@/api/logistics.js"
|
||||
import {
|
||||
Toast
|
||||
} from "@/libs/uniApi";
|
||||
export default {
|
||||
props: ['goodsInfo'],
|
||||
data() {
|
||||
@ -360,8 +363,13 @@
|
||||
order_id: this.goodsInfo.order_id,
|
||||
order_sn: sn
|
||||
}).then(res => {
|
||||
console.log(res)
|
||||
this.$emit('showTost')
|
||||
this.$emit('getlist')
|
||||
}).catch(err => {
|
||||
Toast(err.msg)
|
||||
// console.log(err, 65656)
|
||||
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
@ -123,8 +123,9 @@
|
||||
taskRoleTypeList: ['town_task_type', 'town_task_type_marketing_director', 'town_task_type_master'],
|
||||
townServiceList: [44, 45, 46, 47, 48, 49, 50], // 镇农科服务部长任务
|
||||
navToTownServiceList: [44, 45, 46, 48, 49, 50], // 镇农科服务部长跳转/subpkg/townTask/townTask的任务 0
|
||||
navToTownMarketList: [51, 52, 53, 54, 55, 57, 58, 59], // 镇农科市场部长跳转/subpkg/townTask/townTask的任务 1
|
||||
navToVillageList: [62, 63, 64, 65, 66, 68] // 村管理跳转/subpkg/townTask/townTask的任务 1
|
||||
navToTownMarketList: [51, 52, 53, 54, 55, 56, 57, 58, 59], // 镇农科市场部长跳转/subpkg/townTask/townTask的任务 1
|
||||
navToVillageList: [62, 63, 64, 65, 66, 68, ], // 村管理跳转/subpkg/townTask/townTask的任务 1
|
||||
navToVillageListA: [75, 77, 78, 79, 80, 81] // 村管理跳转/subpkg/townTask/townTask的任务 1
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
@ -146,6 +147,8 @@
|
||||
} else Toast('暂未开放')
|
||||
},
|
||||
clickTask() {
|
||||
|
||||
|
||||
if (this.isTimeInRange()) return Toast('任务正在结算中');
|
||||
// if ((this.$props.datas.type != 31) && this.$props.datas.status !== 2 && this.$props.datas.status !== 1) {
|
||||
// return this.$props.datas.status == 3 ? Toast('任务已完成!') : Toast('任务已结束!');
|
||||
@ -162,6 +165,10 @@
|
||||
return this.navTo(
|
||||
`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}`
|
||||
);
|
||||
if (this.navToVillageListA.includes(this.$props.datas.type))
|
||||
return this.navTo(
|
||||
`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[2]}`
|
||||
);
|
||||
switch (this.$props.datas.type) {
|
||||
case 31:
|
||||
if (this.$store.state.app.userInfo.admin_id) this.navTo(
|
||||
|
||||
@ -331,24 +331,32 @@
|
||||
|
||||
qrqodeFn() {
|
||||
let that = this
|
||||
console.log(6666)
|
||||
uni.scanCode({
|
||||
onlyFromCamera: true,
|
||||
success: function(res) {
|
||||
|
||||
that.takeGood(res.result)
|
||||
}
|
||||
});
|
||||
},
|
||||
// 取货{}
|
||||
takeGood(sn) {
|
||||
console.log(takeGoods)
|
||||
takeGoods({
|
||||
logistics_id: this.goodsDetil.logistics.id,
|
||||
order_id: this.goodsDetil.logistics.order_id,
|
||||
order_sn: sn
|
||||
}).then(res => {
|
||||
}).then((res, err) => {
|
||||
console.log(545454, err)
|
||||
this.showToast()
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
}, 1000)
|
||||
}).catch(err => {
|
||||
Toast(err.msg)
|
||||
console.log(err, 65656)
|
||||
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
@ -6,10 +6,20 @@
|
||||
</u-skeleton>
|
||||
</block>
|
||||
<block v-else>
|
||||
<u-tabs style="background-color: #0022C7;" :list="tabLists" @click="changeTypeCurrent" lineColor='white'
|
||||
lineWidth='30' inactiveStyle='color:white' activeStyle="color:white"></u-tabs>
|
||||
<u-empty v-if="list.length==0" icon="/static/img/empty/data.png" text="没有任务"></u-empty>
|
||||
|
||||
<view v-else class="task_list">
|
||||
|
||||
|
||||
<!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
|
||||
<task-item :datas="item" v-for="item in list" :key="item.id"></task-item>
|
||||
<view class="" v-if="baseList.length">
|
||||
<task-item :datas="item" v-for="item in baseList" :key="item.id"></task-item>
|
||||
</view>
|
||||
<view class="" v-else>
|
||||
<u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</block>
|
||||
@ -35,7 +45,16 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
status: 2,
|
||||
skeleton: false,
|
||||
baseList: [],
|
||||
tabLists: [{
|
||||
name: '进行中',
|
||||
id: 2
|
||||
}, {
|
||||
name: '已完成',
|
||||
id: 3
|
||||
}, ],
|
||||
loadConfig: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
@ -58,12 +77,21 @@
|
||||
uni.$on('initOaTask', this.loadList);
|
||||
},
|
||||
methods: {
|
||||
changeTypeCurrent(e) {
|
||||
this.baseList = []
|
||||
this.status = e.id
|
||||
this.baseList = this.list.filter(item => item.status == this.status)
|
||||
|
||||
|
||||
},
|
||||
async loadList() {
|
||||
let res = await taskLists({
|
||||
limit: 15,
|
||||
page: 1
|
||||
});
|
||||
this.list = res.data;
|
||||
this.baseList = this.list.filter(item => item.status == this.status)
|
||||
|
||||
this.skeleton = false;
|
||||
}
|
||||
},
|
||||
|
||||
@ -282,7 +282,7 @@
|
||||
</u-radio-group>
|
||||
</u-form-item>
|
||||
<u-form-item labelWidth="auto" label="店铺进货渠道" borderBottom>
|
||||
<u--input :readonly="readonly" type='number' v-model="formData1.incomingChannels"
|
||||
<u--input :readonly="readonly" v-model="formData1.incomingChannels"
|
||||
placeholder="请输入进货渠道"></u--input>
|
||||
</u-form-item>
|
||||
<u-form-item labelWidth="auto" label="有无仓储" borderBottom>
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
<template>
|
||||
<view class="task_page">
|
||||
|
||||
<!-- {{taskInfo}} -->
|
||||
|
||||
<u-skeleton v-if="skeleton" :class="{'loading': skeleton}" :animate="true" title rows="3" rows-width="92%"
|
||||
rowsHeight="56">
|
||||
</u-skeleton>
|
||||
@ -14,7 +17,8 @@
|
||||
<view class="card" v-if="extend_info&&extend_info.store_name">
|
||||
<view class="c_title">指定商品: </view>
|
||||
<view class="store">
|
||||
<view class="store_name" v-for="(item, index) in extend_info.store_name" :key="index" @click="copyName(item)">
|
||||
<view class="store_name" v-for="(item, index) in extend_info.store_name" :key="index"
|
||||
@click="copyName(item)">
|
||||
{{item}}
|
||||
</view>
|
||||
</view>
|
||||
@ -28,9 +32,15 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { Toast } from "../../libs/uniApi";
|
||||
import { townTaskDetails } from "@/api/task.js"
|
||||
import { dictDataListsTypeValue } from "@/api/oaPbulic.js"
|
||||
import {
|
||||
Toast
|
||||
} from "../../libs/uniApi";
|
||||
import {
|
||||
townTaskDetails
|
||||
} from "@/api/task.js"
|
||||
import {
|
||||
dictDataListsTypeValue
|
||||
} from "@/api/oaPbulic.js"
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@ -59,15 +69,18 @@
|
||||
id: this.taskInfo.id
|
||||
});
|
||||
if (res.data?.template_info?.extend) {
|
||||
if(res.data?.template_info?.extend?.goods_id && typeof res.data?.template_info?.extend?.goods_id!=='object'){
|
||||
if (res.data?.template_info?.extend?.goods_id && typeof res.data?.template_info?.extend
|
||||
?.goods_id !== 'object') {
|
||||
res.data.template_info.extend.goods_id = res.data?.template_info?.extend?.goods_id.split(',');
|
||||
res.data.template_info.extend.store_name = res.data?.template_info?.extend?.store_name.split(';')||[];
|
||||
res.data.template_info.extend.store_name = res.data?.template_info?.extend?.store_name.split(
|
||||
';') || [];
|
||||
}
|
||||
this.extend_info = res.data?.template_info?.extend;
|
||||
}
|
||||
this.taskInfo = res.data;
|
||||
let dict = await dictDataListsTypeValue({
|
||||
type_value: this.type_value
|
||||
// type_value: 'town_task_type_master'
|
||||
})
|
||||
dict.data.forEach((item) => {
|
||||
if (item.id == this.taskInfo.type) {
|
||||
@ -175,6 +188,7 @@
|
||||
font-size: 26rpx;
|
||||
color: #0122c7;
|
||||
margin-top: -10rpx;
|
||||
|
||||
&_name {
|
||||
flex-shrink: 0;
|
||||
padding: 8rpx;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user