diff --git a/src/views/agriculturalTrusteeship/index.vue b/src/views/agriculturalTrusteeship/index.vue index 6d3fa497..52411453 100644 --- a/src/views/agriculturalTrusteeship/index.vue +++ b/src/views/agriculturalTrusteeship/index.vue @@ -127,7 +127,7 @@ productList:[], main_content_right_header_tit:'全套服务', query:{ - entityId:Cookies.get('ACCESS-SESSION-ID'), + entityId:'', productType:'', supplyDemandName:'' }, diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue index a29834bc..40171e56 100644 --- a/src/views/agriculturalTrusteeship/login.vue +++ b/src/views/agriculturalTrusteeship/login.vue @@ -100,248 +100,250 @@ - +

提交审核

+ diff --git a/src/views/agriculturalTrusteeship/shop/shopEdit.vue b/src/views/agriculturalTrusteeship/shop/shopEdit.vue index cc149167..0c1e3050 100644 --- a/src/views/agriculturalTrusteeship/shop/shopEdit.vue +++ b/src/views/agriculturalTrusteeship/shop/shopEdit.vue @@ -12,22 +12,24 @@ -
- + +
+ - + - + - -
- + +
+ +
-
-
-

发布

-
+
+

发布

+
+
diff --git a/src/views/agriculturalTrusteeship/socialization/bill.vue b/src/views/agriculturalTrusteeship/socialization/bill.vue index 290f0431..79af68a7 100644 --- a/src/views/agriculturalTrusteeship/socialization/bill.vue +++ b/src/views/agriculturalTrusteeship/socialization/bill.vue @@ -22,6 +22,7 @@ @@ -30,6 +31,7 @@ @@ -104,8 +106,8 @@

{{item.dictName}}

-

全部

-

{{itemChild.dictName}}

+

全部

+

{{itemChild.dictName}}

