Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

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/utils/request.js

@@ -95,11 +95,12 @@ service.interceptors.response.use(res => {
             window.location.href = '/sunVillage/login';
           } else if (window.location.href.indexOf('/homestead/') != -1) {
             window.location.href = '/homestead/login';
-          } else {
+          } else if (window.location.href.indexOf('yinnong') != -1){
             window.location.href = '/yinnongLogin';
             //window.location.href = '/zjdLogin';
-
             /*window.location.href = '/index';*/
+          } else {
+            window.location.href = '/agriculturalTrusteeship/login';
           }
         })
       })

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,9 +59,10 @@
           </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>
               </div>
@@ -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,13 +173,14 @@
           startOrderAt:this.format(new Date(),'yyyy-MM'),
           endOrderAt:this.format(new Date(),'yyyy-MM'),
         },
-        content:''
+        content:'',
+        searchInput:''
       };
     },
     created() {
       let query = {
-        parentId : 0,
-        tree:true
+        parentId : null,
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -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,59 +1,72 @@
 <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">
         <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"
+            @finish="onConfirmDept"
+            active-color="#1989fa"
+            :field-names="hcAreaInfoFieldName"
+          />
+        </van-popup>
       </div>
       <div class="search">
         <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
@@ -87,7 +100,7 @@
             @load="getList"
           >
 <!--            @load="onLoad"  @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder'})"-->
-            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder',query:{id:item.id}})">
+            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
               <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap">
               <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png">
               <div class="main_content_right_list_content">
@@ -107,7 +120,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>
@@ -115,7 +128,7 @@
 <script>
   import Cookies from "js-cookie";
   import buyer from "@/components/common/buyer_footer";
-  import {productTypes, supplyDemandList} from "@/api/agriculturalTrusteeship";
+  import {productTypes, supplyDemandList, treeselect} from "@/api/agriculturalTrusteeship";
   import {getInfo} from "@/api/login";
   import request from "@/utils/request";
   export default {
@@ -135,7 +148,8 @@
         productList:[],
         main_content_right_header_tit:'全套服务',
         query:{
-          entityId:Cookies.get('ACCESS-SESSION-ID'),
+          entityId:'',
+          serviceDeptId:'187',
           productType:'',
           supplyDemandName:''
         },
@@ -145,6 +159,15 @@
         avatar:'',
         phonenumber:'',
         searchInput:'',
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
@@ -161,6 +184,12 @@
       productTypes(query).then(response => {
         this.productList = response.data;
       });
+
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
     },
     methods: {
       getList(){
@@ -220,7 +249,19 @@
         }
         this.supplyDemandListYes = [];
         this.getList();
-      }
+      },
+
+      openMain(){
+        $('#topMain').attr('none');
+      },
+      //选择案件属地
+      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>
@@ -234,6 +275,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/placeOrder.vue

@@ -188,17 +188,12 @@
         });
       });
       let query = {
-        parentId : ''
-      }
-      let query1 = {
-        tree : true
+        parentId : null,
+        tree : false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
       });
-      productTypes(query1).then(response => {
-        this.productList1 = response.data;
-      });
       this.getDicts("newBusinessEntity_statistics_project").then(response => {
         for (var i = 0; i < response.data.length; i++) {
           this.projectTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
@@ -214,7 +209,7 @@
       getDetail(){
         supplyDemandGet(this.$route.query.id).then(response => {
           response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType);
-          this.productType = this.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
+          this.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
           if (response.data.supplyMasterMap){
             var attachement = response.data.supplyMasterMap.split( "," );
             response.data.supplyMasterMap = '/api' + attachement[0];
@@ -250,7 +245,7 @@
         this.supplyDemand.serviceAddress = this.user.deptName
         placeOrder(this.supplyDemand).then(response => {
           if(response.code=="200"){
-            this.$notify({ type: 'success', message: '发布成功' });
+            this.$notify({ type: 'success', message: '下单成功' });
             setTimeout(function(){
               history.back(-1);
             },2000)

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,8 +95,8 @@
     },
     created() {
       let query = {
-        parentId : 0,
-        tree:true
+        parentId : null,
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -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>
@@ -76,7 +76,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
@@ -127,7 +127,7 @@
         productList:[],
         main_content_right_header_tit:'全套服务',
         query:{
-          entityId:Cookies.get('ACCESS-SESSION-ID'),
+          entityId:'',
           productType:'',
           supplyDemandName:''
         },
@@ -198,7 +198,12 @@
         }
         this.supplyDemandListYes = [];
         this.getList();
-      }
+      },
+      tabChange(val){
+        this.query.productType = val;
+        this.supplyDemandListYes=[];
+        this.getList();
+      },
     },
   }
 </script>
@@ -345,13 +350,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/insurance/insuranceList.vue

@@ -4,16 +4,27 @@
     <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>
+      <p class="header_right" @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"
+          @finish="onConfirmDept"
+          active-color="#1989fa"
+          :field-names="hcAreaInfoFieldName"
+        />
+      </van-popup>
     </div>
     <!--  头部结束  -->
 
     <!--  内容开始  -->
     <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 +58,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="输入需求进行搜索" />
@@ -61,7 +72,7 @@
             @load="getList"
           >
             <!--            @load="onLoad"-->
-            <div class="main_content_right_list" v-for="(item,index) in productListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipInsuranceProjectDetail',query:{id:item.id}})">
+            <div class="main_content_right_list" v-for="(item,index) in productListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
               <img v-if="item.mainImg" :src="item.mainImg" style="width: 18vw;height: 18vw;">
               <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 18vw;height: 18vw;">
               <div class="main_content_right_list_content">
@@ -84,7 +95,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productList, productTypes, serviceList} from "@/api/agriculturalTrusteeship";
+  import {productList, productTypes, serviceList, treeselect} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipInsuranceList",
     data() {
@@ -106,19 +117,41 @@
         main_content_right_header_tit:'全套服务',
         query:{
           entityId:'',
+          serviceDeptId:'187',
           entityName:'',
           productType:''
         },
         query2:{
           productName :'',
+          serviceDeptId:'187',
           orderByColumn:'order_score'
         },
         searchServiceInput:'',
         searchInput:'',
+        tt:'',
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
+      this.query.financialType = this.$route.query.type;
+      this.query2.financialType = this.$route.query.type;
+      if (this.$route.query.type == 3){this.tt = '农担'}
+      if (this.$route.query.type == 2){this.tt = '保险'}
+      if (this.$route.query.type == 1){this.tt = '贷款'}
 
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
     },
     methods: {
       getServiceList(){
@@ -205,7 +238,18 @@
         }
         this.supplyDemandListYes = [];
         this.getList();
-      }
+      },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        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.supplyDemandListYes = [];
+        this.serviceList = [];
+        this.getServiceList();
+        this.getList();
+      },
     },
   }
 </script>

src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue

@@ -24,7 +24,7 @@
         @load="getList"
       >
         <!--            @load="onLoad"-->
-        <div class="main_content_right_list" v-for="(item,index) in productListYes" @click="$router.push({name:'agriculturalTrusteeshipInsuranceProjectDetail',query:{id:item.id}})">
+        <div class="main_content_right_list" v-for="(item,index) in productListYes" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
           <img v-if="item.mainImg" :src="item.mainImg" style="width: 18vw;height: 18vw;">
           <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 18vw;height: 18vw;">
           <div class="main_content_right_list_content">
