From 9399bee519403e183dd07cb9efe48c947b9aa158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 19 Dec 2022 10:28:05 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/agriculturalTrusteeship/index.js      |  23 ++
 .../agriculturalTrusteeship/buyer/allBill.vue |  46 ++-
 .../buyer/billDetail.vue                      |  76 +++--
 .../buyer/billDetail2.vue                     |  20 +-
 .../buyer/billDetail3.vue                     |  31 +-
 .../buyer/billDetail4.vue                     |  74 +++--
 .../agriculturalTrusteeship/buyer/index.vue   |  99 +++---
 .../buyer/waitBill.vue                        |  19 +-
 src/views/agriculturalTrusteeship/index.vue   |   6 +-
 .../insurance/insuranceList.vue               |  12 +-
 .../insurance/insuranceProjectList.vue        |   1 +
 src/views/agriculturalTrusteeship/login.vue   |   8 +-
 .../socialization/bill.vue                    |  28 +-
 .../socialization/billDetail.vue              |  22 +-
 .../socialization/index.vue                   |   8 +-
 .../socialization/user.vue                    |  52 +++-
 .../socialization/userEdit.vue                | 281 ++++++++++++++++--
 17 files changed, 607 insertions(+), 199 deletions(-)

diff --git a/src/api/agriculturalTrusteeship/index.js b/src/api/agriculturalTrusteeship/index.js
index 75a7865d..f2a29509 100644
--- a/src/api/agriculturalTrusteeship/index.js
+++ b/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
+  })
+}
diff --git a/src/views/agriculturalTrusteeship/buyer/allBill.vue b/src/views/agriculturalTrusteeship/buyer/allBill.vue
index 8f26e2c9..18442fe4 100644
--- a/src/views/agriculturalTrusteeship/buyer/allBill.vue
+++ b/src/views/agriculturalTrusteeship/buyer/allBill.vue
@@ -4,8 +4,8 @@
     <div class="header">
       <div class="search">
         <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
-        <input type="text" placeholder="输入需求进行搜索" />
-        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" />
+        <input type="text" placeholder="输入需求进行搜索" v-model="searchInput"/>
+        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" @click="goSearch" />
       </div>
 <!--      <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" alt="" @click="show = true;">-->
     </div>
@@ -35,8 +35,8 @@
         />
       </van-popup>
       <div class="nav_list">
-        <p class="active">全部</p>
-        <p v-for="(item,index) in orderStatusOptions" :key="index">{{item.dictLabel}}</p>
+        <p :class="{'active':query.orderStatus == ''}" @click="tabChange('')">全部</p>
+        <p :class="{'active':query.orderStatus == item.dictValue}" @click="tabChange(item.dictValue)" v-for="(item,index) in orderStatusOptions" :key="index">{{item.dictLabel}}</p>
       </div>
     </div>
     <!--  导航结束  -->
@@ -59,11 +59,12 @@
           </div>
 <!--          $router.push({name:'agriculturalTrusteeshipBillDetail2',query:{id:item.id}})-->
           <div class="main_content_right_list_center" @click="goDetail(item.orderStatus,item.id)">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="item.supplyDemand!=null" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
-              <p class="tt">{{item.contractionName}}</p>
+              <p class="tt">{{item.demandName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.realityServiceMoney}}</span>.00</p>
+                <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
@@ -71,9 +72,9 @@
               </p>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="item.bookName" />
-          <van-cell title="联系人" :border="false" :value="item.linkera" />
-          <van-cell title="联系电话" :border="false" :value="item.phonea" />
+          <van-cell title="卖方名称" :border="false" :value="item.entityName" />
+          <van-cell title="联系人" :border="false" :value="item.linker" />
+          <van-cell title="联系电话" :border="false" :value="item.supplyDemandTal" />
         </div>
 <!--        <div class="main_content_right_list">-->
 <!--          <div class="main_content_right_list_header">-->
@@ -172,12 +173,13 @@
           startOrderAt:this.format(new Date(),'yyyy-MM'),
           endOrderAt:this.format(new Date(),'yyyy-MM'),
         },
-        content:''
+        content:'',
+        searchInput:''
       };
     },
     created() {
       let query = {
-        parentId : 0,
+        parentId : null,
         tree:true
       }
       productTypes(query).then(response => {
@@ -194,6 +196,11 @@
       getList(){
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
+            // console.log(res.supplyDemand.supplyMasterMap)
+            if (res.supplyDemand!=null){
+              let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," )
+              res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0]
+            }
             res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
             res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
             res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;
@@ -209,6 +216,7 @@
         });
       },
       onConfirmStar(data){
+        this.supplyDemandList=[];
         this.params.startOrderAt = this.format(data,'yyyy-mm');
         this.query.startOrderAt = this.format(data,'yyyy-mm');
         this.startOrderAt = this.format(data,'yyyy年MM月');
@@ -219,6 +227,7 @@
         this.getList();
       },
       onConfirmEnd(data){
+        this.supplyDemandList=[];
         this.params.endOrderAt = this.format(data,'yyyy-mm');
         this.query.endOrderAt = this.format(data,'yyyy-mm');
         this.endOrderAt = this.format(data,'yyyy年MM月');
@@ -238,6 +247,19 @@
         if (type == '已拒单'){
           this.$router.push({name:'agriculturalTrusteeshipBillDetail4',query:{id:id}})
         }
+        if (type == '已下单'){
+          this.$router.push({name:'agriculturalTrusteeshipBillDetail',query:{id:id}})
+        }
+      },
+      tabChange(val){
+        this.query.orderStatus = val;
+        this.supplyDemandList=[];
+        this.getList();
+      },
+      goSearch(){
+        this.supplyDemandList = [];
+        this.query.demandName = this.searchInput;
+        this.getList();
       },
       openDialog(val){
         this.showDialog = val
diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail.vue b/src/views/agriculturalTrusteeship/buyer/billDetail.vue
index 51e414f3..c8aa3304 100644
--- a/src/views/agriculturalTrusteeship/buyer/billDetail.vue
+++ b/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>
diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue b/src/views/agriculturalTrusteeship/buyer/billDetail2.vue
index 10730703..f62ed216 100644
--- a/src/views/agriculturalTrusteeship/buyer/billDetail2.vue
+++ b/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;
         });
diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue b/src/views/agriculturalTrusteeship/buyer/billDetail3.vue
index 61ff8ffd..b72e0d5e 100644
--- a/src/views/agriculturalTrusteeship/buyer/billDetail3.vue
+++ b/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;
         });
diff --git a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue b/src/views/agriculturalTrusteeship/buyer/billDetail4.vue
index 101be4f3..e9b40920 100644
--- a/src/views/agriculturalTrusteeship/buyer/billDetail4.vue
+++ b/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>
diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue
index e98d34da..4d3425b7 100644
--- a/src/views/agriculturalTrusteeship/buyer/index.vue
+++ b/src/views/agriculturalTrusteeship/buyer/index.vue
@@ -1,54 +1,56 @@
 <template>
   <div class="home_wrapper">
-    <!--  头部开始  -->
-    <div class="header">
-<!--      <img :src="avatar">-->
-      <img src="../../../../static/images/agriculturalTrusteeship/index/header.png">
-      <div class="header_box" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
-        <p>{{nickName}}<span>{{phonenumber}}</span><img src="../../../../static/images/agriculturalTrusteeship/buyer/buyer_icon_01.png" alt=""></p>
-        <p>{{allDeptName}}</p>
+    <div id="topMain" class="topMain">
+      <!--  头部开始  -->
+      <div class="header">
+  <!--      <img :src="avatar">-->
+        <img v-if="avatar" :src="avatar" style="width: 50px;height: 50px;">
+        <img v-else src="../../../../static/images/agriculturalTrusteeship/index/header.png" style="width: 50px;height: 50px;">
+        <div class="header_box" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
+          <p>{{nickName}}<span>{{phonenumber}}</span><img src="../../../../static/images/agriculturalTrusteeship/buyer/buyer_icon_01.png" alt=""></p>
+          <p>{{allDeptName}}</p>
+        </div>
       </div>
-    </div>
-    <!--  头部结束  -->
+      <!--  头部结束  -->
 
-    <!--  导航开始  -->
-    <div class="nav">
-      <van-grid :column-num="4" :border="false">
-        <van-grid-item :to="{name:'agriculturalTrusteeshipSocietyList'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_01.png"/>
-          <p>社会化</p>
-        </van-grid-item>
-        <van-grid-item :to="{name:'lawEnforcementCaseStatistics'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_02.png"/>
-          <p>农担</p>
-        </van-grid-item>
-        <van-grid-item :to="{name:'lawEnforcementCaseDistributionMap'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_03.png"/>
-          <p>贷款</p>
-        </van-grid-item>
-        <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList'}">
-          <img src="../../../../static/images/agriculturalTrusteeship/index/nav_04.png"/>
-          <p>保险</p>
-        </van-grid-item>
-      </van-grid>
+      <!--  导航开始  -->
+      <div class="nav">
+        <van-grid :column-num="4" :border="false">
+          <van-grid-item :to="{name:'agriculturalTrusteeshipSocietyList'}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_01.png"/>
+            <p>社会化</p>
+          </van-grid-item>
+          <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:3}}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_02.png"/>
+            <p>农担</p>
+          </van-grid-item>
+          <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:1}}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_03.png"/>
+            <p>贷款</p>
+          </van-grid-item>
+          <van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:2}}">
+            <img src="../../../../static/images/agriculturalTrusteeship/index/nav_04.png"/>
+            <p>保险</p>
+          </van-grid-item>
+        </van-grid>
 
-      <div class="nav_notice_box">
-        <van-notice-bar left-icon="../../../../static/images/agriculturalTrusteeship/index/notice_icon.png" mode="link" :scrollable="false" background="#E2E9FD" color="#334281">
-          <van-swipe
-            vertical
-            class="notice-swipe"
-            :autoplay="3000"
-            :show-indicators="false"
-          >
-            <van-swipe-item>12.0版本上线啦！点击查看更改内容~</van-swipe-item>
-            <van-swipe-item>12.1版本上线啦！点击查看更改内容~</van-swipe-item>
-            <van-swipe-item>12.2版本上线啦！点击查看更改内容~</van-swipe-item>
-          </van-swipe>
-        </van-notice-bar>
+        <div class="nav_notice_box">
+          <van-notice-bar left-icon="../../../../static/images/agriculturalTrusteeship/index/notice_icon.png" mode="link" :scrollable="false" background="#E2E9FD" color="#334281">
+            <van-swipe
+              vertical
+              class="notice-swipe"
+              :autoplay="3000"
+              :show-indicators="false"
+            >
+              <van-swipe-item>12.0版本上线啦！点击查看更改内容~</van-swipe-item>
+              <van-swipe-item>12.1版本上线啦！点击查看更改内容~</van-swipe-item>
+              <van-swipe-item>12.2版本上线啦！点击查看更改内容~</van-swipe-item>
+            </van-swipe>
+          </van-notice-bar>
+        </div>
       </div>