@@ -188,7 +190,7 @@ startOrderAt :this.format(new Date(),'yyyy-MM'), endOrderAt :this.format(new Date(),'yyyy-MM'), orderStatus :'', - productTypeStr:'' + productType:'' }, startOrderAt:this.format(new Date(),'yyyy年MM月'), endOrderAt:this.format(new Date(),'yyyy年MM月'), @@ -216,14 +218,7 @@ tree:true } productTypes(query2).then(response => { - response.data.map(res=>{ - console.log(res.children) - // res.children.map(rr=>{ - // rr.active = false; - // }) - this.productList2.push(response.data); - }) - // this.productList2 = response.data; + this.productList2 = response.data; }); this.getDicts("crop_type").then(response => { this.cropTypeOptions = response.data; @@ -256,8 +251,8 @@ }, onConfirmStar(data){ this.supplyDemandList = []; - this.params.startOrderAt = this.format(data,'yyyy-mm'); - this.query.startOrderAt = this.format(data,'yyyy-mm'); + this.params.startOrderAt = this.format(data,'yyyy-MM'); + this.query.startOrderAt = this.format(data,'yyyy-MM'); this.startOrderAt = this.format(data,'yyyy年MM月'); this.startTimeShow = false; orderStatistics(this.params).then(response => { @@ -267,8 +262,8 @@ }, onConfirmEnd(data){ this.supplyDemandList = []; - this.params.endOrderAt = this.format(data,'yyyy-mm'); - this.query.endOrderAt = this.format(data,'yyyy-mm'); + this.params.endOrderAt = this.format(data,'yyyy-MM'); + this.query.endOrderAt = this.format(data,'yyyy-MM'); this.endOrderAt = this.format(data,'yyyy年MM月'); this.endTimeShow = false; orderStatistics(this.params).then(response => { @@ -287,8 +282,11 @@ startOrderAt :this.format(new Date(),'yyyy-MM'), endOrderAt :this.format(new Date(),'yyyy-MM'), orderStatus :'', - productTypeStr:'' + productType:'' } + + this.params.startOrderAt = this.format(new Date(),'yyyy-MM'); + this.startOrderAt = this.format(new Date(),'yyyy年MM月'); }, goSearch(){ this.supplyDemandList = []; diff --git a/src/views/agriculturalTrusteeship/socialization/billOrder.vue b/src/views/agriculturalTrusteeship/socialization/billOrder.vue index f56a9472..793d843d 100644 --- a/src/views/agriculturalTrusteeship/socialization/billOrder.vue +++ b/src/views/agriculturalTrusteeship/socialization/billOrder.vue @@ -21,7 +21,11 @@
- + +

{{supplyDemand.contractionName}}

@@ -54,7 +58,7 @@ - +
@@ -90,7 +94,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; @@ -109,13 +113,13 @@ 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.countMoney = response.data.unitPrice*response.data.serviceNum; + + 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/socialization/draft.vue b/src/views/agriculturalTrusteeship/socialization/draft.vue index fb26b62b..dc181bad 100644 --- a/src/views/agriculturalTrusteeship/socialization/draft.vue +++ b/src/views/agriculturalTrusteeship/socialization/draft.vue @@ -188,7 +188,7 @@ } .name{ color: #334281; - margin-left: auto; + /*margin-left: auto;*/ padding:0 0 0 15PX; background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center } diff --git a/src/views/agriculturalTrusteeship/socialization/index.vue b/src/views/agriculturalTrusteeship/socialization/index.vue index 2781c561..750b2763 100644 --- a/src/views/agriculturalTrusteeship/socialization/index.vue +++ b/src/views/agriculturalTrusteeship/socialization/index.vue @@ -30,7 +30,7 @@

{{item.contractionName}}

-

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

+

￥{{item.countMoney}}.00

数量：{{item.serviceNum}} @@ -99,7 +99,7 @@ created() { let query = { parentId : null, - tree:true + tree:false } productTypes(query).then(response => { this.productList = response.data; @@ -123,6 +123,7 @@ 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; + res.countMoney = res.unitPrice * res.serviceNum; this.supplyDemandList.push(res); } this.supplyDemandList1.push(res); diff --git a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue index b79cfd5c..eb790819 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.entityName}}{{supplyDemand.createTime}}

@@ -181,6 +181,13 @@ color: #4E7FFF; background: url("../../../../static/images/agriculturalTrusteeship/index/name_icon.png") no-repeat left center; padding-left: 18PX; + display: flex; + span{ + color: #334281; + margin-left: auto; + padding:0 0 0 18PX; + background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center + } } .tab{ display: flex; diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue index e046ea34..efa08a4f 100644 --- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue +++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue @@ -203,7 +203,11 @@ this.supplyDemand.publishStatus = publishStatus; supplyDemandEdit(this.supplyDemand).then((res) => { if(res.code=="200"){ - this.$notify({ type: 'success', message: '发布成功' }); + if (publishStatus == '3'){ + this.$notify({ type: 'success', message: '发布成功' }); + }else{ + this.$notify({ type: 'success', message: '存稿成功' }); + } setTimeout(function(){ history.back(-1); },2000) diff --git a/src/views/agriculturalTrusteeship/socialization/release.vue b/src/views/agriculturalTrusteeship/socialization/release.vue index 35edcd5d..b8237b3f 100644 --- a/src/views/agriculturalTrusteeship/socialization/release.vue +++ b/src/views/agriculturalTrusteeship/socialization/release.vue @@ -65,14 +65,15 @@ /> - - - + + + + - - + +
@@ -128,7 +129,8 @@ }, created() { let query = { - parentId : '' + parentId : '', + tree : true } let query1 = { tree : true @@ -182,7 +184,12 @@ this.supplyDemand.publishStatus = publishStatus; supplyDemandAdd(this.supplyDemand).then((res) => { if(res.code=="200"){ - this.$notify({ type: 'success', message: '发布成功' }); + if (publishStatus == '3'){ + this.$notify({ type: 'success', message: '发布成功' }); + }else{ + this.$notify({ type: 'success', message: '存稿成功' }); + } + setTimeout(function(){ history.back(-1); },2000)