日期

hdApp/src/components/module/dateSelect.vue

@@ -23,6 +23,16 @@
                         </button>
                     </view>
                 </view>
+
+                <view class="select-item-box">
+                    <view class="title">按月份</view>
+                    <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
+                        <view class="item-child_box">
+                            <view class="admin-button-com mini-btn default custom" >{{showMonth||'选择月份'}}</view>
+                        </view>
+                    </picker>
+                </view>
+
                 <view class="select-item-box">
                     <view class="title">时间段</view>
                     <view class="item-child_box" >
@@ -80,7 +90,8 @@ export default {
             startDate:'',
             endDate:'',
             dateIndex:0,
-            defaultDateName:'今天'
+            defaultDateName:'今天',
+            showMonth:null
         }
     },
 	watch:{
@@ -102,6 +113,14 @@ export default {
     onLoad(){
     },
     methods:{
+        bindMonthChange(e){
+            this.dropdownShow = !this.dropdownShow
+            this.dropdownShow = false;
+            let currentMonth = e.target.value
+            this.defaultDateName = currentMonth
+            this.showMonth = currentMonth
+            this.$emit('selectDateFn',{searchTime:'byMonth',startTime:currentMonth})
+        },
         showDatePicker(index){//显示
             this.showPicker = true;
             this.dateIndex = index

hdApp/src/pagesPurchase/gathering.vue

@@ -162,21 +162,26 @@ export default {
     },
     //批量收款
     batchConfirm () {
+      if(this.searchTime == ''){
+        this.$msg('请选择月份')
+        return false
+      }
       let arr = []
-      if (this.selectList.length > 0) {
-        this.selectList.forEach(item => {
-          arr.push(item.id)
-        })
-        purchaseClearCreateOrder({ purchaseIds:arr.join(','),ghsId:this.option.id }).then(res => {
-          if(res.code == 1) {
-            this.pageTo({
-              url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond,
-              type: 2
-            })
-          }
-        }).catch(err => {
-        })
+      if (this.$util.isEmpty(this.selectList)) {
+        this.$msg('请选择订单')
+        return false
       }
+      this.selectList.forEach(item => {
+        arr.push(item.id)
+      })
+      purchaseClearCreateOrder({ purchaseIds:arr.join(','),ghsId:this.option.id }).then(res => {
+        if(res.code == 1) {
+          this.pageTo({
+            url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond,
+            type: 2
+          })
+        }
+      })
     },
     back () {
       uni.navigateBack({})

hdApp/src/pagesPurchase/wechatPay.vue

@@ -31,7 +31,7 @@
               <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" v-if="Number(balance) >0" @click="balancePay">余额支付</button>
             </view>
 
-            <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">记欠款</button>
+            <button class="button-com pay-wx" :class="[count >0 ? 'green':'default']" :disabled="count >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">记欠账</button>
 
           </div>
 
@@ -112,7 +112,7 @@ export default {
       let that = this
       uni.showModal({
 				title: '提示',
-				content: '确认记欠款？',
+				content: '确认记欠账？',
 				success: function (res) {
 					if (res.confirm) {