|
|
|
@ -1,5 +1,6 @@
|
|
|
|
<template>
|
|
|
|
<template>
|
|
|
|
<div class="app-container" v-if="show">
|
|
|
|
<div class="app-container">
|
|
|
|
|
|
|
|
<div v-show="show">
|
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium"
|
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium"
|
|
|
|
class="ry_form">
|
|
|
|
class="ry_form">
|
|
|
|
<el-form-item label="订单状态" prop="status">
|
|
|
|
<el-form-item label="订单状态" prop="status">
|
|
|
|
@ -31,7 +32,6 @@
|
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="loading" :data="omsOrderList" border @selection-change="handleSelectionChange"
|
|
|
|
<el-table v-loading="loading" :data="omsOrderList" border @selection-change="handleSelectionChange"
|
|
|
|
cell-class-name="my-cell">
|
|
|
|
cell-class-name="my-cell">
|
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
|
@ -177,7 +177,6 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
|
|
<InBody v-show="total>0">
|
|
|
|
<InBody v-show="total>0">
|
|
|
|
<pagination
|
|
|
|
<pagination
|
|
|
|
:total="total"
|
|
|
|
:total="total"
|
|
|
|
@ -186,8 +185,8 @@
|
|
|
|
@pagination="getList"
|
|
|
|
@pagination="getList"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</InBody>
|
|
|
|
</InBody>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>
|
|
|
|
<!-- 发货对话框 -->
|
|
|
|
<!-- 发货对话框 -->
|
|
|
|
<el-dialog :title="deliveryObj.title" :visible.sync="deliveryObj.open" width="500px" append-to-body>
|
|
|
|
<el-dialog :title="deliveryObj.title" :visible.sync="deliveryObj.open" width="500px" append-to-body>
|
|
|
|
<el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">
|
|
|
|
<el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">
|
|
|
|
@ -285,6 +284,7 @@ import AddressSelector from "@/views/components/AddressSelector/index.vue";
|
|
|
|
import dateUtil, {dateFormat} from '@/utils/DateUtil';
|
|
|
|
import dateUtil, {dateFormat} from '@/utils/DateUtil';
|
|
|
|
import {isStarRepo} from "@/utils/is-star-plugin"
|
|
|
|
import {isStarRepo} from "@/utils/is-star-plugin"
|
|
|
|
import {mapGetters} from "vuex";
|
|
|
|
import {mapGetters} from "vuex";
|
|
|
|
|
|
|
|
import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
computed:{
|
|
|
|
computed:{
|
|
|
|
@ -293,6 +293,7 @@ export default {
|
|
|
|
name: "OmsOrder",
|
|
|
|
name: "OmsOrder",
|
|
|
|
dicts: ["oms_order_status", "oms_pay_type"],
|
|
|
|
dicts: ["oms_order_status", "oms_pay_type"],
|
|
|
|
components: {
|
|
|
|
components: {
|
|
|
|
|
|
|
|
SeeAdsComponent,
|
|
|
|
AddressSelector
|
|
|
|
AddressSelector
|
|
|
|
},
|
|
|
|
},
|
|
|
|
data() {
|
|
|
|
data() {
|
|
|
|
@ -411,6 +412,13 @@ export default {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
async created() {
|
|
|
|
async created() {
|
|
|
|
|
|
|
|
this.$nextTick(()=>{
|
|
|
|
|
|
|
|
this.$refs.seeAdsComponentRef.show()
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
async confirmOk(success) {
|
|
|
|
|
|
|
|
if (success) {
|
|
|
|
const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/order/order', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
|
|
|
|
const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/order/order', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
|
|
|
|
this.show = res;
|
|
|
|
this.show = res;
|
|
|
|
if (res) {
|
|
|
|
if (res) {
|
|
|
|
@ -426,8 +434,8 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
/** 日期组件设置为今天 */
|
|
|
|
/** 日期组件设置为今天 */
|
|
|
|
setToday() {
|
|
|
|
setToday() {
|
|
|
|
const temp = new Date();
|
|
|
|
const temp = new Date();
|
|
|
|
|