大托管问题修改

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')
     },

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)
   },

src/views/agriculturalTrusteeship/buyer/allBill.vue

@@ -59,12 +59,15 @@
           </div>
 <!--          $router.push({name:'agriculturalTrusteeshipBillDetail2',query:{id:item.id}})-->
           <div class="main_content_right_list_center" @click="goDetail(item.orderStatus,item.id)">
-            <img v-if="item.supplyDemand!=null" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <template v-if="item.supplyDemand!=null">
+              <img v-if="item.supplyDemand.supplyMasterMap" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+              <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
+            </template>
             <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.demandName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.realityServiceMoney}}</span>.00</p>
+                <p>￥<span>{{item.realityServiceMoney == null ? item.countMoney:item.realityServiceMoney}}</span>.00</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
@@ -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){

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( "," );

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( "," );

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){

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){

src/views/agriculturalTrusteeship/buyer/evaluate.vue

@@ -28,9 +28,9 @@
 
 
         <div class="main_content_right_list">
-          <van-field label="实际服务数量" v-model="supplyDemand.realityServiceNum" :border="false" input-align="right" placeholder="实际服务数量" />
-          <van-field label="实际服务费用" v-model="supplyDemand.realityServiceMoney" :border="false" input-align="right" placeholder="实际服务费用" />
-          <van-field label="服务评分" v-model="supplyDemand.serviceScore" :border="false" input-align="right" placeholder="服务评分" />
+          <van-field label="实际服务数量" type="number" v-model="supplyDemand.realityServiceNum" :border="false" input-align="right" placeholder="实际服务数量" />
+          <van-field label="实际服务费用" type="number" v-model="supplyDemand.realityServiceMoney" :border="false" input-align="right" placeholder="实际服务费用" />
+          <van-field label="服务评分" type="number" v-model="supplyDemand.serviceScore" :border="false" input-align="right" placeholder="服务评分" />
           <van-field label="服务评价" v-model="supplyDemand.serviceAssess" :border="false" input-align="right" placeholder="服务评价" />
         </div>
 

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 @@
             </van-tabs>
           </div>
           <div class="main_content_right_nav" v-if="activeKey!=0">
-            <p v-for="(item,index) in productListChildren" :key="index">{{item.dictName}}</p>
+            <p :class="{'active':query.productType == item.id}" @click="tabChange(item.id)" v-for="(item,index) in productListChildren" :key="index">{{item.dictName}}</p>
           </div>
 
           <van-list
@@ -149,7 +149,7 @@
         main_content_right_header_tit:'全套服务',
         query:{
           entityId:'',
-          serviceDeptId:'187',
+          serviceDeptId:'',
           productType:'',
           supplyDemandName:''
         },
@@ -160,7 +160,7 @@
         phonenumber:'',
         searchInput:'',
         deptOptions:[],
-        deptName:'张村',
+        deptName:'',
         showDeptId:false,
         villageValue : '',
         hcAreaInfoFieldName: {
@@ -188,6 +188,8 @@
       treeselect().then(res=>{
         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{

src/views/agriculturalTrusteeship/buyer/placeOrder.vue

@@ -21,7 +21,11 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img :src="supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <template v-if="supplyDemand!=null">
+              <img v-if="supplyDemand.supplyMasterMap" :src="supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+              <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
+            </template>
+            <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{supplyDemand.supplyDemandName}}</p>
               <div class="tab">
@@ -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;
         });
       },

src/views/agriculturalTrusteeship/buyer/waitBill.vue

@@ -25,12 +25,15 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img v-if="item.supplyDemand!=null" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <template v-if="item.supplyDemand!=null">
+              <img v-if="item.supplyDemand.supplyMasterMap" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+              <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
+            </template>
             <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.demandName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
+                <p>￥<span>{{item.countMoney}}</span>.00</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
@@ -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);

src/views/agriculturalTrusteeship/index.vue

@@ -52,7 +52,18 @@
     <div class="main">
       <div class="main_header">
         <p>社会化服务产品</p>
