|
|
|
|
@ -2,51 +2,27 @@
|
|
|
|
|
<!--全部订单--> |
|
|
|
|
<basic-container> |
|
|
|
|
<div class="avue-crud"> |
|
|
|
|
<el-row v-if="!search"> |
|
|
|
|
<div v-h5uShow="!search"> |
|
|
|
|
<!-- 查询模块 --> |
|
|
|
|
<el-form :inline="true" :model="query" class="el-fr"> |
|
|
|
|
<div class="el-form-left"> |
|
|
|
|
<el-form-item label="订单自编号:"> |
|
|
|
|
<el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="运单:"> |
|
|
|
|
<el-input v-model="query.waybillNum" placeholder="请输入运单编号" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="入库时间:" class="el-times"> |
|
|
|
|
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>--> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="stockupDate" |
|
|
|
|
type="datetimerange" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始时间" |
|
|
|
|
end-placeholder="结束时间" |
|
|
|
|
:shortcuts="shortcuts" |
|
|
|
|
:default-time="defaultTime2" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
<!-- <el-form-item label="货物名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="仓库:">--> |
|
|
|
|
<!-- <el-input v-model="query.warehouse" placeholder="请输入仓库"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="是否齐套:">--> |
|
|
|
|
<!-- <el-input v-model="query.completeSet" placeholder="请输入是否齐套"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="品牌:">--> |
|
|
|
|
<!-- <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="服务类型:">--> |
|
|
|
|
<!-- <el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="类型;1 预约单 2库存单:">--> |
|
|
|
|
<!-- <el-input v-model="query.genre" placeholder="请输入类型;1 预约单 2库存单"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="状态;1 配送 2 待配送:">--> |
|
|
|
|
<!-- <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
</div> |
|
|
|
|
<el-form :inline="true" :model="query" class="header_search"> |
|
|
|
|
<el-form-item label="订单自编号:"> |
|
|
|
|
<el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="运单:"> |
|
|
|
|
<el-input v-model="query.waybillNum" placeholder="请输入运单编号" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="入库时间:" class="el-times"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="stockupDate" |
|
|
|
|
type="datetimerange" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始时间" |
|
|
|
|
end-placeholder="结束时间" |
|
|
|
|
:shortcuts="shortcuts" |
|
|
|
|
:default-time="defaultTime2" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
<!-- 查询按钮 --> |
|
|
|
|
|
|
|
|
|
<el-form-item> |
|
|
|
|
@ -54,32 +30,16 @@
|
|
|
|
|
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
</el-row> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 控件区 --> |
|
|
|
|
<el-row> |
|
|
|
|
<!-- <div class="avue-crud__header"> |
|
|
|
|
<!– 头部左侧按钮模块 –> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleTrade" v-if="handler && taker || handler && trade"> 商配</el-button> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleMunicipal" v-if="handler && taker || handler && trade">市配</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add && handler && !trade || permission.stockArticle_add && !taker" >自提</el-button> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleEntire" >全部</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleInform('2')" v-if = "!handler && !taker">未通知</el-button> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleInform('1')" v-if = "!handler && !taker">已通知</el-button> |
|
|
|
|
</div> |
|
|
|
|
<!– 头部右侧按钮模块 –> |
|
|
|
|
<!– <div class="avue-crud__right">–> |
|
|
|
|
<!– <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>–> |
|
|
|
|
<!– <el-button icon="el-icon-search" @click="searchHide" circle></el-button>–> |
|
|
|
|
<!– </div>–> |
|
|
|
|
</div>--> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler" |
|
|
|
|
>创建异常</el-button |
|
|
|
|
> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleMoke" v-if = "handler">转预约单</el-button>--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>--> |
|
|
|
|
<el-button type="danger" icon="Edit" @click="handleCallDelivery('3')" v-if="handler" |
|
|
|
|
>修改客户信息</el-button |
|
|
|
|
> |
|
|
|
|
@ -88,11 +48,7 @@
|
|
|
|
|
> |
|
|
|
|
<el-button type="danger" icon="Download" @click="handleExport" plain>导 出</el-button> |
|
|
|
|
</div> |
|
|
|
|
<!-- <div class="avue-crud__left"> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handlebill" v-if = "!handler">创建提货单</el-button> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')" v-if = "!handler">再次通知</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')" v-if = "!handler">通知提货</el-button> |
|
|
|
|
</div>--> |
|
|
|
|
|
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button> |
|
|
|
|
@ -104,6 +60,7 @@
|
|
|
|
|
<el-row> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<tablecmt |
|
|
|
|
ref="tableNode" |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@ -390,7 +347,7 @@ import option from '@/option/distribution/distributionStockArticle';
|
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { downloadXls } from '@/utils/util'; |
|
|
|
|
import { downloadXls, setNodeHeight } from '@/utils/util'; |
|
|
|
|
import { columnList } from '@/option/distribution/distributionStockArticleSelf'; |
|
|
|
|
import { deepClone } from '@/utils/util.js'; |
|
|
|
|
const _newCol = deepClone(columnList); |
|
|
|
|
@ -925,6 +882,8 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
searchHide() { |
|
|
|
|
this.search = !this.search; |
|
|
|
|
|
|
|
|
|
setNodeHeight(this.$refs.tableNode.$el, '', true); |
|
|
|
|
}, |
|
|
|
|
searchChange() { |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
|
