From 4192e6cbfd657860d2b9a62b4ecea9da2b60cf55 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 7 Nov 2023 18:55:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/task.js | 11 +
components/task/taskItem.vue | 640 ++++++++++++++-------------
pages.json | 18 +
pages/logistics/deliveryDetil.vue | 19 +-
pages/logistics/logisticDetil.vue | 15 +-
subpkg/topUpDeposit/topUpDeposit.vue | 507 +++++++++++----------
subpkg/townTask/gatherRecords.vue | 216 +++++++++
subpkg/townTask/townGather.vue | 638 ++++++++++++++++++++++++++
8 files changed, 1495 insertions(+), 569 deletions(-)
create mode 100644 subpkg/townTask/gatherRecords.vue
create mode 100644 subpkg/townTask/townGather.vue
diff --git a/api/task.js b/api/task.js
index 284cf17..a113762 100644
--- a/api/task.js
+++ b/api/task.js
@@ -65,3 +65,14 @@ export const marketTask10Commit = (data) => oahttp.post('/task/commit_town_task_
* 任务:提交村公司任务-信息平台铺设任务接口
*/
export const villageTask6Commit = (data) => oahttp.post('/task/commit_village_task_type_6', data)
+
+
+/**
+ * 任务:提交村镇公司收集任务列表
+ */
+export const townMasterTask3List = (data) => oahttp.get('/task/service_task_detail', data)
+
+/**
+ * 任务:提交村镇公司收集任务提交
+ */
+export const townMasterTask3Commit = (data) => oahttp.post('/task/commit_town_master_task_type_3', data)
\ No newline at end of file
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 2812b14..3bdd7e8 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -1,30 +1,30 @@
-
-
-
-
-
- 任务名称:
- {{ datas.title }}
-
- 点击查看
-
-
-
-
- 任务状态 :
-
- 已完成
- 已关闭
-
+
+
+
+
+ 任务名称:
+ {{ datas.title }}
+
+ 点击查看
+
+
+
+
+ 任务状态 :
+
+ 已完成
+ 已关闭
+
-
- {{
+
+ {{
(datas.extend.informationg.update
? datas.extend.informationg.update
: 0) +
@@ -33,13 +33,13 @@
? datas.extend.informationg.count
: 0)
}}
-
-
- {{
+ {{
(datas.extend.transaction.arr.transaction_pool
? datas.extend.transaction.arr.transaction_pool
: 0) +
@@ -49,339 +49,351 @@
: 0) +
"元"
}}
-
-
-
- {{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:1)+'元'}} -->
+
+
+ 抵达终点
- 抵达中转点
- 进行中
-
- 进行中
-
-
-
- {{extend.total-extend.not_done_count||0}}/{{extend.total||0}}
-
-
- {{extend.done_count||0}}/{{extend.total||0}}
-
- 进行中
-
- 进行中
-
-
-
+
+ {{extend.total-extend.not_done_count||0}}/{{extend.total||0}}
+
+
+ {{extend.done_count||0}}/{{extend.total||0}}
+
+ 进行中
+
+ 进行中
+
+
+
-
- 完成时间 :
- {{ datas.end_time }}
-
- 进行中
- 已完成
- 已关闭
-
-
- 任务金额 :
- {{ datas.money + "元" || "0.00" }}
-
-
-
-
-
-
+
+ 完成时间 :
+ {{ datas.end_time }}
+
+ 进行中
+ 已完成
+ 已关闭
+
+
+ 任务金额 :
+ {{ datas.money + "元" || "0.00" }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1f489ac..80f514f 100644
--- a/pages.json
+++ b/pages.json
@@ -886,6 +886,24 @@
"navigationBarTextStyle": "white"
}
+ }, {
+ "path": "townTask/townGather",
+ "style": {
+ "navigationBarTitleText": "养殖信息收集",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#0122C7",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "townTask/gatherRecords",
+ "style": {
+ "navigationBarTitleText": "养殖信息收集",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#0122C7",
+ "navigationBarTextStyle": "white"
+ }
+
}, {
"path": "complaint/complaint",
"style": {
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index 2a8d537..747817c 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -62,12 +62,16 @@
通知时间: {{goodsDetil.logistics.create_time}}
-
- 商品信息
-
+
-
- {{item.goods_name}}
+
+ 商品信息
+
+
+ {{item.goods_name}}
+
X{{item.product_num}}{{item.goods_unit}}
@@ -78,6 +82,8 @@
请详细核对订单信息
共计{{goodsDetil.product_count}}件商品
+
+
@@ -443,9 +449,10 @@
flex: 8;
margin: 0;
- .goods_tit {
+ .goods-tit {
margin: 0;
display: flex;
+ justify-content: space-around;
}
diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue
index b97bd63..8a34fe6 100644
--- a/pages/logistics/logisticDetil.vue
+++ b/pages/logistics/logisticDetil.vue
@@ -79,6 +79,9 @@
{{item.goods_name}}
+
+
X{{item.product_num}}{{item.goods_unit}}
@@ -204,12 +207,16 @@
-
- 商品信息
-
+
-
+
+ 商品信息
+
+
{{item.goods_name}}
+
X{{item.product_num}}{{item.goods_unit}}
diff --git a/subpkg/topUpDeposit/topUpDeposit.vue b/subpkg/topUpDeposit/topUpDeposit.vue
index 69c4d8d..a104dd3 100644
--- a/subpkg/topUpDeposit/topUpDeposit.vue
+++ b/subpkg/topUpDeposit/topUpDeposit.vue
@@ -1,259 +1,276 @@
-
-
-
-
- 充值信息
-
- 充值账户
- {{$store.state.app.userInfo.company.company_name||''}}
-
-
-
- 收款公司
- {{partyA.company_name}}
-
-
- 对公账号
- {{partyA.qualification.corporate_account||'暂无信息'}}
-
-
-
-
-
- 创建时间:{{item.create_time}}
- 充值金额:{{item.deposit}}元
- 充值凭证:查看凭证
-
-
-
-
-
+
+
+
+
+ 充值信息
+
+ 充值账户
+ {{$store.state.app.userInfo.company.company_name||''}}
+
+
+
+ 收款公司
+ {{partyA.company_name}}
+
+
+ 对公账号
+ {{partyA.qualification.corporate_account||'暂无信息'}}
+
+
+
+
+
+
+ 创建时间:
+ {{item.create_time}}
+
+
+ 充值金额:
+ {{item.deposit}}元
+
+
+ 充值凭证:
+ 查看凭证
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpkg/townTask/gatherRecords.vue b/subpkg/townTask/gatherRecords.vue
new file mode 100644
index 0000000..1fd8cbc
--- /dev/null
+++ b/subpkg/townTask/gatherRecords.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+ 养植信息
+
+
+ 点击查看
+
+
+
+
+ 法人姓名: {{item.planting[0].entityName}}
+
+
+ 联系电话: {{item.planting[0].phone}}
+
+
+
+
+
+
+ 批发商信息
+
+
+ 点击查看
+
+
+
+
+ 店主姓名: {{item.supply[0].storeName}}
+
+
+ 联系电话: {{item.supply[0].shopkeeperPhone}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpkg/townTask/townGather.vue b/subpkg/townTask/townGather.vue
new file mode 100644
index 0000000..726ca8c
--- /dev/null
+++ b/subpkg/townTask/townGather.vue
@@ -0,0 +1,638 @@
+
+
+
+ 养殖信息
+ 镇批发商信息收集表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file