@@ -66,6 +66,7 @@
     },
     created() {
       this.query.financialServiceId = this.$route.query.id;
+
       this.tt = this.$route.query.financialName
     },
     methods: {
@@ -75,10 +76,7 @@
             if(res.sysYesNo == 'Y'){
               if (res.mainImg){
                 let supplyMasterMap = res.mainImg.split( "," )
-                res.mainImg2 = []
-                supplyMasterMap.map(rr=>{
-                  res.mainImg2.push('/api'+rr)
-                })
+                res.mainImg = '/api'+supplyMasterMap[0]
               }
               this.productListYes.push(res);
             }

src/views/agriculturalTrusteeship/login.vue

@@ -3,15 +3,15 @@
     <!--  头部开始  -->
     <div class="header">
 <!--      @click="onClickLeft"-->
-      <div class="header_left" v-if="navDis == 'none'" @click="navDis = 'block',loginDis = 'none'">
+      <div class="header_left" v-if="navDis == 'none'" @click="loginType='',navDis = 'block',loginDis = 'none'">
         <img src="../../../static/images/agriculturalTrusteeship/return.png">
       </div>
-      <div class="header_left" v-if="navDis == 'block'" @click="$router.push({ path: '/agriculturalTrusteeship/index' })">
+      <div class="header_left" v-if="navDis == 'block'" @click="loginType='',$router.push({ path: '/agriculturalTrusteeship/index' })">
         <img src="../../../static/images/agriculturalTrusteeship/return.png">
       </div>
       <div class="tit">
         <p>大托管服务中心</p>
-        <p>登录注册</p>
+        <p>{{loginType=='mj'?'买家':loginType=='fwzz'?'社会化服务组织':loginType=='bxjg'?'保险机构':loginType=='dkjg'?'贷款机构':loginType=='ndjg'?'农担机构':''}}登录注册</p>
       </div>
     </div>
     <!--  头部结束  -->
@@ -95,253 +95,255 @@
             <div class="clear"></div>
           </div>
 <!--          $router.push({name:'agriculturalTrusteeshipShopList'})-->
-          <p class="submit_btn" v-if="loginType == 'mj'" @click="handleLogin">登录1</p>
+          <p class="submit_btn" v-if="loginType == 'mj'" @click="handleLogin">登录</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="请输入机构名称" >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="serviceForm.linker" center :border="false" placeholder="请输入联系人">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_04.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="serviceForm.address" center :border="false" placeholder="请输入地址" >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
-              </template>
-            </van-field>
-
-<!--            <van-field v-model="value1" center :border="false" placeholder="请输入成立时间">-->
-<!--              <template #left-icon>-->
-<!--                <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">-->
-<!--              </template>-->
-<!--            </van-field>-->
-
-            <van-field v-model="serviceForm.phone" center :border="false" placeholder="请输入电话">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="serviceForm.username" center :border="false" placeholder="请输入用户名" >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="serviceForm.password" center :border="false" placeholder="请输入密码" >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="serviceForm.passwordReal" center :border="false" placeholder="请确认密码">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="serviceForm.fax" center :border="false" placeholder="请输入传真">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="serviceForm.description" center :border="false" placeholder="请输入简要描述">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
-              </template>
-            </van-field>
-
-            <div style="height: 20PX"></div>
-            <van-uploader v-model="mainImgUploader" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
-
-          </template>
-          <template v-if="loginType == 'fwzz'">
-            <van-field v-model="entityForm.entityName" center :border="false" placeholder="请输入主体名称" >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field
-              readonly
-              clickable
-              required
-              :rules="[{ required: true , message:'请选择产品类型'}]"
-              v-model="statisticsTypeId"
-              center
-              @click="showStatisticsTypeId = true"
-              :border="false"
-              right-icon="arrow-down"
-              placeholder="请选择主体类别">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
-              </template>
-            </van-field>
-            <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"
-              :border="false"
-              right-icon="arrow-down"
-              placeholder="请选择生产种类"
-            >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
-              </template>
-            </van-field>
-            <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"
-              :border="false"
-              right-icon="arrow-down"
-              placeholder="请选择示范类型"
-            >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_04.png" alt="">
-              </template>
-            </van-field>
-            <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
-              readonly
-              clickable
-              required
-              :rules="[{ required: true , message:'请选择案件属地'  }]"
-              v-model="deptName"
-              placeholder="请选择主体属地"
-              @click="showDeptId = true"
-              right-icon="arrow-down"
-              :border="false"
-              label-width="auto"
-            >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
-              </template>
-            </van-field>
-            <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 v-model="entityForm.entityAddress" center :border="false" placeholder="请输入主体地址" >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field
-              readonly
-              clickable
-              required
-              :rules="[{ required: true , message:'请选择成立时间'}]"
-              v-model="entityForm.registerTime"
-              center
-              @click="showRegisterTime = true"
-              :border="false"
-              right-icon="arrow-down"
-              placeholder="请选择成立时间"
-            >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">
-              </template>
-            </van-field>
-            <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 v-model="entityForm.principalName" center :border="false" placeholder="请输入负责人姓名">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="entityForm.tal" center :border="false" placeholder="请输入联系方式">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="entityForm.userName" center :border="false" placeholder="请输入账号">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="entityForm.password" center :border="false" placeholder="请输入密码">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
-              </template>
-            </van-field>
-
-            <van-field v-model="entityForm.passwordReal" center :border="false" placeholder="请确认密码">
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
-              </template>
-            </van-field>
+          <van-form @submit="goRegister" ref="formData" show-error :show-error-message="false">
+            <template v-if="loginType == 'bxjg' || loginType == 'dkjg' || loginType == 'ndjg'">
+              <van-field v-model="serviceForm.financialName" required :rules="[{ required: true }]" center :border="false" placeholder="请输入机构名称" >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="serviceForm.linker" required :rules="[{ required: true }]" center :border="false" placeholder="请输入联系人">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_04.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="serviceForm.address" required :rules="[{ required: true }]" center :border="false" placeholder="请输入地址" >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
+                </template>
+              </van-field>
+
+  <!--            <van-field v-model="value1" center :border="false" placeholder="请输入成立时间">-->
+  <!--              <template #left-icon>-->
+  <!--                <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">-->
+  <!--              </template>-->
+  <!--            </van-field>-->
+
+              <van-field v-model="serviceForm.phone" required :rules="[{ required: true }]" center :border="false" placeholder="请输入电话">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="serviceForm.username" required :rules="[{ required: true }]" center :border="false" placeholder="请输入用户名" >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="serviceForm.password" required :rules="[{ required: true }]" center :border="false" placeholder="请输入密码" >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="serviceForm.passwordReal" required :rules="[{ required: true }]" center :border="false" placeholder="请确认密码">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="serviceForm.fax" center :border="false" placeholder="请输入传真">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="serviceForm.description" center :border="false" placeholder="请输入简要描述">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
+                </template>
+              </van-field>
+
+              <div style="height: 20PX"></div>
+              <van-uploader v-model="mainImgUploader" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
 
-            <div style="height: 20PX"></div>
-            <van-uploader v-model="mainImgUploader2" :after-read="afterReadEvidenceEntityForm" :before-delete="deleteFileEvidenceEntityForm" />
+            </template>
+            <template v-if="loginType == 'fwzz'">
+              <van-field v-model="entityForm.entityName" required :rules="[{ required: true }]" center :border="false" placeholder="请输入主体名称" >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field
+                readonly
+                clickable
+                required
+                :rules="[{ required: true }]"
+                v-model="statisticsTypeId"
+                center
+                @click="showStatisticsTypeId = true"
+                :border="false"
+                right-icon="arrow-down"
+                placeholder="请选择主体类别">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
+                </template>
+              </van-field>
+              <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 }]"
+                v-model="industryClassificationType"
+                center
+                @click="showIndustryClassificationType = true"
+                :border="false"
+                right-icon="arrow-down"
+                placeholder="请选择生产种类"
+              >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
+                </template>
+              </van-field>
+              <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 }]"
+                v-model="modelSocietyType"
+                center
+                @click="showModelSocietyType = true"
+                :border="false"
+                right-icon="arrow-down"
+                placeholder="请选择示范类型"
+              >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_04.png" alt="">
+                </template>
+              </van-field>
+              <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
+                readonly
+                clickable
+                required
+                :rules="[{ required: true }]"
+                v-model="deptName"
+                placeholder="请选择主体属地"
+                @click="showDeptId = true"
+                right-icon="arrow-down"
+                :border="false"
+                label-width="auto"
+              >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
+                </template>
+              </van-field>
+              <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 v-model="entityForm.entityAddress" required :rules="[{ required: true }]" center :border="false" placeholder="请输入主体地址" >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field
+                readonly
+                clickable
+                required
+                :rules="[{ required: true }]"
+                v-model="entityForm.registerTime"
+                center
+                @click="showRegisterTime = true"
+                :border="false"
+                right-icon="arrow-down"
+                placeholder="请选择成立时间"
+              >
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">
+                </template>
+              </van-field>
+              <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 v-model="entityForm.principalName" required :rules="[{ required: true }]" center :border="false" placeholder="请输入负责人姓名">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="entityForm.tal" required :rules="[{ required: true }]" center :border="false" placeholder="请输入联系方式">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="entityForm.userName" required :rules="[{ required: true }]" center :border="false" placeholder="请输入账号">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="entityForm.password" required :rules="[{ required: true }]" center :border="false" placeholder="请输入密码">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
+                </template>
+              </van-field>
+
+              <van-field v-model="entityForm.passwordReal" required :rules="[{ required: true }]" center :border="false" placeholder="请确认密码">
+                <template #left-icon>
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
+                </template>
+              </van-field>
+
+              <div style="height: 20PX"></div>
+              <van-uploader v-model="mainImgUploader2" :after-read="afterReadEvidenceEntityForm" :before-delete="deleteFileEvidenceEntityForm" />
 
