Merge remote-tracking branch 'origin/master'

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

src/views/agriculturalTrusteeship/buyer/allBill.vue

@@ -4,8 +4,8 @@
     <div class="header">
       <div class="search">
         <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
-        <input type="text" placeholder="输入需求进行搜索" />
-        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" />
+        <input type="text" placeholder="输入需求进行搜索" v-model="searchInput"/>
+        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" @click="goSearch" />
       </div>
 <!--      <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" alt="" @click="show = true;">-->
     </div>
@@ -35,8 +35,8 @@
         />
       </van-popup>
       <div class="nav_list">
-        <p class="active">全部</p>
-        <p v-for="(item,index) in orderStatusOptions" :key="index">{{item.dictLabel}}</p>
+        <p :class="{'active':query.orderStatus == ''}" @click="tabChange('')">全部</p>
+        <p :class="{'active':query.orderStatus == item.dictValue}" @click="tabChange(item.dictValue)" v-for="(item,index) in orderStatusOptions" :key="index">{{item.dictLabel}}</p>
       </div>
     </div>
     <!--  导航结束  -->
@@ -59,11 +59,12 @@
           </div>
 <!--          $router.push({name:'agriculturalTrusteeshipBillDetail2',query:{id:item.id}})-->
           <div class="main_content_right_list_center" @click="goDetail(item.orderStatus,item.id)">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="item.supplyDemand!=null" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <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>
+              <p class="tt">{{item.demandName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.realityServiceMoney}}</span>.00</p>
+                <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
@@ -71,9 +72,9 @@
               </p>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="item.bookName" />
-          <van-cell title="联系人" :border="false" :value="item.linkera" />
-          <van-cell title="联系电话" :border="false" :value="item.phonea" />
+          <van-cell title="卖方名称" :border="false" :value="item.entityName" />
+          <van-cell title="联系人" :border="false" :value="item.linker" />
+          <van-cell title="联系电话" :border="false" :value="item.supplyDemandTal" />
         </div>
 <!--        <div class="main_content_right_list">-->
 <!--          <div class="main_content_right_list_header">-->
@@ -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

src/views/agriculturalTrusteeship/buyer/billDetail.vue

@@ -16,22 +16,27 @@
         <div class="main_content_right_list">
           <div class="main_content_right_list_header">
             <p class="on">商品信息</p>
-            <p>灌溉</p>
+            <p>{{supplyDemand.productType}}</p>
             <p>服务</p>
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <template v-if="supplyDemand.supplyDemand!=null">
+              <img v-if="supplyDemand.supplyDemand.supplyMasterMap" :src="supplyDemand.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">如果只有一行就空着啊啊啊啊啊啊啊啊啊啊啊啊</p>
+              <p class="tt">{{supplyDemand.demandName}}</p>
               <div class="tab">
-                <p>￥<span>165,836,365</span>.00/亩</p>
+                <p>￥<span>{{supplyDemand.unitPrice}}</span>.00/{{supplyDemand.unit}}</p>
               </div>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" value="张三李四联合合作社" />
-          <van-cell title="联系人" :border="false" value="林晓春" />
-          <van-cell title="联系电话" :border="false" value="165 8874 0311" />
+
+          <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
+          <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
+          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
         </div>
 
         <div class="main_content_right_list">
@@ -39,9 +44,9 @@
             <p class="on">买家信息</p>
           </div>
 
-          <van-cell title="联系人" :border="false" value="张三李四联合合作社" />
-          <van-cell title="联系电话" :border="false" value="林晓春" />
-          <van-cell title="服务地点" :border="false" value="165 8874 0311" />
+          <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
+          <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
+          <van-cell title="服务地点" :border="false" :value="supplyDemand.serviceAddress" />
         </div>
 
         <div class="main_content_right_list">
@@ -49,13 +54,14 @@
             <p class="on">订单信息</p>
           </div>
 
-          <van-cell title="服务合同" :border="false" value="请输入产品名称" />
-          <van-cell title="服务作物" :border="false" value="请输入产品类型" />
-          <van-cell title="下单时间" :border="false" value="请输入二级分类" />
-          <van-cell title="服务时间" :border="false" value="请输入产品规格" />
-          <van-cell title="服务数量" :border="false" value="请输入所属主体" />
-          <van-cell title="成交金额" :border="false" value="请输入单价" />
-          <van-cell title="备注" :border="false" value="请输入数量" />
+          <van-cell title="服务合同" :border="false" :value="supplyDemand.contractionName" />
+          <van-cell title="服务作物" :border="false" :value="supplyDemand.cropType" />
+          <van-cell title="下单时间" :border="false" :value="supplyDemand.orderAt" />
+          <van-cell title="服务时间" :border="false" :value="supplyDemand.serviceAt" />
+          <van-cell title="服务数量" :border="false" :value="supplyDemand.serviceNum" />
+          <van-cell title="成交金额" :border="false" :value="supplyDemand.realityServiceMoney" />
+          <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
+
         </div>
 
     </div>
