|
@@ -135,23 +135,25 @@
|
|
|
<el-col :span="3" style="height: 100%;">
|
|
|
<div class="col-item">
|
|
|
<div style="display: flex; align-items: center;">
|
|
|
- <span style="margin-left: 4px">{{ ({SAVE: "买家下单", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "交易完成", TIME_OUT: "超时", CANCEL: "取消", WAIT_REFUND: "售后中", REFUND: "已退"})[order.status] }}</span>
|
|
|
+ <span style="margin-left: 4px">{{ ({SAVE: "待支付", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "交易完成", TIME_OUT: "超时", CANCEL: "取消", WAIT_REFUND: "售后中", REFUND: "已退"})[order.status] }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<el-col :span="3" style="height: 100%;">
|
|
|
<div class="col-item">
|
|
|
<div class="operate">
|
|
|
- <el-popconfirm title="确认订单吗?" @confirm="quedingesOrderPayOk">
|
|
|
+ <el-popconfirm v-if="~['WAIT'].indexOf(order.status)" title="确认订单吗?" @confirm="quedingesOrderPayOk">
|
|
|
<el-button slot="reference" type="text" size="small">确认订单</el-button>
|
|
|
</el-popconfirm>
|
|
|
- <el-popconfirm title="确认取消订单吗?" @confirm="quedingesOrderCancel">
|
|
|
+ <el-popconfirm v-if="~['SAVE','WAIT'].indexOf(order.status)" title="确认取消订单吗?" @confirm="quedingesOrderCancel">
|
|
|
<el-button slot="reference" type="text" size="small">取消订单</el-button>
|
|
|
</el-popconfirm>
|
|
|
- <el-button @click="viewMaterialFlow(order)" type="text" size="small">查看物流</el-button>
|
|
|
- <el-button @click="viewDetails(order, 0)" type="text" size="small">查看详情</el-button>
|
|
|
- <el-button @click="viewDetails(order, 1)" type="text" size="small">确认收款</el-button>
|
|
|
- <el-button @click="viewDetails(order, 2)" type="text" size="small">退货</el-button>
|
|
|
+ <el-button v-if="~['SEND','OVER'].indexOf(order.status)" @click="viewMaterialFlow(order)" type="text" size="small">查看物流</el-button>
|
|
|
+ <el-button v-if="~['SAVE', 'WAIT', 'PAID', 'SEND', 'OVER', 'CANCEL', 'TIME_OUT'].indexOf(order.status)" @click="viewDetails(order, 0)" type="text" size="small">查看详情</el-button>
|
|
|
+ <el-button v-if="~['SAVE'].indexOf(order.status)" @click="viewDetails(order, 1)" type="text" size="small">确认收款</el-button>
|
|
|
+ <el-button v-if="~['SEND','OVER'].indexOf(order.status)" @click="viewDetails(order, 2)" type="text" size="small">发起退货</el-button>
|
|
|
+ <el-button v-if="~['PAID'].indexOf(order.status)" type="text" @click="gofahuo(order)" size="small">发货</el-button>
|
|
|
+ <el-button v-if="~['PAID','SEND'].indexOf(order.status)" type="text" size="small">打印</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-col>
|
|
@@ -204,6 +206,9 @@
|
|
|
<div v-if="activeKey == 'materialFlow'" style="width:100%;height:100%;">
|
|
|
<materialFlow :detailsId="detailsId"/>
|
|
|
</div>
|
|
|
+ <!-- 发货 -->
|
|
|
+ <div v-if="activeKey == 'fahuo'" style="width:100%;height:100%;">
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</zj-tab-page>
|
|
|
</zj-page-fill>
|
|
@@ -327,6 +332,24 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ gofahuo (row) {
|
|
|
+ this.$refs.tabPage.addTab({
|
|
|
+ // 对应显示的模块
|
|
|
+ activeKey: "fahuo",
|
|
|
+ // 唯一标识
|
|
|
+ key: "fahuo",
|
|
|
+ // 页签名称
|
|
|
+ label: "发货",
|
|
|
+ // 打开时事件
|
|
|
+ triggerEvent: () => {
|
|
|
+ this.detailsId = row.esOrderId
|
|
|
+ },
|
|
|
+ // 关闭时事件
|
|
|
+ closeEvent: () => {
|
|
|
+
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
changeTabs(tab, event) {
|
|
|
this.screenForm.status = this.tabCurrent === 'ALL' ? '' : tab.$options.propsData.name
|
|
|
this.currentPage = 1;
|