From 2e8766a037d6b608a8a294ef2517cdd3e3d1e237 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, 30 Dec 2022 16:27:37 +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 --- src/api/agriculturalTrusteeship/index.js | 2 +- src/router/index.js | 4 ++ .../agriculturalTrusteeship/buyer/allBill.vue | 14 +++- .../buyer/billDetail.vue | 8 ++- .../buyer/billDetail2.vue | 7 +- .../buyer/billDetail3.vue | 7 +- .../buyer/billDetail4.vue | 7 +- .../buyer/evaluate.vue | 6 +- .../agriculturalTrusteeship/buyer/index.vue | 26 +++++-- .../buyer/placeOrder.vue | 14 +++- .../buyer/waitBill.vue | 21 ++++-- src/views/agriculturalTrusteeship/index.vue | 41 +++++++++++- .../insurance/insuranceList.vue | 13 ++-- src/views/agriculturalTrusteeship/login.vue | 12 ++-- .../socialization/bill.vue | 19 ++++-- .../socialization/billDetail.vue | 5 +- .../socialization/billOrder.vue | 7 +- .../socialization/index.vue | 5 +- .../socialization/project.vue | 17 ++++- .../socialization/projectDetail.vue | 5 +- .../socialization/projectEdit.vue | 5 +- .../society/societyList.vue | 67 +++++++++++++++++-- .../society/societyProjectDetail.vue | 5 +- 23 files changed, 256 insertions(+), 61 deletions(-) diff --git a/src/api/agriculturalTrusteeship/index.js b/src/api/agriculturalTrusteeship/index.js index f2a29509..26bf2a62 100644 --- a/src/api/agriculturalTrusteeship/index.js +++ b/src/api/agriculturalTrusteeship/index.js @@ -225,7 +225,7 @@ export function supplyDemandEdit(data) { // 评价 export function supplyComment(data) { return request({ - url: '/deposit/supplyorder/comment', + url: '/entity/supplyorder/comment', headers: { "ACCESS-SESSION-ID": Cookies.get('ACCESS-SESSION-ID') }, diff --git a/src/router/index.js b/src/router/index.js index d20b43f4..9bc39a11 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4606,6 +4606,7 @@ export const constantRoutes = [ meta: { title: '农业大托管', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/agriculturalTrusteeship/index'], resolve) }, @@ -4624,6 +4625,7 @@ export const constantRoutes = [ meta: { title: '保险服务', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/agriculturalTrusteeship/insurance/insuranceList'], resolve) }, @@ -4651,6 +4653,7 @@ export const constantRoutes = [ meta: { title: '社会化服务', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/agriculturalTrusteeship/society/societyList'], resolve) }, @@ -4833,6 +4836,7 @@ export const constantRoutes = [ meta: { title: '买家选购', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/agriculturalTrusteeship/buyer/index'], resolve) }, diff --git a/src/views/agriculturalTrusteeship/buyer/allBill.vue b/src/views/agriculturalTrusteeship/buyer/allBill.vue index 536f01e6..9b92e611 100644 --- a/src/views/agriculturalTrusteeship/buyer/allBill.vue +++ b/src/views/agriculturalTrusteeship/buyer/allBill.vue @@ -59,12 +59,15 @@
- +

{{item.demandName}}

-

￥{{item.realityServiceMoney}}.00

+

￥{{item.realityServiceMoney == null ? item.countMoney:item.realityServiceMoney}}.00

数量：{{item.serviceNum}} @@ -203,7 +206,12 @@ } 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; + var that = this ; + setTimeout(function () { + res.productType = that.productList.filter(function (e) { return e.id == res.productType; })[0].dictName; + },1000) + + res.countMoney = res.unitPrice*res.serviceNum; this.supplyDemandList.push(res); }) if(this.supplyDemandList.length >= response.total){ diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail.vue b/src/views/agriculturalTrusteeship/buyer/billDetail.vue index c8aa3304..aab5aea0 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail.vue @@ -92,7 +92,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; @@ -110,8 +110,10 @@ 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.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; - response.data.updateTime = response.data.updateTime.substr(0,10); + var that = this ; + setTimeout(function () { + response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) if (response.data.supplyDemand!=null){ if (response.data.supplyDemand.supplyMasterMap){ var attachement = response.data.supplyDemand.supplyMasterMap.split( "," ); diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue b/src/views/agriculturalTrusteeship/buyer/billDetail2.vue index f62ed216..1fedf4fe 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail2.vue @@ -95,7 +95,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; @@ -113,7 +113,10 @@ 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.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) if (response.data.supplyDemand!=null){ if (response.data.supplyDemand.supplyMasterMap){ var attachement = response.data.supplyDemand.supplyMasterMap.split( "," ); diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue b/src/views/agriculturalTrusteeship/buyer/billDetail3.vue index b72e0d5e..167956b8 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail3.vue @@ -103,7 +103,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; @@ -121,7 +121,10 @@ 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.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) response.data.updateTime = response.data.updateTime.substr(0,10); if (response.data.supplyDemand!=null){ if (response.data.supplyDemand.supplyMasterMap){ diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue b/src/views/agriculturalTrusteeship/buyer/billDetail4.vue index e9b40920..6b4d58fe 100644 --- a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue +++ b/src/views/agriculturalTrusteeship/buyer/billDetail4.vue @@ -91,7 +91,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; @@ -109,7 +109,10 @@ 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.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) response.data.updateTime = response.data.updateTime.substr(0,10); if (response.data.supplyDemand!=null){ if (response.data.supplyDemand.supplyMasterMap){ diff --git a/src/views/agriculturalTrusteeship/buyer/evaluate.vue b/src/views/agriculturalTrusteeship/buyer/evaluate.vue index 716dbbdd..4c950641 100644 --- a/src/views/agriculturalTrusteeship/buyer/evaluate.vue +++ b/src/views/agriculturalTrusteeship/buyer/evaluate.vue @@ -28,9 +28,9 @@

- - - + + +
diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue index 94f15205..5124379c 100644 --- a/src/views/agriculturalTrusteeship/buyer/index.vue +++ b/src/views/agriculturalTrusteeship/buyer/index.vue @@ -62,7 +62,7 @@ title="请选择" :options="deptOptions" @close="showDeptId = false" - @finish="onConfirmDept" + @change="onConfirmDept" active-color="#1989fa" :field-names="hcAreaInfoFieldName" /> @@ -90,7 +90,7 @@
-

{{item.dictName}}

+

{{item.dictName}}

{ if (res.code == 200) { this.deptOptions = res.data; + this.query.serviceDeptId = res.data[0].value; + this.deptName = res.data[0].label; } }) }, @@ -250,7 +252,11 @@ this.supplyDemandListYes = []; this.getList(); }, - + tabChange(val){ + this.query.productType = val; + this.supplyDemandListYes=[]; + this.getList(); + }, openMain(){ $('#topMain').attr('none'); }, @@ -258,7 +264,7 @@ onConfirmDept({ selectedOptions }){ this.query.serviceDeptId = selectedOptions[selectedOptions.length-1].value; this.deptName = selectedOptions[selectedOptions.length-1].label; - this.showDeptId = false + // this.showDeptId = false this.supplyDemandListYes = []; this.getList(); }, @@ -429,13 +435,19 @@ } .main_content_right_nav{ display: flex; - justify-content: space-between; + flex-wrap: wrap; margin-top: 2vh; p{ padding: 5PX 10PX; background: #F5F5F5; color: #8F8F8F; border-radius: 4PX; + margin-right: 10PX; + margin-bottom: 10PX; + &.active{ + background: #E2E9FD; + color: #1B5DEA; + } } } .main_content_right_list{ diff --git a/src/views/agriculturalTrusteeship/buyer/placeOrder.vue b/src/views/agriculturalTrusteeship/buyer/placeOrder.vue index 2725c8eb..fe9a29fa 100644 --- a/src/views/agriculturalTrusteeship/buyer/placeOrder.vue +++ b/src/views/agriculturalTrusteeship/buyer/placeOrder.vue @@ -21,7 +21,11 @@
- + +

{{supplyDemand.supplyDemandName}}

@@ -164,6 +168,7 @@ showServiceAt: false, activeNames:[], supplyDemand:{ + }, projectTypeOptions:[], productList:[], @@ -209,12 +214,17 @@ getDetail(){ supplyDemandGet(this.$route.query.id).then(response => { response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType); - this.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + that.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) if (response.data.supplyMasterMap){ var attachement = response.data.supplyMasterMap.split( "," ); response.data.supplyMasterMap = '/api' + attachement[0]; } response.data.serviceNum = 1; + response.data.serviceAt = this.format(new Date(),'yyyy-MM-dd'); + response.data.orderAt = this.format(new Date(),'yyyy-MM-dd'); this.supplyDemand = response.data; }); }, diff --git a/src/views/agriculturalTrusteeship/buyer/waitBill.vue b/src/views/agriculturalTrusteeship/buyer/waitBill.vue index 40ecce5d..6fc38329 100644 --- a/src/views/agriculturalTrusteeship/buyer/waitBill.vue +++ b/src/views/agriculturalTrusteeship/buyer/waitBill.vue @@ -25,12 +25,15 @@
- +

{{item.demandName}}

-

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

+

￥{{item.countMoney}}.00

数量：{{item.serviceNum}} @@ -113,13 +116,19 @@ supplyorderList(this.query).then(response => { response.rows.map(res=>{ if ( res.orderStatus == '1'){ - if (res.supplyDemand!=null){ - 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); - res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + res.productType = that.productList.filter(function (e) { return e.id == res.productType; })[0].dictName; + },1000) + res.countMoney = res.unitPrice*res.serviceNum; this.supplyDemandList.push(res); } this.supplyDemandList1.push(res); diff --git a/src/views/agriculturalTrusteeship/index.vue b/src/views/agriculturalTrusteeship/index.vue index 52411453..0f9f63cd 100644 --- a/src/views/agriculturalTrusteeship/index.vue +++ b/src/views/agriculturalTrusteeship/index.vue @@ -52,7 +52,18 @@

社会化服务产品

-

河东河西村

+

{{deptName}}

+ + +
@@ -112,7 +123,7 @@ diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue index 18f0e124..7d3ca428 100644 --- a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue +++ b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue @@ -13,7 +13,7 @@ title="请选择" :options="deptOptions" @close="showDeptId = false" - @finish="onConfirmDept" + @change="onConfirmDept" active-color="#1989fa" :field-names="hcAreaInfoFieldName" /> @@ -117,20 +117,20 @@ main_content_right_header_tit:'全套服务', query:{ entityId:'', - serviceDeptId:'187', + serviceDeptId:'', entityName:'', productType:'' }, query2:{ productName :'', - serviceDeptId:'187', + serviceDeptId:'', orderByColumn:'order_score' }, searchServiceInput:'', searchInput:'', tt:'', deptOptions:[], - deptName:'张村', + deptName:'', showDeptId:false, villageValue : '', hcAreaInfoFieldName: { @@ -150,6 +150,9 @@ treeselect().then(res=>{ if (res.code == 200) { this.deptOptions = res.data; + this.query.serviceDeptId = res.data[0].value; + this.query2.serviceDeptId = res.data[0].value; + this.deptName = res.data[0].label; } }) }, @@ -244,7 +247,7 @@ this.query.serviceDeptId = selectedOptions[selectedOptions.length-1].value; this.query2.serviceDeptId = selectedOptions[selectedOptions.length-1].value; this.deptName = selectedOptions[selectedOptions.length-1].label; - this.showDeptId = false + // this.showDeptId = false this.supplyDemandListYes = []; this.serviceList = []; this.getServiceList(); diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue index 9680e2fd..c66c7ca8 100644 --- a/src/views/agriculturalTrusteeship/login.vue +++ b/src/views/agriculturalTrusteeship/login.vue @@ -11,7 +11,7 @@

大托管服务中心

-

{{loginType=='mj'?'买家':loginType=='fwzz'?'社会化服务组织':loginType=='bxjg'?'保险机构':loginType=='dkjg'?'贷款机构':loginType=='ndjg'?'农担机构':''}}登录注册

+

{{loginType=='mj'?'买家':loginType=='fwzz'?'社会化服务组织':loginType=='bxjg'?'保险机构':loginType=='dkjg'?'贷款机构':loginType=='ndjg'?'农担机构':''}}登录{{loginType!='mj'?'注册':''}}

@@ -269,7 +269,7 @@ title="请选择主体属地" :options="deptOptions" @close="showDeptId = false" - @finish="onConfirmDept" + @change="onConfirmDept" active-color="#1989fa" :field-names="hcAreaInfoFieldName" /> @@ -738,7 +738,8 @@ this.mainImgUploader2.splice(detail.index,1); }, goRegister(){ - console.log(this.loginType) + console.log(this.entityForm) + return; if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg'){ this.serviceForm.mainImg = this.mainImgArr.join(','); this.serviceForm.username = encrypt(this.serviceForm.username); @@ -783,9 +784,10 @@ }, //选择案件属地 onConfirmDept({ selectedOptions }){ - this.entityForm.deptId = selectedOptions[selectedOptions.length-1].value; + this.entityForm.serviceDeptId = selectedOptions[selectedOptions.length-1].value; + this.entityForm.serviceDeptName = selectedOptions[selectedOptions.length-1].label; this.deptName = selectedOptions[selectedOptions.length-1].label; - this.showDeptId = false + // this.showDeptId = false }, //methods结束处 diff --git a/src/views/agriculturalTrusteeship/socialization/bill.vue b/src/views/agriculturalTrusteeship/socialization/bill.vue index 79af68a7..e050c270 100644 --- a/src/views/agriculturalTrusteeship/socialization/bill.vue +++ b/src/views/agriculturalTrusteeship/socialization/bill.vue @@ -67,7 +67,11 @@
- + +

{{item.contractionName}}

@@ -231,13 +235,18 @@ getList(){ supplyorderList(this.query).then(response => { response.rows.map(res=>{ - 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); - res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + res.productType = that.productList.filter(function (e) { return e.id == res.productType; })[0].dictName; + },1000) this.supplyDemandList.push(res); }) if(this.supplyDemandList.length >= response.total){ diff --git a/src/views/agriculturalTrusteeship/socialization/billDetail.vue b/src/views/agriculturalTrusteeship/socialization/billDetail.vue index 48bbc492..1e7b9e36 100644 --- a/src/views/agriculturalTrusteeship/socialization/billDetail.vue +++ b/src/views/agriculturalTrusteeship/socialization/billDetail.vue @@ -111,7 +111,10 @@ 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.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) response.data.countMoney = response.data.unitPrice*response.data.serviceNum; if (response.data.supplyDemand.supplyMasterMap){ var attachement = response.data.supplyDemand.supplyMasterMap.split( "," ); diff --git a/src/views/agriculturalTrusteeship/socialization/billOrder.vue b/src/views/agriculturalTrusteeship/socialization/billOrder.vue index 793d843d..7c51eab6 100644 --- a/src/views/agriculturalTrusteeship/socialization/billOrder.vue +++ b/src/views/agriculturalTrusteeship/socialization/billOrder.vue @@ -112,7 +112,12 @@ 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.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) + + response.data.countMoney = response.data.unitPrice*response.data.serviceNum; if (response.data.supplyDemand!=null){ diff --git a/src/views/agriculturalTrusteeship/socialization/index.vue b/src/views/agriculturalTrusteeship/socialization/index.vue index 47aebf44..796aa34b 100644 --- a/src/views/agriculturalTrusteeship/socialization/index.vue +++ b/src/views/agriculturalTrusteeship/socialization/index.vue @@ -127,7 +127,10 @@ } 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; + var that = this ; + setTimeout(function () { + res.productType = that.productList.filter(function (e) { return e.id == res.productType; })[0].dictName; + },1000) res.countMoney = res.unitPrice * res.serviceNum; this.supplyDemandList.push(res); } diff --git a/src/views/agriculturalTrusteeship/socialization/project.vue b/src/views/agriculturalTrusteeship/socialization/project.vue index ed4bb51a..28055045 100644 --- a/src/views/agriculturalTrusteeship/socialization/project.vue +++ b/src/views/agriculturalTrusteeship/socialization/project.vue @@ -37,7 +37,7 @@
-

{{item.dictName}}

+

{{item.dictName}}

@@ -549,13 +556,19 @@ } .main_content_right_nav{ display: flex; - justify-content: space-between; + flex-wrap: wrap; margin-top: 2vh; p{ padding: 5PX 10PX; background: #F5F5F5; color: #8F8F8F; border-radius: 4PX; + margin-right: 10PX; + margin-bottom: 10PX; + &.active{ + background: #E2E9FD; + color: #1B5DEA; + } } } .main_content_right_list{ diff --git a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue index d850e251..d007c1c8 100644 --- a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue +++ b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue @@ -107,7 +107,10 @@ 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; + var that = this ; + setTimeout(function () { + response.data.productType = that.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) response.data.createTime = response.data.createTime.substr(0,10) if (response.data.supplyMasterMap){ response.data.supplyMasterMapList = []; diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue index 7d829b97..093c24e9 100644 --- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue +++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue @@ -190,7 +190,10 @@ getDetail(){ supplyDemandGet(this.$route.query.id).then(response => { this.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType); - this.productType = this.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + that.productType = that.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) if (response.data.supplyMasterMap){ response.data.supplyMasterMapList = []; var attachement = response.data.supplyMasterMap.split( "," ); diff --git a/src/views/agriculturalTrusteeship/society/societyList.vue b/src/views/agriculturalTrusteeship/society/societyList.vue index ddcc1d18..c6528cad 100644 --- a/src/views/agriculturalTrusteeship/society/societyList.vue +++ b/src/views/agriculturalTrusteeship/society/societyList.vue @@ -13,7 +13,7 @@ title="请选择" :options="deptOptions" @close="showDeptId = false" - @finish="onConfirmDept" + @change="onConfirmDept" active-color="#1989fa" :field-names="hcAreaInfoFieldName" /> @@ -35,10 +35,18 @@ v-model="loading1" :finished="finished1" finished-text="没有更多了" + :immediate-check="false" @load="getServiceList" >
+
+

{{item.modelSocietyType}}

+
+
+
+
+

{{item.entityName}}

@@ -148,23 +156,24 @@ serviceList:[], productListYes:[], financialTypeOptions:[], + modelSocietyTypeOptions:[], productListChildren:[], main_content_right_header_tit:'全套服务', query:{ entityId:'', - serviceDeptId:'187', + serviceDeptId:'', entityName:'', productType:'' }, query2:{ supplyDemandName:'', - serviceDeptId:'187', + serviceDeptId:'', orderByColumn:'order_score' }, searchServiceInput:'', searchInput:'', deptOptions:[], - deptName:'张村', + deptName:'', showDeptId:false, villageValue : '', hcAreaInfoFieldName: { @@ -178,6 +187,9 @@ this.getDicts("Industrial_classification_type").then(response => { this.financialTypeOptions = response.data; }); + this.getDicts("model_society_type").then(response => { + this.modelSocietyTypeOptions = response.data; + }); let query = { parentId : 0 } @@ -188,6 +200,11 @@ treeselect().then(res=>{ if (res.code == 200) { this.deptOptions = res.data; + this.query.serviceDeptId = res.data[0].value; + this.query2.serviceDeptId = res.data[0].value; + this.deptName = res.data[0].label; + this.serviceList = []; + this.getServiceList(); } }) }, @@ -196,6 +213,8 @@ detailList(this.query).then(response => { response.rows.map(res=>{ res.industryClassificationType = this.selectDictLabel(this.financialTypeOptions, res.industryClassificationType); + var modelSocietyType = this.selectDictLabel(this.modelSocietyTypeOptions, res.modelSocietyType); + res.modelSocietyType = modelSocietyType.substr(0,modelSocietyType.length-3) if (res.masterMap){ let supplyMasterMap = res.masterMap.split( "," ) res.masterMap2 = [] @@ -280,7 +299,7 @@ this.query.serviceDeptId = selectedOptions[selectedOptions.length-1].value; this.query2.serviceDeptId = selectedOptions[selectedOptions.length-1].value; this.deptName = selectedOptions[selectedOptions.length-1].label; - this.showDeptId = false + // this.showDeptId = false this.supplyDemandListYes = []; this.serviceList = []; this.getServiceList(); @@ -293,6 +312,43 @@ .home_wrapper{ height: 100vh; background: #ffffff; +} +.boxParents{ + position: absolute; + top: -21PX; + transform: rotateZ(45deg); + right: -58PX; + p{ + position: absolute; + top: 37PX; + left: 54PX; + color: #fff; + z-index: 9; + } +} +.box,.box3 +{ + width:0px; + height:0px; + display:inline-block; + border-top:50px solid rgba(0,0,0,0); + border-right:50px solid rgba(0,0,0,0); + border-bottom:50px solid #FF5E00; + border-left:50px solid rgba(0,0,0,0); + margin-bottom:10px; +} +.box2 +{ + width:25PX; + height:25PX; + background-color:#FF5E00; + display:inline-block; +} +.box{ + transform: translate(56px,10px); +} +.box3{ + transform: translate(-54px,10px); } /*头部*/ .header{ @@ -359,6 +415,7 @@ border-radius: 10PX; margin-top: 2vh; padding: 1.5vh 4%; + position: relative; .content_tt{ font-size: .35rem; margin-bottom: 1vh; diff --git a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue index 401327cb..99f27a43 100644 --- a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue +++ b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue @@ -117,7 +117,10 @@ getDetail(){ supplyDemandGet(this.$route.query.id).then(response => { response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType); - response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + var that = this ; + setTimeout(function () { + response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName; + },1000) response.data.createTime = response.data.createTime.substr(0,10); response.data.supplyMasterMapList = []; if (response.data.theGeom){