|
@@ -19,13 +19,13 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
- <el-form-item label="销售政策编号" prop="policyCode">
|
|
|
- <el-input v-model="screenForm.policyCode" placeholder="请输入销售政策编号"></el-input>
|
|
|
+ <el-form-item label="货品名称" prop="goodsName">
|
|
|
+ <el-input v-model="screenForm.goodsName" placeholder="请输入货品名称"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
- <el-form-item label="销售政策说明" prop="policyRemark">
|
|
|
- <el-input v-model="screenForm.policyRemark" placeholder="请输入销售政策说明"></el-input>
|
|
|
+ <el-form-item label="规格型号" prop="model">
|
|
|
+ <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
@@ -78,6 +78,21 @@
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
<el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
|
|
|
+ <el-table-column align="center" label="提货进度" min-width="120" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-progress :text-inside="true" :stroke-width="26" :percentage="((scope.row.takeQty * 100) / (scope.row.totalQty * 100)) || 0"></el-progress>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.examineStatus | statusFilter}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" label="开票状态" prop="isInvoicing" min-width="100" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.isInvoicing ? '已开票':'未开票'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" label="订单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column align="center" label="订单日期" prop="theTime" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
@@ -97,7 +112,7 @@
|
|
|
<el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column align="center" label="出库数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="center" label="金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column align="center" label="返利使用比例" prop="rebateRate" min-width="110" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
@@ -110,11 +125,6 @@
|
|
|
<el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column align="center" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.examineStatus | statusFilter}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
<el-table-column align="center" label="操作" width="220" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="text" @click="toForm(scope.row)" v-if="scope.row.examineStatus === 'SAVE'">编辑</el-button>
|
|
@@ -185,8 +195,8 @@ export default {
|
|
|
listLoading: false, // 列表加载loading
|
|
|
screenForm: { // 筛选表单数据
|
|
|
orderNum: '',
|
|
|
- policyCode: '',
|
|
|
- policyRemark: '',
|
|
|
+ goodsName: '',
|
|
|
+ model: '',
|
|
|
jxsName: '',
|
|
|
date: '',
|
|
|
zbMan: '',
|
|
@@ -213,8 +223,8 @@ export default {
|
|
|
return {
|
|
|
examineStatus: this.screenForm.status,
|
|
|
id: this.screenForm.orderNum,
|
|
|
- policyCode: this.screenForm.policyCode,
|
|
|
- policyRemark: this.screenForm.policyRemark,
|
|
|
+ materialName: this.screenForm.goodsName,
|
|
|
+ specification: this.screenForm.model,
|
|
|
customer: this.screenForm.jxsName,
|
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
@@ -252,8 +262,8 @@ export default {
|
|
|
pageSize: this.pageSize,
|
|
|
examineStatus: this.screenForm.status,
|
|
|
id: this.screenForm.orderNum,
|
|
|
- policyCode: this.screenForm.policyCode,
|
|
|
- policyRemark: this.screenForm.policyRemark,
|
|
|
+ materialName: this.screenForm.goodsName,
|
|
|
+ specification: this.screenForm.model,
|
|
|
customer: this.screenForm.jxsName,
|
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|