@@ -65,6 +71,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import {productTypes, supplyorderGet} from "@/api/agriculturalTrusteeship";
 
   export default {
     name: "agriculturalTrusteeshipIndex",
@@ -76,13 +83,44 @@
         finished: false,
         show:true,
         activeNames:[],
+        cropTypeOptions:[],
+        orderStatusOptions:[],
+        productList:[],
+        supplyDemand:{}
       };
     },
     created() {
-
+      let query = {
+        parentId : null,
+        tree:true
+      }
+      productTypes(query).then(response => {
+        this.productList = response.data;
+      });
+      this.getDicts("crop_type").then(response => {
+        this.cropTypeOptions = response.data;
+      });
+      this.getDicts("service_order_status").then(response => {
+        this.orderStatusOptions = response.data;
+      });
+      this.getDetail();
     },
     methods: {
-
+      getDetail(){
+        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);
+          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;
+        });
+      },
     },
   }
 </script>

src/views/agriculturalTrusteeship/buyer/billDetail2.vue

@@ -21,7 +21,11 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <template v-if="supplyDemand.supplyDemand!=null">
+              <img v-if="supplyDemand.supplyDemand.supplyMasterMap" :src="supplyDemand.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.contractionName}}</p>
               <div class="tab">
@@ -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;
         });

src/views/agriculturalTrusteeship/buyer/billDetail3.vue

@@ -13,7 +13,7 @@
     <!--  内容开始  -->
     <div class="main">
 
-        <p class="type">已评分<span>评分时间：{{supplyDemand.updateTime.substr(0,10)}}</span></p>
+        <p class="type">已评分<span>评分时间：{{supplyDemand.updateTime}}</span></p>
         <div class="main_content_right_list first">
           <div class="main_content_right_list_header">
             <p class="on">商品信息</p>
@@ -22,17 +22,21 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <template v-if="supplyDemand.supplyDemand!=null">
+              <img v-if="supplyDemand.supplyDemand.supplyMasterMap" :src="supplyDemand.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.contractionName}}</p>
+              <p class="tt">{{supplyDemand.demandName}}</p>
               <div class="tab">
                 <p>￥<span>{{supplyDemand.unitPrice}}</span>.00/{{supplyDemand.unit}}</p>
               </div>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="supplyDemand.bookName" />
-          <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
+          <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
+          <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
+          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
         </div>
 
         <div class="main_content_right_list">
@@ -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;
         });

src/views/agriculturalTrusteeship/buyer/billDetail4.vue

@@ -17,22 +17,26 @@
         <div class="main_content_right_list first">
           <div class="main_content_right_list_header">
             <p class="on">商品信息</p>
-            <p>灌溉</p>
+            <p>{supplyDemand.productType}}</p>
             <p>服务</p>
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <template v-if="supplyDemand.supplyDemand!=null">
+              <img v-if="supplyDemand.supplyDemand.supplyMasterMap" :src="supplyDemand.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">如果只有一行就空着啊啊啊啊啊啊啊啊啊啊啊啊</p>
+              <p class="tt">{{supplyDemand.demandName}}</p>
               <div class="tab">
-                <p>￥<span>165,836,365</span>.00/亩</p>
+                <p>￥<span>{{supplyDemand.unitPrice}}</span>.00/{{supplyDemand.unit}}</p>
               </div>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" value="张三李四联合合作社" />
-          <van-cell title="联系人" :border="false" value="林晓春" />
-          <van-cell title="联系电话" :border="false" value="165 8874 0311" />
+          <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
+          <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
+          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
         </div>
 
         <div class="main_content_right_list">
@@ -40,9 +44,9 @@
             <p class="on">买家信息</p>
           </div>
 
-          <van-cell title="联系人" :border="false" value="张三李四联合合作社" />
-          <van-cell title="联系电话" :border="false" value="林晓春" />
-          <van-cell title="服务地点" :border="false" value="165 8874 0311" />
+          <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
+          <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
+          <van-cell title="服务地点" :border="false" :value="supplyDemand.serviceAddress" />
         </div>
 
         <div class="main_content_right_list">
@@ -50,13 +54,13 @@
             <p class="on">订单信息</p>
           </div>
 
-          <van-cell title="服务合同" :border="false" value="服务合同" />
-          <van-cell title="服务作物" :border="false" value="服务作物" />
-          <van-cell title="下单时间" :border="false" value="下单时间" />
-          <van-cell title="服务时间" :border="false" value="请输入产品规格" />
-          <van-cell title="服务数量" :border="false" value="请输入所属主体" />
-          <van-cell title="成交金额" :border="false" value="请输入单价" />
-          <van-cell title="备注" :border="false" value="请输入数量" />
+          <van-cell title="服务合同" :border="false" :value="supplyDemand.contractionName" />
+          <van-cell title="服务作物" :border="false" :value="supplyDemand.cropType" />
+          <van-cell title="下单时间" :border="false" :value="supplyDemand.orderAt" />
+          <van-cell title="服务时间" :border="false" :value="supplyDemand.serviceAt" />
+          <van-cell title="服务数量" :border="false" :value="supplyDemand.serviceNum" />
+          <van-cell title="成交金额" :border="false" :value="supplyDemand.realityServiceMoney" />
+          <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
         </div>
 
     </div>
