From 9399bee519403e183dd07cb9efe48c947b9aa158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Mon, 19 Dec 2022 10:28:05 +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 --- src/api/agriculturalTrusteeship/index.js | 23 ++ .../agriculturalTrusteeship/buyer/allBill.vue | 46 ++- .../buyer/billDetail.vue | 76 +++-- .../buyer/billDetail2.vue | 20 +- .../buyer/billDetail3.vue | 31 +- .../buyer/billDetail4.vue | 74 +++-- .../agriculturalTrusteeship/buyer/index.vue | 99 +++--- .../buyer/waitBill.vue | 19 +- src/views/agriculturalTrusteeship/index.vue | 6 +- .../insurance/insuranceList.vue | 12 +- .../insurance/insuranceProjectList.vue | 1 + src/views/agriculturalTrusteeship/login.vue | 8 +- .../socialization/bill.vue | 28 +- .../socialization/billDetail.vue | 22 +- .../socialization/index.vue | 8 +- .../socialization/user.vue | 52 +++- .../socialization/userEdit.vue | 281 ++++++++++++++++-- 17 files changed, 607 insertions(+), 199 deletions(-) diff --git a/src/api/agriculturalTrusteeship/index.js b/src/api/agriculturalTrusteeship/index.js index 75a7865d..f2a29509 100644 --- a/src/api/agriculturalTrusteeship/index.js +++ b/src/api/agriculturalTrusteeship/index.js @@ -326,6 +326,17 @@ export function supplyorderGet(id) { }) } +//服务组织详情 +export function entityGet(id) { + return request({ + url: '/depositm/entity/get/'+id, + headers: { + "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID') + }, + method: 'get', + }) +} + //服务合同 export function fwhtList(query) { return request({ @@ -349,3 +360,15 @@ export function placeOrder(data) { data: data }) } + +//下单 +export function entityEdit(data) { + return request({ + url: '/depositm/entity/edit', + headers: { + "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID') + }, + method: 'post', + data: data + }) +} diff --git a/src/views/agriculturalTrusteeship/buyer/allBill.vue b/src/views/agriculturalTrusteeship/buyer/allBill.vue index 8f26e2c9..18442fe4 100644 --- a/src/views/agriculturalTrusteeship/buyer/allBill.vue +++ b/src/views/agriculturalTrusteeship/buyer/allBill.vue @@ -4,8 +4,8 @@
@@ -35,8 +35,8 @@ /> @@ -59,11 +59,12 @@
- + +
-

{{item.contractionName}}

+

{{item.demandName}}

-

{{item.realityServiceMoney}}.00

+

{{item.unitPrice}}.00/{{item.unit}}

数量:{{item.serviceNum}} @@ -71,9 +72,9 @@