+      <!--  导航结束  -->
     </div>
-    <!--  导航结束  -->
-
     <!--  内容开始  -->
     <div class="main">
       <div class="main_header">
@@ -107,7 +109,7 @@
     </div>
     <!--  内容结束  -->
 
-    <img src="../../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc"/>
+    <img src="../../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc" @click="openMain"/>
 
     <buyer></buyer>
   </div>
@@ -220,6 +222,10 @@
         }
         this.supplyDemandListYes = [];
         this.getList();
+      },
+
+      openMain(){
+        $('#topMain').attr('none');
       }
     },
   }
@@ -234,6 +240,9 @@
     align-items: center;
     background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
     padding: 4vh 4% 2vh;
+    img{
+      border-radius: 100%;
+    }
     .header_box{
       margin-left: 4%;
       flex: 1;
diff --git a/src/views/agriculturalTrusteeship/buyer/waitBill.vue b/src/views/agriculturalTrusteeship/buyer/waitBill.vue
index 5bde5bea..e6ff9bc2 100644
--- a/src/views/agriculturalTrusteeship/buyer/waitBill.vue
+++ b/src/views/agriculturalTrusteeship/buyer/waitBill.vue
@@ -25,9 +25,10 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="item.supplyDemand!=null" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
-              <p class="tt">{{item.contractionName}}</p>
+              <p class="tt">{{item.demandName}}</p>
               <div class="tab">
                 <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
               </div>
@@ -37,9 +38,9 @@
               </p>
             </div>
           </div>
-          <van-cell title="卖方名称" :border="false" :value="item.bookName" />
-          <van-cell title="联系人" :border="false" :value="item.linkera" />
-          <van-cell title="联系电话" :border="false" :value="item.phonea" />
+          <van-cell title="卖方名称" :border="false" :value="item.entityName" />
+          <van-cell title="联系人" :border="false" :value="item.linker" />
+          <van-cell title="联系电话" :border="false" :value="item.supplyDemandTal" />
         </div>
       </van-list>
 
@@ -94,7 +95,7 @@
     },
     created() {
       let query = {
-        parentId : 0,
+        parentId : null,
         tree:true
       }
       productTypes(query).then(response => {
@@ -112,9 +113,13 @@
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
             if ( res.orderStatus == '1'){
+              if (res.supplyDemand!=null){
+                let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," )
+                res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0]
+              }
               res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
               res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
-              // res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;
+              res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;
               this.supplyDemandList.push(res);
             }
             this.supplyDemandList1.push(res);
diff --git a/src/views/agriculturalTrusteeship/index.vue b/src/views/agriculturalTrusteeship/index.vue
index ad1408eb..8c40c8bd 100644
--- a/src/views/agriculturalTrusteeship/index.vue
+++ b/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>
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
index e815e866..753c67ce 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
@@ -4,7 +4,7 @@
     <div class="header">
       <div class="header_left" @click="onClickLeft">
         <img src="../../../../static/images/agriculturalTrusteeship/return.png">
-        <p>保险服务</p>
+        <p>{{tt}}服务</p>
       </div>
       <p class="header_right">河东河西村</p>
     </div>
@@ -13,7 +13,7 @@
     <!--  内容开始  -->
     <div class="main">
       <van-tabs v-model="active" sticky animated>
-        <van-tab title="保险公司">
+        <van-tab :title="tt+'公司'">
           <div class="search">
             <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
             <input type="text" v-model="searchServiceInput" placeholder="输入需求进行搜索" />
@@ -47,7 +47,7 @@
           </van-list>
 
         </van-tab>
-        <van-tab title="保险产品">
+        <van-tab :title="tt+'产品'">
           <div class="search">
             <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
             <input type="text" v-model="searchInput" placeholder="输入需求进行搜索" />
@@ -115,10 +115,14 @@
         },
         searchServiceInput:'',
         searchInput:'',
+        tt:''
       };
     },
     created() {
-
+      this.query.financialType = this.$route.query.type;
+      if (this.$route.query.type == 3){this.tt = '农担'}
+      if (this.$route.query.type == 2){this.tt = '保险'}
+      if (this.$route.query.type == 1){this.tt = '贷款'}
     },
     methods: {
       getServiceList(){
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
index ec73a52b..6d5d4e66 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
@@ -66,6 +66,7 @@
     },
     created() {
       this.query.financialServiceId = this.$route.query.id;
+
       this.tt = this.$route.query.financialName
     },
     methods: {
diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue
index e17e9220..b857adbb 100644
--- a/src/views/agriculturalTrusteeship/login.vue
+++ b/src/views/agriculturalTrusteeship/login.vue
@@ -98,7 +98,7 @@
           <p class="submit_btn" v-if="loginType == 'mj'" @click="handleLogin">登录1</p>
           <p class="submit_btn" v-else @click="goLogin">登录</p>
         </van-tab>
-        <van-tab name="register" title="注册">
+        <van-tab name="register" title="注册" v-if="loginType != 'mj'">
         <!--保险机构注册-->
           <template v-if="loginType == 'bxjg' || loginType == 'dkjg' || loginType == 'ndjg'">
             <van-field v-model="serviceForm.financialName" center :border="false" placeholder="请输入机构名称" >
@@ -727,6 +727,7 @@
         this.mainImgUploader2.splice(detail.index,1);
       },
       goRegister(){
+        console.log(this.loginType)
         if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg'){
           this.serviceForm.mainImg = this.mainImgArr.join(',');
           this.serviceForm.username = encrypt(this.serviceForm.username);
@@ -736,7 +737,7 @@
             this.$notify({ type: 'success', message: '注册成功' });
             this.active = 0;
           })
-        }else if(this.loginType = 'fwzz'){
+        }else if(this.loginType == 'fwzz'){
           this.entityForm.mainImg = this.mainImgArrEntity.join(',');
           this.entityForm.userName = encrypt(this.entityForm.userName);
           this.entityForm.password = encrypt(this.entityForm.password);
@@ -745,6 +746,9 @@
             this.active = 0;
           })
         }
+        // else if(this.loginType == 'mj'){
+        //   this.registerSubmit();
+        // }
       },
       onConfirmStatisticsTypeId(data){
         this.entityForm.statisticsTypeId = data.value;
diff --git a/src/views/agriculturalTrusteeship/socialization/bill.vue b/src/views/agriculturalTrusteeship/socialization/bill.vue
index 8d2d52f1..6ffa2d2c 100644
--- a/src/views/agriculturalTrusteeship/socialization/bill.vue
+++ b/src/views/agriculturalTrusteeship/socialization/bill.vue
@@ -4,8 +4,8 @@
     <div class="header">
       <div class="search">
         <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
-        <input type="text" placeholder="输入需求进行搜索" />
-        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" />
+        <input type="text" placeholder="输入需求进行搜索" v-model="searchInput"/>
+        <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" @click="goSearch" />
       </div>
       <img src="../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_01.png" alt="" @click="show = true">
     </div>
@@ -65,7 +65,7 @@
           </div>
 
           <div class="main_content_right_list_center" @click="$router.push({name:'agriculturalTrusteeshipSocializationBillDetail',query:{id:item.id}})">
-            <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <img v-if="item.supplyDemand.supplyMasterMap" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
             <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.contractionName}}</p>
@@ -104,8 +104,8 @@
         <div class="selected" v-for="(item,index) in productList2" :key="index">
           <p class="on">{{item.dictName}}</p>
           <div class="options">
-            <p :class="{'active':query.productType == ''}" @click="query.productType = ''">全部</p>
-            <p :class="{'active':query.productType == itemChild.id}" @click="query.productType = itemChild.id" v-for="(itemChild,indexChild) in item.children" :key="indexChild">{{itemChild.dictName}}</p>
+            <p :class="{'active':query.productTypeStr == ''}" @click="query.productType = ''">全部</p>
+            <p :class="{'active':query.productTypeStr == itemChild.id}" @click="query.productType = itemChild.id" v-for="(itemChild,indexChild) in item.children" :key="indexChild">{{itemChild.dictName}}</p>
           </div>
         </div>
 <!--        <div class="selected">-->
@@ -188,7 +188,7 @@
           startOrderAt :this.format(new Date(),'yyyy-MM'),
           endOrderAt :this.format(new Date(),'yyyy-MM'),
           orderStatus :'',
-          productType:''
+          productTypeStr:''
         },
         startOrderAt:this.format(new Date(),'yyyy年MM月'),
         endOrderAt:this.format(new Date(),'yyyy年MM月'),
@@ -196,7 +196,8 @@
           startOrderAt:this.format(new Date(),'yyyy-MM'),
           endOrderAt:this.format(new Date(),'yyyy-MM'),
         },
-        content:''
+        content:'',
+        searchInput:''
       };
     },
     created() {
@@ -233,9 +234,9 @@
       getList(){
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
-            if (res.supplyMasterMap){
-              let supplyMasterMap = res.supplyMasterMap.split( "," )
-              res.supplyMasterMap = '/api'+supplyMasterMap[0]
+            if (res.supplyDemand.supplyMasterMap){
+              let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," )
+              res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0]
             }
             res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
             res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
@@ -284,9 +285,14 @@
             startOrderAt :this.format(new Date(),'yyyy-MM'),
             endOrderAt :this.format(new Date(),'yyyy-MM'),
             orderStatus :'',
-            productType:''
+            productTypeStr:''
         }
       },
+      goSearch(){
+        this.supplyDemandList = [];
+        this.query.demandName = this.searchInput;
+        this.getList();
+      },
     },
   }
 </script>
diff --git a/src/views/agriculturalTrusteeship/socialization/billDetail.vue b/src/views/agriculturalTrusteeship/socialization/billDetail.vue
index d8629397..fefbb5e5 100644
--- a/src/views/agriculturalTrusteeship/socialization/billDetail.vue
+++ b/src/views/agriculturalTrusteeship/socialization/billDetail.vue
@@ -21,17 +21,19 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img src="../../../../static/images/agriculturalTrusteeship/index/test.png">
+            <img v-if="supplyDemand.supplyDemand!=null" :src="supplyDemand.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
+
             <div class="main_content_right_list_content">
-              <p class="tt">{{supplyDemand.contractionName}}</p>
+              <p class="tt">{{supplyDemand.demandName}}</p>
               <div class="tab">
                 <p>￥<span>{{supplyDemand.unitPrice}}</span>.00/{{supplyDemand.unit}}</p>
               </div>
             </div>
           </div>
-          <van-cell title="买方名称" :border="false" :value="supplyDemand.bookName" />
-          <van-cell title="联系人" :border="false" :value="supplyDemand.linkera" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.phonea" />
+          <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
+          <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
+          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
         </div>
 
         <div class="main_content_right_list">
@@ -109,13 +111,9 @@
           response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType);
           response.data.orderStatus = this.selectDictLabel(this.orderStatusOptions, response.data.orderStatus);
           response.data.productType = this.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;