@@ -66,6 +70,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import {productTypes, supplyorderGet} from "@/api/agriculturalTrusteeship";
 
   export default {
     name: "agriculturalTrusteeshipIndex",
@@ -77,13 +82,44 @@
         finished: false,
         show:true,
         activeNames:[],
+        cropTypeOptions:[],
+        orderStatusOptions:[],
+        productList:[],
+        supplyDemand:{}
       };
     },
     created() {
-
+      let query = {
+        parentId : null,
+        tree:true
+      }
+      productTypes(query).then(response => {
+        this.productList = response.data;
+      });
+      this.getDicts("crop_type").then(response => {
+        this.cropTypeOptions = response.data;
+      });
+      this.getDicts("service_order_status").then(response => {
+        this.orderStatusOptions = response.data;
+      });
+      this.getDetail();
     },
     methods: {
-
+      getDetail(){
+        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);
+          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;
+        });
+      },
     },
   }
 </script>

src/views/agriculturalTrusteeship/buyer/index.vue

@@ -1,54 +1,56 @@
 <template>
   <div class="home_wrapper">
-    <!--  头部开始  -->
-    <div class="header">
-<!--      <img :src="avatar">-->
-      <img src="../../../../static/images/agriculturalTrusteeship/index/header.png">
-      <div class="header_box" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
-        <p>{{nickName}}<span>{{phonenumber}}</span><img src="../../../../static/images/agriculturalTrusteeship/buyer/buyer_icon_01.png" alt=""></p>
-        <p>{{allDeptName}}</p>
+    <div id="topMain" class="topMain">
+      <!--  头部开始  -->
+      <div class="header">
+  <!--      <img :src="avatar">-->
+        <img v-if="avatar" :src="avatar" style="width: 50px;height: 50px;">
+        <img v-else src="../../../../static/images/agriculturalTrusteeship/index/header.png" style="width: 50px;height: 50px;">
+        <div class="header_box" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
+          <p>{{nickName}}<span>{{phonenumber}}</span><img src="../../../../static/images/agriculturalTrusteeship/buyer/buyer_icon_01.png" alt=""></p>
+          <p>{{allDeptName}}</p>
+        </div>
       </div>
-    </div>
-    <!--  头部结束  -->
+      <!--  头部结束  -->
 
-    <!--  导航开始  -->
-    <div class="nav">
-      <van-grid :column-num="4" :border="false">
-        <van-grid-item :to="{name:'agriculturalTrusteeshipSocietyList'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_01.png"/>
-          <p>社会化</p>
-        </van-grid-item>
-        <van-grid-item :to="{name:'lawEnforcementCaseStatistics'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_02.png"/>
-          <p>农担</p>
-        </van-grid-item>
-        <van-grid-item :to="{name:'lawEnforcementCaseDistributionMap'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_03.png"/>
-          <p>贷款</p>
-        </van-grid-item>
-        <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_04.png"/>
-          <p>保险</p>
-        </van-grid-item>
-      </van-grid>
+      <!--  导航开始  -->
+      <div class="nav">
+        <van-grid :column-num="4" :border="false">
+          <van-grid-item :to="{name:'agriculturalTrusteeshipSocietyList'}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_01.png"/>
+            <p>社会化</p>
+          </van-grid-item>
+          <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:3}}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_02.png"/>
+            <p>农担</p>
+          </van-grid-item>
+          <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:1}}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_03.png"/>
+            <p>贷款</p>
+          </van-grid-item>
+          <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:2}}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_04.png"/>
+            <p>保险</p>
+          </van-grid-item>
+        </van-grid>
 
-      <div class="nav_notice_box">
-        <van-notice-bar left-icon="../../../../static/images/agriculturalTrusteeship/index/notice_icon.png" mode="link" :scrollable="false" background="#E2E9FD" color="#334281">
-          <van-swipe
-            vertical
-            class="notice-swipe"
-            :autoplay="3000"
-            :show-indicators="false"
-          >
-            <van-swipe-item>12.0版本上线啦！点击查看更改内容~</van-swipe-item>
-            <van-swipe-item>12.1版本上线啦！点击查看更改内容~</van-swipe-item>
-            <van-swipe-item>12.2版本上线啦！点击查看更改内容~</van-swipe-item>
-          </van-swipe>
-        </van-notice-bar>
+        <div class="nav_notice_box">
+          <van-notice-bar left-icon="../../../../static/images/agriculturalTrusteeship/index/notice_icon.png" mode="link" :scrollable="false" background="#E2E9FD" color="#334281">
+            <van-swipe
+              vertical
+              class="notice-swipe"
+              :autoplay="3000"
+              :show-indicators="false"
+            >
+              <van-swipe-item>12.0版本上线啦！点击查看更改内容~</van-swipe-item>
+              <van-swipe-item>12.1版本上线啦！点击查看更改内容~</van-swipe-item>
+              <van-swipe-item>12.2版本上线啦！点击查看更改内容~</van-swipe-item>
+            </van-swipe>
+          </van-notice-bar>
+        </div>
       </div>
+      <!--  导航结束  -->
     </div>
-    <!--  导航结束  -->
-
     <!--  内容开始  -->
     <div class="main">
       <div class="main_header">
@@ -107,7 +109,7 @@
     </div>
     <!--  内容结束  -->
 
-    <img src="../../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc"/>
+    <img src="../../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc" @click="openMain"/>
 
     <buyer></buyer>
   </div>
@@ -220,6 +222,10 @@
         }
         this.supplyDemandListYes = [];
         this.getList();
+      },
+
+      openMain(){
+        $('#topMain').attr('none');
       }
     },
   }
