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

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){

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){

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){