|
|
@@ -22,35 +22,35 @@
|
|
|
prop="number"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品编码"
|
|
|
prop="oldNumber"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="name"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="350"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="单位"
|
|
|
prop="baseUnitId"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column align="center" label="操作" min-width="100" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="text" @click="deleteBeiGoodsList(scope.$index)">删除</el-button>
|
|
|
@@ -84,35 +84,35 @@
|
|
|
prop="number"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品编码"
|
|
|
prop="oldNumber"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="name"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="350"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="单位"
|
|
|
prop="baseUnitId"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column align="center" label="操作" min-width="100" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="text" @click="deleteKeGoodsList(scope.$index)">删除</el-button>
|
|
|
@@ -130,8 +130,7 @@
|
|
|
filterable
|
|
|
@change="handleChange($event, scope.row)"
|
|
|
>
|
|
|
- <el-option v-for="item in saleList" :key="item.saleCode" :label="item.saleName" :value="item.saleCode">
|
|
|
- </el-option>
|
|
|
+ <el-option v-for="item in saleList" :key="item.saleCode" :label="item.saleName" :value="item.saleCode" />
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -141,50 +140,50 @@
|
|
|
prop="number"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品编码"
|
|
|
prop="oldNumber"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="name"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="350"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column align="left" label="置换单价" prop="price" min-width="160" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- type="number"
|
|
|
v-model.number="scope.row.price"
|
|
|
+ type="number"
|
|
|
placeholder="请输入"
|
|
|
size="mini"
|
|
|
clearable
|
|
|
@change=""
|
|
|
- ></el-input>
|
|
|
+ />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="left" label="格力折扣" prop="discAmount" min-width="160" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- type="number"
|
|
|
v-model.number="scope.row.discAmount"
|
|
|
+ type="number"
|
|
|
placeholder="请输入"
|
|
|
size="mini"
|
|
|
clearable
|
|
|
@change=""
|
|
|
- ></el-input>
|
|
|
+ />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="left" label="返利类型" prop="walletRebateId" min-width="160" show-overflow-tooltip>
|
|
|
@@ -202,8 +201,7 @@
|
|
|
:key="item.walletRebateId"
|
|
|
:label="item.name"
|
|
|
:value="item.walletRebateId"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -223,7 +221,7 @@
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
<el-table :data="orderList" border fit highlight-current-row stripe>
|
|
|
- <el-table-column align="left" label="订单号" prop="id" min-width="120" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="left" label="订单号" prop="id" min-width="120" show-overflow-tooltip />
|
|
|
<el-table-column align="left" label="经销商信息" prop="displaceOrderId" min-width="250" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.customerName + '(' + scope.row.customerNumber + ')' }}
|
|
|
@@ -236,70 +234,70 @@
|
|
|
prop="saleTypeName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="materialName"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="250"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="right"
|
|
|
label="单价"
|
|
|
prop="price"
|
|
|
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="left"
|
|
|
label="返利类型"
|
|
|
prop="rebateWalletName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="right"
|
|
|
label="使用返利金额"
|
|
|
prop="payRebateAmount"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="right"
|
|
|
label="格力折扣"
|
|
|
prop="totalDiscAmount"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="现金钱包"
|
|
|
prop="walletName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="right"
|
|
|
label="实付金额"
|
|
|
prop="payAmount"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" label="置换机型" prop="displaceOrderId" min-width="160" show-overflow-tooltip>
|
|
|
<el-table-column
|
|
|
@@ -308,31 +306,31 @@
|
|
|
prop="ke_saleTypeName"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="ke_materialName"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="ke_specification"
|
|
|
min-width="350"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="right"
|
|
|
label="单价"
|
|
|
prop="ke_price"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column align="right" label="置换数量" prop="ke_refundableQty" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.ke_refundableQty" size="mini" type="number"></el-input>
|
|
|
+ <el-input v-model="scope.row.ke_refundableQty" size="mini" type="number" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -341,11 +339,10 @@
|
|
|
prop="ke_rebateWalletName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="right"
|
|
|
label="使用返利金额"
|
|
|
- prop="singleRebateAmount"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
@@ -354,30 +351,22 @@
|
|
|
{{
|
|
|
(scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
scope.row.ke_discAmount * scope.row.ke_refundableQty) *
|
|
|
- scope.row.ke_rebateRate
|
|
|
+ scope.row.ke_rebateRate
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="right"
|
|
|
- label="格力折扣"
|
|
|
- prop="ke_discAmount"
|
|
|
- min-width="100"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- {{
|
|
|
- scope.row.ke_discAmount * scope.row.ke_refundableQty
|
|
|
- }}
|
|
|
+ <el-table-column align="right" label="格力折扣" prop="ke_discAmount" min-width="100" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.ke_discAmount * scope.row.ke_refundableQty }}
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="现金钱包"
|
|
|
prop="walletName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<!-- {{
|
|
|
@@ -387,9 +376,9 @@
|
|
|
}} -->
|
|
|
{{
|
|
|
scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
- scope.row.ke_discAmount * scope.row.ke_refundableQty -
|
|
|
- (scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
- scope.row.ke_discAmount * scope.row.ke_refundableQty) *
|
|
|
+ scope.row.ke_discAmount * scope.row.ke_refundableQty -
|
|
|
+ (scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
+ scope.row.ke_discAmount * scope.row.ke_refundableQty) *
|
|
|
scope.row.ke_rebateRate
|
|
|
}}
|
|
|
</template>
|
|
|
@@ -406,7 +395,7 @@
|
|
|
<div class="page-footer">
|
|
|
<div class="footer">
|
|
|
<el-button type="primary" @click="submitForm">提交置换</el-button>
|
|
|
- <el-popconfirm title="确定要重置吗？" @onConfirm="resetForm" style="margin-left: 10px">
|
|
|
+ <el-popconfirm title="确定要重置吗？" style="margin-left: 10px" @onConfirm="resetForm">
|
|
|
<el-button slot="reference">重 置</el-button>
|
|
|
</el-popconfirm>
|
|
|
</div>
|
|
|
@@ -423,22 +412,22 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="number" label="物料编码">
|
|
|
- <el-input v-model="beiGoodsDialog_screenForm.number" placeholder="请输入物料编码"></el-input>
|
|
|
+ <el-input v-model="beiGoodsDialog_screenForm.number" placeholder="请输入物料编码" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="oldNumber" label="产品编码">
|
|
|
- <el-input v-model="beiGoodsDialog_screenForm.oldNumber" placeholder="请输入产品编码"></el-input>
|
|
|
+ <el-input v-model="beiGoodsDialog_screenForm.oldNumber" placeholder="请输入产品编码" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="keyword" label="产品名称">
|
|
|
- <el-input v-model="beiGoodsDialog_screenForm.keyword" placeholder="请输入产品名称"></el-input>
|
|
|
+ <el-input v-model="beiGoodsDialog_screenForm.keyword" placeholder="请输入产品名称" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item label="规格型号" prop="specification">
|
|
|
- <el-input v-model="beiGoodsDialog_screenForm.specification" placeholder="请输入规格型号"></el-input>
|
|
|
+ <el-input v-model="beiGoodsDialog_screenForm.specification" placeholder="请输入规格型号" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="24" :lg="24" class="tr">
|
|
|
@@ -465,9 +454,9 @@
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
- @click="submitChooseBeiGoods(scope.row)"
|
|
|
:disabled="scope.row.selected"
|
|
|
- >选择
|
|
|
+ @click="submitChooseBeiGoods(scope.row)"
|
|
|
+ >选择
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -477,47 +466,46 @@
|
|
|
prop="number"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品编码"
|
|
|
prop="oldNumber"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="name"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="是否可被置换"
|
|
|
prop="unit"
|
|
|
min-width="80"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
</el-table>
|
|
|
<div class="pagination clearfix" style="margin-top: 10px">
|
|
|
<div class="fr">
|
|
|
<el-pagination
|
|
|
- @current-change="changeBeiGoodsDialogPage"
|
|
|
:current-page="beiGoodsDialog_currentPage"
|
|
|
:page-size="100"
|
|
|
background
|
|
|
layout="prev, pager, next"
|
|
|
:total="beiGoodsDialog_listTotal"
|
|
|
- >
|
|
|
- </el-pagination>
|
|
|
+ @current-change="changeBeiGoodsDialogPage"
|
|
|
+ />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -538,22 +526,22 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="number" label="物料编码">
|
|
|
- <el-input v-model="keGoodsDialog_screenForm.number" placeholder="请输入物料编码"></el-input>
|
|
|
+ <el-input v-model="keGoodsDialog_screenForm.number" placeholder="请输入物料编码" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="oldNumber" label="产品编码">
|
|
|
- <el-input v-model="keGoodsDialog_screenForm.oldNumber" placeholder="请输入产品编码"></el-input>
|
|
|
+ <el-input v-model="keGoodsDialog_screenForm.oldNumber" placeholder="请输入产品编码" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="keyword" label="产品名称">
|
|
|
- <el-input v-model="keGoodsDialog_screenForm.keyword" placeholder="请输入产品名称"></el-input>
|
|
|
+ <el-input v-model="keGoodsDialog_screenForm.keyword" placeholder="请输入产品名称" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item label="规格型号" prop="specification">
|
|
|
- <el-input v-model="keGoodsDialog_screenForm.specification" placeholder="请输入规格型号"></el-input>
|
|
|
+ <el-input v-model="keGoodsDialog_screenForm.specification" placeholder="请输入规格型号" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<!-- <el-col :xs="12" :sm="6" :lg="6">
|
|
|
@@ -579,6 +567,7 @@
|
|
|
|
|
|
<div class="table">
|
|
|
<el-table
|
|
|
+ v-show="type === 1"
|
|
|
:data="keGoodsDialog_list"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -587,39 +576,39 @@
|
|
|
stripe
|
|
|
height="400"
|
|
|
@selection-change="changeKeGoodsDialogSelection"
|
|
|
- v-show="type === 1"
|
|
|
>
|
|
|
- <el-table-column align="center" type="selection" width="55" :selectable="checkboxSelect"></el-table-column>
|
|
|
+ <el-table-column align="center" type="selection" width="55" :selectable="checkboxSelect" />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="物料编码"
|
|
|
prop="number"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品编码"
|
|
|
prop="oldNumber"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="name"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
</el-table>
|
|
|
<el-table
|
|
|
+ v-show="type === 2"
|
|
|
:data="keGoodsDialog_list"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -627,16 +616,15 @@
|
|
|
highlight-current-row
|
|
|
stripe
|
|
|
height="400"
|
|
|
- v-show="type === 2"
|
|
|
>
|
|
|
<el-table-column align="center" width="80">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
- @click="submitChooseKeGoods(scope.row)"
|
|
|
:disabled="scope.row.selected"
|
|
|
- >选择
|
|
|
+ @click="submitChooseKeGoods(scope.row)"
|
|
|
+ >选择
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -646,47 +634,46 @@
|
|
|
prop="number"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品编码"
|
|
|
prop="oldNumber"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="name"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
</el-table>
|
|
|
<div class="pagination clearfix" style="margin-top: 10px">
|
|
|
<div class="fr">
|
|
|
<el-pagination
|
|
|
- @current-change="changeKeGoodsDialogPage"
|
|
|
:current-page="keGoodsDialog_currentPage"
|
|
|
:page-size="100"
|
|
|
background
|
|
|
layout="prev, pager, next"
|
|
|
:total="keGoodsDialog_listTotal"
|
|
|
- >
|
|
|
- </el-pagination>
|
|
|
+ @current-change="changeKeGoodsDialogPage"
|
|
|
+ />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="closeKeGoodsDialog">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitChooseKeGoods" v-if="type === 1">确 定</el-button>
|
|
|
+ <el-button v-if="type === 1" type="primary" @click="submitChooseKeGoods">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -701,17 +688,17 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="id" label="订单号">
|
|
|
- <el-input v-model="orderDialog_screenForm.id" placeholder="请输入订单号"></el-input>
|
|
|
+ <el-input v-model="orderDialog_screenForm.id" placeholder="请输入订单号" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="customerName" label="经销商名称">
|
|
|
- <el-input v-model="orderDialog_screenForm.customerName" placeholder="请输入经销商名称"></el-input>
|
|
|
+ <el-input v-model="orderDialog_screenForm.customerName" placeholder="请输入经销商名称" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item prop="customerNumber" label="经销商编号">
|
|
|
- <el-input v-model="orderDialog_screenForm.customerNumber" placeholder="请输入经销商编号"></el-input>
|
|
|
+ <el-input v-model="orderDialog_screenForm.customerNumber" placeholder="请输入经销商编号" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
@@ -728,8 +715,7 @@
|
|
|
:key="item.priceTypeId"
|
|
|
:label="item.priceTypeName"
|
|
|
:value="item.priceTypeName"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -744,6 +730,7 @@
|
|
|
|
|
|
<div class="table">
|
|
|
<el-table
|
|
|
+ v-show="type === 1"
|
|
|
:data="orderDialog_list"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -751,12 +738,15 @@
|
|
|
highlight-current-row
|
|
|
stripe
|
|
|
height="400"
|
|
|
- v-show="type === 1"
|
|
|
>
|
|
|
<el-table-column align="center" width="80">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button type="primary" size="mini" @click="submitChooseOrder(scope.row)" :disabled="scope.row.selected"
|
|
|
- >选择
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ :disabled="scope.row.selected"
|
|
|
+ @click="submitChooseOrder(scope.row)"
|
|
|
+ >选择
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -766,14 +756,14 @@
|
|
|
prop="id"
|
|
|
min-width="120"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="直调状态"
|
|
|
prop="directTransferStatusName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column align="left" label="经销商信息" prop="materialName" min-width="250" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.customerName + '(' + scope.row.customerNumber + ')' }}
|
|
|
@@ -785,30 +775,31 @@
|
|
|
prop="saleTypeName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="materialName"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="250"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="可被置换数量"
|
|
|
prop="refundableQty"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
</el-table>
|
|
|
<el-table
|
|
|
+ v-show="type === 2"
|
|
|
:data="orderDialog_list"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -817,29 +808,28 @@
|
|
|
stripe
|
|
|
height="400"
|
|
|
@selection-change="changeOrderDialogSelection"
|
|
|
- v-show="type === 2"
|
|
|
>
|
|
|
<el-table-column
|
|
|
+ v-if="type === 2"
|
|
|
align="center"
|
|
|
type="selection"
|
|
|
width="55"
|
|
|
:selectable="checkboxSelect"
|
|
|
- v-if="type === 2"
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="订单号"
|
|
|
prop="id"
|
|
|
min-width="120"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="直调状态"
|
|
|
prop="directTransferStatusName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column align="left" label="经销商信息" prop="materialName" min-width="250" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.customerName + '(' + scope.row.customerNumber + ')' }}
|
|
|
@@ -851,54 +841,53 @@
|
|
|
prop="saleTypeName"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品名称"
|
|
|
prop="materialName"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="规格型号"
|
|
|
prop="specification"
|
|
|
min-width="250"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="价格类型"
|
|
|
prop="priceType"
|
|
|
min-width="250"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="可被置换数量"
|
|
|
prop="refundableQty"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
- ></el-table-column>
|
|
|
+ />
|
|
|
</el-table>
|
|
|
<div class="pagination clearfix" style="margin-top: 10px">
|
|
|
<div class="fr">
|
|
|
<el-pagination
|
|
|
- @current-change="changeOrderDialogPage"
|
|
|
:current-page="orderDialog_currentPage"
|
|
|
:page-size="100"
|
|
|
background
|
|
|
layout="prev, pager, next"
|
|
|
:total="orderDialog_listTotal"
|
|
|
- >
|
|
|
- </el-pagination>
|
|
|
+ @current-change="changeOrderDialogPage"
|
|
|
+ />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="closeOrderDialog">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitChooseOrder" v-if="type === 2">确 定</el-button>
|
|
|
+ <el-button v-if="type === 2" type="primary" @click="submitChooseOrder">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -971,8 +960,9 @@ export default {
|
|
|
watch: {
|
|
|
keGoodsList: {
|
|
|
deep: true,
|
|
|
- handler: function (val, oal) {
|
|
|
+ handler: function(val, oal) {
|
|
|
if (this.orderList.length && this.type === 2) {
|
|
|
+
|
|
|
this.orderList.forEach(item => {
|
|
|
item.ke_materialName = val[0].name
|
|
|
item.ke_specification = val[0].specification
|
|
|
@@ -984,7 +974,10 @@ export default {
|
|
|
item.ke_rebateWalletName = val[0].rebateWalletName
|
|
|
item.ke_walletRebateId = val[0].walletRebateId
|
|
|
item.ke_discAmount = val[0].discAmount
|
|
|
+ item.ke_rebateRate = val[0].rebateRate
|
|
|
+
|
|
|
})
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1058,12 +1051,12 @@ export default {
|
|
|
pageSize: 100,
|
|
|
...this.beiGoodsDialog_screenForm
|
|
|
}).then(res => {
|
|
|
- let oldGoodsList = this.beiGoodsList
|
|
|
- let newGoodsList = res.data.records
|
|
|
+ const oldGoodsList = this.beiGoodsList
|
|
|
+ const newGoodsList = res.data.records
|
|
|
for (let i = 0; i < oldGoodsList.length; i++) {
|
|
|
- let oldItem = oldGoodsList[i]
|
|
|
+ const oldItem = oldGoodsList[i]
|
|
|
for (let j = 0; j < newGoodsList.length; j++) {
|
|
|
- let newItem = newGoodsList[j]
|
|
|
+ const newItem = newGoodsList[j]
|
|
|
if (newItem.id === oldItem.id) {
|
|
|
newGoodsList[j].selected = true
|
|
|
break
|
|
|
@@ -1174,12 +1167,12 @@ export default {
|
|
|
pageSize: 100,
|
|
|
...this.keGoodsDialog_screenForm
|
|
|
}).then(res => {
|
|
|
- let oldGoodsList = this.keGoodsList
|
|
|
- let newGoodsList = res.data.records
|
|
|
+ const oldGoodsList = this.keGoodsList
|
|
|
+ const newGoodsList = res.data.records
|
|
|
for (let i = 0; i < oldGoodsList.length; i++) {
|
|
|
- let oldItem = oldGoodsList[i]
|
|
|
+ const oldItem = oldGoodsList[i]
|
|
|
for (let j = 0; j < newGoodsList.length; j++) {
|
|
|
- let newItem = newGoodsList[j]
|
|
|
+ const newItem = newGoodsList[j]
|
|
|
if (newItem.id === oldItem.id) {
|
|
|
newGoodsList[j].selected = true
|
|
|
break
|
|
|
@@ -1271,12 +1264,12 @@ export default {
|
|
|
isOver: false,
|
|
|
...this.orderDialog_screenForm
|
|
|
}).then(res => {
|
|
|
- let oldGoodsList = this.orderList
|
|
|
- let newGoodsList = res.data.records
|
|
|
+ const oldGoodsList = this.orderList
|
|
|
+ const newGoodsList = res.data.records
|
|
|
for (let i = 0; i < oldGoodsList.length; i++) {
|
|
|
- let oldItem = oldGoodsList[i]
|
|
|
+ const oldItem = oldGoodsList[i]
|
|
|
for (let j = 0; j < newGoodsList.length; j++) {
|
|
|
- let newItem = newGoodsList[j]
|
|
|
+ const newItem = newGoodsList[j]
|
|
|
if (newItem.orderItemId === oldItem.orderItemId) {
|
|
|
newGoodsList[j].selected = true
|
|
|
break
|
|
|
@@ -1340,7 +1333,7 @@ export default {
|
|
|
}
|
|
|
// 批量置换（多选）
|
|
|
else {
|
|
|
- let orderList = JSON.parse(JSON.stringify(this.orderDialog_selection))
|
|
|
+ const orderList = JSON.parse(JSON.stringify(this.orderDialog_selection))
|
|
|
orderList.forEach(item => {
|
|
|
item.ke_materialName = this.keGoodsList[0].name
|
|
|
item.ke_specification = this.keGoodsList[0].specification
|
|
|
@@ -1381,7 +1374,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- let params = {
|
|
|
+ const params = {
|
|
|
type: this.type,
|
|
|
newDiscAmount: this.keGoodsList[0].discAmount,
|
|
|
newPrice: this.keGoodsList[0].price,
|
zh