-          </template>
-          <p class="submit_btn" @click="goRegister">提交审核</p>
+            </template>
+            <p class="submit_btn" @click="$refs.formData.submit()">提交审核</p>
+          </van-form>
         </van-tab>
       </van-tabs>
     </div>
@@ -455,7 +457,7 @@
 
           this.formData.username = encrypt(this.username);
           this.formData.password = encrypt(this.password);
-          this.formData.financialType = '2';
+          this.formData.financialType = this.financialType;
           serviceLogin(this.formData).then(response => {
             Cookies.set("ACCESS-SESSION-ID", response.data.id);
             Cookies.set("ServiceInformation", response.data);
@@ -476,7 +478,16 @@
         }
       },
       tabsChange(name){
-        console.log(name)
+        this.serviceForm = {};
+        this.entityForm = {};
+        this.statisticsTypeId = '';
+        this.industryClassificationType = '';
+        this.modelSocietyType = '';
+        this.deptName = '';
+        this.mainImgArr = [];
+        this.mainImgArrEntity = [];
+        this.mainImgUploader = [];
+        this.mainImgUploader2 = [];
         if ( name == 'register' ){
           this.position = 'relative';
           this.top = '40px';
@@ -727,6 +738,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 +748,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 +757,9 @@
             this.active = 0;
           })
         }
+        // else if(this.loginType == 'mj'){
+        //   this.registerSubmit();
+        // }
       },
       onConfirmStatisticsTypeId(data){
         this.entityForm.statisticsTypeId = data.value;
@@ -799,14 +814,16 @@
     height: 30PX;
     justify-content: center;
     border-radius: 100%;
+    z-index: 999;
   }
   .tit{
     font-size: .7rem;
     color: #334281;
     text-align: center;
     position: absolute;
-    left: 50%;
-    transform: translateX(-50%);
+    //left: 50%;
+    //transform: translateX(-50%);
+    width: 92%;
     line-height: 1;
     p{
       &:nth-child(1){
@@ -897,4 +914,11 @@
       border-radius: 50PX;
     }
   }
+  /deep/ .van-cell--required::before{
+    left: 20PX;
+    color: rgb(30, 103, 255);
+  }
+  /deep/ .van-cell__value{
+    padding-left: 10PX;
+  }
 </style>

src/views/agriculturalTrusteeship/shop/serviceEdit.vue

@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="编辑保险公司信息"
+      title="编辑公司信息"
       fixed
       placeholder
       left-arrow

src/views/agriculturalTrusteeship/shop/shopAdd.vue

@@ -11,41 +11,24 @@
     <!--  头部结束  -->
 
 
-    <!--  内容开始  -->
-    <div class="main">
-      <van-field label="产品名称" v-model="product.productName" input-align="right" placeholder="请输入产品名称" />
-      <van-field
-        readonly
-        clickable
-        required
-        :rules="[{ required: true , message:'请选择产品类型'}]"
-        v-model="productType"
-        label="产品类型"
-        placeholder="请选择产品类型"
-        @click="showProductType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showProductType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="productTypeOptions"
-          @confirm="onConfirmProductType"
-          @cancel="showProductType = false"
-        />
-      </van-popup>
+    <van-form @submit="submitForm" ref="formData" show-error :show-error-message="false">
+      <!--  内容开始  -->
+      <div class="main">
+        <van-field label="产品名称" required :rules="[{ required: true }]" v-model="product.productName" input-align="right" placeholder="请输入产品名称" />
 
-      <van-field label="简介" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="请输入简介" />
-      <van-field label="图片" :border="false" input-align="right" readonly />
-      <div style="padding: 0 4% 2vh;">
-        <van-uploader v-model="product.mainImgList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+        <van-field label="产品类型" required :rules="[{ required: true }]" v-model="product.productType" input-align="right" placeholder="请输入产品类型" />
+
+        <van-field label="产品描述" required :rules="[{ required: true }]" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="请输入产品描述" />
+        <van-field label="图片" :border="false" input-align="right" readonly />
+        <div style="padding: 0 4% 2vh;">
+          <van-uploader v-model="product.mainImgList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+        </div>
       </div>
-    </div>
 
-    <div class="main_btn">
-      <p @click="submitForm">发布</p>
-    </div>
+      <div class="main_btn" @click="$refs.formData.submit()">
+        <p>发布</p>
+      </div>
+    </van-form>
     <!--  内容结束  -->
   </div>
 </template>

src/views/agriculturalTrusteeship/shop/shopDetail.vue

@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="发布商品"
+      title="查看商品"
       fixed
       placeholder
       left-arrow

src/views/agriculturalTrusteeship/shop/shopEdit.vue

@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="发布商品"
+      title="修改商品"
       fixed
       placeholder
       left-arrow
@@ -12,39 +12,24 @@
 
 
     <!--  内容开始  -->
-    <div class="main">
-      <van-field label="产品名称" v-model="product.productName" input-align="right" placeholder="无" />
-      <van-field
-        readonly
-        clickable
-        required
-        :rules="[{ required: true , message:'请选择产品类型'}]"
-        v-model="productType"
-        label="产品类型"
-        placeholder="请选择产品类型"
-        @click="showProductType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showProductType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="productTypeOptions"
-          @confirm="onConfirmProductType"
-          @cancel="showProductType = false"
-        />
-      </van-popup>
-      <van-field label="简介" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="无" />
-      <van-field label="图片" :border="false" input-align="right" readonly />
-      <div style="padding: 0 4% 2vh;">
-        <van-uploader v-model="product.mainImgList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+    <van-form @submit="submitForm" ref="formData" show-error :show-error-message="false">
+      <div class="main">
+        <van-field label="产品名称" required :rules="[{ required: true }]" v-model="product.productName" input-align="right" placeholder="请输入产品名称" />
+
+        <van-field label="产品类型" required :rules="[{ required: true }]" v-model="product.productType" input-align="right" placeholder="请输入产品类型" />
+
+        <van-field label="产品描述" required :rules="[{ required: true }]" type="textarea" autosize v-model="product.productLink" input-align="right" placeholder="请输入产品描述" />
+
+        <van-field label="图片" :border="false" input-align="right" readonly />
+        <div style="padding: 0 4% 2vh;">
+          <van-uploader v-model="product.mainImgList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+        </div>
       </div>
-    </div>
 
-    <div class="main_btn">
-      <p @click="submitForm">发布</p>
-    </div>
+      <div class="main_btn">
+        <p @click="$refs.formData.submit()">发布</p>
+      </div>
+    </van-form>
     <!--  内容结束  -->
   </div>
 </template>

src/views/agriculturalTrusteeship/shop/shopList.vue

@@ -6,7 +6,18 @@
         <img src="../../../../static/images/agriculturalTrusteeship/return.png">
         <p>退出登录</p>
       </div>
-      <p class="header_right">河东河西村</p>
+<!--      <p class="header_right" @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"-->
+<!--          @finish="onConfirmDept"-->
+<!--          active-color="#1989fa"-->
+<!--          :field-names="hcAreaInfoFieldName"-->
+<!--        />-->
+<!--      </van-popup>-->
     </div>
     <!--  头部结束  -->
 
@@ -17,26 +28,27 @@
             <p class="tt">公司信息</p>
           </template>
           <template #right-icon>
+<!--            v-if="serviceForm.auditStatus != '3'"-->
             <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_edit.png" @click="$router.push({name:'agriculturalTrusteeshipServiceEdit'})">
           </template>
         </van-cell>
 
         <van-field
           readonly
-          :value="serviceForm.financialName"
           label="机构名称"
           left-icon="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_com.png"
           input-align="right"
           :border="false"
-          placeholder="机构名称"
-        >
-          <template #input>
+        />
+
+        <van-cell :border="false">
+          <template #title>
             <div class="serviceName">
               <span :class="{'active':serviceForm.auditStatus == '3'}">{{serviceForm.auditStatus == '1'?'待审核':serviceForm.auditStatus == '3'?'已通过':serviceForm.auditStatus == '2'?'驳回':''}}</span>
               <p>{{serviceForm.financialName}}</p>
             </div>
           </template>
-        </van-field>
+        </van-cell>
 
         <van-field
           readonly
@@ -126,7 +138,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {productList , productOut , productIn , serviceGet} from "@/api/agriculturalTrusteeship";
+  import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipShopList",
     data() {
@@ -141,13 +153,27 @@
         query:{
           financialServiceId:Cookies.get('ACCESS-SESSION-ID'),
           pageNum:1,
-          pageSize:'10'
+          pageSize:'10',
+        },
+        serviceForm:{},
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
         },
-        serviceForm:{}
       };
     },
     created() {
       this.getDetail();
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
     },
     methods: {
       getDetail(){
@@ -191,6 +217,15 @@
           location.reload()
         });
       },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        this.query.deptId = selectedOptions[selectedOptions.length-1].value;
