refactor: 优化项目展示

master
zccbbg 1 year ago
parent 9ee4f01157
commit 20e3fff80d

@ -109,7 +109,7 @@
/> />
</InBody> </InBody>
</div> </div>
<SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/> <!-- <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>-->
<!-- 拒绝对话框 --> <!-- 拒绝对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -160,7 +160,7 @@ export default {
dicts: ["oms_aftersale_type", "oms_aftersale_status"], dicts: ["oms_aftersale_type", "oms_aftersale_status"],
data() { data() {
return { return {
show: false, show: true,
pickerOptions: { pickerOptions: {
shortcuts: dateUtil.getTimeShort2() shortcuts: dateUtil.getTimeShort2()
}, },
@ -223,9 +223,7 @@ export default {
if (status){ if (status){
this.queryParams.status = status this.queryParams.status = status
} }
this.$nextTick(()=>{ this.getList();
this.$refs.seeAdsComponentRef.show()
})
}, },
methods: { methods: {
confirmOk(success) { confirmOk(success) {

@ -1,6 +1,5 @@
<template> <template>
<div class="app-container"> <div class="app-container" v-if="show">
<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">
@ -32,6 +31,7 @@
<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,6 +177,7 @@
</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"
@ -185,8 +186,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">
@ -284,7 +285,6 @@ 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,7 +293,6 @@ 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() {
@ -412,13 +411,6 @@ 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) {
@ -434,8 +426,8 @@ export default {
} }
this.getList(); this.getList();
} }
}
}, },
methods: {
/** 日期组件设置为今天 */ /** 日期组件设置为今天 */
setToday() { setToday() {
const temp = new Date(); const temp = new Date();

@ -119,7 +119,7 @@
/> />
</InBody> </InBody>
</div> </div>
<SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/> <!-- <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>-->
</div> </div>
</template> </template>
@ -136,7 +136,7 @@ export default {
dicts: ['pms_publish_status'], dicts: ['pms_publish_status'],
data() { data() {
return { return {
show: false, show: true,
// //
loading: true, loading: true,
// //
@ -176,9 +176,7 @@ export default {
}; };
}, },
created() { created() {
this.$nextTick(()=>{ this.getList();
this.$refs.seeAdsComponentRef.show()
})
}, },
computed:{ computed:{
...mapGetters(['userId']), ...mapGetters(['userId']),

Loading…
Cancel
Save