From 4a430e720c29c26df01780a911405945e2359060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 28 Dec 2022 15:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agriculturalTrusteeship/buyer/allBill.vue | 2 +- .../agriculturalTrusteeship/buyer/index.vue | 2 +- .../buyer/waitBill.vue | 2 +- .../insurance/insuranceList.vue | 1 + .../insurance/insuranceProjectList.vue | 5 +- .../socialization/billDetail.vue | 6 +- .../socialization/index.vue | 13 +- .../socialization/projectDetail.vue | 3 +- .../socialization/projectEdit.vue | 53 +++--- .../socialization/release.vue | 153 +++++++++--------- .../socialization/user.vue | 2 +- .../society/societyProjectDetail.vue | 42 +++-- 12 files changed, 156 insertions(+), 128 deletions(-) diff --git a/src/views/agriculturalTrusteeship/buyer/allBill.vue b/src/views/agriculturalTrusteeship/buyer/allBill.vue index d9fb1ef9..536f01e6 100644 --- a/src/views/agriculturalTrusteeship/buyer/allBill.vue +++ b/src/views/agriculturalTrusteeship/buyer/allBill.vue @@ -180,7 +180,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue index 95c0eb1d..1977f8b0 100644 --- a/src/views/agriculturalTrusteeship/buyer/index.vue +++ b/src/views/agriculturalTrusteeship/buyer/index.vue @@ -137,7 +137,7 @@ productList:[], main_content_right_header_tit:'全套服务', query:{ - entityId:Cookies.get('ACCESS-SESSION-ID'), + entityId:'', productType:'', supplyDemandName:'' }, diff --git a/src/views/agriculturalTrusteeship/buyer/waitBill.vue b/src/views/agriculturalTrusteeship/buyer/waitBill.vue index e6ff9bc2..40ecce5d 100644 --- a/src/views/agriculturalTrusteeship/buyer/waitBill.vue +++ b/src/views/agriculturalTrusteeship/buyer/waitBill.vue @@ -96,7 +96,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue index 4f3180fd..9d605ac9 100644 --- a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue +++ b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue @@ -120,6 +120,7 @@ }, created() { this.query.financialType = this.$route.query.type; + this.query2.financialType = this.$route.query.type; if (this.$route.query.type == 3){this.tt = '农担'} if (this.$route.query.type == 2){this.tt = '保险'} if (this.$route.query.type == 1){this.tt = '贷款'} diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue index 76a811e4..970f2c70 100644 --- a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue +++ b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue @@ -76,10 +76,7 @@ if(res.sysYesNo == 'Y'){ if (res.mainImg){ let supplyMasterMap = res.mainImg.split( "," ) - res.mainImg2 = [] - supplyMasterMap.map(rr=>{ - res.mainImg2.push('/api'+rr) - }) + res.mainImg = '/api'+supplyMasterMap[0] } this.productListYes.push(res); } diff --git a/src/views/agriculturalTrusteeship/socialization/billDetail.vue b/src/views/agriculturalTrusteeship/socialization/billDetail.vue index fefbb5e5..48bbc492 100644 --- a/src/views/agriculturalTrusteeship/socialization/billDetail.vue +++ b/src/views/agriculturalTrusteeship/socialization/billDetail.vue @@ -56,7 +56,8 @@ - + + @@ -92,7 +93,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; @@ -111,6 +112,7 @@ 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; + response.data.countMoney = response.data.unitPrice*response.data.serviceNum; if (response.data.supplyDemand.supplyMasterMap){ var attachement = response.data.supplyDemand.supplyMasterMap.split( "," ); response.data.supplyDemand.supplyMasterMap = '/api' + attachement[0]; diff --git a/src/views/agriculturalTrusteeship/socialization/index.vue b/src/views/agriculturalTrusteeship/socialization/index.vue index 750b2763..47aebf44 100644 --- a/src/views/agriculturalTrusteeship/socialization/index.vue +++ b/src/views/agriculturalTrusteeship/socialization/index.vue @@ -25,7 +25,10 @@
- +

{{item.contractionName}}

@@ -116,9 +119,11 @@ supplyorderList(this.query).then(response => { response.rows.map(res=>{ if ( res.orderStatus == '1'){ - if (res.supplyDemand.supplyMasterMap){ - let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," ) - res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0] + if (res.supplyDemand){ + if (res.supplyDemand.supplyMasterMap){ + 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); diff --git a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue index eb790819..d850e251 100644 --- a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue +++ b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue @@ -23,7 +23,7 @@

销 {{supplyDemand.orderNum}}分 {{supplyDemand.orderScore}}

{{supplyDemand.supplyDemandName}}

-

{{supplyDemand.entityName}}{{supplyDemand.createTime}}

+

{{supplyDemand.entityName}}{{supplyDemand.createTime}}

@@ -108,6 +108,7 @@ supplyDemandGet(this.$route.query.id).then(response => { response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType); response.data.productType = this.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + response.data.createTime = response.data.createTime.substr(0,10) if (response.data.supplyMasterMap){ response.data.supplyMasterMapList = []; var attachement = response.data.supplyMasterMap.split( "," ); diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue index efa08a4f..c516b7c4 100644 --- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue +++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue @@ -12,6 +12,7 @@ +
@@ -43,28 +44,29 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -87,9 +89,10 @@
-

发布

-

存稿

+

发布

+

存稿

+
@@ -130,7 +133,7 @@ value: 'id', children: 'children', }, - + publishStatus:'' }; }, created() { @@ -200,7 +203,7 @@ submitForm(publishStatus){ this.supplyDemand.supplyMasterMap = this.supplyMasterMapArr.join(',') this.supplyDemand.supplyDemandType = '1'; - this.supplyDemand.publishStatus = publishStatus; + this.supplyDemand.publishStatus = this.publishStatus; supplyDemandEdit(this.supplyDemand).then((res) => { if(res.code=="200"){ if (publishStatus == '3'){ diff --git a/src/views/agriculturalTrusteeship/socialization/release.vue b/src/views/agriculturalTrusteeship/socialization/release.vue index b8237b3f..d12969c0 100644 --- a/src/views/agriculturalTrusteeship/socialization/release.vue +++ b/src/views/agriculturalTrusteeship/socialization/release.vue @@ -12,85 +12,89 @@ -
- - - - - - - +
+ + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - -
- + + + + + + + + + + + + +
+ +
-
-
- - - - -
+
+ + + + +
-
-

发布

-

存稿

-
+
+

发布

+

存稿

+
+
@@ -125,6 +129,7 @@ value: 'id', children: 'children', }, + publishStatus:'' }; }, created() { @@ -181,7 +186,7 @@ submitForm(publishStatus){ this.supplyDemand.supplyMasterMap = this.supplyMasterMapArr.join(',') this.supplyDemand.supplyDemandType = '1'; - this.supplyDemand.publishStatus = publishStatus; + this.supplyDemand.publishStatus = this.publishStatus; supplyDemandAdd(this.supplyDemand).then((res) => { if(res.code=="200"){ if (publishStatus == '3'){ diff --git a/src/views/agriculturalTrusteeship/socialization/user.vue b/src/views/agriculturalTrusteeship/socialization/user.vue index d427e0f0..522f39c1 100644 --- a/src/views/agriculturalTrusteeship/socialization/user.vue +++ b/src/views/agriculturalTrusteeship/socialization/user.vue @@ -2,7 +2,7 @@
-
+

退出登录

diff --git a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue index 04ace279..401327cb 100644 --- a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue +++ b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue @@ -23,7 +23,7 @@

销 {{supplyDemand.orderNum}}分 {{supplyDemand.orderScore}}

{{supplyDemand.supplyDemandName}}

-

{{supplyDemand.entityName}}{{supplyDemand.createTime.substr(0,10)}}

+

{{supplyDemand.entityName}}{{supplyDemand.createTime}}

@@ -41,9 +41,15 @@
- + -
@@ -68,8 +74,11 @@ active: 0, loading: false, finished: false, - center: { lng: 122.089726, lat: 37.540728 }, //经纬度 - zoom: 15, //地图展示级别 + center: { + lng :'', + lat :'', + }, //经纬度 + zoom: 1, //地图展示级别 showDialog:false, supplyDemand:{}, productType:'', @@ -90,17 +99,12 @@ }, created() { let query = { - parentId : '' - } - let query1 = { - tree : true + parentId : '', + tree : false } productTypes(query).then(response => { this.productList = response.data; }); - productTypes(query1).then(response => { - this.productList1 = response.data; - }); this.getDicts("newBusinessEntity_statistics_project").then(response => { for (var i = 0; i < response.data.length; i++) { this.projectTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}); @@ -113,14 +117,23 @@ getDetail(){ supplyDemandGet(this.$route.query.id).then(response => { response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType); - response.data.productType = this.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + response.data.createTime = response.data.createTime.substr(0,10); + response.data.supplyMasterMapList = []; + if (response.data.theGeom){ + console.log(JSON.parse(response.data.theGeom).coordinates[0]) + console.log(JSON.parse(response.data.theGeom).coordinates[1]) + this.center.lng = JSON.parse(response.data.theGeom).coordinates[0]; + this.center.lat = JSON.parse(response.data.theGeom).coordinates[1]; + } 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); }) + }else{ + response.data.supplyMasterMapList.push('../../../../static/images/agriculturalTrusteeship/zwtp.png') } this.supplyDemand = response.data; }); @@ -131,6 +144,7 @@