|
|
|
|
@ -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.urgentOrder" placeholder="请选择" clearable
|
|
|
|
|
:options="urgentOrderOptions" :props="urgentOrderProps">
|
|
|
|
|
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable :options="urgentOrderOptions"
|
|
|
|
|
:props="urgentOrderProps">
|
|
|
|
|
</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.deliveryType" placeholder="请选择" clearable
|
|
|
|
|
:options="deliveryTypeOptions" :props="deliveryTypeProps" multiple>
|
|
|
|
|
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
|
|
|
|
|
:props="deliveryTypeProps" multiple>
|
|
|
|
|
</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,11 +48,10 @@
|
|
|
|
|
<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>
|
|
|
|
|
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
|
|
|
|
|
收起
|
|
|
|
|
</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
@ -62,27 +61,22 @@
|
|
|
|
|
<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>
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
|
|
|
|
|
@click="addSaleHandle()">生成销售订单
|
|
|
|
|
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addSaleHandle()">生成销售订单
|
|
|
|
|
</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="JNPF-common-head-right">
|
|
|
|
|
<el-tooltip content="高级查询" placement="top" v-if="true">
|
|
|
|
|
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
|
|
|
|
|
@click="openSuperQuery()" />
|
|
|
|
|
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @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>
|
|
|
|
|
@ -90,38 +84,35 @@
|
|
|
|
|
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
|
|
|
|
|
<el-table-column prop="code" label="单据编号" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="subjectName" label="一级供应商" align="left">
|
|
|
|
|
<el-table-column prop="subjectName" label="供应商名称" align="left">
|
|
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="单据类型" prop="orderType" algin="left">
|
|
|
|
|
<el-table-column label="单据类型" prop="orderType1" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.orderType1}}
|
|
|
|
|
{{ scope.row.orderType1 }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="单据状态" prop="status" algin="left">
|
|
|
|
|
<el-table-column label="单据状态" prop="purchaseStatus" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.purchaseStatus}}
|
|
|
|
|
{{ scope.row.purchaseStatus }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="saleCode" label="关联销售" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="saleStatus" label="关联单据状态" align="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.saleStatus}}
|
|
|
|
|
{{ scope.row.saleStatus }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="contractName" label="关联合同号" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="是否紧急" prop="urgentOrder" algin="left">
|
|
|
|
|
<el-table-column label="是否紧急" prop="urgentOrder1" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.urgentOrder1}}
|
|
|
|
|
{{ scope.row.urgentOrder1 }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="wareHouseName" label="收货仓库" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="expectArriveDateStart" label="期望送达" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column prop="businessNum" label="计划采购数量" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="storageNumber" label="已收货数量" align="left">
|
|
|
|
|
@ -129,38 +120,38 @@
|
|
|
|
|
<el-table-column prop="storageNum" label="收货次数" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="采购模式" prop="saleMode" algin="left">
|
|
|
|
|
<el-table-column label="采购模式" prop="saleMode1" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.saleMode1}}
|
|
|
|
|
{{ scope.row.saleMode1 }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="结算方式" prop="fixPriceMode" algin="left">
|
|
|
|
|
<el-table-column label="结算方式" prop="fixPriceMode1" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.fixPriceMode1}}
|
|
|
|
|
{{ scope.row.fixPriceMode1 }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="配送方式" prop="deliveryType" algin="left">
|
|
|
|
|
<el-table-column label="配送方式" prop="deliveryType1" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.deliveryType1}}
|
|
|
|
|
{{ scope.row.deliveryType1 }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="运输方式" prop="transportMode" algin="left">
|
|
|
|
|
<el-table-column label="运输方式" prop="transportMode1" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.transportMode1}}
|
|
|
|
|
{{ scope.row.transportMode1 }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="承运类型" prop="carriageMode" algin="left">
|
|
|
|
|
<el-table-column label="承运类型" prop="carriageMode1" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.carriageMode1}}
|
|
|
|
|
{{ scope.row.carriageMode1 }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="承运商" prop="carrier" algin="left">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
{{ scope.row.carrier}}
|
|
|
|
|
{{ scope.row.carrier }}
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
@ -173,7 +164,6 @@
|
|
|
|
|
|
|
|
|
|
<el-table-column prop="creatorTime" label="创建时间" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column prop="realName" label="创建人" align="left">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="lastModifyTime" label="更新时间" align="left">
|
|
|
|
|
@ -183,52 +173,47 @@
|
|
|
|
|
|
|
|
|
|
<el-table-column prop="flowState" label="状态" width="100">
|
|
|
|
|
<template slot-scope="scope" v-if="!scope.row.top">
|
|
|
|
|
<el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
|
|
|
|
|
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
|
|
|
|
|
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
|
|
|
|
|
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
|
|
|
|
|
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
|
|
|
|
|
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
|
|
|
|
|
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
|
|
|
|
|
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
|
|
|
|
|
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
|
|
|
|
|
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
|
|
|
|
|
<el-tag type="warning" v-else>等待提交</el-tag>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="操作" fixed="right" width="150">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
|
|
|
|
|
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
|
|
|
|
|
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" class="JNPF-table-delBtn"
|
|
|
|
|
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
|
|
|
|
|
@click="handleDel(scope.row.id)">删除
|
|
|
|
|
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
|
|
|
|
|
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
|
|
|
|
|
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
|
|
|
|
|
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
|
|
|
|
|
</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" />
|
|
|
|
|
<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" />
|
|
|
|
|
<SaleFlowBox v-if="saleFlowVisible" ref="SaleFlowBox" @close="colseFlow" />
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
|
