大托管问题修改

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:''
         },

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>

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>

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

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;
         });

src/views/agriculturalTrusteeship/socialization/draft.vue

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

src/views/agriculturalTrusteeship/socialization/index.vue

@@ -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);

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;

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)

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)