+        this.deptName = selectedOptions[selectedOptions.length-1].label;
+        this.showDeptId = false
+        this.productListYes = [];
+        this.productListNo = [];
+        this.getList();
+      },
     },
   }
 </script>
@@ -228,6 +263,7 @@
   .serviceName{
     display: flex;
     align-items: center;
+    justify-content: space-between;
     span{
       background: #E8E8E8;
       padding: 0 8PX;

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>
@@ -22,6 +22,7 @@
         <van-datetime-picker
           v-model="currentDateStar"
           @confirm="onConfirmStar"
+          @cancel = "startTimeShow = false"
           type="year-month"
           title="选择年月"
         />
@@ -30,6 +31,7 @@
         <van-datetime-picker
           v-model="currentDateEnd"
           @confirm="onConfirmEnd"
+          @cancel = "endTimeShow = false"
           type="year-month"
           title="选择年月"
         />
@@ -65,7 +67,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>
@@ -196,7 +198,8 @@
           startOrderAt:this.format(new Date(),'yyyy-MM'),
           endOrderAt:this.format(new Date(),'yyyy-MM'),
         },
-        content:''
+        content:'',
+        searchInput:''
       };
     },
     created() {
@@ -205,22 +208,17 @@
       });
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
       });
       let query2 = {
         parentId : null,
-        tree:false
+        tree:true
       }
       productTypes(query2).then(response => {
-        response.data.map(res=>{
-          res.children.map(rr=>{
-            rr.active = false;
-          })
-        })
-        this.productList2 = response.data;
+          this.productList2 = response.data;
       });
       this.getDicts("crop_type").then(response => {
           this.cropTypeOptions = response.data;
@@ -233,9 +231,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);
@@ -253,8 +251,8 @@
       },
       onConfirmStar(data){
         this.supplyDemandList = [];
-        this.params.startOrderAt = this.format(data,'yyyy-mm');
-        this.query.startOrderAt = this.format(data,'yyyy-mm');
+        this.params.startOrderAt = this.format(data,'yyyy-MM');
+        this.query.startOrderAt = this.format(data,'yyyy-MM');
         this.startOrderAt = this.format(data,'yyyy年MM月');
         this.startTimeShow = false;
         orderStatistics(this.params).then(response => {
@@ -264,8 +262,8 @@
       },
       onConfirmEnd(data){
         this.supplyDemandList = [];
-        this.params.endOrderAt = this.format(data,'yyyy-mm');
-        this.query.endOrderAt = this.format(data,'yyyy-mm');
+        this.params.endOrderAt = this.format(data,'yyyy-MM');
+        this.query.endOrderAt = this.format(data,'yyyy-MM');
         this.endOrderAt = this.format(data,'yyyy年MM月');
         this.endTimeShow = false;
         orderStatistics(this.params).then(response => {
@@ -286,6 +284,14 @@
             orderStatus :'',
             productType:''
         }
+
+        this.params.startOrderAt = this.format(new Date(),'yyyy-MM');
+        this.startOrderAt = this.format(new Date(),'yyyy年MM月');
+      },
+      goSearch(){
+        this.supplyDemandList = [];
+        this.query.demandName = this.searchInput;
+        this.getList();
       },
     },
   }

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">
@@ -54,7 +56,8 @@
           <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.realityServiceMoney == null ? supplyDemand.countMoney:supplyDemand.realityServiceMoney" />
+
           <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
         </div>
 
@@ -90,7 +93,7 @@
     created() {
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -109,13 +112,10 @@
           response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType);
           response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus);
           response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
-          if (response.data.supplyMasterMap){
-            response.data.supplyMasterMapList = [];
-            var attachement = response.data.supplyMasterMap.split( "," );
-            this.supplyMasterMapArr = response.data.supplyMasterMap.split( "," );
-            attachement.forEach(responseAttach=>{
-              response.data.supplyMasterMapList.push('/api' + responseAttach);
-            })
+          response.data.countMoney = response.data.unitPrice*response.data.serviceNum;
+          if (response.data.supplyDemand.supplyMasterMap){
+            var attachement = response.data.supplyDemand.supplyMasterMap.split( "," );
+            response.data.supplyDemand.supplyMasterMap = '/api' + attachement[0];
           }
           this.supplyDemand = response.data;
         });

src/views/agriculturalTrusteeship/socialization/billOrder.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">
@@ -54,7 +58,7 @@
         <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.realityServiceMoney == null ? supplyDemand.countMoney:supplyDemand.realityServiceMoney" />
         <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
       </div>
 
@@ -90,7 +94,7 @@
     created() {
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -109,13 +113,13 @@
           response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType);
           response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus);
           response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
-          if (response.data.supplyMasterMap){
-            response.data.supplyMasterMapList = [];
-            var attachement = response.data.supplyMasterMap.split( "," );
-            this.supplyMasterMapArr = response.data.supplyMasterMap.split( "," );
-            attachement.forEach(responseAttach=>{
-              response.data.supplyMasterMapList.push('/api' + responseAttach);
-            })
+          response.data.countMoney = response.data.unitPrice*response.data.serviceNum;
+
+          if (response.data.supplyDemand!=null){
+            if (response.data.supplyDemand.supplyMasterMap){
+              var attachement = response.data.supplyDemand.supplyMasterMap.split( "," );
+              response.data.supplyDemand.supplyMasterMap = '/api' + attachement[0];
+            }
           }
           this.supplyDemand = response.data;
         });
