Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 admin/src/views/business/empower.vue

@@ -16,8 +16,11 @@
                    <el-option label="不符合下发条件" value="6"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="公司" prop="companyName">
            <el-form-item label="组织" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="设备名称" prop="deviceName">
                <el-input v-model="searchForm.deviceName" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="下发起始时间" prop="startTime">
                <el-date-picker
@@ -45,7 +48,7 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
                <li><el-button type="primary" v-permissions="['business:empower:create']">导出</el-button></li>
                <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">导出</el-button></li>
<!--                <li><el-button type="primary" v-permissions="['business:empower:create']">立即下发</el-button></li>-->
<!--                <li><el-button type="primary" v-permissions="['business:empower:create']">取消下发</el-button></li>-->
            </ul>
@@ -59,7 +62,7 @@
                <el-table-column prop="memberName" label="姓名" min-width="80px"></el-table-column>
                <el-table-column prop="memberPhone" label="手机号" min-width="120px"></el-table-column>
                <el-table-column prop="memberidCard" label="身份证号码" min-width="130px"></el-table-column>
                <el-table-column prop="companyName" label="所属公司" min-width="150px"></el-table-column>
                <el-table-column prop="companyName" label="所属组织" min-width="150px"></el-table-column>
                <el-table-column prop="deviceName" label="设备名称" min-width="150px"></el-table-column>
                <el-table-column label="门禁有效期" min-width="170px">
                    <template slot-scope="{row}">
@@ -70,7 +73,7 @@
                        </div>
                    </template>
                </el-table-column>
                <el-table-column prop="sendDate" label="创建时间" min-width="150px"></el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
                <el-table-column label="是否删除" min-width="100px">
                    <template slot-scope="{row}">
                        <span style="color: green;" v-if="row.isdeleted === 0">否</span>
@@ -128,7 +131,8 @@
        startTime: '',
        endTime: '',
        sendStatus: '',
        radio: null
        radio: null,
        deviceName: ''
      },
      time: []
    }