From b57f4eca1133a7ecad85abf3cff87fe88c366ec2 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:10:54 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
index 44fff97..4de560e 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
@@ -15,12 +15,13 @@
<a-form-item label="浠撳簱缂栧彿">
<a-input v-model="queryParam.warehouseCode" allow-clear placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�"/>
</a-form-item>
- </a-col><template v-if="advanced">
- <a-col :md="8" :sm="24">
+ </a-col>
+ <template v-if="advanced">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="浠撳簱鍚嶇О">
<a-input v-model="queryParam.warehouseName" allow-clear placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :md="8" :sm="24">
<a-form-item label="搴撳尯鍚嶇О">
<a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�"/>
@@ -39,10 +40,11 @@
<a-form-item label="ERP浠ｇ爜">
<a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP浠ｇ爜"/>
</a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
+ </a-col><a-col :md="8" :sm="24">
<a-form-item label="鎵�灞炰粨搴�">
- <a-input v-model="queryParam.warehouseId" allow-clear placeholder="璇疯緭鍏ユ墍灞炰粨搴�"/>
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId" placeholder="璇烽�夋嫨鎵�灞炰粨搴�">
+ <a-select-option v-for="(item,index) in warehouseIdData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -168,6 +170,9 @@
<a-button type="primary" v-if="hasPerm('WmsArea:add')" icon="plus" @click="$refs.addForm.add()">鏂板搴撳尯淇℃伅</a-button>
</div>
</template>
+ <span slot="warehouseIdscopedSlots" slot-scope="text">
+ {{ 'area_type' | dictType(text) }}
+ </span>
<span slot="isBarcodeLevelControlscopedSlots" slot-scope="text">
<div v-if="text===true ">
<a-tag color="green">鏄�</a-tag>
@@ -438,7 +443,8 @@
}
},
sorter: true,
- dataIndex: 'warehouseId'
+ dataIndex: 'warehouseId',
+ scopedSlots: { customRender: 'warehouseIdscopedSlots' }
},
{
title: '闆朵欢绾х鎺�',
@@ -675,6 +681,7 @@
return res.data
})
},
+ warehouseIdData: [],
selectedRowKeys: [],
selectedRows: []
}
@@ -701,6 +708,8 @@
}
});
}
+ const warehouseIdOption = this.$options
+ this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
const isBarcodeLevelControlOption = this.$options
this.isBarcodeLevelControlData = isBarcodeLevelControlOption.filters['dictData']('yes_true_false')
const isFIFOOption = this.$options
@@ -824,4 +833,5 @@
button {
margin-right: 8px;
}
+
</style>
--
Gitblit v1.9.3