diff --git a/api/task.js b/api/task.js index 3f20661..fcb7f3b 100644 --- a/api/task.js +++ b/api/task.js @@ -79,4 +79,17 @@ export const townMasterTask3Commit = (data) => oahttp.post('/task/commit_town_ma /** * 入股任务提交 */ -export const commit_service_group_taskAPI = (data) => oahttp.post('/task/commit_service_group_task', data) \ No newline at end of file +export const commit_service_group_taskAPI = (data) => oahttp.post('/task/commit_service_group_task', data) +/** + * 督促小组公司入股 + */ +export const commit_village_task_4API = (data) => oahttp.post('/task/commit_village_task_4', data) +/** + * 入股甲方公司 + */ +export const commit_village_task_5API = (data) => oahttp.post('/task/commit_village_task_5', data) +/** + * 入股甲方公司 + */ +export const commit_town_service_manager_task_6API = (data) => oahttp.post('/task/commit_town_service_manager_task_6', + data) \ No newline at end of file diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue index 662d55e..b68a680 100644 --- a/components/logistiComptent/logistiCard/logistiCard.vue +++ b/components/logistiComptent/logistiCard/logistiCard.vue @@ -37,8 +37,6 @@ - - {{goodsInfo.shop_phone}} @@ -66,11 +64,13 @@ - 商品信息 + 商品信息: - - {{item.goods_name}} + + + {{item.goods_name}} X{{item.product_num}}{{item.goods_unit}} @@ -120,31 +120,32 @@ + + + 联系电话 + + + {{goodsInfo.receiver_phone}} + + + 商品信息 - - {{item.goods_name}} + + + {{item.goods_name}} X{{item.product_num}}{{item.goods_unit}} - - - - - 联系电话 - - - {{goodsInfo.receiver_phone}} - - 共计{{goodsInfo.product_count}}件商品 @@ -255,7 +256,7 @@ 商品信息 - + {{item.goods_name}} X{{item.product_num}}{{item.goods_unit}} @@ -487,11 +488,11 @@ } .pro_list { - display: flex; + /* display: flex; text { margin-right: 20rpx; - } + } */ } .total { @@ -507,6 +508,8 @@ .goods_tit { display: flex; justify-content: space-between; + align-items: center; + margin-top: 20rpx; .goods_detil { width: 55vw; @@ -575,4 +578,8 @@ font-size: 35.05rpx; } } + + .slot-content { + padding-left: 160rpx; + } \ No newline at end of file diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index eb347b5..39209b7 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -106,6 +106,9 @@ import { Toast } from '../../libs/uniApi'; + import { + dictDataListsTypeValue + } from "@/api/oaPbulic.js" export default { name: "task", props: { @@ -114,23 +117,57 @@ default: function() { return {} } + }, + taskValueList: { + type: Array, + default: function() { + return [] + } } }, data() { return { + extend: {}, // 以下从左至右分别为: 服务部长,市场部长,负责人 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, 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 + townServiceList: ["town_task_type_1", "town_task_type_2", "town_task_type_3", "town_task_type_4", + "town_task_type_5", + "town_task_type_7" + ], // 镇农科服务部长任务 + navToTownServiceList: ["town_task_type_1", "town_task_type_2", "town_task_type_3", "town_task_type_5", + "town_task_type_7" + ], // 镇农科服务部长跳转/subpkg/townTask/townTask的任务 0 + navToTownMarketList: ["town_task_type_marketing_director_1", "town_task_type_marketing_director_2", + "town_task_type_marketing_director_3", + "town_task_type_marketing_director_4", + "town_task_type_marketing_director_5", + "town_task_type_marketing_director_6", + "town_task_type_marketing_director_7", + "town_task_type_marketing_director_8", + "town_task_type_marketing_director_9" + ], // 镇农科市场部长跳转/subpkg/townTask/townTask的任务 1 + navToVillageList: ["village_task_type_1", "village_task_type_2", "village_task_type_3", + "village_task_type_7", + ], // 村管理跳转/subpkg/townTask/townTask的任务 1 + navToVillageListA: ["town_task_type_master_2", "town_task_type_master_4", "town_task_type_master_5", + "town_task_type_master_6", + "town_task_type_master_7", + "town_task_type_master_8" + ], // 村管理跳转/subpkg/townTask/townTask的任务 1 + navToList: ["village_task_type_4", "village_task_type_5", "town_task_type_6"], + + }; }, mounted() { this.$props.datas.extend ? this.extend = this.$props.datas.extend : null; + + // 获取用户角色 + // this.$store.state.app.userInfo.group_id + }, + methods: { navTo(url) { if (url) { @@ -147,65 +184,77 @@ } else Toast('暂未开放') }, clickTask() { - - + this.$props.taskValueList.forEach(item => { + // console.log(item) + if (this.$props.datas.type == item.id) { + this.$props.datas.type_value = item.value + } + }) + console.log(this.$props.datas.type_value) + // console.log(this.navToVillageList.includes(this.$props.datas.type_value)) + // return 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('任务已结束!'); // } - if (this.navToTownServiceList.includes(this.$props.datas.type)) + if (this.navToTownServiceList.includes(this.$props.datas.type_value)) return this.navTo( `/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[0]}` ); - if (this.navToTownMarketList.includes(this.$props.datas.type)) + if (this.navToTownMarketList.includes(this.$props.datas.type_value)) return this.navTo( `/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}` ); - if (this.navToVillageList.includes(this.$props.datas.type)) + if (this.navToVillageList.includes(this.$props.datas.type_value)) 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)) + if (this.navToVillageListA.includes(this.$props.datas.type_value)) return this.navTo( - `/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[2]}` + `/subpkg/townTask/villageTask4?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[2]}` ); - switch (this.$props.datas.type) { - case 31: + if (this.navToList.includes(this.$props.datas.type_value)) + + return this.navTo( + `/subpkg/townTask/villageTask4?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[2]}` + ); + switch (this.$props.datas.type_value) { + case "1": if (this.$store.state.app.userInfo.admin_id) this.navTo( `/subpkg/captain/captain?task_id=${this.$props.datas?.id}`); else this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`); break; - case 32: + case "2": this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`); break; - case 33: + case "3": let is_show = true; if (uni.$u.timeFormat(Date.now(), 'yyyy-mm-dd') != this.$props.datas?.end_time) is_show = false; this.navTo( `/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}&is_show=${is_show}` ); break; - case 34: + case "4": this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`); break; - case 35: + case "5": this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`); break; - case 47: + case "town_task_type_4": this.navTo(`/subpkg/townTask/serviceTask4?task_id=${this.$props.datas?.id}`); break; - case 60: + case "town_task_type_marketing_director_10": this.navTo( `/subpkg/townTask/marketTask10?task_id=${this.$props.datas?.id}&stage=${this.$props.datas?.stage}` ); break; - case 67: + // case 67: + // this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); + // break; + case "village_task_type_8": this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); break; - case 69: - this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); - break; - case 76: + case "town_task_type_master_3": this.navTo(`/subpkg/townTask/gatherRecords?task_id=${this.$props.datas?.id}`); break; default: diff --git a/pages.json b/pages.json index eb6ff10..eaa3c5a 100644 --- a/pages.json +++ b/pages.json @@ -156,15 +156,23 @@ "navigationBarTitleText": "配送信息", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/logistics/deliveryDetil", - "style": { - "navigationBarTitleText": "配送信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "app-plus": { + // 弹出层 + "subNVues": [{ + "id": "map", // 唯一标识 + "path": "pages/logistics/mask", // 页面路径 + //样式 + "style": { + "position": "absolute", + "width": "750rpx", + "height": "600rpx", + + "background": "rgba(0,0,0,.5)" + + } + }] + } } }, { @@ -782,6 +790,15 @@ "navigationBarTextStyle": "white" } + }, { + "path": "townTask/villageTask4", + "style": { + "navigationBarTitleText": "任务:入股任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { "path": "otherTask/otherTask", "style": { diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue index 8d09bfa..7d6ac7f 100644 --- a/pages/logistics/deliveryDetil.vue +++ b/pages/logistics/deliveryDetil.vue @@ -12,7 +12,7 @@ :latitude="markers[0].latitude" :enable-scroll="true" :longitude="markers[0].longitude"> - + @@ -58,8 +58,16 @@ 物流信息: 用户名称:  {{fuzzyName( goodsDetil.logistics.receiver_name)}} + + 联系电话:   {{goodsDetil.logistics.shop_phone}} + - 通知时间:  {{goodsDetil.logistics.create_time}} + 联系地址:  {{goodsDetil.logistics.receiver_address}} + + + + 下单时间:  {{goodsDetil.logistics.create_time}} @@ -70,9 +78,7 @@ v-for="(item,index) in goodsDetil.product" :key="index"> - {{item.goods_name}} - - + {{item.goods_name}} X{{item.product_num}} @@ -99,7 +105,7 @@ - + @@ -132,6 +138,7 @@ showPop: false, goodsDetil: undefined, scale: 17, + subNVue: null, nowAddress: "无", markers: [ // 商家 @@ -322,7 +329,11 @@ }); }, + offMaskFn() { + this.showToast = false + this.subNVue.hide() + }, qrqodeFn() { @@ -345,6 +356,7 @@ }).then((res, err) => { this.showToast = true setTimeout(() => { + this.subNVue.show(300) this.showToast = false uni.navigateBack() }, 1000) @@ -371,6 +383,10 @@ }, 500) }) }, + onShow() { + this.subNVue = uni.getSubNVueById('map'); + this.subNVue.hide() + } } diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue index a30c34c..5e26987 100644 --- a/pages/logistics/index.vue +++ b/pages/logistics/index.vue @@ -13,7 +13,7 @@ + @showToast2="showToast2" :goodsInfo="item" :key="index"> @@ -70,14 +70,6 @@ this.getOrderList() }, - showToast() { - this.$refs.uToast.show({ - type: 'success', - title: '成功主题(带图标)', - message: "操作成功", - iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png' - }) - }, showToast2() { // 6 this.$refs.uToast.show({ diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue index ad52179..a10cad3 100644 --- a/pages/logistics/logisticDetil.vue +++ b/pages/logistics/logisticDetil.vue @@ -67,7 +67,7 @@ + :desc="item.create_time" v-for="(item,index) in goodsDetil.record" :key="index"> @@ -77,7 +77,7 @@ 商品信息 - + {{item.goods_name}} @@ -97,41 +97,95 @@ {{goodsDetil.record[2].create_time}} + + + - 收货详情 + 收货详情: + + + + + 用户名称: + + + + {{goodsDetil.logistics.receiver_name}} + + + + + + 联系方式: + + + + {{goodsDetil.logistics.receiver_phone}} + + + + + + 联系地址: {{goodsDetil.logistics.receiver_address}} - - {{ fuzzyName(goodsDetil.logistics.receiver_name) ||"顾客姓名"}}:  {{goodsDetil.logistics.receiver_phone||"顾客电话"}} - - - {{goodsDetil.record[2].create_time}} - + + + - 取货详情 + 取货详情: + + + + + 店铺名称: - {{goodsDetil.logistics.shop_address||"商家地址"}} - - - {{goodsDetil.logistics.shop_name||"商家电话"}} - :  {{goodsDetil.logistics.shop_phone||"商家电话"}} - - - {{goodsDetil.record[1].create_time}} + {{goodsDetil.logistics.shop_name}} + + + 店主姓名: + + + + {{goodsDetil.logistics.shop_user}} + + + + + + 联系方式: + + + + {{goodsDetil.logistics.shop_phone}} + + + + + + 联系方式: + + + + {{goodsDetil.logistics.shop_address}} + + + + @@ -143,18 +197,20 @@ + v-for="(item,index) in goodsDetil.record" :key='index'> - 商品信息 + 商品信息: - - {{item.goods_name}} + + + {{item.goods_name}} X{{item.product_num}}{{item.goods_unit}} @@ -163,7 +219,13 @@ - + + + 收货详情: + + + + 用户名称 @@ -173,7 +235,7 @@ - 联系方式 + 联系方式: - 收货地址 + 联系地址: @@ -190,6 +252,47 @@ + + + 取货时间 + + + {{goodsDetil.logistics.qh_time}} + + + + + + + + 取货详情: + + + + + + 用户名称 + + + {{goodsDetil.logistics.shop_name}} + + + + + 联系方式 + + + {{goodsDetil.logistics.shop_phone}} + + + + + 联系地址 + + + {{goodsDetil.logistics.shop_address}} + + 物流信息 @@ -197,7 +300,7 @@ + v-for="(item,index) in (record)" :key="index"> @@ -210,13 +313,13 @@ - 商品信息 + 商品信息: - - {{item.goods_name}} + v-for="(item,index) in goodsDetil.product" :key="index"> + + {{item.goods_name}} X{{item.product_num}}{{item.goods_unit}} @@ -405,13 +508,7 @@ } } - .pro_list { - display: flex; - - text { - margin-right: 20rpx; - } - } + .pro_list {} .total { /* font-family: "宋体"; */ @@ -445,8 +542,12 @@ } .goods_tit { + margin-top: 10px; display: flex; justify-content: space-between; + /* background-color: red; */ + width: 650rpx; + align-items: center; } .tost_tit { diff --git a/pages/logistics/mask.nvue b/pages/logistics/mask.nvue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/pages/logistics/mask.nvue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue index fa87908..de31aff 100644 --- a/pages/oaTask/oaTask.vue +++ b/pages/oaTask/oaTask.vue @@ -15,7 +15,8 @@ - + @@ -39,6 +40,9 @@ import { taskLists } from "@/api/task.js" + import { + dictDataListsTypeValue + } from "@/api/oaPbulic.js" export default { components: { taskItem @@ -64,19 +68,48 @@ nomoreText: '我也是有底线的~~', status: 'loadmore' }, - list: [] + list: [], + taskValueList: [], + roleList: [{ + id: 17, + type_vale: "village_task_type" + }, { + id: 16, + type_vale: "town_task_type_marketing_director" + }, { + id: 15, + type_vale: "town_task_type_master" + }, { + id: 14, + type_vale: "town_task_type" + }, { + id: 5, + type_vale: "task_type" + } + + ] } }, onLoad() { this.skeleton = true; + }, onShow() { this.loadList(); + this.getTaskValue() }, onReady() { uni.$on('initOaTask', this.loadList); }, methods: { + async getTaskValue() { + const desiredElement = this.roleList.find(element => element.id == this.$store.state.app.userInfo + .group_id); + let res = await dictDataListsTypeValue({ + type_value: desiredElement.type_vale + }) + this.taskValueList = res.data + }, changeTypeCurrent(e) { this.baseList = [] this.status = e.id diff --git a/subpkg/townTask/townTask.vue b/subpkg/townTask/townTask.vue index abec53a..f9e5f26 100644 --- a/subpkg/townTask/townTask.vue +++ b/subpkg/townTask/townTask.vue @@ -1,313 +1,208 @@ + \ No newline at end of file diff --git a/subpkg/townTask/villageTask4.vue b/subpkg/townTask/villageTask4.vue new file mode 100644 index 0000000..cd8d4c4 --- /dev/null +++ b/subpkg/townTask/villageTask4.vue @@ -0,0 +1,336 @@ + + + + \ No newline at end of file