|
@@ -28,7 +28,7 @@
|
|
|
<!-- 选择日期范围 -->
|
|
|
<u-calendar v-model="showDate" @change="dateChange" mode="range"></u-calendar>
|
|
|
<!-- 选择收款方式 -->
|
|
|
- <u-picker v-model="settleStyleModal" @confirm="settleStyleChange" :range="settleStyleList" range-key="name" mode="selector"></u-picker>
|
|
|
+ <u-picker v-model="settleStyleModal" @confirm="settleStyleChange" :range="settleStyleList" range-key="dispName" mode="selector"></u-picker>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
@@ -76,7 +76,6 @@
|
|
|
},
|
|
|
mounted() {
|
|
|
this.init()
|
|
|
- this.getTypeList()
|
|
|
},
|
|
|
methods: {
|
|
|
// 初始化数据
|
|
@@ -117,26 +116,21 @@
|
|
|
},
|
|
|
// 收款方式 change
|
|
|
settleStyleChange(ind){
|
|
|
- this.form.settleStyleSn = this.settleStyleList[ind].settleStyleSn || undefined
|
|
|
- this.settleStyleName = this.settleStyleList[ind].name || ''
|
|
|
+ this.form.settleStyleSn = this.settleStyleList[ind].code || undefined
|
|
|
+ this.settleStyleName = this.settleStyleList[ind].dispName || ''
|
|
|
},
|
|
|
// 收款方式
|
|
|
getTypeList () {
|
|
|
- settleStyleQueryAll({}).then(res => {
|
|
|
- if (res.status == 200 && res.data) {
|
|
|
- this.settleStyleList = res.data
|
|
|
- // 收款方式有值时,匹配对应name
|
|
|
- if(this.defaultParams.settleStyleSn || this.defaultParams.settleStyleSn==0){
|
|
|
- this.settleStyleList.map(item => {
|
|
|
- if(item.settleStyleSn == this.defaultParams.settleStyleSn){
|
|
|
- this.settleStyleName = item.name
|
|
|
- }
|
|
|
- })
|
|
|
+ this.settleStyleList = this.$store.state.vuex_paymentTypeList
|
|
|
+ console.log(this.settleStyleList)
|
|
|
+ // 收款方式有值时,匹配对应name
|
|
|
+ if(this.defaultParams.settleStyleSn || this.defaultParams.settleStyleSn==0){
|
|
|
+ this.settleStyleList.map(item => {
|
|
|
+ if(item.code == this.defaultParams.settleStyleSn){
|
|
|
+ this.settleStyleName = item.dispName
|
|
|
}
|
|
|
- } else {
|
|
|
- this.settleStyleList = []
|
|
|
- }
|
|
|
- })
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
// 时间 change
|
|
|
dateChange(date){
|
|
@@ -160,6 +154,8 @@
|
|
|
isShow (newValue, oldValue) {
|
|
|
if (!newValue) {
|
|
|
this.$emit('close')
|
|
|
+ }else{
|
|
|
+ this.getTypeList()
|
|
|
}
|
|
|
}
|
|
|
}
|