From 0d0e67818a45161af14114211f43aafd232a6da2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 27 一月 2026 10:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaCouponGoodsWindow.vue | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/admin/src/components/business/OperaCouponGoodsWindow.vue b/admin/src/components/business/OperaCouponGoodsWindow.vue
index fd5a9e3..fefba70 100644
--- a/admin/src/components/business/OperaCouponGoodsWindow.vue
+++ b/admin/src/components/business/OperaCouponGoodsWindow.vue
@@ -1,11 +1,11 @@
<template>
<GlobalWindow
:title="title"
- width="80%"
+ width="100%"
:visible.sync="visible"
@confirm="confirm"
>
- <TableLayout :permissions="['business:goods:query']">
+ <TableLayout>
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" style="display: block;" >
<el-form-item label="" prop="name" label-width="5px" style="display: inline-block;margin-right: 30px;">
@@ -100,31 +100,15 @@
components: { GlobalWindow, TableLayout, Pagination },
data () {
return {
- activeName: 'first',
title: '',
visible: false,
- tabelHeight: null,
// 鎼滅储
searchForm: {
- name: '',
- categoryId: '',
- brandId: '',
- type: '0', // 骞冲彴鍟嗗搧
- status: '',
- isrec: '',
- labels: ''
+ id: '',
+ bindShopId: ''
},
- labels: [],
- serials: [],
- brands: [],
- selectGoods: []
+ shops: []
}
- },
- mounted() {
- window.addEventListener('resize', this.handleResize);
- },
- beforeDestroy() {
- window.removeEventListener('resize', this.handleResize);
},
created () {
this.config({
--
Gitblit v1.9.3