From 4ad139d0537be921ec1169e6ffc5030fe56e26b4 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, 6 Jan 2023 17:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buyer/billDetail.vue | 36 +++++++- .../buyer/billDetail2.vue | 36 +++++++- .../buyer/billDetail3.vue | 36 +++++++- .../buyer/billDetail4.vue | 38 +++++++- .../buyer/placeOrder.vue | 90 ++++++++++++------- .../socialization/billDetail.vue | 34 ++++++- .../socialization/billOrder.vue | 34 ++++++- .../society/societyProjectDetail.vue | 3 +- 8 files changed, 253 insertions(+), 54 deletions(-) diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail.vue b/src/views/agriculturalTrusteeship/buyer/billDetail.vue index aab5aea0..746f742e 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail.vue @@ -36,7 +36,26 @@ - + + + + + +
@@ -59,7 +78,8 @@ - + +
@@ -81,7 +101,7 @@ active: 0, loading: false, finished: false, - show:true, + show:false, activeNames:[], cropTypeOptions:[], orderStatusOptions:[], @@ -106,10 +126,20 @@ this.getDetail(); }, methods: { + showDialog() { + this.show = true;// 显示确认对话框 + }, + contact() { + const a = document.createElement("a"); + a.href = "tel:8888410" + a.click(); + this.show = false; + }, getDetail(){ supplyorderGet(this.$route.query.id).then(response => { response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus); + response.data.countMoney = response.data.unitPrice*response.data.serviceNum; var that = this ; setTimeout(function () { response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue b/src/views/agriculturalTrusteeship/buyer/billDetail2.vue index 1fedf4fe..32056a33 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail2.vue @@ -35,7 +35,26 @@ - + + + + + +
@@ -59,7 +78,8 @@ - + +
@@ -84,7 +104,7 @@ active: 0, loading: false, finished: false, - show:true, + show:false, activeNames:[], cropTypeOptions:[], orderStatusOptions:[], @@ -109,10 +129,20 @@ this.getDetail(); }, methods: { + showDialog() { + this.show = true;// 显示确认对话框 + }, + contact() { + const a = document.createElement("a"); + a.href = "tel:8888410" + a.click(); + this.show = false; + }, getDetail(){ supplyorderGet(this.$route.query.id).then(response => { response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus); + response.data.countMoney = response.data.unitPrice*response.data.serviceNum; var that = this ; setTimeout(function () { response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue b/src/views/agriculturalTrusteeship/buyer/billDetail3.vue index 167956b8..5c011e1e 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail3.vue @@ -36,7 +36,26 @@ - + + + + + +
@@ -71,7 +90,8 @@ - + +
@@ -92,7 +112,7 @@ active: 0, loading: false, finished: false, - show:true, + show:false, activeNames:[], cropTypeOptions:[], orderStatusOptions:[], @@ -117,10 +137,20 @@ this.getDetail(); }, methods: { + showDialog() { + this.show = true;// 显示确认对话框 + }, + contact() { + const a = document.createElement("a"); + a.href = "tel:8888410" + a.click(); + this.show = false; + }, getDetail(){ supplyorderGet(this.$route.query.id).then(response => { response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus); + response.data.countMoney = response.data.unitPrice*response.data.serviceNum; var that = this ; setTimeout(function () { response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue b/src/views/agriculturalTrusteeship/buyer/billDetail4.vue index 6b4d58fe..46c676f1 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail4.vue @@ -17,7 +17,7 @@

商品信息

-

{supplyDemand.productType}}

+

{{supplyDemand.productType}}

服务

@@ -36,7 +36,26 @@
- + + + + + +
@@ -59,7 +78,8 @@ - + +
@@ -80,7 +100,7 @@ active: 0, loading: false, finished: false, - show:true, + show:false, activeNames:[], cropTypeOptions:[], orderStatusOptions:[], @@ -105,10 +125,20 @@ this.getDetail(); }, methods: { + showDialog() { + this.show = true;// 显示确认对话框 + }, + contact() { + const a = document.createElement("a"); + a.href = "tel:8888410" + a.click(); + this.show = false; + }, getDetail(){ supplyorderGet(this.$route.query.id).then(response => { response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus); + response.data.countMoney = response.data.unitPrice*response.data.serviceNum; var that = this ; setTimeout(function () { response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; diff --git a/src/views/agriculturalTrusteeship/buyer/placeOrder.vue b/src/views/agriculturalTrusteeship/buyer/placeOrder.vue index fe9a29fa..134fc422 100644 --- a/src/views/agriculturalTrusteeship/buyer/placeOrder.vue +++ b/src/views/agriculturalTrusteeship/buyer/placeOrder.vue @@ -35,7 +35,17 @@ - + + + +
@@ -81,29 +91,38 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - +
@@ -161,14 +173,14 @@ loading: false, finished: false, showfwht: false, - show:true, + show:false, orderAt:new Date(), showOrderAt: false, serviceAt:new Date(), showServiceAt: false, activeNames:[], supplyDemand:{ - + numUnit:'亩' }, projectTypeOptions:[], productList:[], @@ -211,6 +223,15 @@ this.getDetail(); }, methods: { + showDialog() { + this.show = true;// 显示确认对话框 + }, + contact() { + const a = document.createElement("a"); + a.href = "tel:8888410" + a.click(); + this.show = false; + }, getDetail(){ supplyDemandGet(this.$route.query.id).then(response => { response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType); @@ -226,13 +247,16 @@ response.data.serviceAt = this.format(new Date(),'yyyy-MM-dd'); response.data.orderAt = this.format(new Date(),'yyyy-MM-dd'); this.supplyDemand = response.data; + this.supplyDemand.numUnit = '亩'; }); }, onConfirmFwht(val){ + console.log(val) this.contractionName = val.contractionName; this.supplyDemand.fwhtId = val.id; this.cropType = this.selectDictLabel(this.cropTypeOptions, val.cropType); this.supplyDemand.cropType = val.cropType; + this.supplyDemand.serviceNum = val.cropArea; this.showfwht = false; }, onConfirmOrderAt(data){ diff --git a/src/views/agriculturalTrusteeship/socialization/billDetail.vue b/src/views/agriculturalTrusteeship/socialization/billDetail.vue index 1e7b9e36..40b9d3b5 100644 --- a/src/views/agriculturalTrusteeship/socialization/billDetail.vue +++ b/src/views/agriculturalTrusteeship/socialization/billDetail.vue @@ -33,7 +33,26 @@ - + + + + + +
@@ -56,7 +75,7 @@ - +
@@ -82,7 +101,7 @@ active: 0, loading: false, finished: false, - show:true, + show:false, activeNames:[], cropTypeOptions:[], orderStatusOptions:[], @@ -107,6 +126,15 @@ this.getDetail(); }, methods: { + showDialog() { + this.show = true;// 显示确认对话框 + }, + contact() { + const a = document.createElement("a"); + a.href = "tel:8888410" + a.click(); + this.show = false; + }, getDetail(){ supplyorderGet(this.$route.query.id).then(response => { response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); diff --git a/src/views/agriculturalTrusteeship/socialization/billOrder.vue b/src/views/agriculturalTrusteeship/socialization/billOrder.vue index 7c51eab6..7d20472b 100644 --- a/src/views/agriculturalTrusteeship/socialization/billOrder.vue +++ b/src/views/agriculturalTrusteeship/socialization/billOrder.vue @@ -35,7 +35,26 @@ - + + + + + +
@@ -58,7 +77,7 @@ - +
@@ -83,7 +102,7 @@ active: 0, loading: false, finished: false, - show:true, + show:false, activeNames:[], cropTypeOptions:[], orderStatusOptions:[], @@ -108,6 +127,15 @@ this.getDetail(); }, methods: { + showDialog() { + this.show = true;// 显示确认对话框 + }, + contact() { + const a = document.createElement("a"); + a.href = "tel:8888410" + a.click(); + this.show = false; + }, getDetail(){ supplyorderGet(this.$route.query.id).then(response => { response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); diff --git a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue index 7c3e7eb2..a9a98786 100644 --- a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue +++ b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue @@ -47,7 +47,6 @@ @@ -260,7 +259,7 @@ .footer{ display: flex; - justify-content: space-between; + justify-content: center; align-items: center; background: #ffffff; position: fixed;