合并新版本

935090232@qq.com

2021-04-14 87ce5a2c346bfbffa708859ea0cde3fde88854f2

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html

@@ -82,6 +82,14 @@
                        show-overflow-tooltip>
                </el-table-column>
                <el-table-column
                        label="状态"
                        show-overflow-tooltip>
                    <template slot-scope="scope">
                        <span v-if="scope.row.state == 1">待领取</span>
                        <span v-if="scope.row.state == 2">已领取</span>
                    </template>
                </el-table-column>
                <el-table-column
                        label="签到类型"
                        show-overflow-tooltip>
                    <template slot-scope="scope">