@@ -234,6 +240,9 @@
     align-items: center;
     background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
     padding: 4vh 4% 2vh;
+    img{
+      border-radius: 100%;
+    }
     .header_box{
       margin-left: 4%;
       flex: 1;

src/views/agriculturalTrusteeship/buyer/waitBill.vue

@@ -25,9 +25,10 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="item.supplyDemand!=null" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <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>
+              <p class="tt">{{item.demandName}}</p>
               <div class="tab">
                 <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
               </div>
@@ -37,9 +38,9 @@
               </p>
             </div>
           </div>
-          <van-cell title="卖方名称" :border="false" :value="item.bookName" />
-          <van-cell title="联系人" :border="false" :value="item.linkera" />
-          <van-cell title="联系电话" :border="false" :value="item.phonea" />
+          <van-cell title="卖方名称" :border="false" :value="item.entityName" />
+          <van-cell title="联系人" :border="false" :value="item.linker" />
+          <van-cell title="联系电话" :border="false" :value="item.supplyDemandTal" />
         </div>
       </van-list>
 
@@ -94,7 +95,7 @@
     },
     created() {
       let query = {
-        parentId : 0,
+        parentId : null,
         tree:true
       }
       productTypes(query).then(response => {
@@ -112,9 +113,13 @@
         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]
+              }
               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.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;
               this.supplyDemandList.push(res);
             }
             this.supplyDemandList1.push(res);

src/views/agriculturalTrusteeship/index.vue

@@ -17,15 +17,15 @@
           <img src="../../../static/images/agriculturalTrusteeship/index/nav_01.png"/>
           <p>社会化</p>
         </van-grid-item>
-        <van-grid-item :to="{name:'lawEnforcementCaseStatistics'}">
+        <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:3}}">
           <img src="../../../static/images/agriculturalTrusteeship/index/nav_02.png"/>
           <p>农担</p>
         </van-grid-item>
-        <van-grid-item :to="{name:'lawEnforcementCaseDistributionMap'}">
+        <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:1}}">
           <img src="../../../static/images/agriculturalTrusteeship/index/nav_03.png"/>
           <p>贷款</p>
         </van-grid-item>
-        <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList'}">
+        <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:2}}">
           <img src="../../../static/images/agriculturalTrusteeship/index/nav_04.png"/>
           <p>保险</p>
         </van-grid-item>

src/views/agriculturalTrusteeship/insurance/insuranceList.vue

@@ -4,7 +4,7 @@
     <div class="header">
       <div class="header_left" @click="onClickLeft">
         <img src="../../../../static/images/agriculturalTrusteeship/return.png">
-        <p>保险服务</p>
+        <p>{{tt}}服务</p>
       </div>
       <p class="header_right">河东河西村</p>
     </div>
@@ -13,7 +13,7 @@
     <!--  内容开始  -->
     <div class="main">
       <van-tabs v-model="active" sticky animated>
-        <van-tab title="保险公司">
+        <van-tab :title="tt+'公司'">
           <div class="search">
             <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
             <input type="text" v-model="searchServiceInput" placeholder="输入需求进行搜索" />
@@ -47,7 +47,7 @@
           </van-list>
 
         </van-tab>
-        <van-tab title="保险产品">
+        <van-tab :title="tt+'产品'">
           <div class="search">
             <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
             <input type="text" v-model="searchInput" placeholder="输入需求进行搜索" />
@@ -115,10 +115,14 @@
         },
         searchServiceInput:'',
         searchInput:'',
+        tt:''
       };
     },
     created() {
-
+      this.query.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 = '贷款'}
     },
     methods: {
       getServiceList(){

src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue

@@ -66,6 +66,7 @@
     },
     created() {
       this.query.financialServiceId = this.$route.query.id;
+
       this.tt = this.$route.query.financialName
     },
     methods: {

src/views/agriculturalTrusteeship/login.vue

@@ -98,7 +98,7 @@
           <p class="submit_btn" v-if="loginType == 'mj'" @click="handleLogin">登录1</p>
           <p class="submit_btn" v-else @click="goLogin">登录</p>
         </van-tab>
-        <van-tab name="register" title="注册">
+        <van-tab name="register" title="注册" v-if="loginType != 'mj'">
         <!--保险机构注册-->
           <template v-if="loginType == 'bxjg' || loginType == 'dkjg' || loginType == 'ndjg'">
             <van-field v-model="serviceForm.financialName" center :border="false" placeholder="请输入机构名称" >
@@ -727,6 +727,7 @@
         this.mainImgUploader2.splice(detail.index,1);
       },
       goRegister(){
+        console.log(this.loginType)
         if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg'){
           this.serviceForm.mainImg = this.mainImgArr.join(',');
           this.serviceForm.username = encrypt(this.serviceForm.username);
@@ -736,7 +737,7 @@
             this.$notify({ type: 'success', message: '注册成功' });
             this.active = 0;
           })
-        }else if(this.loginType = 'fwzz'){
+        }else if(this.loginType == 'fwzz'){
           this.entityForm.mainImg = this.mainImgArrEntity.join(',');
           this.entityForm.userName = encrypt(this.entityForm.userName);
           this.entityForm.password = encrypt(this.entityForm.password);
@@ -745,6 +746,9 @@
             this.active = 0;
           })
         }
