|
@@ -3,7 +3,7 @@
|
|
|
<template slot-scope="{activeKey, data}">
|
|
|
<template-page v-if="activeKey == 'list'" ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
|
|
|
:options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
|
|
|
- :operation="operation()" :exportList="exportList">
|
|
|
+ :operation="operation()" :exportList="exportList" :operationColumnWidth="160">
|
|
|
<div slot="moreSearch">
|
|
|
<el-radio-group v-model="examineStatus" size="mini" @change="changeType">
|
|
|
<el-radio-button label="">全部</el-radio-button>
|
|
@@ -23,14 +23,14 @@
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="所属商户" prop="companyWechatName">
|
|
|
- <el-input v-model="formData.companyWechatName" autocomplete="off" placeholder="请输入所属商户" disabled></el-input>
|
|
|
+ <el-form-item label="所属商户" prop="companyName">
|
|
|
+ <el-input v-model="formData.companyName" autocomplete="off" placeholder="请输入所属商户" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="销售类型" prop="saleType">
|
|
|
<el-radio-group v-model="formData.saleType" disabled>
|
|
|
- <el-radio :label="1">商城销售</el-radio>
|
|
|
+ <el-radio :label="1">线上销售</el-radio>
|
|
|
<el-radio :label="2">线下销售</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
@@ -291,7 +291,7 @@
|
|
|
{{detailData.companyName}}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="销售类型">
|
|
|
- {{{1: '商城销售', 2: '线下销售'}[detailData.saleType]}}
|
|
|
+ {{{1: '线上销售', 2: '线下销售'}[detailData.saleType]}}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="订单单号">
|
|
|
{{detailData.orderId}}
|
|
@@ -425,7 +425,7 @@ export default {
|
|
|
formDialog: false,
|
|
|
formData: {
|
|
|
id: '',
|
|
|
- companyWechatName: '', // 所属商户
|
|
|
+ companyName: '', // 所属商户
|
|
|
saleType: 2, // 销售类型
|
|
|
orderId: '', // 订单编号
|
|
|
orderSmallType: '', // 工单类型
|
|
@@ -586,6 +586,20 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ orderDetail: {
|
|
|
+ conditions: ({ row, index, column }) => {
|
|
|
+ return row.saleType == 1
|
|
|
+ },
|
|
|
+ btnType: 'text',
|
|
|
+ click: ({ row, index, column }) => {
|
|
|
+ this.$router.push({
|
|
|
+ name: "order_detail",
|
|
|
+ query: {
|
|
|
+ orderId: row.orderId
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
})
|
|
|
},
|
|
|
openForm(type, id) {
|
|
@@ -606,7 +620,7 @@ export default {
|
|
|
this.formVisible = true;
|
|
|
if (type == 'add') {
|
|
|
this.formDialogType = 0
|
|
|
- this.formData.companyWechatName = this.name;
|
|
|
+ this.formData.companyName = this.name;
|
|
|
this.getinitlbslist();
|
|
|
} else if(type == 'edit'){
|
|
|
this.formDialogType = 1;
|