|
|
|
@ -5,8 +5,8 @@
|
|
|
|
|
<el-form @submit.native.prevent>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="单据类型">
|
|
|
|
|
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable :options="orderTypeOptions"
|
|
|
|
|
:props="orderTypeProps">
|
|
|
|
|
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
|
|
|
|
|
:options="orderTypeOptions" :props="orderTypeProps">
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
@ -17,29 +17,29 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="配送方式">
|
|
|
|
|
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
|
|
|
|
|
:props="deliveryTypeProps">
|
|
|
|
|
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
|
|
|
|
|
:options="deliveryTypeOptions" :props="deliveryTypeProps">
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<template v-if="showAll">
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="制单时间">
|
|
|
|
|
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd" startPlaceholder="开始日期"
|
|
|
|
|
endPlaceholder="结束日期" />
|
|
|
|
|
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
|
|
|
|
|
startPlaceholder="开始日期" endPlaceholder="结束日期" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="是否紧急">
|
|
|
|
|
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable :options="urgentOrderOptions"
|
|
|
|
|
:props="urgentOrderProps">
|
|
|
|
|
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable
|
|
|
|
|
:options="urgentOrderOptions" :props="urgentOrderProps">
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="状态">
|
|
|
|
|
<JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
|
|
|
|
|
:props="statusProps" multiple>
|
|
|
|
|
<JnpfSelect v-model="query.status" placeholder="请选择" clearable
|
|
|
|
|
:options="statusOptions" :props="statusProps" multiple>
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
@ -48,7 +48,8 @@
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
|
|
|
|
|
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
|
|
|
|
|
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
|
|
|
|
|
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
|
|
|
|
|
v-if="!showAll">
|
|
|
|
|
展开
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
|
|
|
|
@ -61,17 +62,21 @@
|
|
|
|
|
<div class="JNPF-common-layout-main JNPF-flex-main">
|
|
|
|
|
<div class="JNPF-common-head">
|
|
|
|
|
<div>
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
|
|
|
|
|
@click="addOrUpdateHandle()">新增
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
|
|
|
|
|
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
|
|
|
|
|
v-has="'btn_download'">导出
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
|
|
|
|
|
v-has="'btn_batchRemove'">批量删除
|
|
|
|
|
</el-button>
|
|
|
|
|
<template v-if="this.deliveryType == '2'">
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundCheck()">库存检查
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
|
|
|
|
|
@click="boundCheck()">库存检查
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundLock()">库存锁定
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
|
|
|
|
|
@click="boundLock()">库存锁定
|
|
|
|
|
</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
|
|
|
|
@ -84,27 +89,33 @@
|
|
|
|
|
@click="openSuperQuery()" />
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
|
|
|
|
|
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
|
|
|
|
|
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
|
|
|
|
|
@click="initData()" />
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' hasC
|
|
|
|
|
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
|
|
|
|
|
<el-table-column prop="code" label="单据编号" sortable align="center" fixed="left" width="160">
|
|
|
|
|
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
|
|
|
|
|
custom-column>
|
|
|
|
|
<el-table-column prop="code" label="单据编号" sortable align="center" fixed="left"
|
|
|
|
|
width="160">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="subjectName" label="客户名称" sortable align="center" fixed="left" width="200">
|
|
|
|
|
<el-table-column prop="subjectName" label="客户名称" sortable align="center" fixed="left"
|
|
|
|
|
width="200">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="单据类型" prop="orderType1" sortable align="center" fixed="left" width="100">
|
|
|
|
|
<el-table-column label="单据类型" prop="orderType1" sortable align="center" fixed="left"
|
|
|
|
|
width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="单据状态" prop="saleStatus" sortable align="center" fixed="left" width="100">
|
|
|
|
|
<el-table-column label="单据状态" prop="saleStatus" sortable align="center" fixed="left"
|
|
|
|
|
width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="deliveryType1" label="配送方式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="deliveryType1" label="配送方式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="saleMode1" label="销售模式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="saleMode1" label="销售模式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<el-table-column prop="purchaseCode" label="关联单据号" sortable align="center" width="160">
|
|
|
|
|
</el-table-column>
|
|
|
|
@ -124,38 +135,39 @@
|
|
|
|
|
<el-table-column prop="wareHouseName" label="发货仓库" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="计划销售数量" sortable align="center" width="140">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="计划销售数量" sortable align="center" width="140">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="已发货数量" sortable align="center" width="120">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="已发货数量" sortable align="center" width="120">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="发货次数" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="发货次数" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="结算方式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="结算方式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="运输方式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="运输方式" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="承运类型" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="承运类型" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="承运商" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="承运商" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<!-- <template v-if="this.deliveryType != '1'"> -->
|
|
|
|
|
<el-table-column prop="wareHouseName" label="是否补送" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="是否补送" sortable align="center" width="100">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- </template> -->
|
|
|
|
|
<el-table-column prop="expectArriveDateStart" label="期望送达" sortable align="center" width="100">
|
|
|
|
|
<el-table-column prop="expectArriveDateStart" label="期望送达" sortable align="center"
|
|
|
|
|
width="100">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.expectArriveDateStart | toDate("yyyy-MM-dd") }}
|
|
|
|
|
</template>
|
|
|
|
@ -207,26 +219,30 @@
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</JNPF-table>
|
|
|
|
|
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
|
|
|
|
|
@pagination="initData" />
|
|
|
|
|
<pagination :total="total" :page.sync="listQuery.currentPage"
|
|
|
|
|
:limit.sync="listQuery.pageSize" @pagination="initData" />
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
|
|
|
|
|
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
|
|
|
|
|
|
|
|
|
|
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
|
|
|
|
|
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
|
|
|
|
|
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
|
|
|
|
|
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
|
|
|
|
|
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
|
|
|
|
|
lock-scroll width="400px">
|
|
|
|
|
<el-scrollbar class="template-list">
|
|
|
|
|
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
|
|
|
|
|
<div class="template-item" v-for="item in flowList" :key="item.id"
|
|
|
|
|
@click="selectFlow(item)">{{ item.fullName }}
|
|
|
|
|
</div>
|
|
|
|
|
</el-scrollbar>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
|
|
|
|
|
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
|
|
|
|
|
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
|
|
|
|
|
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
|
|
|
|
|
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
|
|
|
|
|
@close="toFormDetailVisible = false" />
|
|
|
|
|
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
|
|
|
|
|
@superQuery="superQuery" />
|
|
|
|
|
<BoundCheck v-if="boundCheckVisible" ref="BoundCheck" @refresh="initData" />
|
|
|
|
|
<BoundLock v-if="boundLockVisible" ref="BoundLock" @refresh="initData" />
|
|
|
|
|
</div>
|
|
|
|
|