+        // else if(this.loginType == 'mj'){
+        //   this.registerSubmit();
+        // }
       },
       onConfirmStatisticsTypeId(data){
         this.entityForm.statisticsTypeId = data.value;

src/views/agriculturalTrusteeship/socialization/bill.vue

@@ -4,8 +4,8 @@
     <div class="header">
       <div class="search">
         <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
-        <input type="text" placeholder="输入需求进行搜索" />
-        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" />
+        <input type="text" placeholder="输入需求进行搜索" v-model="searchInput"/>
+        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" @click="goSearch" />
       </div>
       <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" alt="" @click="show = true">
     </div>
@@ -65,7 +65,7 @@
           </div>
 
           <div class="main_content_right_list_center" @click="$router.push({name:'agriculturalTrusteeshipSocializationBillDetail',query:{id:item.id}})">
-            <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <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;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.contractionName}}</p>
@@ -104,8 +104,8 @@
         <div class="selected" v-for="(item,index) in productList2" :key="index">
           <p class="on">{{item.dictName}}</p>
           <div class="options">
-            <p :class="{'active':query.productType == ''}" @click="query.productType = ''">全部</p>
-            <p :class="{'active':query.productType == itemChild.id}" @click="query.productType = itemChild.id" v-for="(itemChild,indexChild) in item.children" :key="indexChild">{{itemChild.dictName}}</p>
+            <p :class="{'active':query.productTypeStr == ''}" @click="query.productType = ''">全部</p>
+            <p :class="{'active':query.productTypeStr == itemChild.id}" @click="query.productType = itemChild.id" v-for="(itemChild,indexChild) in item.children" :key="indexChild">{{itemChild.dictName}}</p>
           </div>
         </div>
 <!--        <div class="selected">-->
@@ -188,7 +188,7 @@
           startOrderAt :this.format(new Date(),'yyyy-MM'),
           endOrderAt :this.format(new Date(),'yyyy-MM'),
           orderStatus :'',
-          productType:''
+          productTypeStr:''
         },
         startOrderAt:this.format(new Date(),'yyyy年MM月'),
         endOrderAt:this.format(new Date(),'yyyy年MM月'),
@@ -196,7 +196,8 @@
           startOrderAt:this.format(new Date(),'yyyy-MM'),
           endOrderAt:this.format(new Date(),'yyyy-MM'),
         },
-        content:''
+        content:'',
+        searchInput:''
       };
     },
     created() {
@@ -233,9 +234,9 @@
       getList(){
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
-            if (res.supplyMasterMap){
-              let supplyMasterMap = res.supplyMasterMap.split( "," )
-              res.supplyMasterMap = '/api'+supplyMasterMap[0]
+            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);
@@ -284,9 +285,14 @@
             startOrderAt :this.format(new Date(),'yyyy-MM'),
             endOrderAt :this.format(new Date(),'yyyy-MM'),
             orderStatus :'',
-            productType:''
+            productTypeStr:''
         }
       },
+      goSearch(){
+        this.supplyDemandList = [];
+        this.query.demandName = this.searchInput;
+        this.getList();
+      },
     },
   }
 </script>

src/views/agriculturalTrusteeship/socialization/billDetail.vue

@@ -21,17 +21,19 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="supplyDemand.supplyDemand!=null" :src="supplyDemand.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <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.contractionName}}</p>
+              <p class="tt">{{supplyDemand.demandName}}</p>
               <div class="tab">
                 <p>￥<span>{{supplyDemand.unitPrice}}</span>.00/{{supplyDemand.unit}}</p>
               </div>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="supplyDemand.bookName" />
-          <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
+          <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
+          <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
+          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
         </div>
 
         <div class="main_content_right_list">
@@ -109,13 +111,9 @@
           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.supplyMasterMap){
+            var attachement = response.data.supplyDemand.supplyMasterMap.split( "," );
+            response.data.supplyDemand.supplyMasterMap = '/api' + attachement[0];
           }
           this.supplyDemand = response.data;
         });

src/views/agriculturalTrusteeship/socialization/index.vue

