|
|
@@ -1,6 +1,6 @@
|
|
|
<!-- 搜索表单 -->
|
|
|
<template>
|
|
|
- <!-- <el-form
|
|
|
+ <el-form
|
|
|
label-width="80px"
|
|
|
class="ele-form-search"
|
|
|
@keyup.enter.native="search"
|
|
|
@@ -98,7 +98,25 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col v-bind="styleResponsive ? { lg: 18, md: 12 } : { span: 18 }">
|
|
|
+ <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
|
+ <el-form-item label="发运状态" prop="logisticStatus">
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ placeholder="请选择"
|
|
|
+ v-model="where.logisticStatus"
|
|
|
+ clearable
|
|
|
+ class="w100"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in logisticStatusOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
|
|
|
<div class="ele-form-actions">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -119,8 +137,8 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- </el-form> -->
|
|
|
- <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
|
|
|
+ </el-form>
|
|
|
+ <!-- <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage> -->
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
@@ -139,7 +157,8 @@
|
|
|
categoryName: '',
|
|
|
categoryCode: '',
|
|
|
targetWarehouse: '',
|
|
|
- sourceWarehouse: ''
|
|
|
+ sourceWarehouse: '',
|
|
|
+ logisticStatus: '',
|
|
|
};
|
|
|
return {
|
|
|
// 表单数据
|
|
|
@@ -150,6 +169,10 @@
|
|
|
factoryList: [],
|
|
|
warehouseList: [],
|
|
|
allWarehouseList: [],
|
|
|
+ logisticStatusOptions: [
|
|
|
+ { value: 0, label: '未发运' },
|
|
|
+ { value: 1, label: '已发运' }
|
|
|
+ ],
|
|
|
stutusOptions: [
|
|
|
{
|
|
|
value: 0,
|
|
|
@@ -235,7 +258,6 @@
|
|
|
value: 'logisticStatus',
|
|
|
type: 'select',
|
|
|
placeholder: '请选择',
|
|
|
- width: 360,
|
|
|
planList: [
|
|
|
{ value: 0, label: '未发运' },
|
|
|
{ value: 1, label: '已发运' }
|
|
|
@@ -289,15 +311,15 @@
|
|
|
);
|
|
|
},
|
|
|
/* 搜索 */
|
|
|
- // search() {
|
|
|
- // console.log(this.where);
|
|
|
- // this.$emit('search', this.where);
|
|
|
- // },
|
|
|
- search(e) {
|
|
|
- this.$emit('search', {
|
|
|
- ...e
|
|
|
- });
|
|
|
+ search() {
|
|
|
+ console.log(this.where);
|
|
|
+ this.$emit('search', this.where);
|
|
|
},
|
|
|
+ // search(e) {
|
|
|
+ // this.$emit('search', {
|
|
|
+ // ...e
|
|
|
+ // });
|
|
|
+ // },
|
|
|
/* 重置 */
|
|
|
reset() {
|
|
|
this.where = { ...this.defaultWhere };
|