-        <p>河东河西村</p>
+        <p @click="showDeptId = true">{{deptName}}</p>
+        <van-popup v-model="showDeptId" position="bottom" get-container="body">
+          <van-cascader
+            v-model="villageValue"
+            title="请选择"
+            :options="deptOptions"
+            @close="showDeptId = false"
+            @change="onConfirmDept"
+            active-color="#1989fa"
+            :field-names="hcAreaInfoFieldName"
+          />
+        </van-popup>
       </div>
       <div class="search">
         <img src="../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
@@ -112,7 +123,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productTypes, supplyDemandList} from "@/api/agriculturalTrusteeship";
+  import {productTypes, supplyDemandList, treeselect} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipIndex",
     data() {
@@ -128,10 +139,20 @@
         main_content_right_header_tit:'全套服务',
         query:{
           entityId:'',
+          serviceDeptId:'',
           productType:'',
           supplyDemandName:''
         },
         searchInput:'',
+        deptOptions:[],
+        deptName:'点击选择服务区域',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
@@ -141,6 +162,14 @@
       productTypes(query).then(response => {
         this.productList = response.data;
       });
+
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+          this.query.serviceDeptId = res.data[0].value;
+          this.deptName = res.data[0].label;
+        }
+      })
     },
     methods: {
       getList(){
@@ -204,6 +233,14 @@
         this.supplyDemandListYes=[];
         this.getList();
       },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        this.query.serviceDeptId = selectedOptions[selectedOptions.length-1].value;
+        this.deptName = selectedOptions[selectedOptions.length-1].label;
+        // this.showDeptId = false;
+        this.supplyDemandListYes = [];
+        this.getList();
+      },
     },
   }
 </script>

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();

src/views/agriculturalTrusteeship/login.vue

@@ -11,7 +11,7 @@
       </div>
       <div class="tit">
         <p>大托管服务中心</p>
-        <p>{{loginType=='mj'?'买家':loginType=='fwzz'?'社会化服务组织':loginType=='bxjg'?'保险机构':loginType=='dkjg'?'贷款机构':loginType=='ndjg'?'农担机构':''}}登录注册</p>
+        <p>{{loginType=='mj'?'买家':loginType=='fwzz'?'社会化服务组织':loginType=='bxjg'?'保险机构':loginType=='dkjg'?'贷款机构':loginType=='ndjg'?'农担机构':''}}登录{{loginType!='mj'?'注册':''}}</p>
       </div>
     </div>
     <!--  头部结束  -->
@@ -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结束处

src/views/agriculturalTrusteeship/socialization/bill.vue

@@ -67,7 +67,11 @@
           </div>
 
           <div class="main_content_right_list_center" @click="$router.push({name:'agriculturalTrusteeshipSocializationBillDetail',query:{id:item.id}})">
-            <img v-if="item.supplyDemand.supplyMasterMap" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+
+            <template v-if="item.supplyDemand!=null">
+              <img v-if="item.supplyDemand.supplyMasterMap" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+              <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
+            </template>
             <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.contractionName}}</p>
@@ -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){

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( "," );

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){

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);
             }

src/views/agriculturalTrusteeship/socialization/project.vue

@@ -37,7 +37,7 @@
                   </van-tabs>
                 </div>
                 <div class="main_content_right_nav" v-if="activeKey!=0">
-                  <p v-for="(item,index) in productListChildren" :key="index">{{item.dictName}}</p>
+                  <p :class="{'active':query.productType == item.id}" @click="tabChange(item.id)" v-for="(item,index) in productListChildren" :key="index">{{item.dictName}}</p>
                 </div>
 
                 <van-list
@@ -341,6 +341,13 @@
         this.query2.supplyDemandName = this.searchInput;
         this.getList();
       },
+
+      tabChange(val){
+        this.query.productType = val;
+        this.supplyDemandListYes=[];
+        this.getList();
+      },
+
     },
   }
 </script>
@@ -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{

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 = [];

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( "," );

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"
           >
             <div class="content" v-for="(item,index) in serviceList" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectList',query:{id:item.id,entityName:item.entityName}})">
 
+              <div class="boxParents" v-if="item.modelSocietyType != '非'">
+                <p>{{item.modelSocietyType}}</p>
+                <div class='box'></div>
+                <div class='box2'></div>
+                <div class='box3'></div>
+              </div>
+
               <div class="tt_box">
                 <p class="content_tt">{{item.entityName}}</p>
                 <div class="tab_box">
@@ -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;

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){