@@ -130,7 +134,7 @@
       },
       clickNo(){
         supplyorderReject(this.$route.query.id).then(response => {
-          this.$notify({ type: 'success', message: '接单成功' });
+          this.$notify({ type: 'success', message: '拒单成功' });
           setTimeout(function(){
             history.back(-1);
           },2000)

src/views/agriculturalTrusteeship/socialization/draft.vue

@@ -188,7 +188,7 @@
           }
           .name{
             color: #334281;
-            margin-left: auto;
+            /*margin-left: auto;*/
             padding:0 0 0 15PX;
             background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center
           }

src/views/agriculturalTrusteeship/socialization/index.vue

@@ -25,12 +25,15 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <template v-if="item.supplyDemand">
+              <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>
               <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>
@@ -99,7 +102,7 @@
     created() {
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -116,13 +119,16 @@
         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){
+                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;
+              res.countMoney = res.unitPrice * res.serviceNum;
               this.supplyDemandList.push(res);
             }
             this.supplyDemandList1.push(res);

src/views/agriculturalTrusteeship/socialization/projectDetail.vue

@@ -23,7 +23,7 @@
           <p><span>销 {{supplyDemand.orderNum}}</span><span>分 {{supplyDemand.orderScore}}</span></p>
         </div>
         <p class="tt">{{supplyDemand.supplyDemandName}}</p>
-        <p class="name">{{supplyDemand.entityName}}</p>
+        <p class="name" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectList',query:{id:supplyDemand.entityId,entityName:supplyDemand.entityName}})">{{supplyDemand.entityName}}<span>{{supplyDemand.createTime}}</span></p>
       </div>
 
       <div class="main_box">
@@ -82,10 +82,12 @@
     },
     created() {
       let query = {
-        parentId : ''
+        parentId : null,
+        tree:true
       }
       let query1 = {
-        tree : true
+        parentId : null,
+        tree : false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -106,6 +108,7 @@
         supplyDemandGet(this.$route.query.id).then(response => {
           response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType);
           response.data.productType = this.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
+          response.data.createTime = response.data.createTime.substr(0,10)
           if (response.data.supplyMasterMap){
             response.data.supplyMasterMapList = [];
             var attachement = response.data.supplyMasterMap.split( "," );
@@ -179,6 +182,13 @@
         color: #4E7FFF;
         background: url("../../../../static/images/agriculturalTrusteeship/index/name_icon.png") no-repeat left center;
         padding-left: 18PX;
+        display: flex;
+        span{
+          color: #334281;
+          margin-left: auto;
+          padding:0 0 0 18PX;
+          background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center
+        }
       }
       .tab{
         display: flex;

src/views/agriculturalTrusteeship/socialization/projectEdit.vue

@@ -12,8 +12,9 @@
 
 
     <!--  内容开始  -->
+    <van-form @submit="submitForm" ref="formData" show-error :show-error-message="false">
     <div class="main">
-      <van-field label="产品名称" v-model="supplyDemand.supplyDemandName" input-align="right" placeholder="请输入产品名称" />
+      <van-field label="产品名称" required :rules="[{ required: true }]" v-model="supplyDemand.supplyDemandName" input-align="right" placeholder="请输入产品名称" />
 <!--      <van-field label="产品类型" v-model="supplyDemand.productType" input-align="right" placeholder="请输入产品类型" />-->
       <van-field
         readonly
@@ -43,12 +44,33 @@
 <!--      <van-field label="二级分类" v-model="supplyDemand.supplyDemandType" input-align="right" placeholder="请输入二级分类" />-->
       <van-field label="产品规格" v-model="supplyDemand.specification" input-align="right" placeholder="请输入产品规格" />
 <!--      <van-field label="所属主体" v-model="supplyDemand.bodyType" input-align="right" placeholder="请输入所属主体" />-->
+<!--      <van-field-->
+<!--        readonly-->
+<!--        clickable-->
+<!--        required-->
+<!--        :rules="[{ required: true , message:'请选择所属主体'}]"-->
+<!--        v-model="bodyType"-->
+<!--        label="所属主体"-->
+<!--        placeholder="请选择所属主体"-->
+<!--        @click="showBodyType = true"-->
+<!--        input-align="right"-->
+<!--        right-icon="arrow-down"-->
+<!--        label-width="auto"-->
+<!--      />-->
+<!--      <van-popup v-model="showBodyType" position="bottom">-->
+<!--        <van-picker-->
+<!--          show-toolbar-->
+<!--          :columns="projectTypeOptions"-->
+<!--          @confirm="onConfirmProjectType"-->
+<!--          @cancel="showBodyType = false"-->
+<!--        />-->
+<!--      </van-popup>-->
       <van-field
         readonly
         clickable
         required
         :rules="[{ required: true , message:'请选择所属主体'}]"
-        v-model="bodyType"
+        v-model="supplyDemand.entityName"
         label="所属主体"
         placeholder="请选择所属主体"
         @click="showBodyType = true"
@@ -59,22 +81,23 @@
       <van-popup v-model="showBodyType" position="bottom">
         <van-picker
           show-toolbar
-          :columns="projectTypeOptions"
+          :columns="detailListOptions"
+          value-key="entityName"
           @confirm="onConfirmProjectType"
           @cancel="showBodyType = false"
         />
       </van-popup>
+<!--      <van-field label="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />-->
 
-      <van-field label="单价" v-model="supplyDemand.unitPrice" input-align="right" placeholder="请输入单价" />
+      <van-field label="单价" required :rules="[{ required: true }]" v-model="supplyDemand.unitPrice" input-align="right" placeholder="请输入单价" />
       <van-field label="数量" v-model="supplyDemand.number" input-align="right" placeholder="请输入数量" />
-      <van-field label="单位" v-model="supplyDemand.unit" input-align="right" placeholder="请输入单位" />
-      <van-field label="联系电话" v-model="supplyDemand.supplyDemandTal" input-align="right" placeholder="请输入联系电话" />
-      <van-field label="联系人" v-model="supplyDemand.linker" input-align="right" placeholder="请输入联系人" />
-      <van-field label="服务区域" v-model="supplyDemand.serviceDeptName" input-align="right" placeholder="请输入服务区域" />
+      <van-field label="单位" required :rules="[{ required: true }]" v-model="supplyDemand.unit" input-align="right" placeholder="请输入单位" />
+      <van-field label="联系电话" required :rules="[{ required: true }]" v-model="supplyDemand.supplyDemandTal" input-align="right" placeholder="请输入联系电话" />
+      <van-field label="联系人" required :rules="[{ required: true }]" v-model="supplyDemand.linker" input-align="right" placeholder="请输入联系人" />
       <van-field label="地址" v-model="supplyDemand.address" input-align="right" placeholder="请输入地址" />
-      <van-field label="简介" v-model="supplyDemand.introduction" input-align="right" placeholder="请输入简介" />
+      <van-field label="简介" required :rules="[{ required: true }]" v-model="supplyDemand.introduction" input-align="right" placeholder="请输入简介" />
       <van-field label="详情" v-model="supplyDemand.particulars" input-align="right" placeholder="请输入详情" />
-      <van-field label="图片" :border="false" input-align="right" placeholder="请输入图片" />
+      <van-field label="图片" readonly :border="false" input-align="right" />
       <div style="padding: 0 4% 2vh;">
         <van-uploader v-model="supplyDemand.supplyMasterMapList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
       </div>
@@ -88,15 +111,22 @@
     </div>
 
     <div class="main_btn">
-      <p @click="submitForm">发布</p>
-      <p>存稿</p>
+      <p @click="publishStatus = '3',$refs.formData.submit()">发布</p>
+      <p @click="publishStatus = '2',$refs.formData.submit()">存稿</p>
     </div>
+    </van-form>
     <!--  内容结束  -->
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {supplyDemandGet, productTypes, commonUpload, supplyDemandEdit} from "@/api/agriculturalTrusteeship";
+  import {
+    supplyDemandGet,
+    productTypes,
+    commonUpload,
+    supplyDemandEdit,
+    supplyDemandAdd, detailList
+  } from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
     data() {
@@ -125,15 +155,17 @@
           value: 'id',
           children: 'children',
         },
-
+        publishStatus:'',
+        detailListOptions:[]
       };
     },
     created() {
       let query = {
-        parentId : ''
+        parentId : null,
+        tree:true
       }
       let query1 = {
-        tree : true
+        tree : false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -147,6 +179,11 @@
         }
         this.bodyTypeOptions = response.data;
       });
+      detailList().then(res=>{
+        if (res.code == 200) {
+          this.detailListOptions = res.rows;
+        }
+      })
       this.getDetail();
     },
     methods: {
@@ -174,8 +211,8 @@
         this.showProductType = false;
       },
       onConfirmProjectType(data){
-        this.supplyDemand.bodyType = data.value;
-        this.bodyType = data.text;
+        this.supplyDemand.entityName = data.entityName;
+        this.supplyDemand.entityId = data.id;
         this.showBodyType = false;
       },
       afterReadEvidenceForm(file){
@@ -191,11 +228,17 @@
         this.supplyMasterMapArr.splice(detail.index,1);
         this.supplyDemand.supplyMasterMapList.splice(detail.index,1);
       },
-      submitForm(){
+      submitForm(publishStatus){
         this.supplyDemand.supplyMasterMap = this.supplyMasterMapArr.join(',')
+        this.supplyDemand.supplyDemandType = '1';
+        this.supplyDemand.publishStatus = this.publishStatus;
         supplyDemandEdit(this.supplyDemand).then((res) => {
           if(res.code=="200"){
-            this.$notify({ type: 'success', message: '发布成功' });
+            if (this.publishStatus == '3'){
+              this.$notify({ type: 'success', message: '发布成功' });
+            }else{
+              this.$notify({ type: 'success', message: '存稿成功' });
+            }
             setTimeout(function(){
               history.back(-1);
             },2000)

src/views/agriculturalTrusteeship/socialization/release.vue

@@ -12,90 +12,122 @@
 
 
     <!--  内容开始  -->
-    <div class="main">
-      <van-field label="产品名称" v-model="supplyDemand.supplyDemandName" input-align="right" placeholder="请输入产品名称" />
-      <!--      <van-field label="产品类型" v-model="supplyDemand.productType" input-align="right" placeholder="请输入产品类型" />-->
-      <van-field
-        readonly
-        clickable
-        required
-        :rules="[{ required: true , message:'请选择产品类型'}]"
-        v-model="productType"
-        label="产品类型"
-        placeholder="请选择产品类型"
-        @click="showProductType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
+    <van-form @submit="submitForm" ref="formData" show-error :show-error-message="false">
+      <div class="main">
+        <van-field label="产品名称" required :rules="[{ required: true }]" v-model="supplyDemand.supplyDemandName" input-align="right" placeholder="请输入产品名称" />
+        <!--      <van-field label="产品类型" v-model="supplyDemand.productType" input-align="right" placeholder="请输入产品类型" />-->
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择产品类型'}]"
+          v-model="productType"
+          label="产品类型"
+          placeholder="请选择产品类型"
+          @click="showProductType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+
+        <van-popup v-model="showProductType" round position="bottom">
+          <!--        v-model="cascaderValue"-->
+          <van-cascader
+            title="请选择产品类型"
+            :options="productList"
+            @close="showProductType = false"
+            @finish="onConfirmProductType"
+            :field-names="fieldNames"
+          />
+        </van-popup>
 
-      <van-popup v-model="showProductType" round position="bottom">
-        <!--        v-model="cascaderValue"-->
-        <van-cascader
-          title="请选择产品类型"
-          :options="productList"
-          @close="showProductType = false"
-          @finish="onConfirmProductType"
-          :field-names="fieldNames"
+        <!--      <van-field label="二级分类" v-model="supplyDemand.supplyDemandType" input-align="right" placeholder="请输入二级分类" />-->
+        <van-field label="产品规格" v-model="supplyDemand.specification" input-align="right" placeholder="请输入产品规格" />
+        <!--      <van-field label="所属主体" v-model="supplyDemand.bodyType" input-align="right" placeholder="请输入所属主体" />-->
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择所属主体'}]"
+          v-model="supplyDemand.entityName"
+          label="所属主体"
+          placeholder="请选择所属主体"
+          @click="showBodyType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
         />
-      </van-popup>
+        <van-popup v-model="showBodyType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="detailListOptions"
+            value-key="entityName"
+            @confirm="onConfirmProjectType"
+            @cancel="showBodyType = false"
+          />
+        </van-popup>
+
+<!--        <van-field label="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />-->
+
 
-      <!--      <van-field label="二级分类" v-model="supplyDemand.supplyDemandType" input-align="right" placeholder="请输入二级分类" />-->
-      <van-field label="产品规格" v-model="supplyDemand.specification" input-align="right" placeholder="请输入产品规格" />
-      <!--      <van-field label="所属主体" v-model="supplyDemand.bodyType" input-align="right" placeholder="请输入所属主体" />-->
-      <van-field
-        readonly
-        clickable
-        required
-        :rules="[{ required: true , message:'请选择所属主体'}]"
-        v-model="bodyType"
-        label="所属主体"
-        placeholder="请选择所属主体"
-        @click="showBodyType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showBodyType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="projectTypeOptions"
-          @confirm="onConfirmProjectType"
-          @cancel="showBodyType = false"
+        <van-field label="单价" required :rules="[{ required: true }]" v-model="supplyDemand.unitPrice" type="number" input-align="right" placeholder="请输入单价" />
+        <van-field label="数量" v-model="supplyDemand.number" type="digit" input-align="right" placeholder="请输入数量" />
+        <van-field label="单位" required :rules="[{ required: true }]" v-model="supplyDemand.unit" input-align="right" placeholder="请输入单位" />
+        <van-field label="联系电话" required :rules="[{ required: true }]" v-model="supplyDemand.supplyDemandTal" type="digit" input-align="right" placeholder="请输入联系电话" />
+        <van-field label="联系人" required :rules="[{ required: true }]" v-model="supplyDemand.linker" input-align="right" placeholder="请输入联系人" />
+
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择服务区域'}]"
+          v-model="supplyDemand.serviceDeptName"
+          label="服务区域"
+          placeholder="请选择服务区域"
+          @click="showDeptId = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
         />
-      </van-popup>
+        <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="supplyDemand.unitPrice" input-align="right" placeholder="请输入单价" />
-      <van-field label="数量" v-model="supplyDemand.number" input-align="right" placeholder="请输入数量" />
-      <van-field label="联系电话" v-model="supplyDemand.supplyDemandTal" input-align="right" placeholder="请输入联系电话" />
-      <van-field label="联系人" v-model="supplyDemand.linker" input-align="right" placeholder="请输入联系人" />
-      <van-field label="服务区域" v-model="supplyDemand.serviceDeptName" input-align="right" placeholder="请输入服务区域" />
-      <van-field label="地址" v-model="supplyDemand.address" input-align="right" placeholder="请输入地址" />
-      <van-field label="简介" v-model="supplyDemand.introduction" input-align="right" placeholder="请输入简介" />
-      <van-field label="详情" v-model="supplyDemand.particulars" input-align="right" placeholder="请输入详情" />
-      <van-field label="图片" :border="false" input-align="right" readonly />
-      <div style="padding: 0 4% 2vh;">
-        <van-uploader v-model="supplyDemand.supplyMasterMapList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+        <van-field label="地址" v-model="supplyDemand.address" input-align="right" placeholder="请输入地址" />
+        <van-field label="简介" required :rules="[{ required: true }]" v-model="supplyDemand.introduction" type="textarea" autosize input-align="right" placeholder="请输入简介" />
+        <van-field label="详情" v-model="supplyDemand.particulars" type="textarea" autosize input-align="right" placeholder="请输入详情" />
+        <van-field label="图片" :border="false" input-align="right" readonly />
+        <div style="padding: 0 4% 2vh;">
+          <van-uploader v-model="supplyDemand.supplyMasterMapList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
+        </div>
       </div>
-    </div>
 
-    <div class="main">
-      <baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
-        <!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
-        <bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
-      </baidu-map>
-    </div>
+      <div class="main">
+        <baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
+          <!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
+          <bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
+        </baidu-map>
+      </div>
 
-    <div class="main_btn">
-      <p @click="submitForm('3')">发布</p>
-      <p @click="submitForm('2')">存稿</p>
-    </div>
+      <div class="main_btn">
+        <p @click="publishStatus = '3',$refs.formData.submit()">发布</p>
+        <p @click="publishStatus = '2',$refs.formData.submit()">存稿</p>
+      </div>
+    </van-form>
     <!--  内容结束  -->
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {commonUpload, productTypes, supplyDemandAdd} from "@/api/agriculturalTrusteeship";
+  import {commonUpload, productTypes, supplyDemandAdd, treeselect,detailList} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
     data() {
@@ -124,11 +156,23 @@
           value: 'id',
           children: 'children',
         },
+        publishStatus:'',
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
+        detailListOptions:[]
       };
     },
     created() {
       let query = {
-        parentId : ''
+        parentId : '',
+        tree : true
       }
       let query1 = {
         tree : true
@@ -151,6 +195,16 @@
         }
         this.bodyTypeOptions = response.data;
       });
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
+      detailList().then(res=>{
+        if (res.code == 200) {
+          this.detailListOptions = res.rows;
+        }
+      })
     },
     methods: {
       onConfirmProductType({ selectedOptions }){
@@ -159,8 +213,8 @@
         this.showProductType = false;
       },
       onConfirmProjectType(data){
-        this.supplyDemand.bodyType = data.value;
-        this.bodyType = data.text;
+        this.supplyDemand.entityName = data.entityName;
+        this.supplyDemand.entityId = data.id;
         this.showBodyType = false;
       },
       afterReadEvidenceForm(file){
@@ -179,16 +233,27 @@
       submitForm(publishStatus){
         this.supplyDemand.supplyMasterMap = this.supplyMasterMapArr.join(',')
         this.supplyDemand.supplyDemandType = '1';
-        this.supplyDemand.publishStatus = publishStatus;
+        this.supplyDemand.publishStatus = this.publishStatus;
         supplyDemandAdd(this.supplyDemand).then((res) => {
           if(res.code=="200"){
-            this.$notify({ type: 'success', message: '发布成功' });
+            if (this.publishStatus == '3'){
+              this.$notify({ type: 'success', message: '发布成功' });
+            }else{
+              this.$notify({ type: 'success', message: '存稿成功' });
+            }
+
             setTimeout(function(){
               history.back(-1);
             },2000)
           }
         })
       },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        this.supplyDemand.serviceDeptId = selectedOptions[selectedOptions.length-1].value;
+        this.supplyDemand.serviceDeptName = selectedOptions[selectedOptions.length-1].label;
+        this.showDeptId = false
+      },
     },
   }
 </script>

src/views/agriculturalTrusteeship/socialization/user.vue

@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <div class="header">
-      <div class="header_left" @click="onClickLeft">
+      <div class="header_left" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
         <img src="../../../../static/images/agriculturalTrusteeship/return.png">
         <p>退出登录</p>
       </div>
@@ -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>

src/views/agriculturalTrusteeship/society/societyList.vue

@@ -6,7 +6,18 @@
         <img src="../../../../static/images/agriculturalTrusteeship/return.png">
         <p>社会化服务组织</p>
       </div>
-      <p class="header_right">河东河西村</p>
+      <p class="header_right" @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"
+          @finish="onConfirmDept"
+          active-color="#1989fa"
+          :field-names="hcAreaInfoFieldName"
+        />
+      </van-popup>
     </div>
     <!--  头部结束  -->
 
@@ -92,8 +103,8 @@
                 finished-text="没有更多了"
                 @load="getList"
               >
-                <!--            @load="onLoad"-->
-                <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocializationProjectDetail',query:{id:item.id}})">
+                <!--            @load="onLoad" agriculturalTrusteeshipSocializationProjectDetail-->
+                <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
                   <img v-if="item.supplyMasterMap" :src="item.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">
@@ -119,7 +130,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {supplyDemandList, detailList, productTypes} from "@/api/agriculturalTrusteeship";
+  import {supplyDemandList, detailList, productTypes, treeselect} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipInsuranceList",
     data() {
@@ -141,15 +152,26 @@
         main_content_right_header_tit:'全套服务',
         query:{
           entityId:'',
+          serviceDeptId:'187',
           entityName:'',
           productType:''
         },
         query2:{
           supplyDemandName:'',
+          serviceDeptId:'187',
           orderByColumn:'order_score'
         },
         searchServiceInput:'',
         searchInput:'',
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
@@ -162,6 +184,12 @@
       productTypes(query).then(response => {
         this.productList = response.data;
       });
+
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
     },
     methods: {
       getServiceList(){
@@ -246,7 +274,18 @@
         }
         this.supplyDemandListYes = [];
         this.getList();
-      }
+      },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        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.supplyDemandListYes = [];
+        this.serviceList = [];
+        this.getServiceList();
+        this.getList();
+      },
     },
   }
 </script>

