From 0e394ed580b09329ecaa8476bbb6334f8212b009 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 13:40:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
index 8bb4943..24ac6b1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
@@ -7,18 +7,18 @@
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛缂栧彿">
- <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ュ鎴风紪鍙�"/>
+ <a-form-item label="缂栧彿">
+ <a-input v-model="queryParam.custCode" allow-clear placeholder="璇疯緭鍏ョ紪鍙�"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛涓枃鍚嶇О">
- <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ュ鎴蜂腑鏂囧悕绉�"/>
+ <a-form-item label="涓枃鍚嶇О">
+ <a-input v-model="queryParam.custChinaName" allow-clear placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"/>
</a-form-item>
</a-col><template v-if="advanced">
<a-col :md="8" :sm="24">
- <a-form-item label="瀹㈡埛鑻辨枃鍚嶇О">
- <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ュ鎴疯嫳鏂囧悕绉�"/>
+ <a-form-item label="鑻辨枃鍚嶇О">
+ <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -27,12 +27,9 @@
</a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="绫诲瀷">
- <a-input-number v-model="queryParam.custType" style="width: 100%" allow-clear placeholder="璇疯緭鍏ョ被鍨�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="绫诲瀷鍚嶇О">
- <a-input v-model="queryParam.custTypeName" allow-clear placeholder="璇疯緭鍏ョ被鍨嬪悕绉�"/>
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.custType" placeholder="璇烽�夋嫨绫诲瀷">
+ <a-select-option v-for="(item,index) in custTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -142,9 +139,12 @@
<a-button type="info" v-if="hasPerm('BaseCustomer:exportExcel')" icon="download" @click="BaseCustomerToExcel()">
瀵煎嚭
</a-button>
- <a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">鏂板瀹㈡埛妗ｆ</a-button>
+ <a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">鏂板寰�鏉ュ叧绯�</a-button>
</div>
</template>
+ <span slot="custTypescopedSlots" slot-scope="text">
+ {{ 'base_customer_type' | dictType(text) }}
+ </span>
<span slot="isDisabledscopedSlots" slot-scope="text">
<div v-if="text===true ">
<a-tag color="green">鏄�</a-tag>
@@ -204,7 +204,7 @@
customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
},
{
- title: '瀹㈡埛缂栧彿',
+ title: '缂栧彿',
align: 'center',
customHeaderCell: () => {
return {
@@ -224,7 +224,7 @@
dataIndex: 'custCode'
},
{
- title: '瀹㈡埛涓枃鍚嶇О',
+ title: '涓枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -244,7 +244,7 @@
dataIndex: 'custChinaName'
},
{
- title: '瀹㈡埛鑻辨枃鍚嶇О',
+ title: '鑻辨枃鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -289,26 +289,6 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'custType'
- },
- {
- title: '绫诲瀷鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
@@ -321,7 +301,8 @@
}
},
sorter: true,
- dataIndex: 'custTypeName'
+ dataIndex: 'custType',
+ scopedSlots: { customRender: 'custTypescopedSlots' }
},
{
title: '鑱旂郴浜�',
@@ -572,6 +553,7 @@
return res.data
})
},
+ custTypeData: [],
selectedRowKeys: [],
selectedRows: []
}
@@ -598,6 +580,8 @@
}
});
}
+ const custTypeOption = this.$options
+ this.custTypeData = custTypeOption.filters['dictData']('base_customer_type')
const isDisabledOption = this.$options
this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
--
Gitblit v1.9.3