|
@@ -3,7 +3,13 @@
|
|
|
<div v-show="!isShowDetail">
|
|
|
<!-- 筛选条件 -->
|
|
|
<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">
|
|
@@ -16,27 +22,42 @@
|
|
|
</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-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="订单号" prop="orderNo">
|
|
|
- <el-input v-model="screenForm.orderNo" placeholder="请输入订单号"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.orderNo"
|
|
|
+ placeholder="请输入订单号"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="合同号" prop="contractNo">
|
|
|
- <el-input v-model="screenForm.contractNo" placeholder="请输入合同号"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.contractNo"
|
|
|
+ placeholder="请输入合同号"
|
|
|
+ />
|
|
|
</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-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-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
@@ -47,49 +68,76 @@
|
|
|
range-separator="至"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期">
|
|
|
- </el-date-picker>
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ />
|
|
|
</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-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-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item prop="type" label="存货类别">
|
|
|
- <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
|
|
|
- <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
|
|
|
+ <el-select
|
|
|
+ v-model="screenForm.type"
|
|
|
+ placeholder="选择存货类别"
|
|
|
+ style="width: 100%"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in categoryList"
|
|
|
+ :key="item.name"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.name"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="业务员" prop="salesMan">
|
|
|
- <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
|
|
|
+ <el-select
|
|
|
+ v-model="screenForm.salesMan"
|
|
|
+ placeholder="选择业务员"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ style="width: 100%"
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="item in salesmanList"
|
|
|
:key="item.adminUserId"
|
|
|
:label="item.nickName"
|
|
|
- :value="item.adminUserId">
|
|
|
- </el-option>
|
|
|
+ :value="item.adminUserId"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
|
<el-form-item label="区域" prop="refRegionWork">
|
|
|
- <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="screenForm.refRegionWork"
|
|
|
+ placeholder="请输入区域"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :xs="24" :sm="24" :lg="24" 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>
|
|
@@ -102,7 +150,7 @@
|
|
|
<!-- <el-button size="mini" type="warning" icon="el-icon-close">退货</el-button> -->
|
|
|
</div>
|
|
|
<div class="fr">
|
|
|
- <ExportButton :exUrl="'ship/pExport'" :exParams="exParams" />
|
|
|
+ <ExportButton :ex-url="'ship/pExport'" :ex-params="exParams" />
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="table">
|
|
@@ -115,92 +163,357 @@
|
|
|
highlight-current-row
|
|
|
stripe
|
|
|
show-summary
|
|
|
- :summary-method="$getSummaries">
|
|
|
- <el-table-column align="left" label="发货单号" prop="id" min-width="140" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.id" />
|
|
|
- <span>{{scope.row.id}}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></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="enginOrderNo" min-width="140" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.enginOrderNo" />
|
|
|
- <span>{{scope.row.enginOrderNo}}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
|
|
|
+ :summary-method="$getSummaries"
|
|
|
+ >
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="发货单号"
|
|
|
+ prop="id"
|
|
|
+ min-width="140"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.customerNumber" />
|
|
|
- <span>{{scope.row.customerNumber}}</span>
|
|
|
+ <CopyButton :copy-text="scope.row.id" />
|
|
|
+ <span>{{ scope.row.id }}</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="orderTime"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="仓库"
|
|
|
+ prop="correspondName"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="订单号"
|
|
|
+ prop="enginOrderNo"
|
|
|
+ min-width="140"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.customerName" />
|
|
|
- <span>{{scope.row.customerName}}</span>
|
|
|
+ <CopyButton :copy-text="scope.row.enginOrderNo" />
|
|
|
+ <span>{{ scope.row.enginOrderNo }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="存货类别" prop="categoryName" 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="refEnginRecordNo"
|
|
|
+ min-width="150"
|
|
|
+ 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.materialCode" />
|
|
|
- <span>{{scope.row.materialCode}}</span>
|
|
|
+ <CopyButton :copy-text="scope.row.customerName" />
|
|
|
+ <span>{{ scope.row.customerName }}</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="refUseUnit"
|
|
|
+ min-width="100"
|
|
|
+ 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.materialOldNumber" />
|
|
|
- <span>{{scope.row.materialOldNumber}}</span>
|
|
|
+ <CopyButton :copy-text="scope.row.materialName" />
|
|
|
+ <span>{{ scope.row.materialName }}</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="materialCode"
|
|
|
+ min-width="120"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.materialName" />
|
|
|
- <span>{{scope.row.materialName}}</span>
|
|
|
+ <CopyButton :copy-text="scope.row.materialCode" />
|
|
|
+ <span>{{ scope.row.materialCode }}</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="materialOldNumber"
|
|
|
+ min-width="140"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.specification" />
|
|
|
- <span>{{scope.row.specification}}</span>
|
|
|
+ <CopyButton :copy-text="scope.row.materialOldNumber" />
|
|
|
+ <span>{{ scope.row.materialOldNumber }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip></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="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="规格型号"
|
|
|
+ prop="specification"
|
|
|
+ min-width="350"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.singlePayPrice | numToFixed}}
|
|
|
+ <CopyButton :copy-text="scope.row.specification" />
|
|
|
+ <span>{{ scope.row.specification }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="right" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.payAmount | numToFixed}}
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="数量"
|
|
|
+ prop="qty"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="单价"
|
|
|
+ prop="price"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="总金额"
|
|
|
+ prop="payAmount"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="安装地址"
|
|
|
+ prop="refInstallAddress"
|
|
|
+ min-width="300"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="联系人"
|
|
|
+ prop="refLinkman"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="固定电话"
|
|
|
+ prop="refTel"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="移动电话"
|
|
|
+ prop="refPhone"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="销售类型"
|
|
|
+ prop="saleTypeName"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="项目类别"
|
|
|
+ prop="refProjectCategory"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="行业类别"
|
|
|
+ prop="refTradeCategory"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="跨区厂编号"
|
|
|
+ prop="refFactoryNo"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="保证函"
|
|
|
+ prop="refPromiseProvide"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="押金"
|
|
|
+ prop="takeDeposit"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template v-slot="scope">
|
|
|
+ {{ scope.row.takeDeposit ? "不扣" : "扣" }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="第几次申报"
|
|
|
+ prop="refDeclareNo"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="备注信息"
|
|
|
+ prop="headerRemark"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="格力内部备注"
|
|
|
+ prop="geLiInerNote"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="区域"
|
|
|
+ prop="refRegionWork"
|
|
|
+ min-width="300"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="业务员"
|
|
|
+ prop="serviceName"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="实装物料编码"
|
|
|
+ prop="realMaterialNumber"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="实装厂产品编码"
|
|
|
+ prop="realMaterialOldNumber"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="实装规格型号"
|
|
|
+ prop="realSpecification"
|
|
|
+ min-width="300"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="发货申请备注"
|
|
|
+ prop="remark"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="二级经销商代码"
|
|
|
+ prop="secondCustomerNumber"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="经销商编码"
|
|
|
+ prop="customerNumber"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.payRebateAmount | numToFixed}}
|
|
|
+ <CopyButton :copy-text="scope.row.customerNumber" />
|
|
|
+ <span>{{ scope.row.customerNumber }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="制单人"
|
|
|
+ prop="createBy"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="制单日期"
|
|
|
+ prop="createTime"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="审单人"
|
|
|
+ prop="approvalName"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="审单日期"
|
|
|
+ prop="approvalTime"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="返利金额"
|
|
|
+ prop="payRebateAmount"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.totalDiscAmount | numToFixed}}
|
|
|
+ {{ scope.row.payRebateAmount | numToFixed }}
|
|
|
</template>
|
|
|
</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="center" label="操作" width="200" fixed="right">
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="操作"
|
|
|
+ width="200"
|
|
|
+ fixed="right"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
|
|
|
- <el-button type="text" @click="getPassword(scope.row.id)">获取密码</el-button>
|
|
|
- <el-button type="text" @click="openShareDetail(scope.row.id)">密码记录</el-button>
|
|
|
+ <el-button type="text" @click="toDetail(scope.row)"
|
|
|
+ >详情</el-button
|
|
|
+ >
|
|
|
+ <el-button type="text" @click="getPassword(scope.row.id)"
|
|
|
+ >获取密码</el-button
|
|
|
+ >
|
|
|
+ <el-button type="text" @click="openShareDetail(scope.row.id)"
|
|
|
+ >密码记录</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -209,43 +522,55 @@
|
|
|
<div class="pagination clearfix">
|
|
|
<div class="fr">
|
|
|
<el-pagination
|
|
|
- @size-change="handleSizeChange"
|
|
|
- @current-change="handleCurrentChange"
|
|
|
:current-page="currentPage"
|
|
|
:page-sizes="[10, 20, 30, 50]"
|
|
|
:page-size="10"
|
|
|
layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="listTotal">
|
|
|
- </el-pagination>
|
|
|
+ :total="listTotal"
|
|
|
+ @size-change="handleSizeChange"
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
+ />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
<!-- 密码记录 -->
|
|
|
- <el-dialog title="密码记录" :visible.sync="isShowDialog" :show-close="false" width="50%" :close-on-click-modal="false">
|
|
|
- <div class="table" style="margin: 10px 0 20px;">
|
|
|
+ <el-dialog
|
|
|
+ title="密码记录"
|
|
|
+ :visible.sync="isShowDialog"
|
|
|
+ :show-close="false"
|
|
|
+ width="50%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ >
|
|
|
+ <div class="table" style="margin: 10px 0 20px">
|
|
|
<el-table
|
|
|
v-loading="dialogTable_listLoading"
|
|
|
:data="dialogTable_dataList"
|
|
|
element-loading-text="Loading"
|
|
|
tooltip-effect="dark"
|
|
|
style="width: 100%"
|
|
|
- max-height="270">
|
|
|
- <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
|
|
|
- <el-table-column align="center" prop="printPassword" label="密码"></el-table-column>
|
|
|
- <el-table-column align="center" prop="createTime" label="打印时间"></el-table-column>
|
|
|
+ max-height="270"
|
|
|
+ >
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="序号"
|
|
|
+ type="index"
|
|
|
+ width="50"
|
|
|
+ />
|
|
|
+ <el-table-column align="center" prop="printPassword" label="密码" />
|
|
|
+ <el-table-column align="center" prop="createTime" label="打印时间" />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div class="pagination clearfix">
|
|
|
<div class="fr">
|
|
|
<el-pagination
|
|
|
- @current-change="dialogTableCurrentChange"
|
|
|
:current-page="dialogTable_currentPage"
|
|
|
:page-size="dialogTable_pageSize"
|
|
|
background
|
|
|
layout="prev, pager, next"
|
|
|
- :total="dialogTable_listTotal">
|
|
|
- </el-pagination>
|
|
|
+ :total="dialogTable_listTotal"
|
|
|
+ @current-change="dialogTableCurrentChange"
|
|
|
+ />
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
@@ -254,17 +579,25 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <HomeDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" ref="refDetail" />
|
|
|
-
|
|
|
+ <HomeDetail
|
|
|
+ v-if="isShowDetail"
|
|
|
+ ref="refDetail"
|
|
|
+ :list-item="queryItem"
|
|
|
+ @backListFormDetail="backList"
|
|
|
+ />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { getEnginList, getPassword, getPasswordRecord } from "@/api/supply/deliver";
|
|
|
-import { getCategoryList, getSalesmanList } from '@/api/common'
|
|
|
+import {
|
|
|
+ getEnginList,
|
|
|
+ getPassword,
|
|
|
+ getPasswordRecord,
|
|
|
+} from "@/api/supply/deliver";
|
|
|
+import { getCategoryList, getSalesmanList } from "@/api/common";
|
|
|
import HomeDetail from "@/views/supply/deliver/components/home_detail";
|
|
|
|
|
|
-let that
|
|
|
+let that;
|
|
|
export default {
|
|
|
components: {
|
|
|
HomeDetail,
|
|
@@ -276,18 +609,19 @@ export default {
|
|
|
listTotal: 0, // 列表总数
|
|
|
dataList: null, // 列表数据
|
|
|
listLoading: false, // 列表加载loading
|
|
|
- screenForm: { // 筛选表单数据
|
|
|
- orderNum: '',
|
|
|
- orderNo: '',
|
|
|
- contractNo: '',
|
|
|
- jxsName: '',
|
|
|
- chName: '',
|
|
|
- model: '',
|
|
|
- date: '',
|
|
|
- jxsNum: '',
|
|
|
- status: '',
|
|
|
- salesMan: '',
|
|
|
- refRegionWork:''
|
|
|
+ screenForm: {
|
|
|
+ // 筛选表单数据
|
|
|
+ orderNum: "",
|
|
|
+ orderNo: "",
|
|
|
+ contractNo: "",
|
|
|
+ jxsName: "",
|
|
|
+ chName: "",
|
|
|
+ model: "",
|
|
|
+ date: "",
|
|
|
+ jxsNum: "",
|
|
|
+ status: "",
|
|
|
+ salesMan: "",
|
|
|
+ refRegionWork: "",
|
|
|
},
|
|
|
salesmanList: [],
|
|
|
categoryList: [],
|
|
@@ -300,7 +634,7 @@ export default {
|
|
|
dialogTable_listTotal: 0, // 密码记录 - 列表总数
|
|
|
|
|
|
queryItem: {},
|
|
|
- }
|
|
|
+ };
|
|
|
},
|
|
|
|
|
|
computed: {
|
|
@@ -313,16 +647,16 @@ export default {
|
|
|
customerName: this.screenForm.jxsName,
|
|
|
materialName: this.screenForm.chName,
|
|
|
specification: this.screenForm.model,
|
|
|
- startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
- endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
|
+ startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
|
+ endTime: this.screenForm.date ? this.screenForm.date[1] : "",
|
|
|
categoryName: this.screenForm.type,
|
|
|
serviceId: this.screenForm.salesMan,
|
|
|
- refRegionWork:this.screenForm.refRegionWork,
|
|
|
+ refRegionWork: this.screenForm.refRegionWork,
|
|
|
orderType: 2, // 2家用工程 3商用工程
|
|
|
- }
|
|
|
+ };
|
|
|
},
|
|
|
isShowDetail() {
|
|
|
- return this.queryItem.hasOwnProperty('id');
|
|
|
+ return this.queryItem.hasOwnProperty("id");
|
|
|
},
|
|
|
},
|
|
|
|
|
@@ -344,9 +678,9 @@ export default {
|
|
|
pageSize: -1,
|
|
|
isCustomer: 0,
|
|
|
status: true,
|
|
|
- }).then(res => {
|
|
|
+ }).then((res) => {
|
|
|
this.salesmanList = res.data.records;
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
// 获取存货类别列表
|
|
@@ -354,16 +688,16 @@ export default {
|
|
|
getCategoryList({
|
|
|
pageNum: 1,
|
|
|
pageSize: -1,
|
|
|
- }).then(res => {
|
|
|
+ }).then((res) => {
|
|
|
this.categoryList = res.data.records;
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
// 查询列表
|
|
|
getList() {
|
|
|
this.listLoading = true;
|
|
|
|
|
|
- let params = {
|
|
|
+ const params = {
|
|
|
pageNum: this.currentPage,
|
|
|
pageSize: this.pageSize,
|
|
|
id: this.screenForm.orderNum,
|
|
@@ -373,23 +707,23 @@ export default {
|
|
|
customerName: this.screenForm.jxsName,
|
|
|
materialName: this.screenForm.chName,
|
|
|
specification: this.screenForm.model,
|
|
|
- startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
- endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
|
+ startTime: this.screenForm.date ? this.screenForm.date[0] : "",
|
|
|
+ endTime: this.screenForm.date ? this.screenForm.date[1] : "",
|
|
|
categoryName: this.screenForm.type,
|
|
|
- refRegionWork:this.screenForm.refRegionWork,
|
|
|
+ refRegionWork: this.screenForm.refRegionWork,
|
|
|
serviceId: this.screenForm.salesMan,
|
|
|
orderType: 2, // 2家用工程 3商用工程
|
|
|
};
|
|
|
getEnginList(params).then((res) => {
|
|
|
- res.data.records.forEach(item => {
|
|
|
+ res.data.records.forEach((item) => {
|
|
|
item.notOutNumber = item.salesStatus ? 0 : item.refundableQty;
|
|
|
- item.sums1 = ['refundableQty', 'notOutNumber'];
|
|
|
- item.sums2 = ['payAmount', 'afterTaxPrice', 'noTotalAmount'];
|
|
|
- })
|
|
|
+ item.sums1 = ["refundableQty", "notOutNumber"];
|
|
|
+ item.sums2 = ["payAmount", "afterTaxPrice", "noTotalAmount"];
|
|
|
+ });
|
|
|
this.dataList = res.data.records;
|
|
|
this.listTotal = res.data.total;
|
|
|
this.listLoading = false;
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
// 提交筛选表单
|
|
@@ -421,10 +755,9 @@ export default {
|
|
|
// 进入详情
|
|
|
toDetail(item) {
|
|
|
this.queryItem = item;
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.$refs.refDetail.initPrint()
|
|
|
- })
|
|
|
-
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.refDetail.initPrint();
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
backList() {
|
|
@@ -433,12 +766,12 @@ export default {
|
|
|
|
|
|
// 获取密码
|
|
|
getPassword(id) {
|
|
|
- getPassword({id}).then(res => {
|
|
|
- this.$alert(res.data, '新密码', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- callback: action => {}
|
|
|
+ getPassword({ id }).then((res) => {
|
|
|
+ this.$alert(res.data, "新密码", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ callback: (action) => {},
|
|
|
});
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
// 密码记录 - 获取列表
|
|
@@ -446,12 +779,12 @@ export default {
|
|
|
getPasswordRecord({
|
|
|
pageNum: this.dialogTable_currentPage,
|
|
|
pageSize: this.dialogTable_pageSize,
|
|
|
- id
|
|
|
- }).then(res => {
|
|
|
+ id,
|
|
|
+ }).then((res) => {
|
|
|
this.dialogTable_dataList = res.data.records;
|
|
|
this.dialogTable_listTotal = res.data.total;
|
|
|
this.dialogTable_listLoading = false;
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
// 密码记录 - 打开弹窗
|
|
@@ -466,10 +799,8 @@ export default {
|
|
|
this.dialogTable_currentPage = val;
|
|
|
this.getPasswordRecord();
|
|
|
},
|
|
|
- }
|
|
|
-}
|
|
|
+ },
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
-<style lang="scss" scoped>
|
|
|
-
|
|
|
-</style>
|
|
|
+<style lang="scss" scoped></style>
|