src/views/agriculturalTrusteeship/society/societyProjectDetail.vue

@@ -23,7 +23,7 @@
           <p><span>销 {{supplyDemand.orderNum}}</span><span>分 {{supplyDemand.orderScore}}</span></p>
         </div>
         <p class="tt">{{supplyDemand.supplyDemandName}}</p>
-        <p class="name">{{supplyDemand.entityName}}</p>
+        <p class="name" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectList',query:{id:supplyDemand.entityId,entityName:supplyDemand.entityName}})">{{supplyDemand.entityName}}<span>{{supplyDemand.createTime}}</span></p>
       </div>
 
       <div class="main_box">
@@ -31,7 +31,7 @@
         <van-cell title="产品规格" :border="false" :value="supplyDemand.specification" />
         <van-cell title="产品数量" :border="false" :value="supplyDemand.number" />
         <van-cell title="服务区域" :border="false" :value="supplyDemand.serviceDeptName" />
-        <van-cell title="产品简介" :border="false" :value="supplyDemand.introduction" />
+        <van-cell title="产品简介" type="textarea" autosize :border="false" :value="supplyDemand.introduction" />
         <van-cell title="公司地址" :border="false" :value="supplyDemand.address" />
       </div>
 
@@ -41,9 +41,15 @@
       </div>
 
       <div class="main_box" style="padding: 0;">