-          if (response.data.supplyMasterMap){
-            response.data.supplyMasterMapList = [];
-            var attachement = response.data.supplyMasterMap.split( "," );
-            this.supplyMasterMapArr = response.data.supplyMasterMap.split( "," );
-            attachement.forEach(responseAttach=>{
-              response.data.supplyMasterMapList.push('/api' + responseAttach);
-            })
+          if (response.data.supplyDemand.supplyMasterMap){
+            var attachement = response.data.supplyDemand.supplyMasterMap.split( "," );
+            response.data.supplyDemand.supplyMasterMap = '/api' + attachement[0];
           }
           this.supplyDemand = response.data;
         });
diff --git a/src/views/agriculturalTrusteeship/socialization/index.vue b/src/views/agriculturalTrusteeship/socialization/index.vue
index 8bfabc1e..2781c561 100644
--- a/src/views/agriculturalTrusteeship/socialization/index.vue
+++ b/src/views/agriculturalTrusteeship/socialization/index.vue
@@ -25,7 +25,7 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img v-if="item.supplyMasterMap" :src="item.supplyMasterMap" style="width: 25vw;height: 25vw;">
+            <img v-if="item.supplyDemand.supplyMasterMap" :src="item.supplyDemand.supplyMasterMap" style="width: 25vw;height: 25vw;">
             <img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 25vw;height: 25vw;">
             <div class="main_content_right_list_content">
               <p class="tt">{{item.contractionName}}</p>
@@ -116,9 +116,9 @@
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
             if ( res.orderStatus == '1'){
-              if (res.supplyMasterMap){
-                let supplyMasterMap = res.supplyMasterMap.split( "," )
-                res.supplyMasterMap = '/api'+supplyMasterMap[0]
+              if (res.supplyDemand.supplyMasterMap){
+                let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," )
+                res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0]
               }
               res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
               res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
diff --git a/src/views/agriculturalTrusteeship/socialization/user.vue b/src/views/agriculturalTrusteeship/socialization/user.vue
index d3eae0ec..d427e0f0 100644
--- a/src/views/agriculturalTrusteeship/socialization/user.vue
+++ b/src/views/agriculturalTrusteeship/socialization/user.vue
@@ -14,22 +14,22 @@
         <van-grid :column-num="4" :border="false">
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_01.png" alt="">
-            <p class="nav_num">3,501</p>
+            <p class="nav_num">{{content.numFinish}}</p>
             <p>已成交</p>
           </van-grid-item>
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_02.png" alt="">
-            <p class="nav_num">3,501</p>
+            <p class="nav_num">{{content.numHandling}}</p>
             <p>待处理</p>
           </van-grid-item>
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_04.png" alt="">
-            <p class="nav_num">3,501</p>
+            <p class="nav_num">{{content.numReject}}</p>
             <p>已拒单</p>
           </van-grid-item>
           <van-grid-item>
             <img src="../../../../static/images/agriculturalTrusteeship/socialization/user_nav_03.png" alt="">
-            <p class="nav_num" style="color: #FF5D00">3,501</p>
+            <p class="nav_num" style="color: #FF5D00">{{content.realityServiceMoney}}</p>
             <p style="color: #FF5D00">总收入</p>
           </van-grid-item>
         </van-grid>
@@ -49,13 +49,13 @@
         </van-cell>
 
         <div class="main_box" style="margin-top: 0;">
-          <van-field label="主体名称" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_01.png" :border="false" input-align="right" value="内容" />
-          <van-field label="主体类别" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_02.png" :border="false" input-align="right" value="内容" />
-          <van-field label="生产种类" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_03.png" :border="false" input-align="right" value="内容" />
-          <van-field label="成立时间" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_04.png" :border="false" input-align="right" value="内容" />
-          <van-field label="示范类型" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_05.png" :border="false" input-align="right" value="内容" />
-          <van-field label="负责人" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_06.png" :border="false" input-align="right" value="内容" />
-          <van-field label="联系电话" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_07.png" :border="false" input-align="right" value="内容" />
+          <van-field label="主体名称" v-model="entityForm.entityName" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_01.png" :border="false" input-align="right" value="内容" />
+          <van-field label="主体类别" v-model="entityForm.statisticsTypeId" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_02.png" :border="false" input-align="right" value="内容" />
+          <van-field label="生产种类" v-model="entityForm.industryClassificationType" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_03.png" :border="false" input-align="right" value="内容" />
+          <van-field label="成立时间" v-model="entityForm.registerTime" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_04.png" :border="false" input-align="right" value="内容" />
+          <van-field label="示范类型" v-model="entityForm.modelSocietyType" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_05.png" :border="false" input-align="right" value="内容" />
+          <van-field label="负责人" v-model="entityForm.principalName" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_06.png" :border="false" input-align="right" value="内容" />
+          <van-field label="联系电话" v-model="entityForm.tal" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_07.png" :border="false" input-align="right" value="内容" />
         </div>
 
         <div class="main_box">
@@ -78,6 +78,7 @@
   import Cookies from "js-cookie";
   import agr from "@/components/common/agr_footer";
   import dialogClose from "@/components/agriculturalTrusteeship/dialog";
+  import {entityGet, orderStatistics} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipInsuranceList",
     components: {
@@ -92,13 +93,38 @@
         finished: false,
         center: { lng: 122.089726, lat: 37.540728 }, //经纬度
         zoom: 15, //地图展示级别
-        showDialog:false
+        showDialog:false,
+        entityForm:{},
+        content:{},
+        statisticsTypeIdOptions:[],
+        industryClassificationTypeOptions:[],
+        modelSocietyTypeOptions:[],
       };
     },
     created() {
-
+      orderStatistics().then(response => {
+        this.content = response.data;
+      });
+      this.getDicts("newBusinessEntity_statistics_project").then(response => {
+        this.statisticsTypeIdOptions = response.data;
+      });
+      this.getDicts("Industrial_classification_type").then(response => {
+        this.industryClassificationTypeOptions = response.data;
+      });
+      this.getDicts("model_society_type").then(response => {
+        this.modelSocietyTypeOptions = response.data;
+      });
+      this.getUser();
     },
     methods: {
+      getUser(){
+        entityGet(Cookies.get('ACCESS-SESSION-ID')).then(res=>{
+          res.data.statisticsTypeId = this.selectDictLabel(this.statisticsTypeIdOptions, res.data.statisticsTypeId);
+          res.data.industryClassificationType = this.selectDictLabel(this.industryClassificationTypeOptions, res.data.industryClassificationType);
+          res.data.modelSocietyType = this.selectDictLabel(this.modelSocietyTypeOptions, res.data.modelSocietyType);
+          this.entityForm = res.data;
+        })
+      },
       openDialog(val){
         this.showDialog = val
       },
diff --git a/src/views/agriculturalTrusteeship/socialization/userEdit.vue b/src/views/agriculturalTrusteeship/socialization/userEdit.vue
index 257c2ff3..98629fac 100644
--- a/src/views/agriculturalTrusteeship/socialization/userEdit.vue
+++ b/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>

From 5fefdcd03cd36d841a20b8af8eca895f86b3e9ca Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Mon, 19 Dec 2022 11:38:40 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E9=93=B6=E5=86=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankAgriculture/paymentApproval/approvalAdd.vue       | 8 ++++----
 .../bankAgriculture/paymentApproval/approvalDetail.vue    | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail11.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail12.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail2.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail3.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalModify.vue    | 4 ++--
 .../bankAgriculture/paymentApproval/approvalAdd.vue       | 6 +++---
 .../bankAgriculture/paymentApproval/approvalDetail.vue    | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail11.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail12.vue  | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail2.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalDetail3.vue   | 4 ++--
 .../bankAgriculture/paymentApproval/approvalModify.vue    | 6 +++---
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
index 6a2fc6e5..6a3aefb3 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/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:'',
 
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
index 60801d7a..aa142b4e 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/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>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
index f8a65da3..3ed0973e 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/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>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue
index ea8f1090..7218a084 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail12.vue
+++ b/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>
 
 
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue
index 6851ed3d..8afddfc9 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail2.vue
+++ b/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>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue
index 9247a86a..8aee54bd 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail3.vue
+++ b/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>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
index 1bccbd2e..55402962 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/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>
@@ -303,7 +303,7 @@
             <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>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 1b75a5ed..7772e862 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/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,7 +307,7 @@
         </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>
@@ -373,7 +373,7 @@
         fileList1:[],
         fileList2:[],
         fileList3:[],
-        capitalExpenditureType:'',
+        capitalExpenditureType:'结算类',
         payee:'',
         bankType:'',
 
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
index 52b542e0..08ee0d72 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/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>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
index 96329060..28f4dc36 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/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>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
index 7bfab55f..69264bdd 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
+++ b/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>
 
 
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
index 9d1e7f89..86371c7c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
+++ b/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>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue
index 662c2e0e..8aed358f 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail3.vue
+++ b/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>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 054bfc00..e6e3da4b 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <p class="main_title">上传附件</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;">
         <van-cell value="收据" />
         <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
@@ -303,7 +303,7 @@
             <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: {

From 7ef904bea41e513c2e01271ff85cf92f07e8f720 Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Mon, 19 Dec 2022 17:01:18 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=93=B6=E5=86=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yinnong/bankAgriculture/paymentApproval/approvalAdd.vue     | 2 +-
 .../yinnong/bankAgriculture/paymentApproval/approvalModify.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 7772e862..9c15f21e 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -310,7 +310,7 @@
             <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>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index e6e3da4b..4f487096 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <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>
+      <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>

From 63d154add75d0fe6638b371bf63554cebb74770a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 19 Dec 2022 17:31:37 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  5 +-
 .../agriculturalTrusteeship/buyer/allBill.vue |  2 +-
 .../agriculturalTrusteeship/buyer/index.vue   |  2 +-
 src/views/agriculturalTrusteeship/index.vue   | 17 ++++--
 .../insurance/insuranceList.vue               |  2 +-
 .../insurance/insuranceProjectList.vue        |  2 +-
 src/views/agriculturalTrusteeship/login.vue   | 54 ++++++++++++-------
 .../shop/serviceEdit.vue                      |  2 +-
 .../agriculturalTrusteeship/shop/shopAdd.vue  | 47 ++++++----------
 .../shop/shopDetail.vue                       |  2 +-
 .../agriculturalTrusteeship/shop/shopEdit.vue | 31 +++--------
 .../agriculturalTrusteeship/shop/shopList.vue | 13 ++---
 .../socialization/bill.vue                    | 14 ++---
 .../socialization/billOrder.vue               |  2 +-
 .../socialization/projectDetail.vue           |  6 ++-
 .../socialization/projectEdit.vue             | 24 ++++++---
 .../society/societyList.vue                   |  4 +-
 .../society/societyProjectDetail.vue          | 13 +++--
 .../society/societyProjectList.vue            |  2 +-
 19 files changed, 129 insertions(+), 115 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 593730ee..af3daf43 100644
--- a/src/utils/request.js
+++ b/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';
           }
         })
       })
