|
@@ -16,7 +16,7 @@
|
|
|
allowClear
|
|
|
>
|
|
|
<a-spin v-if="fetching" slot="notFoundContent" size="small" />
|
|
|
- <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerName" :disabled="(isValidateEnabled ? item.enabledFlag=='0' : false) || (dealerDisabled?item.dealerFlag==1:false)">
|
|
|
+ <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerName" :disabled="pageType&&pageType==='1'?false:((isValidateEnabled ? item.enabledFlag=='0' : false) || (dealerDisabled ? item.dealerFlag==1:false))">
|
|
|
{{ item.customerName }}
|
|
|
<span v-if="isValidateEnabled && item.enabledFlag=='0'">(已禁用)</span>
|
|
|
</a-select-option>
|
|
@@ -63,7 +63,7 @@ export default {
|
|
|
type: [String, Number],
|
|
|
default: 'all'
|
|
|
},
|
|
|
- pageType: {
|
|
|
+ pageType: {// 页面类型
|
|
|
type: String,
|
|
|
default: '0' // 0客户名称 1被合并的客户名称
|
|
|
}
|
|
@@ -96,8 +96,7 @@ export default {
|
|
|
if (this.isEnabled) {
|
|
|
params.enabledFlag = 1
|
|
|
}
|
|
|
- const ajaxUrl = this.pageType === '0' ? custList : queryCanCustomer
|
|
|
- ajaxUrl(params).then(res => {
|
|
|
+ custList(params).then(res => {
|
|
|
if (fetchId !== this.lastFetchId) {
|
|
|
return
|
|
|
}
|