大托管

src/views/agriculturalTrusteeship/buyer/billDetail.vue

@@ -36,7 +36,26 @@
 
           <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
           <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
+          <van-cell @click="showDialog" :border="false" >
+            <template #title>
+              <div style="display: flex;align-items: center;">
+                <p style="margin-right: 5px;">联系电话</p>
+                <img src="../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png">
+              </div>
+            </template>
+            <template #default>
+              <p style="color: #336699">{{supplyDemand.supplyDemandTal}}</p>
+            </template>
+          </van-cell>
+          <van-dialog
+            v-model="show"
+            title="联系卖家"
+            :message="`确认拨打`+supplyDemand.supplyDemandTal+`联系电话？`"
+            show-cancel-button
+            @cancel="show=false"
+            @confirm="contact"
+          >
+          </van-dialog>
         </div>
 
         <div class="main_content_right_list">
@@ -59,7 +78,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>
@@ -81,7 +101,7 @@
         active: 0,
         loading: false,
         finished: false,
-        show:true,
+        show:false,
         activeNames:[],
         cropTypeOptions:[],
         orderStatusOptions:[],
@@ -106,10 +126,20 @@
       this.getDetail();
     },
     methods: {
+      showDialog() {
+        this.show = true;// 显示确认对话框
+      },
+      contact() {
+        const a = document.createElement("a");
+        a.href = "tel:8888410"
+        a.click();
+        this.show = false;
+      },
       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.countMoney = response.data.unitPrice*response.data.serviceNum;
           var that = this ;
           setTimeout(function () {
             response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;

src/views/agriculturalTrusteeship/buyer/billDetail2.vue

@@ -35,7 +35,26 @@
           </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 @click="showDialog" :border="false" >
+            <template #title>
+              <div style="display: flex;align-items: center;">
+                <p style="margin-right: 5px;">联系电话</p>
+                <img src="../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png">
+              </div>
+            </template>
+            <template #default>
+              <p style="color: #336699">{{supplyDemand.supplyDemandTal}}</p>
+            </template>
+          </van-cell>
+          <van-dialog
+            v-model="show"
+            title="联系卖家"
+            :message="`确认拨打`+supplyDemand.supplyDemandTal+`联系电话？`"
+            show-cancel-button
+            @cancel="show=false"
+            @confirm="contact"
+          >
+          </van-dialog>
         </div>
 
         <div class="main_content_right_list">
@@ -59,7 +78,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>
 
@@ -84,7 +104,7 @@
         active: 0,
         loading: false,
         finished: false,
-        show:true,
+        show:false,
         activeNames:[],
         cropTypeOptions:[],
         orderStatusOptions:[],
@@ -109,10 +129,20 @@
       this.getDetail();
     },
     methods: {
+      showDialog() {
+        this.show = true;// 显示确认对话框
+      },
+      contact() {
+        const a = document.createElement("a");
+        a.href = "tel:8888410"
+        a.click();
+        this.show = false;
+      },
       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.countMoney = response.data.unitPrice*response.data.serviceNum;
           var that = this ;
           setTimeout(function () {
             response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;

src/views/agriculturalTrusteeship/buyer/billDetail3.vue

@@ -36,7 +36,26 @@
           </div>
           <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
           <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
+          <van-cell @click="showDialog" :border="false" >
+            <template #title>
+              <div style="display: flex;align-items: center;">
+                <p style="margin-right: 5px;">联系电话</p>
+                <img src="../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png">
+              </div>
+            </template>
+            <template #default>
+              <p style="color: #336699">{{supplyDemand.supplyDemandTal}}</p>
+            </template>
+          </van-cell>
+          <van-dialog
+            v-model="show"
+            title="联系卖家"
+            :message="`确认拨打`+supplyDemand.supplyDemandTal+`联系电话？`"
+            show-cancel-button
+            @cancel="show=false"
+            @confirm="contact"
+          >
+          </van-dialog>
         </div>
 
         <div class="main_content_right_list">
@@ -71,7 +90,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 +112,7 @@
         active: 0,
         loading: false,
         finished: false,
-        show:true,
+        show:false,
         activeNames:[],
         cropTypeOptions:[],
         orderStatusOptions:[],
@@ -117,10 +137,20 @@
       this.getDetail();
     },
     methods: {
+      showDialog() {
+        this.show = true;// 显示确认对话框
+      },
+      contact() {
+        const a = document.createElement("a");
+        a.href = "tel:8888410"
+        a.click();
+        this.show = false;
+      },
       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.countMoney = response.data.unitPrice*response.data.serviceNum;
           var that = this ;
           setTimeout(function () {
             response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;

src/views/agriculturalTrusteeship/buyer/billDetail4.vue

@@ -17,7 +17,7 @@
         <div class="main_content_right_list first">
           <div class="main_content_right_list_header">
             <p class="on">商品信息</p>
-            <p>{supplyDemand.productType}}</p>
+            <p>{{supplyDemand.productType}}</p>
             <p>服务</p>
           </div>
 
@@ -36,7 +36,26 @@
           </div>
           <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
           <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
+          <van-cell @click="showDialog" :border="false" >
+            <template #title>
+              <div style="display: flex;align-items: center;">
+                <p style="margin-right: 5px;">联系电话</p>
+                <img src="../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png">
+              </div>
+            </template>
+            <template #default>
+              <p style="color: #336699">{{supplyDemand.supplyDemandTal}}</p>
+            </template>
+          </van-cell>
+          <van-dialog
+            v-model="show"
+            title="联系卖家"
+            :message="`确认拨打`+supplyDemand.supplyDemandTal+`联系电话？`"
+            show-cancel-button
+            @cancel="show=false"
+            @confirm="contact"
+          >
+          </van-dialog>
         </div>
 
         <div class="main_content_right_list">
@@ -59,7 +78,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>
 
@@ -80,7 +100,7 @@
         active: 0,
         loading: false,
         finished: false,
-        show:true,
+        show:false,
         activeNames:[],
         cropTypeOptions:[],
         orderStatusOptions:[],
@@ -105,10 +125,20 @@
       this.getDetail();
     },
     methods: {
+      showDialog() {
+        this.show = true;// 显示确认对话框
+      },
+      contact() {
+        const a = document.createElement("a");
+        a.href = "tel:8888410"
+        a.click();
+        this.show = false;
+      },
       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.countMoney = response.data.unitPrice*response.data.serviceNum;
           var that = this ;
           setTimeout(function () {
             response.data.productType = that.productList.filter(function (e) { return e.id == response.data.productType; })[0].dictName;

src/views/agriculturalTrusteeship/buyer/placeOrder.vue

@@ -35,7 +35,17 @@
           </div>
           <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
           <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
+          <van-cell @click="showDialog" :border="false" >
+            <template #title>
+              <div style="display: flex;align-items: center;">
+                <p style="margin-right: 5px;">联系电话</p>
+                <img src="../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png">
+              </div>
+            </template>
+            <template #default>
+              <p style="color: #336699">{{supplyDemand.supplyDemandTal}}</p>
+            </template>
+          </van-cell>
         </div>
 
         <div class="main_content_right_list">
@@ -81,29 +91,38 @@
 
 <!--          <van-field label="下单时间" v-model="supplyDemand.orderAt" :border="false" input-align="right" placeholder="请输入下单时间" />-->
 
-          <van-field
-            readonly
-            clickable
-            required
-            :border="false"
-            :rules="[{ required: true , message:'请选择下单时间'}]"
-            v-model="supplyDemand.orderAt"
-            label="下单时间"
-            placeholder="请选择下单时间"
-            @click="showOrderAt = true"
-            input-align="right"
-            right-icon="arrow-down"
-            label-width="auto"
-          />
-          <van-popup v-model="showOrderAt" position="bottom">
-            <van-datetime-picker
-              v-model="orderAt"
-              @confirm="onConfirmOrderAt"
-              type="date"
-              title="选择年月"
-            />
-          </van-popup>
+<!--          <van-field-->
+<!--            readonly-->
+<!--            clickable-->
+<!--            required-->
+<!--            :border="false"-->
+<!--            :rules="[{ required: true , message:'请选择下单时间'}]"-->
+<!--            v-model="supplyDemand.orderAt"-->
+<!--            label="下单时间"-->
+<!--            placeholder="请选择下单时间"-->
+<!--            @click="showOrderAt = true"-->
+<!--            input-align="right"-->
+<!--            right-icon="arrow-down"-->
+<!--            label-width="auto"-->
+<!--          />-->
+<!--          <van-popup v-model="showOrderAt" position="bottom">-->
+<!--            <van-datetime-picker-->
+<!--              v-model="orderAt"-->
+<!--              @confirm="onConfirmOrderAt"-->
+<!--              type="date"-->
+<!--              title="选择年月"-->
+<!--            />-->
+<!--          </van-popup>-->
+
 
+
+          <van-field label="服务数量" :border="false" input-align="right" >
+            <template #input>
+              <van-stepper v-model="supplyDemand.serviceNum" />
+            </template>
+          </van-field>
+
+          <van-field label="数量单位" required :rules="[{ required: true }]" v-model="supplyDemand.numUnit" :border="false" input-align="right" placeholder="请输入数量单位" />
           <van-field
             readonly
             clickable
@@ -126,15 +145,8 @@
               title="选择年月"
             />
           </van-popup>
-
-          <van-field label="服务数量" :border="false" input-align="right" >
-            <template #input>
-              <van-stepper v-model="supplyDemand.serviceNum" />
-            </template>
-          </van-field>
-
-          <van-field label="数量单位" v-model="supplyDemand.numUnit" :border="false" input-align="right" placeholder="请输入数量单位" />
           <van-field label="备注" v-model="supplyDemand.serviceRemark" :border="false" input-align="right" placeholder="请输入备注" />
+
         </div>
 
     </div>
@@ -161,14 +173,14 @@
         loading: false,
         finished: false,
         showfwht: false,
-        show:true,
+        show:false,
         orderAt:new Date(),
         showOrderAt: false,
         serviceAt:new Date(),
         showServiceAt: false,
         activeNames:[],
         supplyDemand:{
-
+          numUnit:'亩'
         },
         projectTypeOptions:[],
         productList:[],
@@ -211,6 +223,15 @@
       this.getDetail();
     },
     methods: {
+      showDialog() {
+        this.show = true;// 显示确认对话框
+      },
+      contact() {
+        const a = document.createElement("a");
+        a.href = "tel:8888410"
+        a.click();
+        this.show = false;
+      },
       getDetail(){
         supplyDemandGet(this.$route.query.id).then(response => {
           response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType);
@@ -226,13 +247,16 @@
           response.data.serviceAt = this.format(new Date(),'yyyy-MM-dd');
           response.data.orderAt = this.format(new Date(),'yyyy-MM-dd');
           this.supplyDemand = response.data;
+          this.supplyDemand.numUnit = '亩';
         });
       },
       onConfirmFwht(val){
+        console.log(val)
         this.contractionName = val.contractionName;
         this.supplyDemand.fwhtId = val.id;
         this.cropType = this.selectDictLabel(this.cropTypeOptions, val.cropType);
         this.supplyDemand.cropType = val.cropType;
+        this.supplyDemand.serviceNum = val.cropArea;
         this.showfwht = false;
       },
       onConfirmOrderAt(data){

src/views/agriculturalTrusteeship/socialization/billDetail.vue

@@ -33,7 +33,26 @@
           </div>
           <van-cell title="卖方名称" :border="false" :value="supplyDemand.entityName" />
           <van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
-          <van-cell title="联系电话" :border="false" :value="supplyDemand.supplyDemandTal" />
+          <van-cell @click="showDialog" :border="false" >
+            <template #title>
+              <div style="display: flex;align-items: center;">
+                <p style="margin-right: 5px;">联系电话</p>
+                <img src="../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png">
+              </div>
+            </template>
+            <template #default>
+              <p style="color: #336699">{{supplyDemand.supplyDemandTal}}</p>
+            </template>
+          </van-cell>
+          <van-dialog
+            v-model="show"
+            title="联系卖家"
+            :message="`确认拨打`+supplyDemand.supplyDemandTal+`联系电话？`"
+            show-cancel-button
+            @cancel="show=false"
+            @confirm="contact"
+          >
+          </van-dialog>
         </div>
 
         <div class="main_content_right_list">
@@ -56,7 +75,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 == null ? supplyDemand.countMoney:supplyDemand.realityServiceMoney" />
+          <van-cell title="订单金额（元）" :border="false" :value="supplyDemand.realityServiceMoney == null ? supplyDemand.countMoney:supplyDemand.realityServiceMoney" />
 
           <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
         </div>
@@ -82,7 +101,7 @@
         active: 0,
         loading: false,
         finished: false,
-        show:true,
+        show:false,
         activeNames:[],
         cropTypeOptions:[],
         orderStatusOptions:[],
@@ -107,6 +126,15 @@
       this.getDetail();
     },
     methods: {
+      showDialog() {
+        this.show = true;// 显示确认对话框
+      },
+      contact() {
+        const a = document.createElement("a");
+        a.href = "tel:8888410"
+        a.click();
+        this.show = false;
+      },
       getDetail(){
         supplyorderGet(this.$route.query.id).then(response => {
           response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType);

src/views/agriculturalTrusteeship/socialization/billOrder.vue

@@ -35,7 +35,26 @@
         </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 @click="showDialog" :border="false" >
+          <template #title>
+            <div style="display: flex;align-items: center;">
+              <p style="margin-right: 5px;">联系电话</p>
+              <img src="../../../../static/images/agriculturalTrusteeship/insurance/insurance_list_iphone.png">
+            </div>
+          </template>
+          <template #default>
+            <p style="color: #336699">{{supplyDemand.phone}}</p>
+          </template>
+        </van-cell>
+        <van-dialog
+          v-model="show"
+          title="联系卖家"
+          :message="`确认拨打`+supplyDemand.phone+`联系电话？`"
+          show-cancel-button
+          @cancel="show=false"
+          @confirm="contact"
+        >
+        </van-dialog>
       </div>
 
       <div class="main_content_right_list">
@@ -58,7 +77,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 == null ? supplyDemand.countMoney:supplyDemand.realityServiceMoney" />
+        <van-cell title="订单金额（元）" :border="false" :value="supplyDemand.realityServiceMoney == null ? supplyDemand.countMoney:supplyDemand.realityServiceMoney" />
         <van-cell title="备注" :border="false" :value="supplyDemand.serviceRemark" />
       </div>
 
@@ -83,7 +102,7 @@
         active: 0,
         loading: false,
         finished: false,
-        show:true,
+        show:false,
         activeNames:[],
         cropTypeOptions:[],
         orderStatusOptions:[],
@@ -108,6 +127,15 @@
       this.getDetail();
     },
     methods: {
+      showDialog() {
+        this.show = true;// 显示确认对话框
+      },
+      contact() {
+        const a = document.createElement("a");
+        a.href = "tel:8888410"
+        a.click();
+        this.show = false;
+      },
       getDetail(){
         supplyorderGet(this.$route.query.id).then(response => {
           response.data.cropType = this.selectDictLabel(this.cropTypeOptions, response.data.cropType);

src/views/agriculturalTrusteeship/society/societyProjectDetail.vue

@@ -47,7 +47,6 @@
 
     <!--  底部提交按钮  -->
     <div class="footer">
-      <p>温馨提示：下单前请先与商家沟通联系</p>
       <img src="../../../../static/images/agriculturalTrusteeship/insurance/submit_shop_btn.png" @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder',query:{id:$route.query.id}})">
     </div>
   </div>
@@ -260,7 +259,7 @@
 
   .footer{
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     align-items: center;
     background: #ffffff;
     position: fixed;