diff --git a/src/views/agriculturalTrusteeship/buyer/allBill.vue b/src/views/agriculturalTrusteeship/buyer/allBill.vue
index 18442fe4..d9fb1ef9 100644
--- a/src/views/agriculturalTrusteeship/buyer/allBill.vue
+++ b/src/views/agriculturalTrusteeship/buyer/allBill.vue
@@ -64,7 +64,7 @@
             <div class="main_content_right_list_content">
               <p class="tt">{{item.demandName}}</p>
               <div class="tab">
-                <p>￥<span>{{item.unitPrice}}</span>.00/{{item.unit}}</p>
+                <p>￥<span>{{item.realityServiceMoney}}</span>.00</p>
               </div>
               <p class="name">
                 <span>数量：{{item.serviceNum}}</span>
diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue
index 4d3425b7..95c0eb1d 100644
--- a/src/views/agriculturalTrusteeship/buyer/index.vue
+++ b/src/views/agriculturalTrusteeship/buyer/index.vue
@@ -89,7 +89,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">
diff --git a/src/views/agriculturalTrusteeship/index.vue b/src/views/agriculturalTrusteeship/index.vue
index 8c40c8bd..6d3fa497 100644
--- a/src/views/agriculturalTrusteeship/index.vue
+++ b/src/views/agriculturalTrusteeship/index.vue
@@ -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
@@ -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{
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
index 753c67ce..4f3180fd 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
@@ -61,7 +61,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">
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
index 6d5d4e66..76a811e4 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
+++ b/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">
diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue
index b857adbb..a29834bc 100644
--- a/src/views/agriculturalTrusteeship/login.vue
+++ b/src/views/agriculturalTrusteeship/login.vue
@@ -95,25 +95,25 @@
             <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="注册" v-if="loginType != 'mj'">
         <!--保险机构注册-->
           <template v-if="loginType == 'bxjg' || loginType == 'dkjg' || loginType == 'ndjg'">
-            <van-field v-model="serviceForm.financialName" center :border="false" placeholder="请输入机构名称" >
+            <van-field v-model="serviceForm.financialName" required 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="请输入联系人">
+            <van-field v-model="serviceForm.linker" required 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="请输入地址" >
+            <van-field v-model="serviceForm.address" required center :border="false" placeholder="请输入地址" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
               </template>
@@ -125,37 +125,37 @@
 <!--              </template>-->
 <!--            </van-field>-->
 
-            <van-field v-model="serviceForm.phone" center :border="false" placeholder="请输入电话">
+            <van-field v-model="serviceForm.phone" required 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="请输入用户名" >
+            <van-field v-model="serviceForm.username" required 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="请输入密码" >
+            <van-field v-model="serviceForm.password" required 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="请确认密码">
+            <van-field v-model="serviceForm.passwordReal" required 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="请输入传真">
+            <van-field v-model="serviceForm.fax" required 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="请输入简要描述">
+            <van-field v-model="serviceForm.description" required center :border="false" placeholder="请输入简要描述">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
               </template>
@@ -166,7 +166,7 @@
 
           </template>
           <template v-if="loginType == 'fwzz'">
-            <van-field v-model="entityForm.entityName" center :border="false" placeholder="请输入主体名称" >
+            <van-field v-model="entityForm.entityName" required center :border="false" placeholder="请输入主体名称" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
               </template>
@@ -274,7 +274,7 @@
               />
             </van-popup>
 
-            <van-field v-model="entityForm.entityAddress" center :border="false" placeholder="请输入主体地址" >
+            <van-field v-model="entityForm.entityAddress" required center :border="false" placeholder="请输入主体地址" >
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
               </template>
@@ -307,31 +307,31 @@
               />
             </van-popup>
 
-            <van-field v-model="entityForm.principalName" center :border="false" placeholder="请输入负责人姓名">
+            <van-field v-model="entityForm.principalName" required 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="请输入联系方式">
+            <van-field v-model="entityForm.tal" required 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="请输入账号">
+            <van-field v-model="entityForm.userName" required 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="请输入密码">
+            <van-field v-model="entityForm.password" required 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="请确认密码">
+            <van-field v-model="entityForm.passwordReal" required center :border="false" placeholder="请确认密码">
               <template #left-icon>
                 <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
               </template>
@@ -455,7 +455,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 +476,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';
@@ -901,4 +910,11 @@
       border-radius: 50PX;
     }
   }
+  /deep/ .van-cell--required::before{
+    left: 20PX;
+    color: rgb(30, 103, 255);
+  }
+  /deep/ .van-cell__value{
+    padding-left: 10PX;
+  }
 </style>
diff --git a/src/views/agriculturalTrusteeship/shop/serviceEdit.vue b/src/views/agriculturalTrusteeship/shop/serviceEdit.vue
index ec6ecb06..3b732c99 100644
--- a/src/views/agriculturalTrusteeship/shop/serviceEdit.vue
+++ b/src/views/agriculturalTrusteeship/shop/serviceEdit.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="编辑保险公司信息"
+      title="编辑公司信息"
       fixed
       placeholder
       left-arrow
diff --git a/src/views/agriculturalTrusteeship/shop/shopAdd.vue b/src/views/agriculturalTrusteeship/shop/shopAdd.vue
index 794c3c61..ae0ee7ef 100644
--- a/src/views/agriculturalTrusteeship/shop/shopAdd.vue
+++ b/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>
diff --git a/src/views/agriculturalTrusteeship/shop/shopDetail.vue b/src/views/agriculturalTrusteeship/shop/shopDetail.vue
index e6c0246e..8fe4e38a 100644
--- a/src/views/agriculturalTrusteeship/shop/shopDetail.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopDetail.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="发布商品"
+      title="查看商品"
       fixed
       placeholder
       left-arrow
diff --git a/src/views/agriculturalTrusteeship/shop/shopEdit.vue b/src/views/agriculturalTrusteeship/shop/shopEdit.vue
index 2a7ebc0e..cc149167 100644
--- a/src/views/agriculturalTrusteeship/shop/shopEdit.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopEdit.vue
@@ -2,7 +2,7 @@
   <div class="home_wrapper">
     <!--  头部开始  -->
     <van-nav-bar
-      title="发布商品"
+      title="修改商品"
       fixed
       placeholder
       left-arrow
@@ -13,29 +13,12 @@
 
     <!--  内容开始  -->
     <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="产品名称" 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" />
diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue
index 828e3d67..090c16f3 100644
--- a/src/views/agriculturalTrusteeship/shop/shopList.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopList.vue
@@ -17,26 +17,26 @@
             <p class="tt">公司信息</p>
           </template>
           <template #right-icon>
-            <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_edit.png" @click="$router.push({name:'agriculturalTrusteeshipServiceEdit'})">
+            <img v-if="serviceForm.auditStatus != '3'" 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
@@ -228,6 +228,7 @@
   .serviceName{
     display: flex;
     align-items: center;
+    justify-content: space-between;
     span{
       background: #E8E8E8;
       padding: 0 8PX;
diff --git a/src/views/agriculturalTrusteeship/socialization/bill.vue b/src/views/agriculturalTrusteeship/socialization/bill.vue
index 6ffa2d2c..290f0431 100644
--- a/src/views/agriculturalTrusteeship/socialization/bill.vue
+++ b/src/views/agriculturalTrusteeship/socialization/bill.vue
@@ -206,22 +206,24 @@
       });
       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;
-          })
+          console.log(res.children)
+          // res.children.map(rr=>{
+          //   rr.active = false;
+          // })
+          this.productList2.push(response.data);
         })
