Skip to content

J
jiedao-app-operator-master
Commit 44223c43 authored by wux's avatar wux
Browse files
Options

Revert "研发需求35 异常订单列表调整查询框位置" 

This reverts commit f36bf981.
parent 262e29a2
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 106 deletions
src/views/ecw/order/exception/index.vue
View file @ 44223c43
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
...@@ -30,40 +26,6 @@ ...@@ -30,40 +26,6 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('运输方式') + ':'">
<dict-selector
:type="DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable="true"
v-model="queryParams.transportId"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('异常状态') + ':'">
<dict-selector
:type="DICT_TYPE.ORDER_EXCEPTION_STATUS"
:clearable="true"
v-model="queryParams.orderExceptionStatusList"
multiple
@keyup.enter.native="handleQuery"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('客户经理') + ':'">
<el-select
v-model="queryParams.customerIds"
multiple
:placeholder="$t('请选择客户经理')"
clearable
class="w-200"
>
<el-option
v-for="item in creatorData"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('发货人')" prop="consignorText"> <el-form-item :label="$t('发货人')" prop="consignorText">
<el-input <el-input
v-model.trim="queryParams.consignorText" v-model.trim="queryParams.consignorText"
...@@ -82,29 +44,14 @@ ...@@ -82,29 +44,14 @@
class="w-200" class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('异常类型') + ':'"> <el-form-item :label="$t('运输方式') + ':'">
<dict-selector <dict-selector
:type="DICT_TYPE.ORDER_ERROR_TYPE" :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable="true" :clearable="true"
multiple v-model="queryParams.transportId"
v-model="queryParams.orderExceptionType"
@keyup.enter.native="handleQuery"
multiple
class="w-200" class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('出货渠道')" prop="channelId">
<!--嵌套一个form来脱离disabled控制-->
<selector
:clearable="true"
v-model="queryParams.channelIds"
multiple
:options="channelList"
value-field="channelId"
:label-field="$l(null, 'name')"
class="w-200"
></selector>
</el-form-item>
<el-form-item :label="$t('始发仓')"> <el-form-item :label="$t('始发仓')">
<el-select <el-select
v-model="queryParams.startWarehouseIds" v-model="queryParams.startWarehouseIds"
...@@ -179,21 +126,7 @@ ...@@ -179,21 +126,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品') + ':'">
<div class="flex w-200">
<dict-selector
:type="DICT_TYPE.EXCEPTION_SELECT_FILED"
style="width: 40px"
v-model="queryParams.goodsNameKey"
/>
<product-selector
v-model.trim="queryParams.goodsName"
:clearable="true"
@keyup.enter.native="handleQuery"
class="flex-1"
/>
</div>
</el-form-item>
<!--<el-form-item :label="$t('订单状态')" prop="status"> <!--<el-form-item :label="$t('订单状态')" prop="status">
<dict-selector <dict-selector
:type="DICT_TYPE.ORDER_STATUS" :type="DICT_TYPE.ORDER_STATUS"
...@@ -218,6 +151,18 @@ ...@@ -218,6 +151,18 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('出货渠道')" prop="channelId">
<!--嵌套一个form来脱离disabled控制-->
<selector
:clearable="true"
v-model="queryParams.channelIds"
multiple
:options="channelList"
value-field="channelId"
:label-field="$l(null, 'name')"
class="w-200"
></selector>
</el-form-item>
<el-form-item :label="$t('控货') + ':'" v-show="showSearch"> <el-form-item :label="$t('控货') + ':'" v-show="showSearch">
<dict-selector <dict-selector
:type="DICT_TYPE.ECW_YESNO" :type="DICT_TYPE.ECW_YESNO"
...@@ -227,6 +172,27 @@ ...@@ -227,6 +172,27 @@
class="w-200" class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('异常状态') + ':'">
<dict-selector
:type="DICT_TYPE.ORDER_EXCEPTION_STATUS"
:clearable="true"
v-model="queryParams.orderExceptionStatusList"
multiple
@keyup.enter.native="handleQuery"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('异常类型') + ':'">
<dict-selector
:type="DICT_TYPE.ORDER_ERROR_TYPE"
:clearable="true"
multiple
v-model="queryParams.orderExceptionType"
@keyup.enter.native="handleQuery"
multiple
class="w-200"
/>
</el-form-item>
<!-- <el-form-item :label="$t('发货人')+':'"> <!-- <el-form-item :label="$t('发货人')+':'">
<customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" /> <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
</el-form-item> </el-form-item>
...@@ -252,28 +218,22 @@ ...@@ -252,28 +218,22 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch"> <el-form-item :label="$t('商品') + ':'">
<selector v-model="queryParams.goodsTypes" multiple clearable :options="productAttrList" label-field="attrName" value-field="id" class="w-200"> <div class="flex w-200">
</selector> <dict-selector
</el-form-item> :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
<el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch"> style="width: 40px"
<el-select v-model="queryParams.goodsNameKey"
v-model="queryParams.packageTypeArr" />
multiple <product-selector
:placeholder="$t('请选择')" v-model.trim="queryParams.goodsName"
clearable :clearable="true"
class="w-200" @keyup.enter.native="handleQuery"
> class="flex-1"
<template />
v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)" </div>
>
<el-option
:label="$l(item, 'label')"
:value="item.value"
></el-option>
</template>
</el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('备案') + ':'" v-show="showSearch"> <el-form-item :label="$t('备案') + ':'" v-show="showSearch">
<dict-selector <dict-selector
:type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
...@@ -284,6 +244,22 @@ ...@@ -284,6 +244,22 @@
class="w-200" class="w-200"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('客户经理') + ':'">
<el-select
v-model="queryParams.customerIds"
multiple
:placeholder="$t('请选择客户经理')"
clearable
class="w-200"
>
<el-option
v-for="item in creatorData"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch"> <el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
<el-select <el-select
v-model="queryParams.isExternalWarehouse" v-model="queryParams.isExternalWarehouse"
...@@ -296,6 +272,28 @@ ...@@ -296,6 +272,28 @@
<el-option :label="$t('自有仓')" :value="0"></el-option> <el-option :label="$t('自有仓')" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
<el-select
v-model="queryParams.packageTypeArr"
multiple
:placeholder="$t('请选择')"
clearable
class="w-200"
>
<template
v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
>
<el-option
:label="$l(item, 'label')"
:value="item.value"
></el-option>
</template>
</el-select>
</el-form-item>
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
<selector v-model="queryParams.goodsTypes" multiple clearable :options="productAttrList" label-field="attrName" value-field="id" class="w-200">
</selector>
</el-form-item>
<el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch"> <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
<el-select <el-select
v-model="queryParams.types" v-model="queryParams.types"
...@@ -399,6 +397,10 @@ ...@@ -399,6 +397,10 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
...@@ -1202,20 +1204,6 @@ export default { ...@@ -1202,20 +1204,6 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.top-right-btn{
width: 100%;
margin-bottom: 20px;
position: relative;
right: 0;
}
::v-deep .top-right-btn .el-row .el-button{
font-size: 28px;
}
::v-deep .top-right-btn .el-row{
display: flex;
justify-content: flex-end;
flex-wrap: wrap;
}
.total { .total {
display: flex; display: flex;
align-items: center; align-items: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment