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

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>

src/views/agriculturalTrusteeship/buyer/placeOrder.vue

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

src/views/agriculturalTrusteeship/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>

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>

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: '存稿成功' });

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: '存稿成功' });

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>