|
@@ -85,7 +85,7 @@
|
|
|
></el-option>
|
|
></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>-->
|
|
</el-form-item>-->
|
|
|
- <el-form-item label="审阅状态" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
|
|
|
|
|
+ <!-- <el-form-item label="审阅状态" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
|
<el-select
|
|
<el-select
|
|
|
v-model="dataForm.auditStatus"
|
|
v-model="dataForm.auditStatus"
|
|
|
clearable
|
|
clearable
|
|
@@ -105,7 +105,7 @@
|
|
|
<el-option key="1" label="推广单" value="1"></el-option>
|
|
<el-option key="1" label="推广单" value="1"></el-option>
|
|
|
<el-option key="0" label="普通单" value="0"></el-option>
|
|
<el-option key="0" label="普通单" value="0"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
- </el-form-item>
|
|
|
|
|
|
|
+ </el-form-item>-->
|
|
|
|
|
|
|
|
<!--<el-form-item :label="this.$i18n.t('group.orderStatus') + ':'" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
<!--<el-form-item :label="this.$i18n.t('group.orderStatus') + ':'" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
|
<el-select
|
|
<el-select
|
|
@@ -139,7 +139,7 @@
|
|
|
size="small"
|
|
size="small"
|
|
|
></el-input>
|
|
></el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <!--<el-form-item :label="this.$i18n.t('order.paymentMethod') + ':'" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
|
|
|
|
|
+ <el-form-item :label="this.$i18n.t('order.paymentMethod') + ':'" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
|
<template>
|
|
<template>
|
|
|
<el-select
|
|
<el-select
|
|
|
v-model="dataForm.payType"
|
|
v-model="dataForm.payType"
|
|
@@ -155,7 +155,7 @@
|
|
|
></el-option>
|
|
></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</template>
|
|
</template>
|
|
|
- </el-form-item>-->
|
|
|
|
|
|
|
+ </el-form-item>
|
|
|
<!-- -->
|
|
<!-- -->
|
|
|
<el-form-item label="快递单号" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
<el-form-item label="快递单号" :label-width=" lang === 'en' ? '145px' : '85px'">
|
|
|
<el-input
|
|
<el-input
|
|
@@ -414,13 +414,13 @@
|
|
|
<span class="order-index">No.{{index + 1}}</span>
|
|
<span class="order-index">No.{{index + 1}}</span>
|
|
|
<span class="order-number">{{ $t("order.number") }}:{{ order.orderNumber }}</span>
|
|
<span class="order-number">{{ $t("order.number") }}:{{ order.orderNumber }}</span>
|
|
|
<span class="order-time">{{ $t("order.createTime") }}:{{ order.createTime }}</span>
|
|
<span class="order-time">{{ $t("order.createTime") }}:{{ order.createTime }}</span>
|
|
|
- <el-tag effect="dark" v-if="order.auditStatus==0" type="danger">待审阅</el-tag>
|
|
|
|
|
|
|
+ <!--<el-tag effect="dark" v-if="order.auditStatus==0" type="danger">待审阅</el-tag>
|
|
|
<el-tag effect="dark" v-else-if="order.auditStatus==1" type="success">已审阅</el-tag>
|
|
<el-tag effect="dark" v-else-if="order.auditStatus==1" type="success">已审阅</el-tag>
|
|
|
- <el-tag effect="dark" v-else type="danger">待审阅</el-tag>
|
|
|
|
|
- <div v-if="order.isPromotion === 1">
|
|
|
|
|
|
|
+ <el-tag effect="dark" v-else type="danger">待审阅</el-tag>-->
|
|
|
|
|
+ <!--<div v-if="order.isPromotion === 1">
|
|
|
<el-tag effect="dark" v-if="order.isPromotion === 1" type="primary">推广单</el-tag>
|
|
<el-tag effect="dark" v-if="order.isPromotion === 1" type="primary">推广单</el-tag>
|
|
|
<el-button type="text" @click="openOrderPromotionDialog(order.orderNumber, order.prodName)">推广链接</el-button>
|
|
<el-button type="text" @click="openOrderPromotionDialog(order.orderNumber, order.prodName)">推广链接</el-button>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>-->
|
|
|
|
|
|
|
|
<!-- <span>店铺名称:{{order.shopName}}</span> -->
|
|
<!-- <span>店铺名称:{{order.shopName}}</span> -->
|
|
|
<!-- <span>买家:19999999999</span>
|
|
<!-- <span>买家:19999999999</span>
|
|
@@ -1159,22 +1159,28 @@ export default {
|
|
|
value: 4,
|
|
value: 4,
|
|
|
label: this.$i18n.t('order.sameCityDelivery')
|
|
label: this.$i18n.t('order.sameCityDelivery')
|
|
|
}],
|
|
}],
|
|
|
- payType: [{
|
|
|
|
|
- value: 0,
|
|
|
|
|
- label: this.$i18n.t('order.pointsPayment')
|
|
|
|
|
- }, {
|
|
|
|
|
|
|
+ payType: [
|
|
|
|
|
+ // {
|
|
|
|
|
+ // value: 0,
|
|
|
|
|
+ // label: this.$i18n.t('order.pointsPayment')
|
|
|
|
|
+ // },
|
|
|
|
|
+ {
|
|
|
value: 1,
|
|
value: 1,
|
|
|
label: this.$i18n.t('admin.weChatPay')
|
|
label: this.$i18n.t('admin.weChatPay')
|
|
|
- }, {
|
|
|
|
|
- value: 2,
|
|
|
|
|
- label: this.$i18n.t('admin.aliPay')
|
|
|
|
|
- }, {
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ // {
|
|
|
|
|
+ // value: 2,
|
|
|
|
|
+ // label: this.$i18n.t('admin.aliPay')
|
|
|
|
|
+ // },
|
|
|
|
|
+ {
|
|
|
value: 3,
|
|
value: 3,
|
|
|
label: this.$i18n.t('admin.balancePay')
|
|
label: this.$i18n.t('admin.balancePay')
|
|
|
- }, {
|
|
|
|
|
- value: 4,
|
|
|
|
|
- label: this.$i18n.t('order.payPalPayment')
|
|
|
|
|
- }],
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ // {
|
|
|
|
|
+ // value: 4,
|
|
|
|
|
+ // label: this.$i18n.t('order.payPalPayment')
|
|
|
|
|
+ // }
|
|
|
|
|
+ ],
|
|
|
resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
|
|
resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
|
|
|
dataList: [],
|
|
dataList: [],
|
|
|
page: {
|
|
page: {
|