-        <baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
+        <baidu-map
+          :center="center"
+          panBy="[50,50]"
+          :zoom="zoom"
+          :scroll-wheel-zoom="true"
+          :pinch-to-zoom="true"
+          map-type="BMAP_NORMAL_MAP"
+          style="height:25vh" >
           <!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
-          <bm-geolocation anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :showAddressBar="true" :autoLocation="true"></bm-geolocation>
           <bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
         </baidu-map>
       </div>
@@ -53,7 +59,7 @@
     <!--  底部提交按钮  -->
     <div class="footer">
       <p>温馨提示：下单前请先与商家沟通联系</p>
-      <img src="../../../../static/images/agriculturalTrusteeship/insurance/submit_shop_btn.png">
+      <img src="../../../../static/images/agriculturalTrusteeship/insurance/submit_shop_btn.png" @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder',query:{id:$route.query.id}})">
     </div>
   </div>
 </template>
@@ -68,8 +74,11 @@
         active: 0,
         loading: false,
         finished: false,
-        center: { lng: 122.089726, lat: 37.540728 }, //经纬度
-        zoom: 15, //地图展示级别
+        center: {
+          lng :'',
+          lat :'',
+        }, //经纬度
+        zoom: 1, //地图展示级别
         showDialog:false,
         supplyDemand:{},
         productType:'',
@@ -90,17 +99,12 @@
     },
     created() {
       let query = {
-        parentId : ''
-      }
-      let query1 = {
-        tree : true
+        parentId : '',
+        tree : false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
       });
