|
|
@@ -120,6 +120,32 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="产品类别" prop="categoryId">
|
|
|
+ <el-select
|
|
|
+ v-model="screenForm.categoryId"
|
|
|
+ style="width: 100%"
|
|
|
+ placeholder="选择产品类别"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-form-item label="发货时间" prop="invoiceDate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="screenForm.invoiceDate"
|
|
|
+ type="datetimerange"
|
|
|
+ range-separator="至"
|
|
|
+ style="width: 100%"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
</template>
|
|
|
@@ -162,40 +188,84 @@
|
|
|
{{ scope.row.syncStatus == 0 ? '未推送' : scope.row.syncStatus == 1 ? '推送成功' : '失败推送' }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="状态"
|
|
|
+ prop="examineStatus"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.examineStatus | statusFilter }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="打印时间" prop="printTime" min-width="100" show-overflow-tooltip />
|
|
|
- <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="打印时间"
|
|
|
+ prop="printTime"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="发货日期"
|
|
|
+ prop="invoiceOrderTime"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="订单类型"
|
|
|
+ prop="orderType"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.orderType | orderTypeFilter }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column align="left" label="开票状态" prop="billStatus" min-width="100" show-overflow-tooltip>
|
|
|
+ <!-- <el-table-column align="left" label="开票状态" prop="billStatus" min-width="100" show-overflow-tooltip sortable>
|
|
|
<template slot-scope="scope">
|
|
|
{{scope.row.billStatus | billStatusFilter}}
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column align="left" label="发票号" prop="billReceipt" min-width="250" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="发票号"
|
|
|
+ prop="billReceipt"
|
|
|
+ min-width="250"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.billReceipt }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="出库单号" prop="id" min-width="110" show-overflow-tooltip>
|
|
|
+ <el-table-column align="left" label="出库单号" prop="id" min-width="110" show-overflow-tooltip sortable>
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.id" />
|
|
|
<span>{{ scope.row.id }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="发货单号"
|
|
|
+ prop="orderNo"
|
|
|
+ min-width="130"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.orderNo" />
|
|
|
<span>{{ scope.row.orderNo }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>
|
|
|
+ <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip sortable>
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton
|
|
|
:copy-text="
|
|
|
@@ -217,27 +287,56 @@
|
|
|
}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="仓库"
|
|
|
+ prop="correspondName"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="经销商编码"
|
|
|
prop="customerNumber"
|
|
|
- min-width="100"
|
|
|
+ min-width="120"
|
|
|
show-overflow-tooltip
|
|
|
+ sortable
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.customerNumber" />
|
|
|
<span>{{ scope.row.customerNumber }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="经销商名称"
|
|
|
+ prop="customerName"
|
|
|
+ min-width="250"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.customerName" />
|
|
|
<span>{{ scope.row.customerName }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
|
|
|
- <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="销售类型"
|
|
|
+ prop="saleTypeName"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="物料编码"
|
|
|
+ prop="materialCode"
|
|
|
+ min-width="120"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.materialCode" />
|
|
|
<span>{{ scope.row.materialCode }}</span>
|
|
|
@@ -249,37 +348,73 @@
|
|
|
prop="materialOldNumber"
|
|
|
min-width="140"
|
|
|
show-overflow-tooltip
|
|
|
+ sortable
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.materialOldNumber" />
|
|
|
<span>{{ scope.row.materialOldNumber }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="产品名称"
|
|
|
+ prop="materialName"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.materialName" />
|
|
|
<span>{{ scope.row.materialName }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="规格型号"
|
|
|
+ prop="specification"
|
|
|
+ min-width="350"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copy-text="scope.row.specification" />
|
|
|
<span>{{ scope.row.specification }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
|
|
|
- <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
|
|
|
- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip sortable />
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="数量"
|
|
|
+ prop="refundableQty"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
+ <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip sortable>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.price | numToFixed }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="订单金额"
|
|
|
+ prop="payAmount"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.payAmount | numToFixed }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="订单备注"
|
|
|
+ prop="headerRemark"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="审核时间"
|
|
|
@@ -289,15 +424,37 @@
|
|
|
sortable
|
|
|
/>
|
|
|
|
|
|
- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip />
|
|
|
- <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip />
|
|
|
- <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="发货申请备注"
|
|
|
+ prop="remark"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="表体备注"
|
|
|
+ prop="invoiceRemark"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="业务员"
|
|
|
+ prop="serviceName"
|
|
|
+ min-width="120"
|
|
|
+ show-overflow-tooltip
|
|
|
+ sortable
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="表头业务员"
|
|
|
prop="k3ServiceName"
|
|
|
- min-width="100"
|
|
|
+ min-width="120"
|
|
|
show-overflow-tooltip
|
|
|
+ sortable
|
|
|
/>
|
|
|
<!-- <el-table-column align="center" label="操作" width="120" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -344,6 +501,7 @@ import SalesDetail from '@/views/supply/sales/components/sales_detail'
|
|
|
import SalesExamine from '@/views/supply/sales/components/sales_examine'
|
|
|
import SalesReturnForm from '@/views/supply/sales/components/sales_return_form'
|
|
|
import ExamineDialog from '@/components/Common/examine-dialog'
|
|
|
+import { getCategoryList } from '@/api/common'
|
|
|
|
|
|
let that
|
|
|
export default {
|
|
|
@@ -399,6 +557,8 @@ export default {
|
|
|
mainOrderId: '',
|
|
|
printDesc: null,
|
|
|
syncStatus: '',
|
|
|
+ categoryId: '',
|
|
|
+ invoiceDate: '',
|
|
|
id: ''
|
|
|
},
|
|
|
statusList: [
|
|
|
@@ -434,6 +594,7 @@ export default {
|
|
|
status: '',
|
|
|
remark: ''
|
|
|
},
|
|
|
+ categoryList: [],
|
|
|
setDisabled: {
|
|
|
disabledDate: time => {
|
|
|
if (this.choiceDate) {
|
|
|
@@ -465,6 +626,9 @@ export default {
|
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
|
syncStatus: this.screenForm.syncStatus,
|
|
|
+ categoryId: this.screenForm.categoryId,
|
|
|
+ invoiceStartTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[0] : '',
|
|
|
+ invoiceEndTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[1] : '',
|
|
|
approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : '',
|
|
|
approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : '',
|
|
|
printStartTime: this.screenForm.printTime ? this.screenForm.printTime[0] : '',
|
|
|
@@ -482,6 +646,7 @@ export default {
|
|
|
|
|
|
created() {
|
|
|
this.getList()
|
|
|
+ this.getCategoryList()
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
@@ -501,7 +666,9 @@ export default {
|
|
|
specification: this.screenForm.model,
|
|
|
correspondName: this.screenForm.warehouse,
|
|
|
syncStatus: this.screenForm.syncStatus,
|
|
|
-
|
|
|
+ categoryId: this.screenForm.categoryId,
|
|
|
+ invoiceStartTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[0] : '',
|
|
|
+ invoiceEndTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[1] : '',
|
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
|
approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : '',
|
|
|
@@ -598,7 +765,16 @@ export default {
|
|
|
this.queryItem = item
|
|
|
this.isShowExamine = true
|
|
|
},
|
|
|
-
|
|
|
+ // 获取存货类别列表
|
|
|
+ getCategoryList() {
|
|
|
+ getCategoryList({
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: -1
|
|
|
+ }).then(res => {
|
|
|
+ this.categoryList = res.data.records
|
|
|
+ console.log(this.categoryList)
|
|
|
+ })
|
|
|
+ },
|
|
|
backList() {
|
|
|
this.queryItem = {}
|
|
|
this.isShowDetail = false
|
howie