|
@@ -275,7 +275,7 @@
|
|
|
<el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
- <div class="table" style="margin-top: 20px" v-if="detailData.examineStatus == 'OK'">
|
|
|
+ <div v-if="detailData.examineStatus == 'OK'" class="table" style="margin-top: 20px">
|
|
|
<el-table
|
|
|
:data="detailData.refundNoteList"
|
|
|
element-loading-text="Loading"
|
|
@@ -287,10 +287,10 @@
|
|
|
show-summary
|
|
|
:summary-method="$getSummaries"
|
|
|
>
|
|
|
- <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
|
|
|
- <el-table-column align="left" label="创建人" prop="createBy" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="创建时间" prop="createTime" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="退订说明" prop="refundNote" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="center" label="序号" type="index" width="50" />
|
|
|
+ <el-table-column align="left" label="创建人" prop="createBy" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="创建时间" prop="createTime" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="退订说明" prop="refundNote" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -302,21 +302,22 @@
|
|
|
v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'"
|
|
|
type="danger"
|
|
|
@click="closeData"
|
|
|
- >关闭订单</el-button
|
|
|
- >
|
|
|
+ >关闭订单</el-button>
|
|
|
<!-- <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button> -->
|
|
|
|
|
|
<template v-if="detailData.isPlanOrder === 'true'">
|
|
|
- <el-button v-if="!isDealer" type="primary" :disabled="detailData.directTransferStatus" @click="overData"
|
|
|
- >直调完结</el-button
|
|
|
- >
|
|
|
+ <el-button
|
|
|
+ v-if="!isDealer"
|
|
|
+ type="primary"
|
|
|
+ :disabled="detailData.directTransferStatus"
|
|
|
+ @click="overData"
|
|
|
+ >直调完结</el-button>
|
|
|
<el-button
|
|
|
v-if="!isDealer"
|
|
|
type="primary"
|
|
|
:disabled="detailData.directTransferStatus"
|
|
|
@click="openDeliverDialog"
|
|
|
- >直调发货</el-button
|
|
|
- >
|
|
|
+ >直调发货</el-button>
|
|
|
</template>
|
|
|
<el-button @click="goBack">返回列表</el-button>
|
|
|
</div>
|
|
@@ -745,6 +746,7 @@ export default {
|
|
|
|
|
|
// 提交 直调发货
|
|
|
submitDeliverForm() {
|
|
|
+ console.log(this.deliverGoodsList)
|
|
|
this.$refs.deliverForm.validate(valid => {
|
|
|
if (valid) {
|
|
|
for (let i = 0; i < this.deliverGoodsList.length; i++) {
|
|
@@ -753,6 +755,9 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
+ // const arr = this.deliverGoodsList.filter(k => {
|
|
|
+ // return k.directTransferQty !== 0 || k.directTransferQty !== null
|
|
|
+ // })
|
|
|
const params = {
|
|
|
enginOrderId: this.detailData.enginOrderId,
|
|
|
enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
|