Commit 95f63de8 authored by chenwei's avatar chenwei

fix🐛: 修复1/21 第二版问题

parent d4741548
......@@ -164,7 +164,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('收入归属')" prop="baIncomeBelong">
<dict-selector :type="DICT_TYPE.ATTRIBUTION_OF_INCOME" v-model="form.baIncomeBelong" clearable></dict-selector>
<dict-selector :type="DICT_TYPE.ATTRIBUTION_OF_INCOME" formatter="number" v-model="form.baIncomeBelong" clearable></dict-selector>
<!-- <el-select v-model="form.baIncomeBelong" :placeholder="$t('请选择收入归属')" clearable>
<el-option v-for="countryItem in countryList" :key="countryItem.id" :label="$l(countryItem, 'title')" :value="countryItem.id" />
</el-select> -->
......
......@@ -368,6 +368,13 @@ export default {
}
this.handleQuery()
},
activated() {
const orderNo = this.$route.query.orderNo || ""
if (orderNo) {
this.queryParams.orderNo = orderNo
}
this.handleQuery()
},
methods: {
goBankReceiptDetailsList(row) {
this.$router.push({ path: "/financial/bankAccount/BankReceiptDetails", query: { receiptNo: row.receiptNo } })
......
......@@ -381,9 +381,9 @@ export default {
this.handleQuery()
},
watch: {
"queryParams.destCountry": {
"queryParams.destCountryIds": {
handler(val, oldVal) {
this.queryParams.destCity = []
this.queryParams.destCityIds = []
if (val && val.length > 0) {
this.loadCityList(2, val.join())
} else {
......@@ -391,9 +391,9 @@ export default {
}
}
},
"queryParams.destCity": {
"queryParams.destCityIds": {
handler(val, oldVal) {
this.queryParams.objectiveWareHouseId = []
this.queryParams.destWarehouseIds = []
if (val.length > 0) {
this.loadWareHouseList(3, val.join())
} else {
......@@ -497,7 +497,7 @@ export default {
if (this.queryParams.pickRatio && this.queryParams.pickRatioSymbols) {
params[this.queryParams.pickRatioSymbols] = this.queryParams.pickRatio
}
// this.addBeginAndEndTime(params, this.queryParams.dateFilter, this.dateFilterType, false)
this.addBeginAndEndTime(params, this.queryParams.dateFilter, this.dateFilterType, false)
const { data } = await loadSelfNoSummaryList(params)
this.list = data.list
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment