diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue
index 17eee73..c832e95 100644
--- a/components/logistiComptent/logistiCard/logistiCard.vue
+++ b/components/logistiComptent/logistiCard/logistiCard.vue
@@ -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)
+
})
},
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 3bdd7e8..eb347b5 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -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(
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index a3ed9ea..440c291 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -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)
+
})
},
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index 964f6bb..fa87908 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -6,10 +6,20 @@
+
+
+
+
-
+
+
+
+
+
+
@@ -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;
}
},
diff --git a/subpkg/townTask/townGather.vue b/subpkg/townTask/townGather.vue
index b4bfd2e..7b99696 100644
--- a/subpkg/townTask/townGather.vue
+++ b/subpkg/townTask/townGather.vue
@@ -282,7 +282,7 @@
-
diff --git a/subpkg/townTask/townTask.vue b/subpkg/townTask/townTask.vue
index f644d40..f9e5f26 100644
--- a/subpkg/townTask/townTask.vue
+++ b/subpkg/townTask/townTask.vue
@@ -1,194 +1,208 @@
-
-
-
-
-
- {{`任务名称: ${taskInfo.title||''}`}}
- {{taskInfo.content||''}}
-
-
- 目标数量: {{extend_info.target}}
-
-
- 指定商品:
-
-
- {{item}}
-
-
-
-
- 判定条件:
- {{remark}}
-
-
-
+
+
+
+
+
+
+
+
+ {{`任务名称: ${taskInfo.title||''}`}}
+ {{taskInfo.content||''}}
+
+
+ 目标数量: {{extend_info.target}}
+
+
+ 指定商品:
+
+
+ {{item}}
+
+
+
+
+ 判定条件:
+ {{remark}}
+
+
+
\ No newline at end of file