@@ -25,7 +25,7 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <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;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.contractionName}}</p>
@@ -116,9 +116,9 @@
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
             if ( res.orderStatus == '1'){
-              if (res.supplyMasterMap){
-                let supplyMasterMap = res.supplyMasterMap.split( "," )
-                res.supplyMasterMap = '/api'+supplyMasterMap[0]
+              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);

src/views/agriculturalTrusteeship/socialization/user.vue

@@ -14,22 +14,22 @@
         <van-grid :column-num="4" :border="false">
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_01.png" alt="">
-            <p class="nav_num">3,501</p>
+            <p class="nav_num">{{content.numFinish}}</p>
             <p>已成交</p>
           </van-grid-item>
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_02.png" alt="">
-            <p class="nav_num">3,501</p>
+            <p class="nav_num">{{content.numHandling}}</p>
             <p>待处理</p>
           </van-grid-item>
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_04.png" alt="">
-            <p class="nav_num">3,501</p>
+            <p class="nav_num">{{content.numReject}}</p>
             <p>已拒单</p>
           </van-grid-item>
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_03.png" alt="">
-            <p class="nav_num" style="color: #FF5D00">3,501</p>
+            <p class="nav_num" style="color: #FF5D00">{{content.realityServiceMoney}}</p>
             <p style="color: #FF5D00">总收入</p>
           </van-grid-item>
         </van-grid>
@@ -49,13 +49,13 @@
         </van-cell>
 
         <div class="main_box" style="margin-top: 0;">
-          <van-field label="主体名称" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_01.png" :border="false" input-align="right" value="内容" />
-          <van-field label="主体类别" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_02.png" :border="false" input-align="right" value="内容" />
-          <van-field label="生产种类" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_03.png" :border="false" input-align="right" value="内容" />
-          <van-field label="成立时间" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_04.png" :border="false" input-align="right" value="内容" />
-          <van-field label="示范类型" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_05.png" :border="false" input-align="right" value="内容" />
-          <van-field label="负责人" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_06.png" :border="false" input-align="right" value="内容" />
-          <van-field label="联系电话" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_07.png" :border="false" input-align="right" value="内容" />
+          <van-field label="主体名称" v-model="entityForm.entityName" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_01.png" :border="false" input-align="right" value="内容" />
+          <van-field label="主体类别" v-model="entityForm.statisticsTypeId" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_02.png" :border="false" input-align="right" value="内容" />
+          <van-field label="生产种类" v-model="entityForm.industryClassificationType" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_03.png" :border="false" input-align="right" value="内容" />
+          <van-field label="成立时间" v-model="entityForm.registerTime" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_04.png" :border="false" input-align="right" value="内容" />
+          <van-field label="示范类型" v-model="entityForm.modelSocietyType" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_05.png" :border="false" input-align="right" value="内容" />
+          <van-field label="负责人" v-model="entityForm.principalName" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_06.png" :border="false" input-align="right" value="内容" />
+          <van-field label="联系电话" v-model="entityForm.tal" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_07.png" :border="false" input-align="right" value="内容" />
         </div>
 
         <div class="main_box">
@@ -78,6 +78,7 @@
   import Cookies from "js-cookie";
   import agr from "@/components/common/agr_footer";
   import dialogClose from "@/components/agriculturalTrusteeship/dialog";
+  import {entityGet, orderStatistics} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipInsuranceList",
     components: {
@@ -92,13 +93,38 @@
         finished: false,
         center: { lng: 122.089726, lat: 37.540728 }, //经纬度
         zoom: 15, //地图展示级别
-        showDialog:false
+        showDialog:false,
+        entityForm:{},
+        content:{},
+        statisticsTypeIdOptions:[],
+        industryClassificationTypeOptions:[],
+        modelSocietyTypeOptions:[],
       };
     },
     created() {
-
+      orderStatistics().then(response => {
+        this.content = response.data;
+      });
+      this.getDicts("newBusinessEntity_statistics_project").then(response => {
+        this.statisticsTypeIdOptions = response.data;
+      });
+      this.getDicts("Industrial_classification_type").then(response => {
+        this.industryClassificationTypeOptions = response.data;
+      });
+      this.getDicts("model_society_type").then(response => {
+        this.modelSocietyTypeOptions = response.data;
+      });
+      this.getUser();
     },
     methods: {
+      getUser(){
+        entityGet(Cookies.get('ACCESS-SESSION-ID')).then(res=>{
+          res.data.statisticsTypeId = this.selectDictLabel(this.statisticsTypeIdOptions, res.data.statisticsTypeId);
+          res.data.industryClassificationType = this.selectDictLabel(this.industryClassificationTypeOptions, res.data.industryClassificationType);
+          res.data.modelSocietyType = this.selectDictLabel(this.modelSocietyTypeOptions, res.data.modelSocietyType);
+          this.entityForm = res.data;
+        })
+      },
       openDialog(val){
         this.showDialog = val
       },

src/views/agriculturalTrusteeship/socialization/userEdit.vue

@@ -12,28 +12,141 @@
 
     <!--  内容开始  -->
     <div class="main">
-      <van-field label="主体名称" input-align="right" placeholder="请输入主体名称" />
-      <van-field label="主体类别" input-align="right" placeholder="请输入主体类别" />
-      <van-field label="生产种类" input-align="right" placeholder="请输入生产种类" />
-      <van-field label="示范类型" input-align="right" placeholder="请输入示范类型" />
-      <van-field label="主体住址" input-align="right" placeholder="请输入主体住址" />
-      <van-field label="数量" input-align="right" placeholder="请输入数量" />
-      <van-field label="成立时间" input-align="right" placeholder="请输入成立时间" />
-      <van-field label="负责人姓名" input-align="right" placeholder="请输入负责人姓名" />
-      <van-field label="联系电话" input-align="right" placeholder="请输入联系电话" />
-      <van-field label="开户银行" input-align="right" placeholder="请输入开户银行" />
-      <van-field label="银行账号" input-align="right" placeholder="请输入银行账号" />
-      <van-field label="经营土地面积(亩)" input-align="right" placeholder="请输入经营土地面积(亩)" />
-      <van-field label="成员出资总额" input-align="right" placeholder="请输入成员出资总额" />
-      <van-field label="成员个数" input-align="right" placeholder="请输入成员个数" />
-      <van-field label="非成员个数" input-align="right" placeholder="请输入非成员个数" />
-      <van-field label="带动农户数量（个）" input-align="right" placeholder="请输入带动农户数量（个）" />
-      <van-field label="网站网址" input-align="right" placeholder="请输入网站网址" />
-      <van-field label="关联账套" input-align="right" placeholder="请输入关联账套" />
-      <van-field label="服务区域" input-align="right" placeholder="请输入服务区域" />
-      <van-field label="图片" :border="false" input-align="right" placeholder="请输入图片" />
+      <van-field label="主体名称" v-model="entityForm.entityName" input-align="right" placeholder="请输入主体名称" />
+
+      <van-field
+        readonly
+        clickable
+        required
+        :rules="[{ required: true , message:'请选择主体类别'}]"
+        v-model="statisticsTypeId"
+        center
+        @click="showStatisticsTypeId = true"
+        right-icon="arrow-down"
+        placeholder="请选择主体类别"
+        label="主体类别"
+        input-align="right"
+      />
+      <van-popup v-model="showStatisticsTypeId" position="bottom" get-container="body">
+        <van-picker
+          show-toolbar
+          :columns="statisticsTypeIdOptions"
+          @confirm="onConfirmStatisticsTypeId"
+          @cancel="showStatisticsTypeId = false"
+        />
+      </van-popup>
+
+      <van-field
+        readonly
+        clickable
+        required
+        :rules="[{ required: true , message:'请选择生产种类'}]"
+        v-model="industryClassificationType"
+        center
+        @click="showIndustryClassificationType = true"
+        right-icon="arrow-down"
+        placeholder="请选择生产种类"
+        label="生产种类"
+        input-align="right"
+      />
+      <van-popup v-model="showIndustryClassificationType" position="bottom" get-container="body">
+        <van-picker
+          show-toolbar
+          :columns="industryClassificationTypeOptions"
+          @confirm="onConfirmIndustryClassificationType"
+          @cancel="showIndustryClassificationType = false"
+        />
+      </van-popup>
+
+      <van-field
+        readonly
+        clickable
+        required
+        :rules="[{ required: true , message:'请选择示范类型'}]"
+        v-model="modelSocietyType"
+        center
+        @click="showModelSocietyType = true"
+        right-icon="arrow-down"
+        placeholder="请选择示范类型"
+        label="示范类型"
+        input-align="right"
+      />
+      <van-popup v-model="showModelSocietyType" position="bottom" get-container="body">
+        <van-picker
+          show-toolbar
+          :columns="modelSocietyTypeOptions"
+          @confirm="onConfirmModelSocietyType"
+          @cancel="showModelSocietyType = false"
+        />
+      </van-popup>
+
+      <van-field label="主体住址" v-model="entityForm.entityAddress" input-align="right" placeholder="请输入主体住址" />
+<!--      <van-field label="数量" v-model="entityForm.entityName" input-align="right" placeholder="请输入数量" />-->
+
+      <van-field
+        readonly
+        clickable
+        required
+        :rules="[{ required: true , message:'请选择成立时间'}]"
+        v-model="entityForm.registerTime"
+        center
+        @click="showRegisterTime = true"
+        right-icon="arrow-down"
+        placeholder="请选择成立时间"
+        label="成立时间"
+        input-align="right"
+      />
+      <van-popup v-model="showRegisterTime" position="bottom" get-container="body">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          title="选择年月日"
+          show-toolbar
+          @confirm="onConfirmRegisterTime"
+          @cancel="showRegisterTime = false"
+        />
+      </van-popup>
+      <van-field label="负责人姓名" v-model="entityForm.principalName" input-align="right" placeholder="请输入负责人姓名" />
+      <van-field label="联系电话" v-model="entityForm.tal" input-align="right" placeholder="请输入联系电话" />
+      <van-field label="开户银行" v-model="entityForm.depositBankName" input-align="right" placeholder="请输入开户银行" />
+      <van-field label="银行账号" v-model="entityForm.accountNumber" input-align="right" placeholder="请输入银行账号" />
+      <van-field label="经营土地面积(亩)" v-model="entityForm.landArea" label-width="auto" input-align="right" placeholder="请输入经营土地面积(亩)" />
+      <van-field label="成员出资总额" v-model="entityForm.membersContributions" input-align="right" placeholder="请输入成员出资总额" />
+      <van-field label="成员个数" v-model="entityForm.manpowerNumber" input-align="right" placeholder="请输入成员个数" />
+      <van-field label="非成员个数" v-model="entityForm.nonManpowerNumber" input-align="right" placeholder="请输入非成员个数" />
+      <van-field label="带动农户数量（个）" v-model="entityForm.driveFarmers" label-width="auto" input-align="right" placeholder="请输入带动农户数量（个）" />
+      <van-field label="网站网址" v-model="entityForm.webLinks" input-align="right" placeholder="请输入网站网址" />
+<!--      <van-field label="关联账套" v-model="entityForm.bookName" input-align="right" placeholder="请输入关联账套" />-->
+
+
+      <van-field
+        readonly
+        clickable
+        required
+        :rules="[{ required: true , message:'请选择服务区域'  }]"
+        v-model="entityForm.serviceDeptName"
+        label="服务区域"
+        placeholder="请选择服务区域"
+        @click="showDeptId = true"
+        right-icon="arrow-down"
+        label-width="auto"
+        input-align="right"
+      />
+      <van-popup v-model="showDeptId" position="bottom" get-container="body">
+        <van-cascader
+          v-model="villageValue"
+          title="请选择服务区域"
+          :options="deptOptions"
+          @close="showDeptId = false"
+          @finish="onConfirmDept"
+          active-color="#1989fa"
+          :field-names="hcAreaInfoFieldName"
+        />
+      </van-popup>
+<!--      <van-field label="服务区域" v-model="entityForm.serviceDeptName" input-align="right" placeholder="请输入服务区域" />-->
+      <van-field label="图片" :border="false" input-align="right" readonly />
       <div style="padding: 0 4% 2vh;">
-        <van-uploader />
+        <van-uploader v-model="entityForm.masterMapList" :after-read="afterReadEvidenceEntityForm" :before-delete="deleteFileEvidenceEntityForm" />
       </div>
     </div>
 
@@ -45,14 +158,14 @@
     </div>
 
     <div class="main_btn">
-      <p>发布</p>
-      <p>存稿</p>
+      <p @click="submitForm">保存</p>
     </div>
     <!--  内容结束  -->
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
+  import {commonUpload, entityGet, treeselect,entityEdit} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
     data() {
@@ -63,14 +176,132 @@
         finished: false,
         center: { lng: 122.089726, lat: 37.540728 }, //经纬度
         zoom: 15, //地图展示级别
-        showDialog:false
+        showDialog:false,
+        entityForm:{},
+        content:{},
+        statisticsTypeIdOptions:[],
+        industryClassificationTypeOptions:[],
+        modelSocietyTypeOptions:[],
+        statisticsTypeIdOptions2:[],
+        industryClassificationTypeOptions2:[],
+        modelSocietyTypeOptions2:[],
+        mainImgUploader2:[],
+        mainImgArrEntity:[],
+
+        showStatisticsTypeId : false,
+        statisticsTypeId:'',
+        industryClassificationType:'',
+        showIndustryClassificationType: false,
+        modelSocietyType:'',
+        showModelSocietyType: false,
+        showRegisterTime :false,
+        currentDate:new Date(),
+        deptOptions:[],
+        deptName:'',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
+      this.getDicts("newBusinessEntity_statistics_project").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.statisticsTypeIdOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.statisticsTypeIdOptions2 = response.data;
+      });
+      this.getDicts("Industrial_classification_type").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.industryClassificationTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.industryClassificationTypeOptions2 = response.data;
+      });
+      this.getDicts("model_society_type").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.modelSocietyTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        this.modelSocietyTypeOptions2 = response.data;
+      });
 
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
+      this.getUser();
     },
     methods: {
-
+      getUser(){
+        entityGet(Cookies.get('ACCESS-SESSION-ID')).then(res=>{
+          this.statisticsTypeId = this.selectDictLabel(this.statisticsTypeIdOptions2, res.data.statisticsTypeId);
+          this.industryClassificationType = this.selectDictLabel(this.industryClassificationTypeOptions2, res.data.industryClassificationType);
+          this.modelSocietyType = this.selectDictLabel(this.modelSocietyTypeOptions2, res.data.modelSocietyType);
+          if (res.data.masterMap){
+            res.data.masterMapList = [];
+            var attachement = res.data.masterMap.split( "," );
+            this.mainImgArrEntity = res.data.masterMap.split( "," );
+            attachement.forEach(responseAttach=>{
+              res.data.masterMapList.push({
+                url:'/api' + responseAttach,
+                isImage: true
+              });
+            })
+          }
+          this.entityForm = res.data;
+        })
+      },
+      afterReadEvidenceEntityForm(file){
+        let params1 = new FormData();
+        params1.append("file", file.file);
+        commonUpload(params1).then((r1) => {
+          // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
+          this.mainImgArrEntity.push(r1.fileName)
+        })
+      },
+      deleteFileEvidenceEntityForm(file,detail) {
+        this.mainImgArrEntity.splice(detail.index,1);
+        this.entityForm.masterMapList.splice(detail.index,1);
+      },
+      onConfirmStatisticsTypeId(data){
+        this.entityForm.statisticsTypeId = data.value;
+        this.statisticsTypeId = data.text;
+        this.showStatisticsTypeId = false;
+      },
+      onConfirmIndustryClassificationType(data){
+        this.entityForm.industryClassificationType = data.value;
+        this.industryClassificationType = data.text;
+        this.showIndustryClassificationType = false;
+      },
+      onConfirmModelSocietyType(data){
+        this.entityForm.modelSocietyType = data.value;
+        this.modelSocietyType = data.text;
+        this.showModelSocietyType = false;
+      },
+      onConfirmRegisterTime(data){
+        this.currentDate = data ;
+        this.entityForm.registerTime = this.format(data,'yyyy-MM-dd')
+        this.showRegisterTime = false;
+      },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        this.entityForm.serviceDeptName = selectedOptions[selectedOptions.length-1].label;
+        this.entityForm.serviceDeptId = selectedOptions[selectedOptions.length-1].value;
+        this.deptName = selectedOptions[selectedOptions.length-1].label;
+        this.showDeptId = false
+      },
+      submitForm(){
+        this.entityForm.masterMap = this.mainImgArrEntity.join(',')
+        entityEdit(this.entityForm).then(res=>{
+          this.$notify({ type: 'success', message: '保存成功' });
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
+        })
+      }
     },
   }
 </script>