-      productTypes(query1).then(response => {
-        this.productList1 = response.data;
-      });
       this.getDicts("newBusinessEntity_statistics_project").then(response => {
         for (var i = 0; i < response.data.length; i++) {
           this.projectTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
@@ -113,14 +117,23 @@
       getDetail(){
         supplyDemandGet(this.$route.query.id).then(response => {
           response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType);
-          response.data.productType = this.productList1.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
+          response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
+          response.data.createTime = response.data.createTime.substr(0,10);
+          response.data.supplyMasterMapList = [];
+          if (response.data.theGeom){
+            console.log(JSON.parse(response.data.theGeom).coordinates[0])
+            console.log(JSON.parse(response.data.theGeom).coordinates[1])
+            this.center.lng = JSON.parse(response.data.theGeom).coordinates[0];
+            this.center.lat = JSON.parse(response.data.theGeom).coordinates[1];
+          }
           if (response.data.supplyMasterMap){
-            response.data.supplyMasterMapList = [];
             var attachement = response.data.supplyMasterMap.split( "," );
             this.supplyMasterMapArr = response.data.supplyMasterMap.split( "," );
             attachement.forEach(responseAttach=>{
               response.data.supplyMasterMapList.push('/api' + responseAttach);
             })
+          }else{
+            response.data.supplyMasterMapList.push('../../../../static/images/agriculturalTrusteeship/zwtp.png')
           }
           this.supplyDemand = response.data;
         });
@@ -131,6 +144,7 @@
 <style scoped lang="scss">
 .home_wrapper{
   padding-bottom: 15vh;
+  background-color: #F9F9F9;
 }
   /*头部*/
   .header{
@@ -187,6 +201,13 @@
         color: #4E7FFF;
         background: url("../../../../static/images/agriculturalTrusteeship/index/name_icon.png") no-repeat left center;
         padding-left: 18PX;
+        display: flex;
+        span{
+          color: #334281;
+          margin-left: auto;
+          padding:0 0 0 18PX;
+          background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center
+        }
       }
       .tab{
         display: flex;

src/views/agriculturalTrusteeship/society/societyProjectList.vue

@@ -43,7 +43,7 @@
             @load="getList"
           >
             <!--            @load="onLoad"-->
-            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocializationProjectDetail',query:{id:item.id}})">
+            <div class="main_content_right_list" v-for="(item,index) in supplyDemandListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
               <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 18vw;height: 18vw;">
               <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 18vw;height: 18vw;">
               <div class="main_content_right_list_content">

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -289,7 +289,7 @@
           </van-popup>-->
         </div>
       </div>
-      <p class="main_title"  v-if="isModifyOrder">上传附件</p>
+      <p class="main_title"  v-if="isModifyOrder" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;"  v-if="isModifyOrder">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -306,10 +306,10 @@
         </van-row>
         <van-row v-else>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保存修改</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -372,7 +372,7 @@
         fileList1:[],
         fileList2:[],
         fileList3:[],
-        capitalExpenditureType:'',
+        capitalExpenditureType:'结算类',
         payee:'',
         bankType:'',
 

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue

@@ -72,8 +72,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue

@@ -64,8 +64,8 @@
         <van-field readonly label="申请使用金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" label-width="auto"/>
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue

@@ -116,8 +116,8 @@
         <van-field readonly label="负责人全称" v-model="item.leader" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
 

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue

@@ -69,8 +69,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue

@@ -56,8 +56,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue

@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <p class="main_title">上传附件</p>
+      <p class="main_title" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -300,10 +300,10 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>

src/views/sunVillage_info/index.vue

@@ -45,6 +45,7 @@
         </div>
         <div class="index_info">
             <div class="title"></div>
+
             <div class="nav_list">
               <div class="nav_list_box">
                 <van-cell style="border-radius: 6px;">
@@ -54,16 +55,13 @@
                 </van-cell>
                 <router-link :to="{name:'sunVillageInfoListFinance'}" class="nav_item n_1">财务公开榜</router-link>
                 <router-link :to="{name:'sunVillageInfoListTourists'}" class="nav_item n_2">零工公开榜</router-link>
-                <router-link :to="{name:'sunVillageInfoListIssues'}" class="nav_item n_3">重大事项</router-link>
-                <router-link :to="{name:'sunVillageInfoListBalanceRanking'}" class="nav_item n_4">科目余额表</router-link>
-                <router-link :to="{name:'sunVillageInfoListVote'}" class="nav_item n_5">发布投票</router-link>
-                <router-link :to="{name:'sunVillageInfoFixedAssets'}" class="nav_item n_6">资产登记</router-link>
-                <router-link :to="{name:'sunVillageInfoInformation'}" class="nav_item n_7">合同登记</router-link>
                 <router-link :to="{name:'sunVillageInfoListRegister'}" class="nav_item n_8">零工登记</router-link>
                 <router-link :to="{name:'sunVillageInfoStatisticalReport'}" class="nav_item n_9">统计填报</router-link>
-                <router-link :to="{name:'sunVillageInfoDetailedLedger'}" class="nav_item n_10">明细账</router-link>
+                <router-link :to="{name:'sunVillageInfoListIssues'}" class="nav_item n_3">重大事项</router-link>
+                <router-link :to="{name:'sunVillageInfoListVote'}" class="nav_item n_5">发布投票</router-link>
               </div>
             </div>
+
             <div class="nav_list">
               <div class="nav_box">
                 <van-cell style="border-radius: 6px;">
@@ -126,15 +124,32 @@
                     </div>
                     <p style="margin-top: 5px;color: #666666;">开户行</p>
                   </van-grid-item>
+                  <!--
                   <van-grid-item text="重大事项" :to="{name:'sunVillageApprovalList13'}" >
                     <div class="icon" slot="default" style="background:#c568f5;" >
                       <img src="../../../static/images/onlineHome/icon_Y3.png" alt />
                     </div>
                     <p style="margin-top: 5px;color: #666666;">重大事项</p>
                   </van-grid-item>
+                  -->
                 </van-grid>
               </div>
             </div>
+
+          <div class="nav_list">
+            <div class="nav_list_box">
+              <van-cell style="border-radius: 6px;">
+                <template #title>
+                  <p style="font-weight: bold;font-size: 18px;display: inline-block">财务信息</p>
+                </template>
+              </van-cell>
+              <router-link :to="{name:'sunVillageInfoListBalanceRanking'}" class="nav_item n_4">科目余额表</router-link>
+              <router-link :to="{name:'sunVillageInfoFixedAssets'}" class="nav_item n_6">固定资产</router-link>
+              <router-link :to="{name:'sunVillageInfoInformation'}" class="nav_item n_7">合同信息</router-link>
+              <router-link :to="{name:'sunVillageInfoDetailedLedger'}" class="nav_item n_10">明细账</router-link>
+            </div>
+          </div>
+
         </div>
         <div class="footer">
             技术支持：北京农燊高科信息技术有限公司
@@ -390,7 +405,7 @@
                 &.n_4 {
                     background: url('../../assets/images/sunVillage_info/index_block_04.png') no-repeat center top;
                     background-size: 50%;
-                    margin-bottom: 20PX;
+                    // margin-bottom: 20PX;
                 }
                 &.n_5 {
                     background: url('../../assets/images/sunVillage_info/index_block_05.png') no-repeat center top;
@@ -400,12 +415,12 @@
                 &.n_6 {
                     background: url('../../assets/images/sunVillage_info/index_block_06.png') no-repeat center top;
                     background-size: 50%;
-                    margin-bottom: 20PX;
+                    // margin-bottom: 20PX;
                 }
                 &.n_7 {
                     background: url('../../assets/images/sunVillage_info/index_block_07.png') no-repeat center top;
                     background-size: 50%;
-                    margin-bottom: 20PX;
+                    // margin-bottom: 20PX;
                 }
                 &.n_8 {
                     background: url('../../assets/images/sunVillage_info/index_block_08.png') no-repeat center top;
@@ -415,11 +430,13 @@
                 &.n_9 {
                     background: url('../../assets/images/sunVillage_info/index_block_09.png') no-repeat center top;
                     background-size: 50%;
+                    margin-bottom: 20PX;
 
                 }
                 &.n_10 {
                     background: url('../../assets/images/sunVillage_info/index_block_10.png') no-repeat center top;
                     background-size: 50%;
+                    // margin-bottom: 20PX;
                 }
             }
           .icon{
@@ -440,6 +457,7 @@
       font-size: 22px;
       color: #3f3d56;
       text-align: center;
+      padding-top: 20px;
       padding-bottom: 25PX;
     }
 }

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -289,7 +289,7 @@
           </van-popup>-->
         </div>
       </div>
-      <p class="main_title" v-if="isModifyOrder">上传附件</p>
+      <p class="main_title"  v-if="isModifyOrder" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;" v-if="isModifyOrder">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -307,10 +307,10 @@
         </van-row>
         <van-row v-else>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保存修改</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -373,7 +373,7 @@
         fileList1:[],
         fileList2:[],
         fileList3:[],
-        capitalExpenditureType:'',
+        capitalExpenditureType:'结算类',
         payee:'',
         bankType:'',
 

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue

@@ -72,8 +72,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue

@@ -64,8 +64,8 @@
         <van-field readonly label="申请使用金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" label-width="auto"/>
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue

@@ -116,8 +116,8 @@
         <van-field readonly label="负责人全称" v-model="item.leader" input-align="right" label-width="auto"/>
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
 

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue

@@ -69,8 +69,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue

@@ -56,8 +56,8 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
-      <p class="main_more" v-if="showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
-      <p class="main_more" v-if="!showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue

@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <p class="main_title">上传附件</p>
+      <p class="main_title" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -300,10 +300,10 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -445,7 +445,7 @@
           this.payerOptions[index].value = res.id;
         })
       });
-      this.getFileList();
+      this.getDictionaries();
     },
 
     methods: {

src/views/yinnong/my.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-      <van-row style="background: url('../../../static/images/onlineHome/bg1.jpg') 50% ;height: 220px;border-radius:0 0 50px 50px;">
+      <van-row style="background: url('../../../static/images/onlineHome/bg11.png') no-repeat left -20px;background-size: 100%;height: 220px;border-radius:0 0 50px 50px;">
         <van-cell center  style="padding-top: 50px;background: none">
           <template #title>
             <p style="color: #fff;margin-left: 10px;font-size: 20px">{{nickName}}</p>
@@ -69,44 +69,44 @@
 <!--            />-->
 <!--          </template>-->
 <!--        </van-cell>-->
-        <van-cell title="阳光村务" is-link @click="sunVillage">
+        <van-cell title="阳光村务" center is-link @click="sunVillage">
           <template #icon>
             <van-image
               fit="contain"
-              height="22"
+              height="20"
               style="margin-right: 15px"
-              src="../../../static/images/onlineHome/myIcon8.png"
+              src="../../../static/images/onlineHome/myIcon01.png"
             />
           </template>
         </van-cell>
-        
-        <van-cell title="电子签名" is-link to="signature">
+
+        <van-cell title="电子签名" center is-link to="signature">
           <template #icon>
             <van-image
               fit="contain"
-              height="22"
+              height="20"
               style="margin-right: 15px"
-              src="../../../static/images/onlineHome/myIcon7.png"
+              src="../../../static/images/onlineHome/myIcon02.png"
             />
           </template>
         </van-cell>
-        <van-cell title="修改密码" is-link to="password">
+        <van-cell title="修改密码" center is-link to="password">
           <template #icon>
             <van-image
               fit="contain"
-              height="22"
+              height="20"
               style="margin-right: 15px"
-              src="../../../static/images/onlineHome/myIcon7.png"
+              src="../../../static/images/onlineHome/myIcon03.png"
             />
           </template>
         </van-cell>
-        <van-cell title="退出登录" is-link @click="logout">
+        <van-cell title="退出登录" center is-link @click="logout">
           <template #icon>
             <van-image
               fit="contain"
-              height="22"
+              height="20"
               style="margin-right: 15px"
-              src="../../../static/images/onlineHome/myIcon8.png"
+              src="../../../static/images/onlineHome/myIcon04.png"
             />
           </template>
         </van-cell>