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

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>

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

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" />

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>