|
@@ -50,8 +50,14 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
- <el-form-item :label="bill==='COMMONLY'?'钱包类型':'返利类型'" prop="customerWalletId">
|
|
|
|
- <el-select class="selectStyle" v-model="searchForm.customerWalletId" placeholder="请选择" filterable size="mini">
|
|
|
|
|
|
+ <el-form-item :label="bill === 'COMMONLY' ? '钱包类型' : '返利类型'" prop="customerWalletId">
|
|
|
|
+ <el-select
|
|
|
|
+ class="selectStyle"
|
|
|
|
+ v-model="searchForm.customerWalletId"
|
|
|
|
+ placeholder="请选择"
|
|
|
|
+ filterable
|
|
|
|
+ size="mini"
|
|
|
|
+ >
|
|
<el-option
|
|
<el-option
|
|
v-for="(v, i) in walletList"
|
|
v-for="(v, i) in walletList"
|
|
:key="i"
|
|
:key="i"
|
|
@@ -81,7 +87,6 @@
|
|
placeholder="选择日期时间"
|
|
placeholder="选择日期时间"
|
|
value-format="yyyy-MM-dd"
|
|
value-format="yyyy-MM-dd"
|
|
size="mini"
|
|
size="mini"
|
|
-
|
|
|
|
>
|
|
>
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -106,7 +111,13 @@
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-form-item label="单据类型" prop="billType">
|
|
<el-form-item label="单据类型" prop="billType">
|
|
- <el-select class="selectStyle" v-model="searchForm.billType" placeholder="请选择" filterable size="mini">
|
|
|
|
|
|
+ <el-select
|
|
|
|
+ class="selectStyle"
|
|
|
|
+ v-model="searchForm.billType"
|
|
|
|
+ placeholder="请选择"
|
|
|
|
+ filterable
|
|
|
|
+ size="mini"
|
|
|
|
+ >
|
|
<el-option v-for="(v, i) in typeList" :key="i" :label="v" :value="v"></el-option>
|
|
<el-option v-for="(v, i) in typeList" :key="i" :label="v" :value="v"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -227,7 +238,7 @@
|
|
<span>{{ scope.row.enginRecordNo }}</span>
|
|
<span>{{ scope.row.enginRecordNo }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
-
|
|
|
|
|
|
+
|
|
<el-table-column
|
|
<el-table-column
|
|
align="left"
|
|
align="left"
|
|
label="钱包"
|
|
label="钱包"
|
|
@@ -503,7 +514,7 @@ import { getAmountCount, getCustomerList, getStandbookList } from '@/api/finance
|
|
import { numToFixed } from '@/filters'
|
|
import { numToFixed } from '@/filters'
|
|
import sticky from '@/utils/table-sticky'
|
|
import sticky from '@/utils/table-sticky'
|
|
export default {
|
|
export default {
|
|
- mixins: [sticky],
|
|
|
|
|
|
+ // mixins: [sticky],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
isShow: false,
|
|
isShow: false,
|
|
@@ -530,7 +541,7 @@ export default {
|
|
customerNumber: '',
|
|
customerNumber: '',
|
|
billType: '',
|
|
billType: '',
|
|
remark: '',
|
|
remark: '',
|
|
- enginRecordNo:''
|
|
|
|
|
|
+ enginRecordNo: ''
|
|
}, //搜索表单
|
|
}, //搜索表单
|
|
listLoading: false, // 列表加载loading
|
|
listLoading: false, // 列表加载loading
|
|
|
|
|
|
@@ -583,8 +594,7 @@ export default {
|
|
type: this.bill,
|
|
type: this.bill,
|
|
customerName: this.$route.query.customerName,
|
|
customerName: this.$route.query.customerName,
|
|
customerNumber: this.$route.query.customerNumber,
|
|
customerNumber: this.$route.query.customerNumber,
|
|
- enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
|
-
|
|
|
|
|
|
+ enginRecordNo: this.searchForm.enginRecordNo
|
|
}
|
|
}
|
|
} else if (this.isCustomer) {
|
|
} else if (this.isCustomer) {
|
|
return {
|
|
return {
|
|
@@ -594,8 +604,7 @@ export default {
|
|
type: this.bill,
|
|
type: this.bill,
|
|
customerName: this.$store.state.user.customerName,
|
|
customerName: this.$store.state.user.customerName,
|
|
customerNumber: this.$store.state.user.customerNumber,
|
|
customerNumber: this.$store.state.user.customerNumber,
|
|
- enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
|
-
|
|
|
|
|
|
+ enginRecordNo: this.searchForm.enginRecordNo
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
return {
|
|
return {
|
|
@@ -605,8 +614,7 @@ export default {
|
|
type: this.bill,
|
|
type: this.bill,
|
|
customerName: this.customerName,
|
|
customerName: this.customerName,
|
|
customerNumber: this.customerNumber || this.searchForm.customerNumber,
|
|
customerNumber: this.customerNumber || this.searchForm.customerNumber,
|
|
- enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
|
-
|
|
|
|
|
|
+ enginRecordNo: this.searchForm.enginRecordNo
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1245,7 +1253,7 @@ export default {
|
|
billNo: this.searchForm.billNo,
|
|
billNo: this.searchForm.billNo,
|
|
billType: this.searchForm.billType,
|
|
billType: this.searchForm.billType,
|
|
customerId: this.searchForm.customerId,
|
|
customerId: this.searchForm.customerId,
|
|
- enginRecordNo:this.searchForm.enginRecordNo,
|
|
|
|
|
|
+ enginRecordNo: this.searchForm.enginRecordNo,
|
|
customerName: '',
|
|
customerName: '',
|
|
customerNumber: this.searchForm.customerNumber,
|
|
customerNumber: this.searchForm.customerNumber,
|
|
customerWalletId: this.searchForm.customerWalletId,
|
|
customerWalletId: this.searchForm.customerWalletId,
|
|
@@ -1322,7 +1330,7 @@ export default {
|
|
.color4 {
|
|
.color4 {
|
|
background-color: #6bcfd7;
|
|
background-color: #6bcfd7;
|
|
}
|
|
}
|
|
-.el-date-editor--date{
|
|
|
|
|
|
+.el-date-editor--date {
|
|
height: 100% !important;
|
|
height: 100% !important;
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|