|
@@ -105,7 +105,7 @@
|
|
<view class="slot-content"><rich-text :nodes="tipContent"></rich-text></view>
|
|
<view class="slot-content"><rich-text :nodes="tipContent"></rich-text></view>
|
|
</u-modal>
|
|
</u-modal>
|
|
<!-- 分享询问弹窗 -->
|
|
<!-- 分享询问弹窗 -->
|
|
- <u-modal v-model="shareShow" :show-cancel-button="true" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false"></u-modal>
|
|
|
|
|
|
+ <u-modal v-model="shareShow" :show-cancel-button="true" :content="shareContent" @confirm="handleShare" @cancel="shareShow = false;submitLoading = false;"></u-modal>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -195,7 +195,8 @@ export default {
|
|
shareShow: false,
|
|
shareShow: false,
|
|
verifySn:'',
|
|
verifySn:'',
|
|
backDiscountPrice:null,
|
|
backDiscountPrice:null,
|
|
- backDiscountVal:null
|
|
|
|
|
|
+ backDiscountVal:null,
|
|
|
|
+ cycleNameShow:''
|
|
};
|
|
};
|
|
},
|
|
},
|
|
onReady() {
|
|
onReady() {
|
|
@@ -281,6 +282,8 @@ export default {
|
|
},
|
|
},
|
|
handleClean() {
|
|
handleClean() {
|
|
this.showSearch = false;
|
|
this.showSearch = false;
|
|
|
|
+ // 清空选择周期时组件值
|
|
|
|
+ this.$refs.rangeDate.init();
|
|
let systemList = this.$store.state.vuex_systemSetList;
|
|
let systemList = this.$store.state.vuex_systemSetList;
|
|
let cycleObj = systemList.find(item => {
|
|
let cycleObj = systemList.find(item => {
|
|
return item.remarks == 'sales_bill_period';
|
|
return item.remarks == 'sales_bill_period';
|
|
@@ -299,12 +302,12 @@ export default {
|
|
this.params.bizBeginDate = this.getQueryDate().beginDate;
|
|
this.params.bizBeginDate = this.getQueryDate().beginDate;
|
|
this.params.bizEndDate = this.getQueryDate().endDate;
|
|
this.params.bizEndDate = this.getQueryDate().endDate;
|
|
this.cycleName = this.changeShowTime();
|
|
this.cycleName = this.changeShowTime();
|
|
- this.dateArray = '';
|
|
|
|
} else if (this.curTab == 7) {
|
|
} else if (this.curTab == 7) {
|
|
this.cycleName = this.placeTab[this.curTab].name;
|
|
this.cycleName = this.placeTab[this.curTab].name;
|
|
this.params.bizBeginDate = undefined;
|
|
this.params.bizBeginDate = undefined;
|
|
this.params.bizEndDate = undefined;
|
|
this.params.bizEndDate = undefined;
|
|
}
|
|
}
|
|
|
|
+ this.dateArray = '';
|
|
this.getList();
|
|
this.getList();
|
|
},
|
|
},
|
|
getList() {
|
|
getList() {
|
|
@@ -332,7 +335,7 @@ export default {
|
|
this.dateArray = date.startDate + ' ~ ' + date.endDate;
|
|
this.dateArray = date.startDate + ' ~ ' + date.endDate;
|
|
this.params.bizBeginDate = date.startDate + ' 00:00:00';
|
|
this.params.bizBeginDate = date.startDate + ' 00:00:00';
|
|
this.params.bizEndDate = date.endDate + ' 23:59:59';
|
|
this.params.bizEndDate = date.endDate + ' 23:59:59';
|
|
- this.cycleName = date.startDate + '至' + date.endDate;
|
|
|
|
|
|
+ this.cycleNameShow = date.startDate + '至' + date.endDate;
|
|
},
|
|
},
|
|
// 更改日期格式显示
|
|
// 更改日期格式显示
|
|
changeShowTime() {
|
|
changeShowTime() {
|
|
@@ -358,6 +361,11 @@ export default {
|
|
},
|
|
},
|
|
handleSearch() {
|
|
handleSearch() {
|
|
this.showSearch = false;
|
|
this.showSearch = false;
|
|
|
|
+ if(this.curTab == 6){
|
|
|
|
+ this.cycleName = this.cycleNameShow;
|
|
|
|
+ }else{
|
|
|
|
+ this.cycleNameShow = ''
|
|
|
|
+ }
|
|
this.changeTime();
|
|
this.changeTime();
|
|
},
|
|
},
|
|
jumpPage(url) {
|
|
jumpPage(url) {
|
|
@@ -419,9 +427,12 @@ export default {
|
|
this.chooseList.push(row);
|
|
this.chooseList.push(row);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this.discountVal = ''
|
|
|
|
- this.backDiscountPrice = this.settlement
|
|
|
|
- this.backDiscountVal = this.discountVal
|
|
|
|
|
|
+ if(this.settlement *1 <0){
|
|
|
|
+ this.backDiscountVal = '0.00'
|
|
|
|
+ }else{
|
|
|
|
+ this.backDiscountVal = this.discountVal
|
|
|
|
+ }
|
|
|
|
+ this.backDiscountPrice = this.settlement
|
|
// 是否全选
|
|
// 是否全选
|
|
this.allChecked = isAllChecked;
|
|
this.allChecked = isAllChecked;
|
|
},
|
|
},
|
|
@@ -465,8 +476,8 @@ export default {
|
|
let obj = {
|
|
let obj = {
|
|
detailNum: this.chooseList.length,
|
|
detailNum: this.chooseList.length,
|
|
totalAmount: this.chooseTotalPayPrice,
|
|
totalAmount: this.chooseTotalPayPrice,
|
|
- discountAmount: this.discountVal || 0,
|
|
|
|
- settleAmount: this.settlement,
|
|
|
|
|
|
+ discountAmount: this.backDiscountVal || 0,
|
|
|
|
+ settleAmount: this.chooseTotalPayPrice - this.backDiscountVal ,
|
|
detailList: this.chooseList
|
|
detailList: this.chooseList
|
|
};
|
|
};
|
|
let ajaxData = Object.assign(this.params, obj);
|
|
let ajaxData = Object.assign(this.params, obj);
|