|
@@ -3,57 +3,92 @@
|
|
|
<div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
|
|
|
<!-- 筛选条件 -->
|
|
|
<div class="screen-container">
|
|
|
- <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
|
|
|
+ <el-form
|
|
|
+ ref="screenForm"
|
|
|
+ :model="screenForm"
|
|
|
+ label-width="85px"
|
|
|
+ size="mini"
|
|
|
+ label-position="left"
|
|
|
+ >
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="24" :sm="24" :lg="24">
|
|
|
<el-form-item prop="orderNum" label-width="0">
|
|
|
<el-radio-group v-model="screenForm.status" @change="getList()">
|
|
|
<el-radio-button label="">全部</el-radio-button>
|
|
|
- <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
|
|
|
+ <el-radio-button
|
|
|
+ v-for="(item, index) in statusList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.value"
|
|
|
+ >{{ item.label }}</el-radio-button
|
|
|
+ >
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="发货单号" prop="orderNum">
|
|
|
- <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.orderNum"
|
|
|
+ placeholder="请输入发货单号"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="订单号" prop="mainOrderId">
|
|
|
- <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.mainOrderId"
|
|
|
+ placeholder="请输入订单号"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="经销商名称" prop="jxsName">
|
|
|
- <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.jxsName"
|
|
|
+ placeholder="请输入经销商名称"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="经销商编号" prop="jxsNum">
|
|
|
- <el-input v-model="screenForm.jxsNum" placeholder="请输入规格型号"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.jxsNum"
|
|
|
+ placeholder="请输入规格型号"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="产品名称" prop="chName">
|
|
|
- <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.chName"
|
|
|
+ placeholder="请输入产品名称"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="物料编码" prop="chNum">
|
|
|
- <el-input v-model="screenForm.chNum" placeholder="请输入物料编码"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.chNum"
|
|
|
+ placeholder="请输入物料编码"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="规格型号" prop="model">
|
|
|
- <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.model"
|
|
|
+ placeholder="请输入规格型号"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="仓库名称" prop="warehouse">
|
|
|
- <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.warehouse"
|
|
|
+ placeholder="请输入仓库名称"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :xs="24" :sm="12" :lg="6">
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="单据日期" prop="date">
|
|
|
<el-date-picker
|
|
|
v-model="screenForm.date"
|
|
@@ -97,17 +132,10 @@
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="打印时间排序" prop="printDesc">
|
|
|
- <el-select v-model="screenForm.printDesc" clearable filterable >
|
|
|
- <el-option
|
|
|
- label="默认"
|
|
|
- :value="null">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="倒叙"
|
|
|
- :value="1">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
-
|
|
|
+ <el-select v-model="screenForm.printDesc" clearable filterable>
|
|
|
+ <el-option label="默认" :value="null"> </el-option>
|
|
|
+ <el-option label="倒叙" :value="1"> </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
@@ -121,7 +149,9 @@
|
|
|
<el-col :xs="24" :sm="12" :lg="18" class="tr">
|
|
|
<el-form-item label="">
|
|
|
<el-button @click="resetScreenForm">清空</el-button>
|
|
|
- <el-button type="primary" @click="submitScreenForm">搜索</el-button>
|
|
|
+ <el-button type="primary" @click="submitScreenForm"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -149,11 +179,18 @@
|
|
|
stripe
|
|
|
@selection-change="handleSelectionChange"
|
|
|
show-summary
|
|
|
- :summary-method="$getSummaries">
|
|
|
+ :summary-method="$getSummaries"
|
|
|
+ >
|
|
|
<!-- <el-table-column align="center" type="selection" width="55"></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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.examineStatus | statusFilter}}
|
|
|
+ {{ scope.row.examineStatus | statusFilter }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -163,7 +200,13 @@
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
></el-table-column>
|
|
|
- <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="订单类型"
|
|
|
+ prop="orderType"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.orderType | orderTypeFilter }}
|
|
|
</template>
|
|
@@ -173,91 +216,220 @@
|
|
|
{{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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.billReceipt }}
|
|
|
+ {{ 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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.id" />
|
|
|
- <span>{{scope.row.id}}</span>
|
|
|
+ <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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.orderNo" />
|
|
|
- <span>{{scope.row.orderNo}}</span>
|
|
|
+ <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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
|
|
|
- <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
|
|
|
+ <CopyButton :copyText='scope.row.orderType === "TRADE" ||
|
|
|
+ scope.row.orderType === "HOME" || scope.row.orderType
|
|
|
+ ==="REQUISITION_TRADE" || scope.row.orderType
|
|
|
+ ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
|
|
|
+ <span>{{
|
|
|
+ scope.row.orderType === "TRADE" ||
|
|
|
+ scope.row.orderType === "HOME" ||
|
|
|
+ scope.row.orderType === "REQUISITION_TRADE" ||
|
|
|
+ scope.row.orderType === "REQUISITION_HOME"
|
|
|
+ ? scope.row.enginOrderNo
|
|
|
+ : scope.row.mainOrderId
|
|
|
+ }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="仓库"
|
|
|
+ prop="correspondName"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="经销商编码"
|
|
|
+ prop="customerNumber"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.customerNumber" />
|
|
|
- <span>{{scope.row.customerNumber}}</span>
|
|
|
+ <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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.customerName" />
|
|
|
- <span>{{scope.row.customerName}}</span>
|
|
|
+ <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>
|
|
|
- <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
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="物料编码"
|
|
|
+ prop="materialCode"
|
|
|
+ min-width="120"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.materialCode" />
|
|
|
- <span>{{scope.row.materialCode}}</span>
|
|
|
+ <span>{{ scope.row.materialCode }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="产品编码"
|
|
|
+ prop="materialOldNumber"
|
|
|
+ min-width="140"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.materialOldNumber" />
|
|
|
- <span>{{scope.row.materialOldNumber}}</span>
|
|
|
+ <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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.materialName" />
|
|
|
- <span>{{scope.row.materialName}}</span>
|
|
|
+ <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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<CopyButton :copyText="scope.row.specification" />
|
|
|
- <span>{{scope.row.specification}}</span>
|
|
|
+ <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>
|
|
|
- <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <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
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="数量"
|
|
|
+ prop="refundableQty"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="单价"
|
|
|
+ prop="price"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<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
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.payAmount | numToFixed }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
- label="制单人"
|
|
|
- prop="createBy"
|
|
|
+ label="订单备注"
|
|
|
+ prop="headerRemark"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="发货申请备注"
|
|
|
+ prop="remark"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="表体备注"
|
|
|
+ prop="invoiceRemark"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="业务员"
|
|
|
+ prop="serviceName"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="表头业务员"
|
|
|
+ prop="k3ServiceName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
></el-table-column>
|
|
|
- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
<!-- <el-table-column align="center" label="操作" width="120" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="text" @click="toDetail(scope.row)">详情</el-button>
|
|
@@ -283,29 +455,49 @@
|
|
|
:page-sizes="[10, 20, 30, 50]"
|
|
|
:page-size="10"
|
|
|
layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="listTotal">
|
|
|
+ :total="listTotal"
|
|
|
+ >
|
|
|
</el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
|
|
|
-
|
|
|
- <SalesDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
|
|
|
- <SalesExamine :listItem="queryItem" v-if="isShowExamine" @backListFormExamine="backList" />
|
|
|
- <SalesReturnForm :listItem="queryItem" v-if="isShowReturnForm" @backListFormDetail="backList" />
|
|
|
+ <ExamineDialog
|
|
|
+ :isShow.sync="isShowExamineDialog"
|
|
|
+ :examineForm.sync="examineForm"
|
|
|
+ />
|
|
|
|
|
|
+ <SalesDetail
|
|
|
+ :listItem="queryItem"
|
|
|
+ v-if="isShowDetail"
|
|
|
+ @backListFormDetail="backList"
|
|
|
+ />
|
|
|
+ <SalesExamine
|
|
|
+ :listItem="queryItem"
|
|
|
+ v-if="isShowExamine"
|
|
|
+ @backListFormExamine="backList"
|
|
|
+ />
|
|
|
+ <SalesReturnForm
|
|
|
+ :listItem="queryItem"
|
|
|
+ v-if="isShowReturnForm"
|
|
|
+ @backListFormDetail="backList"
|
|
|
+ />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { abandonData, examineBatch, examineJudge, getList } from '@/api/supply/sales'
|
|
|
-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 {
|
|
|
+ abandonData,
|
|
|
+ examineBatch,
|
|
|
+ examineJudge,
|
|
|
+ getList,
|
|
|
+} from "@/api/supply/sales";
|
|
|
+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";
|
|
|
|
|
|
-let that
|
|
|
+let that;
|
|
|
export default {
|
|
|
components: {
|
|
|
SalesDetail,
|
|
@@ -315,8 +507,8 @@ export default {
|
|
|
},
|
|
|
filters: {
|
|
|
statusFilter(val) {
|
|
|
- let obj = that.statusList.find(o => o.value == val);
|
|
|
- return obj ? obj.label : ''
|
|
|
+ let obj = that.statusList.find((o) => o.value == val);
|
|
|
+ return obj ? obj.label : "";
|
|
|
},
|
|
|
orderTypeFilter(val) {
|
|
|
let obj = that.orderTypeList.find((o) => o.value == val);
|
|
@@ -324,11 +516,11 @@ export default {
|
|
|
},
|
|
|
billStatusFilter(val) {
|
|
|
const MAP = {
|
|
|
- 1: '已开票',
|
|
|
- 0: '未开票',
|
|
|
- }
|
|
|
+ 1: "已开票",
|
|
|
+ 0: "未开票",
|
|
|
+ };
|
|
|
return MAP[val];
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
@@ -337,56 +529,57 @@ export default {
|
|
|
listTotal: 0, // 列表总数
|
|
|
dataList: null, // 列表数据
|
|
|
listLoading: false, // 列表加载loading
|
|
|
- screenForm: { // 筛选表单数据
|
|
|
- orderNum: '',
|
|
|
- jxsName: '',
|
|
|
- jxsNum: '',
|
|
|
- chName: '',
|
|
|
- chNum: '',
|
|
|
- model: '',
|
|
|
- warehouse: '',
|
|
|
- date: '',
|
|
|
- status: '',
|
|
|
- approval:'',
|
|
|
- printTime:'',
|
|
|
- mainOrderId: '',
|
|
|
- printDesc:null,
|
|
|
- id:''
|
|
|
+ screenForm: {
|
|
|
+ // 筛选表单数据
|
|
|
+ orderNum: "",
|
|
|
+ jxsName: "",
|
|
|
+ jxsNum: "",
|
|
|
+ chName: "",
|
|
|
+ chNum: "",
|
|
|
+ model: "",
|
|
|
+ warehouse: "",
|
|
|
+ date: "",
|
|
|
+ status: "",
|
|
|
+ approval: "",
|
|
|
+ printTime: "",
|
|
|
+ mainOrderId: "",
|
|
|
+ printDesc: null,
|
|
|
+ id: "",
|
|
|
},
|
|
|
statusList: [
|
|
|
- { label: '已保存', value: 'SAVE' },
|
|
|
- { label: '待审核', value: 'WAIT' },
|
|
|
- { label: '审核通过', value: 'OK' },
|
|
|
- // { label: '审核驳回', value: 'FAIL' },,
|
|
|
+ { label: "已保存", value: "SAVE" },
|
|
|
+ { label: "待审核", value: "WAIT" },
|
|
|
+ { label: "审核通过", value: "OK" },
|
|
|
+ // { label: '审核驳回', value: 'FAIL' },,
|
|
|
],
|
|
|
orderTypeList: [
|
|
|
- { label: '商用', value: 'TRADE' },
|
|
|
- { label: '家用', value: 'HOME' },
|
|
|
- { label: '零售单', value: 'RETAIL' },
|
|
|
- { label: '销售政策单', value: 'RETAIL_POLICY' },
|
|
|
- { label: '置换单家用', value: 'PERMU_HOME' },
|
|
|
- { label: '置换商用', value: 'PERMU_TRADE' },
|
|
|
- { label: '置换零售', value: 'PERMU_RETAIL' },
|
|
|
- { label: '置换销售政策单', value: 'PERMU_RETAIL_POLICY' },
|
|
|
- { label: '调拨单零售', value: 'REQUISITION_RETAIL' },
|
|
|
- { label: '调拨单销售政策', value: 'REQUISITION_RETAIL_POLICY' },
|
|
|
- { label: '调拨单商用', value: 'REQUISITION_TRADE' },
|
|
|
- { label: '调拨单家用', value: 'REQUISITION_HOME' },
|
|
|
+ { label: "商用", value: "TRADE" },
|
|
|
+ { label: "家用", value: "HOME" },
|
|
|
+ { label: "零售单", value: "RETAIL" },
|
|
|
+ { label: "销售政策单", value: "RETAIL_POLICY" },
|
|
|
+ { label: "置换单家用", value: "PERMU_HOME" },
|
|
|
+ { label: "置换商用", value: "PERMU_TRADE" },
|
|
|
+ { label: "置换零售", value: "PERMU_RETAIL" },
|
|
|
+ { label: "置换销售政策单", value: "PERMU_RETAIL_POLICY" },
|
|
|
+ { label: "调拨单零售", value: "REQUISITION_RETAIL" },
|
|
|
+ { label: "调拨单销售政策", value: "REQUISITION_RETAIL_POLICY" },
|
|
|
+ { label: "调拨单商用", value: "REQUISITION_TRADE" },
|
|
|
+ { label: "调拨单家用", value: "REQUISITION_HOME" },
|
|
|
],
|
|
|
|
|
|
queryItem: {},
|
|
|
isShowDetail: false,
|
|
|
isShowExamine: false,
|
|
|
isShowReturnForm: false,
|
|
|
- value1: "",
|
|
|
+ value1: "",
|
|
|
choiceDate: "",
|
|
|
multipleSelection: [],
|
|
|
isShowExamineDialog: false,
|
|
|
examineForm: {
|
|
|
- status: '',
|
|
|
- remark: '',
|
|
|
+ status: "",
|
|
|
+ remark: "",
|
|
|
},
|
|
|
- setDisabled: {
|
|
|
+ setDisabled: {
|
|
|
disabledDate: (time) => {
|
|
|
if (this.choiceDate) {
|
|
|
const res = 13 * 24 * 3600 * 1000;
|
|
@@ -400,7 +593,7 @@ export default {
|
|
|
if (maxDate) this.choiceDate = "";
|
|
|
},
|
|
|
},
|
|
|
- }
|
|
|
+ };
|
|
|
},
|
|
|
|
|
|
computed: {
|
|
@@ -414,20 +607,24 @@ export default {
|
|
|
materialNumber: this.screenForm.chNum,
|
|
|
specification: this.screenForm.model,
|
|
|
correspondName: this.screenForm.warehouse,
|
|
|
- startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
- endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
|
- approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
|
|
|
- approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
|
|
|
- printStartTime:this.screenForm.printTime
|
|
|
+ startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
|
+ endTime: this.screenForm.date ? this.screenForm.date[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]
|
|
|
: "",
|
|
|
- printEndtTime:this.screenForm.printTime
|
|
|
+ printEndtTime: this.screenForm.printTime
|
|
|
? this.screenForm.printTime[1]
|
|
|
: "",
|
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
|
- printTimeDesc:this.screenForm.printDesc,
|
|
|
- id:this.screenForm.id
|
|
|
- }
|
|
|
+ printTimeDesc: this.screenForm.printDesc,
|
|
|
+ id: this.screenForm.id,
|
|
|
+ };
|
|
|
},
|
|
|
},
|
|
|
|
|
@@ -455,45 +652,47 @@ export default {
|
|
|
materialNumber: this.screenForm.chNum,
|
|
|
specification: this.screenForm.model,
|
|
|
correspondName: this.screenForm.warehouse,
|
|
|
- startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
- endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
|
- approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
|
|
|
- approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
|
|
|
- printStartTime:this.screenForm.printTime
|
|
|
+ startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
|
+ endTime: this.screenForm.date ? this.screenForm.date[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]
|
|
|
: "",
|
|
|
- printEndtTime:this.screenForm.printTime
|
|
|
+ printEndtTime: this.screenForm.printTime
|
|
|
? this.screenForm.printTime[1]
|
|
|
: "",
|
|
|
- printTimeDesc:this.screenForm.printDesc,
|
|
|
+ printTimeDesc: this.screenForm.printDesc,
|
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
|
- id:this.screenForm.id
|
|
|
+ id: this.screenForm.id,
|
|
|
};
|
|
|
getList(params).then((res) => {
|
|
|
- res.data.records.forEach(item => {
|
|
|
- item.sums1 = ['refundableQty'];
|
|
|
- item.sums2 = ['price', 'payAmount'];
|
|
|
- })
|
|
|
+ res.data.records.forEach((item) => {
|
|
|
+ item.sums1 = ["refundableQty"];
|
|
|
+ item.sums2 = ["price", "payAmount"];
|
|
|
+ });
|
|
|
this.dataList = res.data.records;
|
|
|
this.listTotal = res.data.total;
|
|
|
this.listLoading = false;
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
- updateReceipt() {
|
|
|
-
|
|
|
- if (!this.value1) {
|
|
|
- this.$errorMsg('请选择时间')
|
|
|
- return
|
|
|
- }
|
|
|
+ updateReceipt() {
|
|
|
+ if (!this.value1) {
|
|
|
+ this.$errorMsg("请选择时间");
|
|
|
+ return;
|
|
|
+ }
|
|
|
updateReceipt({
|
|
|
- startTime:this.value1[0],
|
|
|
- endTime:this.value1[1]
|
|
|
- }).then(res=>{
|
|
|
- this.getList();
|
|
|
+ startTime: this.value1[0],
|
|
|
+ endTime: this.value1[1],
|
|
|
+ }).then((res) => {
|
|
|
+ this.getList();
|
|
|
this.$successMsg("已更新");
|
|
|
- this.value1 = ''
|
|
|
- })
|
|
|
-
|
|
|
+ this.value1 = "";
|
|
|
+ });
|
|
|
},
|
|
|
// 提交筛选表单
|
|
|
submitScreenForm() {
|
|
@@ -524,13 +723,15 @@ export default {
|
|
|
// 判断是否可以审批
|
|
|
async examineJudge(item) {
|
|
|
// 获取页面模版
|
|
|
- const result = await new Promise((resolve, reject)=>{
|
|
|
- examineJudge({id: item.id}).then(res => {
|
|
|
- resolve(res.code == 200);
|
|
|
- }).catch(res => {
|
|
|
- resolve(0);
|
|
|
- })
|
|
|
- })
|
|
|
+ const result = await new Promise((resolve, reject) => {
|
|
|
+ examineJudge({ id: item.id })
|
|
|
+ .then((res) => {
|
|
|
+ resolve(res.code == 200);
|
|
|
+ })
|
|
|
+ .catch((res) => {
|
|
|
+ resolve(0);
|
|
|
+ });
|
|
|
+ });
|
|
|
return result;
|
|
|
},
|
|
|
|
|
@@ -549,7 +750,7 @@ export default {
|
|
|
// 进入审批
|
|
|
async toExamine(item) {
|
|
|
const canExamine = await this.examineJudge(item);
|
|
|
- if(!canExamine) {
|
|
|
+ if (!canExamine) {
|
|
|
return false;
|
|
|
}
|
|
|
this.queryItem = item;
|
|
@@ -574,31 +775,29 @@ export default {
|
|
|
|
|
|
// 提交 批量审批
|
|
|
submitExamineForm() {
|
|
|
- let ids = this.multipleSelection.map(item => {
|
|
|
+ let ids = this.multipleSelection.map((item) => {
|
|
|
return item.id;
|
|
|
});
|
|
|
examineBatch({
|
|
|
- ids: ids.join(','),
|
|
|
+ ids: ids.join(","),
|
|
|
examineStatus: this.examineForm.status,
|
|
|
approvalRemark: this.examineForm.remark,
|
|
|
- }).then(res => {
|
|
|
+ }).then((res) => {
|
|
|
this.isShowExamineDialog = false;
|
|
|
this.getList();
|
|
|
- this.$successMsg('修改成功');
|
|
|
- })
|
|
|
+ this.$successMsg("修改成功");
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
// 弃审
|
|
|
handleAbandon(id) {
|
|
|
- abandonData({id}).then(res => {
|
|
|
+ abandonData({ id }).then((res) => {
|
|
|
this.$successMsg();
|
|
|
this.getList();
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
- }
|
|
|
-}
|
|
|
+ },
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
-<style lang="scss" scoped>
|
|
|
-
|
|
|
-</style>
|
|
|
+<style lang="scss" scoped></style>
|