- - - + + + @@ -172,12 +173,13 @@ startOrderAt:this.format(new Date(),'yyyy-MM'), endOrderAt:this.format(new Date(),'yyyy-MM'), }, - content:'' + content:'', + searchInput:'' }; }, created() { let query = { - parentId : 0, + parentId : null, tree:true } productTypes(query).then(response => { @@ -194,6 +196,11 @@ getList(){ supplyorderList(this.query).then(response => { response.rows.map(res=>{ + // console.log(res.supplyDemand.supplyMasterMap) + if (res.supplyDemand!=null){ + let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," ) + res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0] + } res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType); res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus); res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName; @@ -209,6 +216,7 @@ }); }, onConfirmStar(data){ + this.supplyDemandList=[]; this.params.startOrderAt = this.format(data,'yyyy-mm'); this.query.startOrderAt = this.format(data,'yyyy-mm'); this.startOrderAt = this.format(data,'yyyy年MM月'); @@ -219,6 +227,7 @@ this.getList(); }, onConfirmEnd(data){ + this.supplyDemandList=[]; this.params.endOrderAt = this.format(data,'yyyy-mm'); this.query.endOrderAt = this.format(data,'yyyy-mm'); this.endOrderAt = this.format(data,'yyyy年MM月'); @@ -238,6 +247,19 @@ if (type == '已拒单'){ this.$router.push({name:'agriculturalTrusteeshipBillDetail4',query:{id:id}}) } + if (type == '已下单'){ + this.$router.push({name:'agriculturalTrusteeshipBillDetail',query:{id:id}}) + } + }, + tabChange(val){ + this.query.orderStatus = val; + this.supplyDemandList=[]; + this.getList(); + }, + goSearch(){ + this.supplyDemandList = []; + this.query.demandName = this.searchInput; + this.getList(); }, openDialog(val){ this.showDialog = val diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail.vue b/src/views/agriculturalTrusteeship/buyer/billDetail.vue index 51e414f3..c8aa3304 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail.vue @@ -16,22 +16,27 @@

商品信息

-

灌溉

+

{{supplyDemand.productType}}

服务

- + +
-

如果只有一行就空着啊啊啊啊啊啊啊啊啊啊啊啊

+

{{supplyDemand.demandName}}

-

165,836,365.00/亩

+

{{supplyDemand.unitPrice}}.00/{{supplyDemand.unit}}

- - - + + + +
@@ -39,9 +44,9 @@

买家信息

- - - + + +
@@ -49,13 +54,14 @@

订单信息

- - - - - - - + + + + + + + + @@ -65,6 +71,7 @@ diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue b/src/views/agriculturalTrusteeship/buyer/billDetail2.vue index 10730703..f62ed216 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail2.vue @@ -21,7 +21,11 @@
- + +

{{supplyDemand.contractionName}}

@@ -90,7 +94,7 @@ }, created() { let query = { - parentId : 0, + parentId : null, tree:true } productTypes(query).then(response => { @@ -110,13 +114,11 @@ response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus); response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; - if (response.data.supplyMasterMap){ - response.data.supplyMasterMapList = []; - var attachement = response.data.supplyMasterMap.split( "," ); - this.supplyMasterMapArr = response.data.supplyMasterMap.split( "," ); - attachement.forEach(responseAttach=>{ - response.data.supplyMasterMapList.push('/api' + responseAttach); - }) + if (response.data.supplyDemand!=null){ + if (response.data.supplyDemand.supplyMasterMap){ + var attachement = response.data.supplyDemand.supplyMasterMap.split( "," ); + response.data.supplyDemand.supplyMasterMap = '/api' + attachement[0]; + } } this.supplyDemand = response.data; }); diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue b/src/views/agriculturalTrusteeship/buyer/billDetail3.vue index 61ff8ffd..b72e0d5e 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail3.vue @@ -13,7 +13,7 @@
-

已评分评分时间:{{supplyDemand.updateTime.substr(0,10)}}

+

已评分评分时间:{{supplyDemand.updateTime}}

商品信息

@@ -22,17 +22,21 @@
- + +
-

{{supplyDemand.contractionName}}

+

{{supplyDemand.demandName}}

{{supplyDemand.unitPrice}}.00/{{supplyDemand.unit}}

- - - + + +
@@ -98,7 +102,7 @@ }, created() { let query = { - parentId : 0, + parentId : null, tree:true } productTypes(query).then(response => { @@ -118,13 +122,12 @@ response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType); response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus); response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; - if (response.data.supplyMasterMap){ - response.data.supplyMasterMapList = []; - var attachement = response.data.supplyMasterMap.split( "," ); - this.supplyMasterMapArr = response.data.supplyMasterMap.split( "," ); - attachement.forEach(responseAttach=>{ - response.data.supplyMasterMapList.push('/api' + responseAttach); - }) + response.data.updateTime = response.data.updateTime.substr(0,10); + if (response.data.supplyDemand!=null){ + if (response.data.supplyDemand.supplyMasterMap){ + var attachement = response.data.supplyDemand.supplyMasterMap.split( "," ); + response.data.supplyDemand.supplyMasterMap = '/api' + attachement[0]; + } } this.supplyDemand = response.data; }); diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue b/src/views/agriculturalTrusteeship/buyer/billDetail4.vue index 101be4f3..e9b40920 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail4.vue @@ -17,22 +17,26 @@

商品信息

-

灌溉

+

{supplyDemand.productType}}

服务

- + +
-

如果只有一行就空着啊啊啊啊啊啊啊啊啊啊啊啊

+

{{supplyDemand.demandName}}

-

165,836,365.00/亩

+

{{supplyDemand.unitPrice}}.00/{{supplyDemand.unit}}

- - - + + +
@@ -40,9 +44,9 @@

买家信息

- - - + + +
@@ -50,13 +54,13 @@

订单信息

- - - - - - - + + + + + + +
@@ -66,6 +70,7 @@ diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue index e98d34da..4d3425b7 100644 --- a/src/views/agriculturalTrusteeship/buyer/index.vue +++ b/src/views/agriculturalTrusteeship/buyer/index.vue @@ -1,54 +1,56 @@