-        this.productList2 = response.data;
+        // this.productList2 = response.data;
       });
       this.getDicts("crop_type").then(response => {
           this.cropTypeOptions = response.data;
diff --git a/src/views/agriculturalTrusteeship/socialization/billOrder.vue b/src/views/agriculturalTrusteeship/socialization/billOrder.vue
index a8fa0452..f56a9472 100644
--- a/src/views/agriculturalTrusteeship/socialization/billOrder.vue
+++ b/src/views/agriculturalTrusteeship/socialization/billOrder.vue
@@ -130,7 +130,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)
diff --git a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
index 39ffb827..b79cfd5c 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
@@ -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;
diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
index 38a69b17..e046ea34 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
@@ -70,11 +70,10 @@
       <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="地址" 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" 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 +87,21 @@
     </div>
 
     <div class="main_btn">
-      <p @click="submitForm">发布</p>
-      <p>存稿</p>
+      <p @click="submitForm('3')">发布</p>
+      <p @click="submitForm('2')">存稿</p>
     </div>
     <!--  内容结束  -->
   </div>
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {supplyDemandGet, productTypes, commonUpload, supplyDemandEdit} from "@/api/agriculturalTrusteeship";
+  import {
+    supplyDemandGet,
+    productTypes,
+    commonUpload,
+    supplyDemandEdit,
+    supplyDemandAdd
+  } from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
     data() {
@@ -130,10 +135,11 @@
     },
     created() {
       let query = {
-        parentId : ''
+        parentId : null,
+        tree:true
       }
       let query1 = {
-        tree : true
+        tree : false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -191,8 +197,10 @@
         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 = publishStatus;
         supplyDemandEdit(this.supplyDemand).then((res) => {
           if(res.code=="200"){
             this.$notify({ type: 'success', message: '发布成功' });
diff --git a/src/views/agriculturalTrusteeship/society/societyList.vue b/src/views/agriculturalTrusteeship/society/societyList.vue
index abd7d744..329480fd 100644
--- a/src/views/agriculturalTrusteeship/society/societyList.vue
+++ b/src/views/agriculturalTrusteeship/society/societyList.vue
@@ -92,8 +92,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">
diff --git a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue
index 465504f3..04ace279 100644
--- a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue
+++ b/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">{{supplyDemand.entityName}}<span>{{supplyDemand.createTime.substr(0,10)}}</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>
 
@@ -53,7 +53,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>
@@ -187,6 +187,13 @@
         color: #4E7FFF;
         background: url("../../../../static/images/agriculturalTrusteeship/index/name_icon.png") no-repeat left center;
         padding-left: 18PX;
+        display: flex;
+        span{
+          color: #334281;
+          margin-left: auto;
+          padding:0 0 0 18PX;
+          background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center
+        }
       }
       .tab{
         display: flex;
diff --git a/src/views/agriculturalTrusteeship/society/societyProjectList.vue b/src/views/agriculturalTrusteeship/society/societyProjectList.vue
index 56c1aab6..d186b325 100644
--- a/src/views/agriculturalTrusteeship/society/societyProjectList.vue
+++ b/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">

From 1838d40304847bbf4c934e6e858021c056cb19ea Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 26 Dec 2022 15:19:20 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/index.vue | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue
index f9352877..74739b04 100644
--- a/src/views/sunVillage_info/index.vue
+++ b/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,14 +55,12 @@
                 </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:'sunVillageInfoListRegister'}" class="nav_item n_8">零工登记</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>
               </div>
             </div>
+
             <div class="nav_list">
               <div class="nav_box">
                 <van-cell style="border-radius: 6px;">
@@ -124,15 +123,31 @@
                     </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>
+            </div>
+          </div>
+
         </div>
         <div class="footer">
             技术支持：北京农燊高科信息技术有限公司

From 7a073c3a305286fbec6ad00bf9bac511669cb352 Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Tue, 27 Dec 2022 10:31:27 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E9=93=B6=E5=86=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankAgriculture/paymentApproval/approvalModify.vue        | 4 ++--
 .../bankAgriculture/paymentApproval/approvalModify.vue        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
index 55402962..2d903872 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <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>
+      <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,7 +300,7 @@
       <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">提<i style="margin-right: 1em;"></i>交</van-button>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 4f487096..3420527e 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -288,7 +288,7 @@
           </van-popup>
         </div>
       </div>
-      <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>
+      <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,7 +300,7 @@
       <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">提<i style="margin-right: 1em;"></i>交</van-button>

From 4c667ebb60b4c5d816ee653b862ee36ef25964ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 27 Dec 2022 10:40:59 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E9=93=B6=E5=86=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/yinnong/my.vue              |  28 +++++++++++++-------------
 static/images/onlineHome/bg11.png     | Bin 0 -> 21352 bytes
 static/images/onlineHome/myIcon01.png | Bin 0 -> 471 bytes
 static/images/onlineHome/myIcon02.png | Bin 0 -> 470 bytes
 static/images/onlineHome/myIcon03.png | Bin 0 -> 384 bytes
 static/images/onlineHome/myIcon04.png | Bin 0 -> 448 bytes
 6 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 static/images/onlineHome/bg11.png
 create mode 100644 static/images/onlineHome/myIcon01.png
 create mode 100644 static/images/onlineHome/myIcon02.png
 create mode 100644 static/images/onlineHome/myIcon03.png
 create mode 100644 static/images/onlineHome/myIcon04.png

diff --git a/src/views/yinnong/my.vue b/src/views/yinnong/my.vue
index 6b102451..cc295aee 100644
--- a/src/views/yinnong/my.vue
+++ b/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>
diff --git a/static/images/onlineHome/bg11.png b/static/images/onlineHome/bg11.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a0d868350b0c5c37d03487240c37d544fd5e275
GIT binary patch
literal 21352
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

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/myIcon01.png b/static/images/onlineHome/myIcon01.png
new file mode 100644
index 0000000000000000000000000000000000000000..25712684c9a9a51632d2d3692b47b820949dd427
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004b3#c}2nYxW
zd<bNS0004wNkl<ZI8V)#QBJ}@5Qb-#roLc+2Zclk^#sBR)EjUE;R3kapf|AU1-OB|
z0X+goAQ2L(50t<QSa+PMAwejnBtE#wCfn`o*Zu#QDFTmbH*^u{4gei_&N>LdkJ0W;
zz0wF12!I9!Z2}c#g-9G4qY0rtek?Z`G##Nr{pyu{d0Ejj$NG%xl%x5?J0JcAF6vqF
zl-4ssb&Iw8kYq9T&Vrf_TR`x_a}EdvW2iTIu6P&vt$}17cA+tzbS$&#gUY!-LESJi
zM6MjJ>h~KyJXoMz5<ni}#x6)c&WeJ4(AMqb(DrQ)NlXPLn}`K4ip@6~h??W4iX+k#
z(STvaEnxJ4b~9C4VxC!h9Ngj=7=^AFF8fDGJ0|s;*i>nM1`;|VUS|YGoYBj?S^0Ze
zONtTVOl?9yk@)woq=6J`s<cCCPV+1VYb0G?<8C0OTF48ZJD8SecOtKJRQGeCwv{1o
zp=<{egU#AUgex{M$e1ziX>4$FBNwe^)BF4@`X17xSs|OaC0N6aiZ4T26YOp=D3t&J
N002ovPDHLkV1j8P!>a%Q

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/myIcon02.png b/static/images/onlineHome/myIcon02.png
new file mode 100644
index 0000000000000000000000000000000000000000..567da69f647f3e89ede473d0222dab2bcb459fda
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq000jF000pP1^@s60t)t_00004b3#c}2nYxW
zd<bNS0004vNkl<ZI8S|(QBJ}@5Qb+q5nnXogF*r%+`xK+dILNGTtKp%fN}y09zZ;S
zdIGos^#sNM3Fw0uc@dM2|F#xOZQD0?_n-OyZw98Euc+UPhw|Me5-lWSVbz(tr(PuC
zJaMhP9OAw~idy1}X67@W*%UD6lqs(0*On5wMYoHYdonhUtL>%3OkEM`%?2eWRScm8
z;l%f)GruXjad(xgg;t8Mr~MM@B)%}`*Mx+hrh`%=d7mpr&IiD;)@t8cxyP%WuA!q5
zZ1?}!j;aF6d7P>#U>qIDW<(+%vq9P30hX83JdDVHszN<-6l4x_Zk|c#5jk5~IpgHF
zovZByM#06kD%cr0Q^|8#zt{InSE3avUq&<ibCgY<tNP7m@d1MFurf`MbU?EAn=_Mq
zVA~MJv^5CUgRSz#6&5q+G0vSd^4r};Ub8_~gukYj4Y;^B57IU)4wFMz<cU%q>^GU%
z7LgbHcA`H(lK!?c=C?xDqu>C!AsWV^WeJ1K;X0CsF}cYx<q6H*512mg65>^Zx&QzG
M07*qoM6N<$f()|JZ2$lO

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/myIcon03.png b/static/images/onlineHome/myIcon03.png
new file mode 100644
index 0000000000000000000000000000000000000000..92b474c27b1a51a89b4b80b3f33d9b3ef754237f
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$00004b3#c}2nYxW
zd<bNS0003uNkl<ZI8WV^!A-+J5Jl%N5H27&2XLe~Qc5rtU^;*bFa=<i4%`7tD1gvG
zsDN}pN(f3K*>Fe>IVEC;T}u%m7`$AWo4vDd{_LMYQ@(~^z6ViAC82?%i8>sVoi#5r
z`M$N=Ly%;BB6tv#GKtw{@|?B@Ggbfgzm?=&0-f6;XkF!OKF&tU@0C^iNr4c!F@OuB
zvRgnH;$*B2jH2o=?Z?8juQgv!?i$M8_!A_MZxL8O5!1t{<HxI#&Jb&WQD6a&>i}mZ
z4LNP^@Zy=7Ugn|}Z9a6R5>HOOJziJ^C<8btF;-gFqNS*XnW_)hpWZ5TgUI|;6NY62
z7bJN~#8G8CznT7@A*&sz9{R5tb_todjlx3Eu^FUd4_pI)XPk-6y<6B}+SdzZiLQXp
eJoLvMKm7pc{>=oDGRda^0000<MNUMnLSTYsQJk;<

literal 0
HcmV?d00001

diff --git a/static/images/onlineHome/myIcon04.png b/static/images/onlineHome/myIcon04.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9068a810bc398e8f6794b5f8979905becd9a450
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq000pH000vR1^@s6cBSU=00004b3#c}2nYxW
zd<bNS0004ZNkl<ZI8V)#y-vbV6vxjgLW~~?7@;JTC~?=gV<J95AECRk)Xl*`M<-ie
zKp%lk7o&sj#>v3}Q#36mcF_gl9?xx30u?`T;HGJE&pr3o^S`&}kCU6h!hE8Ah6qap
zJmd?*=gUDr7lg|8gPprZ&Gc_Mpn;OuMbRk}U|B&_iQtsum#8GJhS5+6gAi7lj=GA)
zs!v_OgGVQ~6D4cb)4ELJxy~gK1MOx_-S3B`tsp&1?cfblr4S;*va<HDFBYtp!N5IU
zt2b+Tt3OBXWl5E9A#zjE@^!A~&~@^qKSM%!B+gw&9XRh_RWcqB&Gc-({`yFAdb&qB
zlYfD*oCeD=Mv^1{i}ARfA6F7@z<3WyIUu^n+&hcW+CT#qOwVI4Nxnj=5;$`=aez#o
zq4p87N4Par?{&KAb5oKb!I<4@t))<$u!l^4=0a=*AB>9q;hq#l4^1iBn5jN5Phoc>
q4(brxB@tfw;~ki2cy^`{#ohrt%QWS-JNkeC0000<MNUMnLSTZD0mOd*

literal 0
HcmV?d00001


From 1dcd24652b3ad02d9ae90970cd17ed087d522436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 28 Dec 2022 11:01:27 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/agriculturalTrusteeship/index.vue   |   2 +-
 src/views/agriculturalTrusteeship/login.vue   | 482 +++++++++---------
 .../agriculturalTrusteeship/shop/shopEdit.vue |  24 +-
 .../socialization/bill.vue                    |  30 +-
 .../socialization/billOrder.vue               |  24 +-
 .../socialization/draft.vue                   |   2 +-
 .../socialization/index.vue                   |   5 +-
 .../socialization/projectDetail.vue           |   9 +-
 .../socialization/projectEdit.vue             |   6 +-
 .../socialization/release.vue                 |  21 +-
 10 files changed, 315 insertions(+), 290 deletions(-)

diff --git a/src/views/agriculturalTrusteeship/index.vue b/src/views/agriculturalTrusteeship/index.vue
index 6d3fa497..52411453 100644
--- a/src/views/agriculturalTrusteeship/index.vue
+++ b/src/views/agriculturalTrusteeship/index.vue
@@ -127,7 +127,7 @@
         productList:[],
         main_content_right_header_tit:'全套服务',
         query:{
-          entityId:Cookies.get('ACCESS-SESSION-ID'),
+          entityId:'',
           productType:'',
           supplyDemandName:''
         },
diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue
index a29834bc..40171e56 100644
--- a/src/views/agriculturalTrusteeship/login.vue
+++ b/src/views/agriculturalTrusteeship/login.vue
@@ -100,248 +100,250 @@
         </van-tab>
         <van-tab name="register" title="注册" v-if="loginType != 'mj'">
         <!--保险机构注册-->
-          <template v-if="loginType == 'bxjg' || loginType == 'dkjg' || loginType == 'ndjg'">
-            <van-field v-model="serviceForm.financialName" required 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 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 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 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 center :border="false" placeholder="请输入用户名" >
-              <template #left-icon>
-                <img src="../../../static/images/agriculturalTrusteeship/login/register_06.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" required :rules="[{ required: true }]" 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" required :rules="[{ required: true }]" 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" />
 
-            <van-field v-model="serviceForm.password" required 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 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" required 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" required 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" required 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" required 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" required 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 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 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 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 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>
+            <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>
diff --git a/src/views/agriculturalTrusteeship/shop/shopEdit.vue b/src/views/agriculturalTrusteeship/shop/shopEdit.vue
index cc149167..0c1e3050 100644
--- a/src/views/agriculturalTrusteeship/shop/shopEdit.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopEdit.vue
@@ -12,22 +12,24 @@
 
 
     <!--  内容开始  -->
-    <div class="main">
-      <van-field label="产品名称" required :rules="[{ required: true }]" v-model="product.productName" input-align="right" placeholder="请输入产品名称" />
+    <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 }]" 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="产品描述" 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" />
+        <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>
diff --git a/src/views/agriculturalTrusteeship/socialization/bill.vue b/src/views/agriculturalTrusteeship/socialization/bill.vue
index 290f0431..79af68a7 100644
--- a/src/views/agriculturalTrusteeship/socialization/bill.vue
+++ b/src/views/agriculturalTrusteeship/socialization/bill.vue
@@ -22,6 +22,7 @@
         <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="选择年月"
         />
@@ -104,8 +106,8 @@
         <div class="selected" v-for="(item,index) in productList2" :key="index">
           <p class="on">{{item.dictName}}</p>
           <div class="options">
-            <p :class="{'active':query.productTypeStr == ''}" @click="query.productType = ''">全部</p>
-            <p :class="{'active':query.productTypeStr == itemChild.id}" @click="query.productType = itemChild.id" v-for="(itemChild,indexChild) in item.children" :key="indexChild">{{itemChild.dictName}}</p>
+            <p :class="{'active':query.productType == ''}" @click="query.productType = ''">全部</p>
+            <p :class="{'active':query.productType == itemChild.id}" @click="query.productType = itemChild.id" v-for="(itemChild,indexChild) in item.children" :key="indexChild">{{itemChild.dictName}}</p>
           </div>
         </div>
 <!--        <div class="selected">-->
@@ -188,7 +190,7 @@
           startOrderAt :this.format(new Date(),'yyyy-MM'),
           endOrderAt :this.format(new Date(),'yyyy-MM'),
           orderStatus :'',
-          productTypeStr:''
+          productType:''
         },
         startOrderAt:this.format(new Date(),'yyyy年MM月'),
         endOrderAt:this.format(new Date(),'yyyy年MM月'),
@@ -216,14 +218,7 @@
         tree:true
       }
       productTypes(query2).then(response => {
-        response.data.map(res=>{
-          console.log(res.children)
-          // res.children.map(rr=>{
-          //   rr.active = false;
-          // })
-          this.productList2.push(response.data);
-        })
-        // this.productList2 = response.data;
+          this.productList2 = response.data;
       });
       this.getDicts("crop_type").then(response => {
           this.cropTypeOptions = response.data;
@@ -256,8 +251,8 @@
       },
       onConfirmStar(data){
         this.supplyDemandList = [];
-        this.params.startOrderAt = this.format(data,'yyyy-mm');
-        this.query.startOrderAt = this.format(data,'yyyy-mm');
+        this.params.startOrderAt = this.format(data,'yyyy-MM');
+        this.query.startOrderAt = this.format(data,'yyyy-MM');
         this.startOrderAt = this.format(data,'yyyy年MM月');
         this.startTimeShow = false;
         orderStatistics(this.params).then(response => {
@@ -267,8 +262,8 @@
       },
       onConfirmEnd(data){
         this.supplyDemandList = [];
-        this.params.endOrderAt = this.format(data,'yyyy-mm');
-        this.query.endOrderAt = this.format(data,'yyyy-mm');
+        this.params.endOrderAt = this.format(data,'yyyy-MM');
+        this.query.endOrderAt = this.format(data,'yyyy-MM');
         this.endOrderAt = this.format(data,'yyyy年MM月');
         this.endTimeShow = false;
         orderStatistics(this.params).then(response => {
@@ -287,8 +282,11 @@
             startOrderAt :this.format(new Date(),'yyyy-MM'),
             endOrderAt :this.format(new Date(),'yyyy-MM'),
             orderStatus :'',
-            productTypeStr:''
+            productType:''
         }
+
+        this.params.startOrderAt = this.format(new Date(),'yyyy-MM');
+        this.startOrderAt = this.format(new Date(),'yyyy年MM月');
       },
       goSearch(){
         this.supplyDemandList = [];
diff --git a/src/views/agriculturalTrusteeship/socialization/billOrder.vue b/src/views/agriculturalTrusteeship/socialization/billOrder.vue
index f56a9472..793d843d 100644
--- a/src/views/agriculturalTrusteeship/socialization/billOrder.vue
+++ b/src/views/agriculturalTrusteeship/socialization/billOrder.vue
@@ -21,7 +21,11 @@
         </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;
         });
diff --git a/src/views/agriculturalTrusteeship/socialization/draft.vue b/src/views/agriculturalTrusteeship/socialization/draft.vue
index fb26b62b..dc181bad 100644
--- a/src/views/agriculturalTrusteeship/socialization/draft.vue
+++ b/src/views/agriculturalTrusteeship/socialization/draft.vue
@@ -188,7 +188,7 @@
           }
           .name{
             color: #334281;
-            margin-left: auto;
+            /*margin-left: auto;*/
             padding:0 0 0 15PX;
             background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center
           }
diff --git a/src/views/agriculturalTrusteeship/socialization/index.vue b/src/views/agriculturalTrusteeship/socialization/index.vue
index 2781c561..750b2763 100644
--- a/src/views/agriculturalTrusteeship/socialization/index.vue
+++ b/src/views/agriculturalTrusteeship/socialization/index.vue
@@ -30,7 +30,7 @@
             <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 +99,7 @@
     created() {
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -123,6 +123,7 @@
               res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
               res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
               res.productType = this.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;
+              res.countMoney = res.unitPrice * res.serviceNum;
               this.supplyDemandList.push(res);
             }
             this.supplyDemandList1.push(res);
diff --git a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
index b79cfd5c..eb790819 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
@@ -23,7 +23,7 @@
           <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.id,entityName:supplyDemand.entityName}})">{{supplyDemand.entityName}}<span>{{supplyDemand.createTime}}</span></p>
       </div>
 
       <div class="main_box">
@@ -181,6 +181,13 @@
         color: #4E7FFF;
         background: url("../../../../static/images/agriculturalTrusteeship/index/name_icon.png") no-repeat left center;
         padding-left: 18PX;
+        display: flex;
+        span{
+          color: #334281;
+          margin-left: auto;
+          padding:0 0 0 18PX;
+          background: url("../../../../static/images/agriculturalTrusteeship/socialization/socialization_icon_clock.png") no-repeat left center
+        }
       }
       .tab{
         display: flex;
diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
index e046ea34..efa08a4f 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
@@ -203,7 +203,11 @@
         this.supplyDemand.publishStatus = publishStatus;
         supplyDemandEdit(this.supplyDemand).then((res) => {
           if(res.code=="200"){
-            this.$notify({ type: 'success', message: '发布成功' });
+            if (publishStatus == '3'){
+              this.$notify({ type: 'success', message: '发布成功' });
+            }else{
+              this.$notify({ type: 'success', message: '存稿成功' });
+            }
             setTimeout(function(){
               history.back(-1);
             },2000)
diff --git a/src/views/agriculturalTrusteeship/socialization/release.vue b/src/views/agriculturalTrusteeship/socialization/release.vue
index 35edcd5d..b8237b3f 100644
--- a/src/views/agriculturalTrusteeship/socialization/release.vue
+++ b/src/views/agriculturalTrusteeship/socialization/release.vue
@@ -65,14 +65,15 @@
         />
       </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.unitPrice" type="number" input-align="right" placeholder="请输入单价" />
+      <van-field label="数量" v-model="supplyDemand.number" type="digit" input-align="right" placeholder="请输入数量" />
+      <van-field label="单位" v-model="supplyDemand.unit" input-align="right" placeholder="请输入单位" />
+      <van-field label="联系电话" v-model="supplyDemand.supplyDemandTal" type="digit" 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="简介" 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" />
@@ -128,7 +129,8 @@
     },
     created() {
       let query = {
-        parentId : ''
+        parentId : '',
+        tree : true
       }
       let query1 = {
         tree : true
@@ -182,7 +184,12 @@
         this.supplyDemand.publishStatus = publishStatus;
         supplyDemandAdd(this.supplyDemand).then((res) => {
           if(res.code=="200"){
-            this.$notify({ type: 'success', message: '发布成功' });
+            if (publishStatus == '3'){
+              this.$notify({ type: 'success', message: '发布成功' });
+            }else{
+              this.$notify({ type: 'success', message: '存稿成功' });
+            }
+
             setTimeout(function(){
               history.back(-1);
             },2000)

From 4a430e720c29c26df01780a911405945e2359060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 28 Dec 2022 15:27:17 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agriculturalTrusteeship/buyer/allBill.vue |   2 +-
 .../agriculturalTrusteeship/buyer/index.vue   |   2 +-
 .../buyer/waitBill.vue                        |   2 +-
 .../insurance/insuranceList.vue               |   1 +
 .../insurance/insuranceProjectList.vue        |   5 +-
 .../socialization/billDetail.vue              |   6 +-
 .../socialization/index.vue                   |  13 +-
 .../socialization/projectDetail.vue           |   3 +-
 .../socialization/projectEdit.vue             |  53 +++---
 .../socialization/release.vue                 | 153 +++++++++---------
 .../socialization/user.vue                    |   2 +-
 .../society/societyProjectDetail.vue          |  42 +++--
 12 files changed, 156 insertions(+), 128 deletions(-)

diff --git a/src/views/agriculturalTrusteeship/buyer/allBill.vue b/src/views/agriculturalTrusteeship/buyer/allBill.vue
index d9fb1ef9..536f01e6 100644
--- a/src/views/agriculturalTrusteeship/buyer/allBill.vue
+++ b/src/views/agriculturalTrusteeship/buyer/allBill.vue
@@ -180,7 +180,7 @@
     created() {
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue
index 95c0eb1d..1977f8b0 100644
--- a/src/views/agriculturalTrusteeship/buyer/index.vue
+++ b/src/views/agriculturalTrusteeship/buyer/index.vue
@@ -137,7 +137,7 @@
         productList:[],
         main_content_right_header_tit:'全套服务',
         query:{
-          entityId:Cookies.get('ACCESS-SESSION-ID'),
+          entityId:'',
           productType:'',
           supplyDemandName:''
         },
diff --git a/src/views/agriculturalTrusteeship/buyer/waitBill.vue b/src/views/agriculturalTrusteeship/buyer/waitBill.vue
index e6ff9bc2..40ecce5d 100644
--- a/src/views/agriculturalTrusteeship/buyer/waitBill.vue
+++ b/src/views/agriculturalTrusteeship/buyer/waitBill.vue
@@ -96,7 +96,7 @@
     created() {
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
index 4f3180fd..9d605ac9 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
@@ -120,6 +120,7 @@
     },
     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 = '贷款'}
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
index 76a811e4..970f2c70 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceProjectList.vue
@@ -76,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);
             }
diff --git a/src/views/agriculturalTrusteeship/socialization/billDetail.vue b/src/views/agriculturalTrusteeship/socialization/billDetail.vue
index fefbb5e5..48bbc492 100644
--- a/src/views/agriculturalTrusteeship/socialization/billDetail.vue
+++ b/src/views/agriculturalTrusteeship/socialization/billDetail.vue
@@ -56,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>
 
@@ -92,7 +93,7 @@
     created() {
       let query = {
         parentId : null,
-        tree:true
+        tree:false
       }
       productTypes(query).then(response => {
         this.productList = response.data;
@@ -111,6 +112,7 @@
           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.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];
diff --git a/src/views/agriculturalTrusteeship/socialization/index.vue b/src/views/agriculturalTrusteeship/socialization/index.vue
index 750b2763..47aebf44 100644
--- a/src/views/agriculturalTrusteeship/socialization/index.vue
+++ b/src/views/agriculturalTrusteeship/socialization/index.vue
@@ -25,7 +25,10 @@
           </div>
 
           <div class="main_content_right_list_center">
-            <img v-if="item.supplyDemand.supplyMasterMap" :src="item.supplyDemand.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>
@@ -116,9 +119,11 @@
         supplyorderList(this.query).then(response => {
           response.rows.map(res=>{
             if ( res.orderStatus == '1'){
-              if (res.supplyDemand.supplyMasterMap){
-                let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," )
-                res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0]
+              if (res.supplyDemand){
+                if (res.supplyDemand.supplyMasterMap){
+                  let supplyMasterMap = res.supplyDemand.supplyMasterMap.split( "," )
+                  res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0]
+                }
               }
               res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
               res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
diff --git a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue b/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
index eb790819..d850e251 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectDetail.vue
+++ b/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" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectList',query:{id:supplyDemand.id,entityName:supplyDemand.entityName}})">{{supplyDemand.entityName}}<span>{{supplyDemand.createTime}}</span></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">
@@ -108,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( "," );
diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
index efa08a4f..c516b7c4 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
@@ -12,6 +12,7 @@
 
 
     <!--  内容开始  -->
+    <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="产品类型" v-model="supplyDemand.productType" input-align="right" placeholder="请输入产品类型" />-->
@@ -43,28 +44,29 @@
 <!--      <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"-->
+<!--        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 label="所属主体" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />
       <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.unit" input-align="right" placeholder="请输入单位" />
@@ -87,9 +89,10 @@
     </div>
 
     <div class="main_btn">
-      <p @click="submitForm('3')">发布</p>
-      <p @click="submitForm('2')">存稿</p>
+      <p @click="publishStatus = '3',$refs.formData.submit()">发布</p>
+      <p @click="publishStatus = '2',$refs.formData.submit()">存稿</p>
     </div>
+    </van-form>
     <!--  内容结束  -->
   </div>
 </template>
@@ -130,7 +133,7 @@
           value: 'id',
           children: 'children',
         },
-
+        publishStatus:''
       };
     },
     created() {
@@ -200,7 +203,7 @@
       submitForm(publishStatus){
         this.supplyDemand.supplyMasterMap = this.supplyMasterMapArr.join(',')
         this.supplyDemand.supplyDemandType = '1';
-        this.supplyDemand.publishStatus = publishStatus;
+        this.supplyDemand.publishStatus = this.publishStatus;
         supplyDemandEdit(this.supplyDemand).then((res) => {
           if(res.code=="200"){
             if (publishStatus == '3'){
diff --git a/src/views/agriculturalTrusteeship/socialization/release.vue b/src/views/agriculturalTrusteeship/socialization/release.vue
index b8237b3f..d12969c0 100644
--- a/src/views/agriculturalTrusteeship/socialization/release.vue
+++ b/src/views/agriculturalTrusteeship/socialization/release.vue
@@ -12,85 +12,89 @@
 
 
     <!--  内容开始  -->
-    <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-popup v-model="showProductType" round position="bottom">
-        <!--        v-model="cascaderValue"-->
-        <van-cascader
-          title="请选择产品类型"
-          :options="productList"
-          @close="showProductType = false"
-          @finish="onConfirmProductType"
-          :field-names="fieldNames"
+    <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>
 
-      <!--      <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-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-field label="二级分类" v-model="supplyDemand.supplyDemandType" input-align="right" placeholder="请输入二级分类" />-->
+        <van-field label="产品规格" required :rules="[{ required: true }]" 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 label="单价" 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="单位" v-model="supplyDemand.unit" input-align="right" placeholder="请输入单位" />
-      <van-field label="联系电话" v-model="supplyDemand.supplyDemandTal" type="digit" 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" 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" />
+        <van-field label="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />
+
+        <van-field label="单价" required :rules="[{ required: true }]" v-model="supplyDemand.unitPrice" type="number" input-align="right" placeholder="请输入单价" />
+        <van-field label="数量" required :rules="[{ required: true }]" 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 label="服务区域" required :rules="[{ required: true }]" v-model="supplyDemand.serviceDeptName" input-align="right" placeholder="请输入服务区域" />
+        <van-field label="地址" required :rules="[{ required: true }]" 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="详情" required :rules="[{ required: true }]" 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>
@@ -125,6 +129,7 @@
           value: 'id',
           children: 'children',
         },
+        publishStatus:''
       };
     },
     created() {
@@ -181,7 +186,7 @@
       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"){
             if (publishStatus == '3'){
diff --git a/src/views/agriculturalTrusteeship/socialization/user.vue b/src/views/agriculturalTrusteeship/socialization/user.vue
index d427e0f0..522f39c1 100644
--- a/src/views/agriculturalTrusteeship/socialization/user.vue
+++ b/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>
diff --git a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue
index 04ace279..401327cb 100644
--- a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue
+++ b/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}}<span>{{supplyDemand.createTime.substr(0,10)}}</span></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">
@@ -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>
@@ -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{

From 47f10bb9b7884e58a9feeb3fb26a0dbe08007b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 28 Dec 2022 17:02:48 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agriculturalTrusteeship/buyer/index.vue   | 41 ++++++++++++++--
 .../buyer/placeOrder.vue                      | 13 ++---
 .../insurance/insuranceList.vue               | 47 +++++++++++++++++--
 .../agriculturalTrusteeship/shop/shopList.vue | 41 ++++++++++++++--
 .../socialization/projectEdit.vue             | 24 +++++-----
 .../socialization/release.vue                 |  2 +-
 .../society/societyList.vue                   | 45 ++++++++++++++++--
 7 files changed, 178 insertions(+), 35 deletions(-)

diff --git a/src/views/agriculturalTrusteeship/buyer/index.vue b/src/views/agriculturalTrusteeship/buyer/index.vue
index 1977f8b0..94f15205 100644
--- a/src/views/agriculturalTrusteeship/buyer/index.vue
+++ b/src/views/agriculturalTrusteeship/buyer/index.vue
@@ -55,7 +55,18 @@
     <div class="main">
       <div class="main_header">
         <p>社会化服务产品</p>
-        <p>河东河西村</p>
+        <p @click="showDeptId = true">{{deptName}}</p>
+        <van-popup v-model="showDeptId" position="bottom" get-container="body">
+          <van-cascader
+            v-model="villageValue"
+            title="请选择"
+            :options="deptOptions"
+            @close="showDeptId = false"
+            @finish="onConfirmDept"
+            active-color="#1989fa"
+            :field-names="hcAreaInfoFieldName"
+          />
+        </van-popup>
       </div>
       <div class="search">
         <img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_01.png" />
@@ -117,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 {
@@ -138,6 +149,7 @@
         main_content_right_header_tit:'全套服务',
         query:{
           entityId:'',
+          serviceDeptId:'187',
           productType:'',
           supplyDemandName:''
         },
@@ -147,6 +159,15 @@
         avatar:'',
         phonenumber:'',
         searchInput:'',
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
@@ -163,6 +184,12 @@
       productTypes(query).then(response => {
         this.productList = response.data;
       });
+
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
     },
     methods: {
       getList(){
@@ -226,7 +253,15 @@
 
       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>
diff --git a/src/views/agriculturalTrusteeship/buyer/placeOrder.vue b/src/views/agriculturalTrusteeship/buyer/placeOrder.vue
index a5c6fa17..2725c8eb 100644
--- a/src/views/agriculturalTrusteeship/buyer/placeOrder.vue
+++ b/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)
diff --git a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
index 9d605ac9..18f0e124 100644
--- a/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
+++ b/src/views/agriculturalTrusteeship/insurance/insuranceList.vue
@@ -6,7 +6,18 @@
         <img src="../../../../static/images/agriculturalTrusteeship/return.png">
         <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>
     <!--  头部结束  -->
 
@@ -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,16 +117,27 @@
         main_content_right_header_tit:'全套服务',
         query:{
           entityId:'',
+          serviceDeptId:'187',
           entityName:'',
           productType:''
         },
         query2:{
           productName :'',
+          serviceDeptId:'187',
           orderByColumn:'order_score'
         },
         searchServiceInput:'',
         searchInput:'',
-        tt:''
+        tt:'',
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
@@ -124,6 +146,12 @@
       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(){
@@ -210,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>
diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue
index 090c16f3..03673199 100644
--- a/src/views/agriculturalTrusteeship/shop/shopList.vue
+++ b/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>
     <!--  头部结束  -->
 
@@ -126,7 +137,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() {
@@ -140,14 +151,29 @@
         productListNo:[],
         query:{
           financialServiceId:Cookies.get('ACCESS-SESSION-ID'),
+          serviceDeptId:'187',
           pageNum:1,
           pageSize:'10'
         },
-        serviceForm:{}
+        serviceForm:{},
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     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.serviceDeptId = selectedOptions[selectedOptions.length-1].value;
+        this.deptName = selectedOptions[selectedOptions.length-1].label;
+        this.showDeptId = false
+        this.productListYes = [];
+        this.productListNo = [];
+        this.getList();
+      },
     },
   }
 </script>
diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
index c516b7c4..3a4c9dcb 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
@@ -14,7 +14,7 @@
     <!--  内容开始  -->
     <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
@@ -42,7 +42,7 @@
       </van-popup>
 
 <!--      <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="产品规格" required :rules="[{ required: true }]" v-model="supplyDemand.specification" input-align="right" placeholder="请输入产品规格" />
 <!--      <van-field label="所属主体" v-model="supplyDemand.bodyType" input-align="right" placeholder="请输入所属主体" />-->
 <!--      <van-field-->
 <!--        readonly-->
@@ -66,15 +66,15 @@
 <!--        />-->
 <!--      </van-popup>-->
 
-      <van-field label="所属主体" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />
-      <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.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.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="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />
+      <van-field label="单价" required :rules="[{ required: true }]" v-model="supplyDemand.unitPrice" input-align="right" placeholder="请输入单价" />
+      <van-field label="数量" required :rules="[{ required: true }]" v-model="supplyDemand.number" 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="地址" required :rules="[{ required: true }]" v-model="supplyDemand.address" input-align="right" placeholder="请输入地址" />
+      <van-field label="简介" required :rules="[{ required: true }]" v-model="supplyDemand.introduction" input-align="right" placeholder="请输入简介" />
+      <van-field label="详情" required :rules="[{ required: true }]" v-model="supplyDemand.particulars" 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" />
@@ -206,7 +206,7 @@
         this.supplyDemand.publishStatus = this.publishStatus;
         supplyDemandEdit(this.supplyDemand).then((res) => {
           if(res.code=="200"){
-            if (publishStatus == '3'){
+            if (this.publishStatus == '3'){
               this.$notify({ type: 'success', message: '发布成功' });
             }else{
               this.$notify({ type: 'success', message: '存稿成功' });
diff --git a/src/views/agriculturalTrusteeship/socialization/release.vue b/src/views/agriculturalTrusteeship/socialization/release.vue
index d12969c0..a0a934d2 100644
--- a/src/views/agriculturalTrusteeship/socialization/release.vue
+++ b/src/views/agriculturalTrusteeship/socialization/release.vue
@@ -189,7 +189,7 @@
         this.supplyDemand.publishStatus = this.publishStatus;
         supplyDemandAdd(this.supplyDemand).then((res) => {
           if(res.code=="200"){
-            if (publishStatus == '3'){
+            if (this.publishStatus == '3'){
               this.$notify({ type: 'success', message: '发布成功' });
             }else{
               this.$notify({ type: 'success', message: '存稿成功' });
diff --git a/src/views/agriculturalTrusteeship/society/societyList.vue b/src/views/agriculturalTrusteeship/society/societyList.vue
index 329480fd..ddcc1d18 100644
--- a/src/views/agriculturalTrusteeship/society/societyList.vue
+++ b/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>
     <!--  头部结束  -->
 
@@ -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>

From ece47b931b83eb3c679f23e43d845fe707d5c229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 29 Dec 2022 08:59:34 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/agriculturalTrusteeship/login.vue   |  4 +-
 .../agriculturalTrusteeship/shop/shopList.vue | 32 +++++-----
 .../socialization/projectEdit.vue             |  9 +--
 .../socialization/release.vue                 | 59 ++++++++++++++++---
 4 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue
index 40171e56..052a5e77 100644
--- a/src/views/agriculturalTrusteeship/login.vue
+++ b/src/views/agriculturalTrusteeship/login.vue
@@ -150,13 +150,13 @@
                 </template>
               </van-field>
 
-              <van-field v-model="serviceForm.fax" required :rules="[{ required: true }]" center :border="false" placeholder="请输入传真">
+              <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" required :rules="[{ required: true }]" center :border="false" placeholder="请输入简要描述">
+              <van-field v-model="serviceForm.description" center :border="false" placeholder="请输入简要描述">
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
                 </template>
diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue
index 03673199..b6b69daf 100644
--- a/src/views/agriculturalTrusteeship/shop/shopList.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopList.vue
@@ -6,18 +6,18 @@
         <img src="../../../../static/images/agriculturalTrusteeship/return.png">
         <p>退出登录</p>
       </div>
-      <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>
+<!--      <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>
     <!--  头部结束  -->
 
@@ -28,7 +28,8 @@
             <p class="tt">公司信息</p>
           </template>
           <template #right-icon>
-            <img v-if="serviceForm.auditStatus != '3'" src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_edit.png" @click="$router.push({name:'agriculturalTrusteeshipServiceEdit'})">
+<!--            v-if="serviceForm.auditStatus != '3'"-->
+            <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_edit.png" @click="$router.push({name:'agriculturalTrusteeshipServiceEdit'})">
           </template>
         </van-cell>
 
@@ -151,9 +152,8 @@
         productListNo:[],
         query:{
           financialServiceId:Cookies.get('ACCESS-SESSION-ID'),
-          serviceDeptId:'187',
           pageNum:1,
-          pageSize:'10'
+          pageSize:'10',
         },
         serviceForm:{},
         deptOptions:[],
@@ -219,7 +219,7 @@
       },
       //选择案件属地
       onConfirmDept({ selectedOptions }){
-        this.query.serviceDeptId = selectedOptions[selectedOptions.length-1].value;
+        this.query.deptId = selectedOptions[selectedOptions.length-1].value;
         this.deptName = selectedOptions[selectedOptions.length-1].label;
         this.showDeptId = false
         this.productListYes = [];
diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
index 3a4c9dcb..61245012 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
@@ -42,7 +42,7 @@
       </van-popup>
 
 <!--      <van-field label="二级分类" v-model="supplyDemand.supplyDemandType" input-align="right" placeholder="请输入二级分类" />-->
-      <van-field label="产品规格" required :rules="[{ required: true }]" v-model="supplyDemand.specification" 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-->
@@ -67,14 +67,15 @@
 <!--      </van-popup>-->
 
       <van-field label="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />
+
       <van-field label="单价" required :rules="[{ required: true }]" v-model="supplyDemand.unitPrice" input-align="right" placeholder="请输入单价" />
-      <van-field label="数量" required :rules="[{ required: true }]" v-model="supplyDemand.number" input-align="right" placeholder="请输入数量" />
+      <van-field label="数量" v-model="supplyDemand.number" 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="地址" required :rules="[{ required: true }]" v-model="supplyDemand.address" input-align="right" placeholder="请输入地址" />
+      <van-field label="地址" v-model="supplyDemand.address" input-align="right" placeholder="请输入地址" />
       <van-field label="简介" required :rules="[{ required: true }]" v-model="supplyDemand.introduction" input-align="right" placeholder="请输入简介" />
-      <van-field label="详情" required :rules="[{ required: true }]" v-model="supplyDemand.particulars" input-align="right" placeholder="请输入详情" />
+      <van-field label="详情" v-model="supplyDemand.particulars" 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" />
diff --git a/src/views/agriculturalTrusteeship/socialization/release.vue b/src/views/agriculturalTrusteeship/socialization/release.vue
index a0a934d2..0459f3bb 100644
--- a/src/views/agriculturalTrusteeship/socialization/release.vue
+++ b/src/views/agriculturalTrusteeship/socialization/release.vue
@@ -42,7 +42,7 @@
         </van-popup>
 
         <!--      <van-field label="二级分类" v-model="supplyDemand.supplyDemandType" input-align="right" placeholder="请输入二级分类" />-->
-        <van-field label="产品规格" required :rules="[{ required: true }]" v-model="supplyDemand.specification" 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-->
@@ -69,14 +69,39 @@
         <van-field label="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />
 
         <van-field label="单价" required :rules="[{ required: true }]" v-model="supplyDemand.unitPrice" type="number" input-align="right" placeholder="请输入单价" />
-        <van-field label="数量" required :rules="[{ required: true }]" v-model="supplyDemand.number" type="digit" 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 label="服务区域" required :rules="[{ required: true }]" v-model="supplyDemand.serviceDeptName" input-align="right" placeholder="请输入服务区域" />
-        <van-field label="地址" required :rules="[{ required: true }]" v-model="supplyDemand.address" 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 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.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="详情" required :rules="[{ required: true }]" v-model="supplyDemand.particulars" 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" />
@@ -100,7 +125,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {commonUpload, productTypes, supplyDemandAdd} from "@/api/agriculturalTrusteeship";
+  import {commonUpload, productTypes, supplyDemandAdd, treeselect} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
     data() {
@@ -129,7 +154,16 @@
           value: 'id',
           children: 'children',
         },
-        publishStatus:''
+        publishStatus:'',
+        deptOptions:[],
+        deptName:'张村',
+        showDeptId:false,
+        villageValue : '',
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
       };
     },
     created() {
@@ -158,6 +192,11 @@
         }
         this.bodyTypeOptions = response.data;
       });
+      treeselect().then(res=>{
+        if (res.code == 200) {
+          this.deptOptions = res.data;
+        }
+      })
     },
     methods: {
       onConfirmProductType({ selectedOptions }){
@@ -201,6 +240,12 @@
           }
         })
       },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        this.supplyDemand.serviceDeptId = selectedOptions[selectedOptions.length-1].value;
+        this.supplyDemand.serviceDeptName = selectedOptions[selectedOptions.length-1].label;
+        this.showDeptId = false
+      },
     },
   }
 </script>

From 2159ccc8faabe22d66ee313963d52aad26ba5b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 29 Dec 2022 16:41:31 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=A4=A7=E6=89=98=E7=AE=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/agriculturalTrusteeship/login.vue   | 12 ++--
 .../socialization/projectEdit.vue             | 39 +++++++++++--
 .../socialization/release.vue                 | 58 +++++++++++--------
 3 files changed, 73 insertions(+), 36 deletions(-)

diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue
index 052a5e77..9680e2fd 100644
--- a/src/views/agriculturalTrusteeship/login.vue
+++ b/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>
     <!--  头部结束  -->
@@ -814,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){
diff --git a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
index 61245012..7d829b97 100644
--- a/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
+++ b/src/views/agriculturalTrusteeship/socialization/projectEdit.vue
@@ -65,8 +65,29 @@
 <!--          @cancel="showBodyType = false"-->
 <!--        />-->
 <!--      </van-popup>-->
-
-      <van-field label="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" 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 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="单价" required :rules="[{ required: true }]" v-model="supplyDemand.unitPrice" input-align="right" placeholder="请输入单价" />
       <van-field label="数量" v-model="supplyDemand.number" input-align="right" placeholder="请输入数量" />
@@ -104,7 +125,7 @@
     productTypes,
     commonUpload,
     supplyDemandEdit,
-    supplyDemandAdd
+    supplyDemandAdd, detailList
   } from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
@@ -134,7 +155,8 @@
           value: 'id',
           children: 'children',
         },
-        publishStatus:''
+        publishStatus:'',
+        detailListOptions:[]
       };
     },
     created() {
@@ -157,6 +179,11 @@
         }
         this.bodyTypeOptions = response.data;
       });
+      detailList().then(res=>{
+        if (res.code == 200) {
+          this.detailListOptions = res.rows;
+        }
+      })
       this.getDetail();
     },
     methods: {
@@ -184,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){
diff --git a/src/views/agriculturalTrusteeship/socialization/release.vue b/src/views/agriculturalTrusteeship/socialization/release.vue
index 0459f3bb..209b8dc7 100644
--- a/src/views/agriculturalTrusteeship/socialization/release.vue
+++ b/src/views/agriculturalTrusteeship/socialization/release.vue
@@ -44,29 +44,31 @@
         <!--      <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="supplyDemand.entityName"
+          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="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="所属主体" required :rules="[{ required: true }]" v-model="supplyDemand.entityName" input-align="right" placeholder="请输入所属主体" />
 
         <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="请输入数量" />
@@ -125,7 +127,7 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import {commonUpload, productTypes, supplyDemandAdd, treeselect} from "@/api/agriculturalTrusteeship";
+  import {commonUpload, productTypes, supplyDemandAdd, treeselect,detailList} from "@/api/agriculturalTrusteeship";
   export default {
     name: "agriculturalTrusteeshipSocializationRelease",
     data() {
@@ -164,6 +166,7 @@
           value: "value",
           children: "children",
         },
+        detailListOptions:[]
       };
     },
     created() {
@@ -197,6 +200,11 @@
           this.deptOptions = res.data;
         }
       })
+      detailList().then(res=>{
+        if (res.code == 200) {
+          this.detailListOptions = res.rows;
+        }
+      })
     },
     methods: {
       onConfirmProductType({ selectedOptions }){
@@ -205,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){