From bd916670e7915ec914d71ed7daadbe8eb5fd0835 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 24 4月 2024 15:31:37 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
index b63d919..46f2a31 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -22,21 +22,20 @@
</a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="搴撲綅绫诲瀷">
- <a-input-number v-model="queryParam.placeType" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ簱浣嶇被鍨�"/>
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeType" placeholder="璇烽�夋嫨搴撲綅绫诲瀷">
+ <a-select-option v-for="(item,index) in placeTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="搴撲綅绫诲瀷鍚嶇О">
<a-input v-model="queryParam.placeTypeName" allow-clear placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�"/>
</a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="瀛樻斁鍗曚綅">
- <a-input v-model="queryParam.stockUnit" allow-clear placeholder="璇疯緭鍏ュ瓨鏀惧崟浣�"/>
- </a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="搴撲綅灞炴��">
- <a-input-number v-model="queryParam.placeStatus" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ簱浣嶅睘鎬�"/>
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.placeStatus" placeholder="璇烽�夋嫨搴撲綅灞炴��">
+ <a-select-option v-for="(item,index) in placeStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -266,6 +265,12 @@
<a-button type="primary" v-if="hasPerm('WmsPlace:add')" icon="plus" @click="$refs.addForm.add()">鏂板搴撲綅淇℃伅</a-button>
</div>
</template>
+ <span slot="placeTypescopedSlots" slot-scope="text">
+ {{ 'place_type' | dictType(text) }}
+ </span>
+ <span slot="placeStatusscopedSlots" slot-scope="text">
+ {{ 'place_status' | dictType(text) }}
+ </span>
<span slot="isSrmPlacescopedSlots" slot-scope="text">
<div v-if="text===true ">
<a-tag color="green">鏄�</a-tag>
@@ -444,19 +449,20 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'placeType'
+ dataIndex: 'placeType',
+ scopedSlots: { customRender: 'placeTypescopedSlots' }
},
{
title: '搴撲綅绫诲瀷鍚嶇О',
@@ -479,44 +485,25 @@
dataIndex: 'placeTypeName'
},
{
- title: '瀛樻斁鍗曚綅',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'stockUnit'
- },
- {
title: '搴撲綅灞炴��',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'placeStatus'
+ dataIndex: 'placeStatus',
+ scopedSlots: { customRender: 'placeStatusscopedSlots' }
},
{
title: '鏄惁鍫嗗灈鏈哄簱浣�',
@@ -1193,6 +1180,8 @@
return res.data
})
},
+ placeTypeData: [],
+ placeStatusData: [],
selectedRowKeys: [],
selectedRows: []
}
@@ -1219,6 +1208,10 @@
}
});
}
+ const placeTypeOption = this.$options
+ this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+ const placeStatusOption = this.$options
+ this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
const isSrmPlaceOption = this.$options
this.isSrmPlaceData = isSrmPlaceOption.filters['dictData']('yes_true_false')
const isRgvPlaceOption = this.$options
--
Gitblit v1.9.3