

{{item.contractionName}}
¥{{item.realityServiceMoney}}.00
+¥{{item.unitPrice}}.00/{{item.unit}}
数量:{{item.serviceNum}} @@ -77,7 +78,7 @@
From 2da46e90e1e4ca1a1e01101aca9ab4496faa4663 Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Fri, 16 Dec 2022 10:56:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=93=B6=E5=86=9C-=E9=93=B6=E8=A1=8C?=
=?UTF-8?q?=E8=BD=AC=E8=B4=A6=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=87=8D=E6=96=B0?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bankAgriculture/paymentApproval/approvalModify.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index d803d79c..e0c4c509 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -406,6 +406,9 @@
templateList:[],
};
},
+ activated:function(){
+ this.getDictionaries();
+ },
created() {
let queryParams={
pageNum: 1,
@@ -444,7 +447,6 @@
this.payerOptions[index].value = res.id;
})
});
- this.getDictionaries();
this.getFileList();
},
methods: {
@@ -471,7 +473,6 @@
},
getDictionaries(){
getTransfer(this.$route.query.id).then((response) => {
-
this.getDicts("capital_expenditure_type").then((res) => {
for (var i = 0; i < res.data.length; i++) {
this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
From 699e4c9c9f45cf573979c2dac39561e6c4e00268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 16 Dec 2022 13:17:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1+=E9=93=B6?=
=?UTF-8?q?=E5=86=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/agriculturalTrusteeship/index.js | 13 +-
.../socialization/bill.vue | 125 ++++++++++------
.../socialization/billDetail.vue | 28 +++-
.../socialization/billOrder.vue | 136 ++++++++++--------
.../socialization/index.vue | 15 +-
src/views/yinnong/doneCompleted/completed.vue | 4 +-
src/views/yinnong/doneCompleted/done.vue | 4 +-
src/views/yinnong/workbench.vue | 4 +-
src/views/yinnongLogin.vue | 8 +-
static/images/onlineHome/banner_01.png | Bin 36685 -> 35579 bytes
static/images/onlineHome/banner_02.png | Bin 35390 -> 36815 bytes
static/images/onlineHome/banner_03.png | Bin 36600 -> 37568 bytes
static/images/onlineHome/yinnongLogo1.png | Bin 0 -> 71662 bytes
13 files changed, 207 insertions(+), 130 deletions(-)
create mode 100644 static/images/onlineHome/yinnongLogo1.png
diff --git a/src/api/agriculturalTrusteeship/index.js b/src/api/agriculturalTrusteeship/index.js
index c7af7e29..75a7865d 100644
--- a/src/api/agriculturalTrusteeship/index.js
+++ b/src/api/agriculturalTrusteeship/index.js
@@ -280,6 +280,17 @@ export function supplyorderReject(id) {
})
}
+// 接单
+export function supplyorderFinish(id) {
+ return request({
+ url: '/depositm/supplyorder/finish/'+id,
+ headers: {
+ "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID')
+ },
+ method: 'post',
+ })
+}
+
//订单列表
export function supplyorderList(query) {
return request({
@@ -295,7 +306,7 @@ export function supplyorderList(query) {
//服务组织订单统计
export function orderStatistics(query) {
return request({
- url: '/depositm/entity/orderStatistics',
+ url: '/depositm/supplyorder/orderStatistics',
headers: {
"ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID')
},
diff --git a/src/views/agriculturalTrusteeship/socialization/bill.vue b/src/views/agriculturalTrusteeship/socialization/bill.vue
index b66de3e3..8d2d52f1 100644
--- a/src/views/agriculturalTrusteeship/socialization/bill.vue
+++ b/src/views/agriculturalTrusteeship/socialization/bill.vue
@@ -7,7 +7,7 @@
-
+
@@ -65,11 +65,12 @@
{{item.contractionName}}
¥{{item.realityServiceMoney}}.00
+¥{{item.unitPrice}}.00/{{item.unit}}
数量:{{item.serviceNum}} @@ -77,7 +78,7 @@
筛选
全套服务
-灌溉
-除草
-播种
+ + + + + + + + + +{{item.dictName}}
-施肥
-时间
2021年11月
+{{startOrderAt}}
- -2021年11月
+{{endOrderAt}}
确定
-取消
-重置
+确定
+取消
+重置
接单
-拒单
-商品信息
-{{supplyDemand.productType}}
-服务
-商品信息
+{{supplyDemand.productType}}
+服务
+{{supplyDemand.contractionName}}
-¥{{supplyDemand.unitPrice}}.00/{{supplyDemand.unit}}
-{{supplyDemand.contractionName}}
+¥{{supplyDemand.unitPrice}}.00/{{supplyDemand.unit}}
买家信息
-买家信息
订单信息
-订单信息
接单
-拒单
+接单
+拒单
{{item.productType}}
服务
@@ -25,11 +25,12 @@{{item.contractionName}}
¥{{item.realityServiceMoney}}.00
+¥{{item.unitPrice}}.00/{{item.unit}}
数量:{{item.serviceNum}} @@ -37,7 +38,7 @@