|
|
@@ -109,7 +109,7 @@
|
|
|
<el-divider direction="vertical" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="table" >
|
|
|
+ <div class="table">
|
|
|
<el-table
|
|
|
:data="goodsList"
|
|
|
element-loading-text="Loading"
|
|
|
@@ -134,7 +134,7 @@
|
|
|
/>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- label="存货编码"
|
|
|
+ label="物料编码"
|
|
|
prop="materialNumber"
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
@@ -264,32 +264,32 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- label="业务员"-->
|
|
|
-<!-- prop="retiredQty"-->
|
|
|
-<!-- min-width="160"-->
|
|
|
-<!-- show-overflow-tooltip-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-select-->
|
|
|
-<!-- v-model="scope.row.serviceName"-->
|
|
|
-<!-- size="small"-->
|
|
|
-<!-- disabled-->
|
|
|
-<!-- placeholder="选择业务员"-->
|
|
|
-
|
|
|
-<!-- style="width: 100%"-->
|
|
|
-<!-- @change="handleUser2($event,scope.row)"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <el-option-->
|
|
|
-<!-- v-for="item in scope.row.userList"-->
|
|
|
-<!-- :key="item.adminUserId"-->
|
|
|
-<!-- :label="item.nickName"-->
|
|
|
-<!-- :value="item.adminUserId"-->
|
|
|
-<!-- />-->
|
|
|
-<!-- </el-select>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column-->
|
|
|
+ <!-- align="center"-->
|
|
|
+ <!-- label="业务员"-->
|
|
|
+ <!-- prop="retiredQty"-->
|
|
|
+ <!-- min-width="160"-->
|
|
|
+ <!-- show-overflow-tooltip-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <el-select-->
|
|
|
+ <!-- v-model="scope.row.serviceName"-->
|
|
|
+ <!-- size="small"-->
|
|
|
+ <!-- disabled-->
|
|
|
+ <!-- placeholder="选择业务员"-->
|
|
|
+
|
|
|
+ <!-- style="width: 100%"-->
|
|
|
+ <!-- @change="handleUser2($event,scope.row)"-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <el-option-->
|
|
|
+ <!-- v-for="item in scope.row.userList"-->
|
|
|
+ <!-- :key="item.adminUserId"-->
|
|
|
+ <!-- :label="item.nickName"-->
|
|
|
+ <!-- :value="item.adminUserId"-->
|
|
|
+ <!-- />-->
|
|
|
+ <!-- </el-select>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
label="实付金额"
|
|
|
@@ -302,7 +302,7 @@
|
|
|
{{ (((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100).toFixed(2) }}
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- {{ (scope.row.price*scope.row.qty ).toFixed(2)}}
|
|
|
+ {{ (scope.row.price*scope.row.qty ).toFixed(2) }}
|
|
|
</template>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -346,18 +346,18 @@
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
- v-if="!listItem"
|
|
|
- align="center"
|
|
|
- label="总仓库"
|
|
|
- prop="status1"
|
|
|
- min-width="100"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <div>{{ scope.row.status1 | status1Filter }}</div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <!-- <el-table-column-->
|
|
|
+ <!-- v-if="!listItem"-->
|
|
|
+ <!-- align="center"-->
|
|
|
+ <!-- label="总仓库"-->
|
|
|
+ <!-- prop="status1"-->
|
|
|
+ <!-- min-width="100"-->
|
|
|
+ <!-- show-overflow-tooltip-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <div>{{ scope.row.status1 | status1Filter }}</div>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
<el-table-column
|
|
|
v-if="!listItem"
|
|
|
align="center"
|
|
|
@@ -413,7 +413,7 @@
|
|
|
size="small"
|
|
|
>
|
|
|
<el-row v-if="factor.length && !dataList.length" style="margin: 0 0 20px 0;font-size: 20px;">
|
|
|
- 引用销售政策说明：{{!remark ? factor[0].name : remark }} 配提比列：{{pop}}
|
|
|
+ 引用销售政策说明：{{ !remark ? factor[0].name : remark }} 配提比列：{{ pop }}
|
|
|
</el-row>
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :xs="24" :sm="6" :lg="6">
|
|
|
@@ -426,8 +426,6 @@
|
|
|
style="width: 100%"
|
|
|
@change="handlePolicy"
|
|
|
>
|
|
|
- <el-option label="默认" :value="''" />
|
|
|
-
|
|
|
<el-option
|
|
|
v-for="(item, index) in policyList"
|
|
|
:key="index"
|
|
|
@@ -580,9 +578,9 @@
|
|
|
</el-pagination>
|
|
|
</div> -->
|
|
|
</div>
|
|
|
-<!-- <div v-if="factor.length">-->
|
|
|
-<!-- 引用销售政策说明：{{ factor.length ? factor[0].name : "" }} 配提比列：{{pop}}-->
|
|
|
-<!-- </div>-->
|
|
|
+ <!-- <div v-if="factor.length">-->
|
|
|
+ <!-- 引用销售政策说明：{{ factor.length ? factor[0].name : "" }} 配提比列：{{pop}}-->
|
|
|
+ <!-- </div>-->
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="hanlePopData">完成</el-button>
|
|
|
</span>
|
|
|
@@ -826,7 +824,7 @@ export default {
|
|
|
totalArr: [],
|
|
|
type: 1,
|
|
|
newMultipleSelections: [],
|
|
|
- remark:''
|
|
|
+ remark: ''
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -953,16 +951,15 @@ export default {
|
|
|
})[0]
|
|
|
this.$set(row, 'serviceId', user.adminUserId)
|
|
|
this.$set(row, 'serviceName', user.nickName)
|
|
|
- this.$set(this.mainForm,'k3ServiceId',user.adminUserId)
|
|
|
- this.$set(this.mainForm,'k3ServiceName',user.nickName)
|
|
|
-
|
|
|
+ this.$set(this.mainForm, 'k3ServiceId', user.adminUserId)
|
|
|
+ this.$set(this.mainForm, 'k3ServiceName', user.nickName)
|
|
|
},
|
|
|
// 返回列表
|
|
|
goBack() {
|
|
|
this.$emit('backListFormDetail')
|
|
|
},
|
|
|
|
|
|
- handleWallets(e, row,index) {
|
|
|
+ handleWallets(e, row, index) {
|
|
|
if (e) {
|
|
|
const service = row.wallets.filter((k) => {
|
|
|
return e == k.customerWalletId
|
|
|
@@ -971,12 +968,12 @@ export default {
|
|
|
this.$set(this.mainForm, 'k3ServiceName', service.serviceName)
|
|
|
this.$set(row, 'serviceId', service.serviceId)
|
|
|
this.$set(row, 'serviceName', service.serviceName)
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
console.log(index)
|
|
|
- if (index ===0){
|
|
|
- this.$set(this.mainForm, 'k3ServiceId', '')
|
|
|
- this.$set(this.mainForm, 'k3ServiceName', '')
|
|
|
- }
|
|
|
+ if (index === 0) {
|
|
|
+ this.$set(this.mainForm, 'k3ServiceId', '')
|
|
|
+ this.$set(this.mainForm, 'k3ServiceName', '')
|
|
|
+ }
|
|
|
this.$set(row, 'serviceId', '')
|
|
|
this.$set(row, 'serviceName', '')
|
|
|
}
|
|
|
@@ -1087,7 +1084,6 @@ export default {
|
|
|
}
|
|
|
const datas = data.records
|
|
|
if (this.listItem) {
|
|
|
-
|
|
|
for (let i = 0; i < this.goodsList.length; i++) {
|
|
|
for (let j = 0; j < datas.length; j++) {
|
|
|
if (datas[j].id == this.goodsList[i].policyMaterialId) {
|
|
|
@@ -1286,7 +1282,6 @@ export default {
|
|
|
this.$set(this.multipleData[i], 'customerWalletId', this.multipleData[i].wallets[0].customerWalletId)
|
|
|
this.$set(this.multipleData[i], 'serviceName', this.multipleData[i].wallets[0].serviceName)
|
|
|
this.$set(this.multipleData[i], 'serviceId', this.multipleData[i].wallets[0].serviceId)
|
|
|
-
|
|
|
}
|
|
|
arrData = [...arrData, ...this.multipleData[i]]
|
|
|
}
|
|
|
@@ -1682,23 +1677,21 @@ export default {
|
|
|
},
|
|
|
// 修改返利钱包
|
|
|
changeWallet(e, row) {
|
|
|
- if (e){
|
|
|
- const obj = row.rebateWallets.filter(k => {
|
|
|
- return e === k.customerWalletId
|
|
|
- })[0]
|
|
|
- this.$set(row, 'rebateRate', (obj.rebateRate || 0))
|
|
|
- }else{
|
|
|
- this.$set(row, 'rebateRate', 0)
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
+ if (e) {
|
|
|
+ const obj = row.rebateWallets.filter(k => {
|
|
|
+ return e === k.customerWalletId
|
|
|
+ })[0]
|
|
|
+ this.$set(row, 'rebateRate', (obj.rebateRate || 0))
|
|
|
+ } else {
|
|
|
+ this.$set(row, 'rebateRate', 0)
|
|
|
+ }
|
|
|
},
|
|
|
- clearWallet(e){
|
|
|
+ clearWallet(e) {
|
|
|
console.log(e)
|
|
|
// const obj = row.rebateWallets.filter(k => {
|
|
|
// return e === k.customerWalletId
|
|
|
// })[0]
|
|
|
- this.$set(row, 'rebateRate',0)
|
|
|
+ this.$set(row, 'rebateRate', 0)
|
|
|
},
|
|
|
// 检查库存
|
|
|
checkStock() {
|
莫绍宝