Merge remote-tracking branch 'origin/master'

jiangping

2025-07-02 ec7cc88fca8de4b3c56f8ebee074fb7ce71ebf1e

 admin/src/views/business/information.vue

@@ -7,8 +7,8 @@
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select v-model="searchForm.status" clearable @change="search" placeholder="状态">
          <el-option label="正常" value="1"></el-option>
          <el-option label="禁用" value="0"></el-option>
          <el-option label="正常" value="0"></el-option>
          <el-option label="禁用" value="1"></el-option>
        </el-select>
      </el-form-item>
      <section>
@@ -19,10 +19,11 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:information:create', 'business:information:delete']">
        <li><el-button type="primary" @click="$refs.operaInformationWindow.open('新建动态资讯')" icon="el-icon-plus" v-permissions="['business:information:create']">新建</el-button></li>
        <li><el-button type="primary" @click="$refs.operaInformationWindow.open('新建动态资讯',null,searchForm.type)" icon="el-icon-plus" v-permissions="['business:information:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:information:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe
@@ -63,7 +64,7 @@
            fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaInformationWindow.open('编辑动态资讯', row)" icon="el-icon-edit" v-permissions="['business:information:update']">编辑</el-button>
            <el-button type="text" @click="$refs.operaInformationWindow.open('编辑动态资讯', row,searchForm.type)" icon="el-icon-edit" v-permissions="['business:information:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:information:delete']">删除</el-button>
          </template>
        </el-table-column>
@@ -112,22 +113,9 @@
      showContent: '',
      showTitle: '',
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        remark: '',
        type:0,
        title: '',
        describe: '',
        imgurl: '',
        thumbnailImgurl: '',
        type: '',
        jumpType: '',
        contnet: '',
        sortnum: '',
        status: ''
        status: null
      }
    }
  },