|
|
@@ -87,6 +87,7 @@
|
|
|
backgroundColor: item1.color?item1.color: '#ccc',
|
|
|
border: selectList.includes(item1.styleCss.id) ? '5px solid #1890ff': 'none'
|
|
|
}"
|
|
|
+ @contextmenu="(e)=>{e.preventDefault();openFormDialogVisible('singleEdit',item1)}"
|
|
|
>
|
|
|
<div>
|
|
|
<i style="line-height: 15px;">{{ item1.columnNo }}</i>
|
|
|
@@ -106,200 +107,208 @@
|
|
|
v-model="activeName"
|
|
|
@tab-click="handleClickTab">
|
|
|
<!-- <el-tab-pane label="创建区域" name="first"></el-tab-pane> -->
|
|
|
- <el-tab-pane label="座位管理" name="second"></el-tab-pane>
|
|
|
- <el-tab-pane label="批量处理" name="batch"></el-tab-pane>
|
|
|
- <el-tab-pane label="当前选择" name="select"></el-tab-pane>
|
|
|
- </el-tabs>
|
|
|
- </div>
|
|
|
- <!-- 座位管理 -->
|
|
|
- <div v-if="activeName == 'second'" class="qu-second-box">
|
|
|
- <div class="qu-second-form">
|
|
|
- <el-form :model="ruleForm1" size="mini" :rules="rules1" ref="ruleForm1" label-width="80px" class="demo-ruleForm">
|
|
|
- <div v-if="!rowAll" style="display: flex;">
|
|
|
- <el-form-item label-width="0px" label=" ">
|
|
|
- <el-input placeholder="行数" v-model="ruleForm1.rowAll"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <span style="margin-top: 10px;">—</span>
|
|
|
- <el-form-item label-width="0px" label=" ">
|
|
|
- <el-input placeholder="列数" v-model="ruleForm1.colsAll"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-button style="height: 28px;margin-top: 7px;margin-left: 5px;" size="mini" type="primary" @click="createTemplate('ruleForm1')">创建模板</el-button>
|
|
|
- </div>
|
|
|
- <div v-else style="display: flex;">
|
|
|
- <el-button style="height: 28px;margin-top: 7px;" size="mini" type="primary" @click="addRanks('row')">增加一排</el-button>
|
|
|
- <el-button style="height: 28px;margin-top: 7px;margin-left: 5px;" size="mini" type="primary" @click="addRanks('cols')">增加一列</el-button>
|
|
|
- </div>
|
|
|
- </el-form>
|
|
|
- </div>
|
|
|
- <div class="qu-second-info">
|
|
|
- <div class="qu-second-select">
|
|
|
- <span>当前选择的是：</span>
|
|
|
- <span v-if="currentRow">{{ currentRow }}排</span>
|
|
|
- <span v-if="currentRow">(注：从左至右排序如下)</span>
|
|
|
- </div>
|
|
|
- <div class="qu-second-info-tool">
|
|
|
- <span>快速排序:</span>
|
|
|
- <i @click="seatSortingFun('rise')">升序</i>
|
|
|
- <i @click="seatSortingFun('fall')">降序</i>
|
|
|
- <i @click="seatSortingFun('symmetry')">奇偶对称</i>
|
|
|
- <i @click="seatSortingFun('reversal')">反转</i>
|
|
|
- </div>
|
|
|
- <!-- <div class="qu-second-info-tool">
|
|
|
- <span>批量操作:</span>
|
|
|
- <i @click="seatSortingFun('rise')">修改名称</i>
|
|
|
- </div> -->
|
|
|
- <div class="qu-second-info-list">
|
|
|
- <div
|
|
|
- class="qu-second-info-item"
|
|
|
- :key="index"
|
|
|
- v-for="(item,index) in currentTabelList">
|
|
|
- <span>{{ item.name }}</span>
|
|
|
+ <el-tab-pane label="座位管理" name="second">
|
|
|
+ <!-- 座位管理 -->
|
|
|
+ <div class="qu-second-box">
|
|
|
+ <div class="qu-second-form">
|
|
|
+ <el-form :model="ruleForm1" size="mini" :rules="rules1" ref="ruleForm1" label-width="80px" class="demo-ruleForm">
|
|
|
+ <div v-if="!rowAll" style="display: flex;">
|
|
|
+ <el-form-item label-width="0px" label=" ">
|
|
|
+ <el-input placeholder="行数" v-model="ruleForm1.rowAll"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <span style="margin-top: 10px;">—</span>
|
|
|
+ <el-form-item label-width="0px" label=" ">
|
|
|
+ <el-input placeholder="列数" v-model="ruleForm1.colsAll"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-button style="height: 28px;margin-top: 7px;margin-left: 5px;" size="mini" type="primary" @click="createTemplate('ruleForm1')">创建模板</el-button>
|
|
|
+ </div>
|
|
|
+ <div v-else style="display: flex;">
|
|
|
+ <el-button style="height: 28px;margin-top: 7px;" size="mini" type="primary" @click="addRanks('row')">增加一排</el-button>
|
|
|
+ <el-button style="height: 28px;margin-top: 7px;margin-left: 5px;" size="mini" type="primary" @click="addRanks('cols')">增加一列</el-button>
|
|
|
+ </div>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <div class="qu-second-info">
|
|
|
+ <div class="qu-second-select">
|
|
|
+ <span>当前选择的是：</span>
|
|
|
+ <span v-if="currentRow">{{ currentRow }}排</span>
|
|
|
+ <span v-if="currentRow">(注：从左至右排序如下)</span>
|
|
|
+ </div>
|
|
|
+ <div class="qu-second-info-tool">
|
|
|
+ <span>快速排序:</span>
|
|
|
+ <i @click="seatSortingFun('rise')">升序</i>
|
|
|
+ <i @click="seatSortingFun('fall')">降序</i>
|
|
|
+ <i @click="seatSortingFun('symmetry')">奇偶对称</i>
|
|
|
+ <i @click="seatSortingFun('reversal')">反转</i>
|
|
|
+ </div>
|
|
|
+ <!-- <div class="qu-second-info-tool">
|
|
|
+ <span>批量操作:</span>
|
|
|
+ <i @click="seatSortingFun('rise')">修改名称</i>
|
|
|
+ </div> -->
|
|
|
+ <div class="qu-second-info-list">
|
|
|
+ <div
|
|
|
+ class="qu-second-info-item"
|
|
|
+ :key="index"
|
|
|
+ v-for="(item,index) in currentTabelList">
|
|
|
+ <div >
|
|
|
+ <span>名称:{{ item.name }}</span>
|
|
|
+ <span>优先级:{{ item.priority }}</span>
|
|
|
+ </div>
|
|
|
+ <el-button type="primary" size="mini" @click="openFormDialogVisible('singleEdit',item)">编辑</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
-
|
|
|
- <!-- 批量操作 -->
|
|
|
- <div v-if="activeName == 'batch'" class="qu-batch-box">
|
|
|
- <div class="qu-batch-form">
|
|
|
- <el-form :model="queryParams" ref="queryForm" size="mini" label-width="40px">
|
|
|
- <el-form-item style="margin-bottom: 5px;" label="坐标" >
|
|
|
- <div style="display: flex;">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.row"
|
|
|
- placeholder="行数"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- <span>—</span>
|
|
|
- <el-input
|
|
|
- v-model="queryParams.cols"
|
|
|
- placeholder="列数"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane label="批量处理" name="batch">
|
|
|
+ <!-- 批量操作 -->
|
|
|
+ <div class="qu-batch-box">
|
|
|
+ <div class="qu-batch-form">
|
|
|
+ <el-form :model="queryParams" ref="queryForm" size="mini" label-width="40px">
|
|
|
+ <el-form-item style="margin-bottom: 5px;" label="坐标" >
|
|
|
+ <div style="display: flex;">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.row"
|
|
|
+ placeholder="行数"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ <span>—</span>
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.cols"
|
|
|
+ placeholder="列数"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item style="margin-bottom: 5px;" label="类型">
|
|
|
+ <el-select v-model="queryParams.seatTypeId" placeholder="座位类型" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="(item,index) in seatTypeList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="未绑定"
|
|
|
+ :value="-1"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item style="margin-bottom: 5px;" label="名称" >
|
|
|
+ <div style="display: flex;">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.name"
|
|
|
+ placeholder="座位名称"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ <el-button style="margin-left: 5px;" type="primary" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
+ <el-button size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <div class="qu-batch-tool">
|
|
|
+ <div>
|
|
|
+ <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaName')">座位名称</el-button>
|
|
|
+ <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaType')">座位类型</el-button>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaPriority')">优先级</el-button>
|
|
|
+ <el-button type="danger" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaDisable')">批量禁用</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item style="margin-bottom: 5px;" label="类型">
|
|
|
- <el-select v-model="queryParams.seatTypeId" placeholder="座位类型" clearable>
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in seatTypeList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="未绑定"
|
|
|
- :value="-1"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item style="margin-bottom: 5px;" label="名称" >
|
|
|
- <div style="display: flex;">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.name"
|
|
|
- placeholder="座位名称"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- <el-button style="margin-left: 5px;" type="primary" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
- <el-button size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ <div class="qu-batch-table">
|
|
|
+ <el-table
|
|
|
+ size="mini"
|
|
|
+ :data="batchTableList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ style="width: 100%"
|
|
|
+ height="100%"
|
|
|
+ row-key="styleCss.id"
|
|
|
+ >
|
|
|
+ <el-table-column
|
|
|
+ type="selection"
|
|
|
+ align="center"
|
|
|
+ width="40">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="name"
|
|
|
+ align="center"
|
|
|
+ label="名称">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>
|
|
|
+ <span>{{ scope.row.name ? scope.row.name : '暂未命名' }}</span>
|
|
|
+ <span>({{ scope.row.rowNo}}-{{ scope.row.columnNo}})</span>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="优先级">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ scope.row.priority }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
</div>
|
|
|
-
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- </div>
|
|
|
- <div class="qu-batch-tool">
|
|
|
- <div>
|
|
|
- <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaName')">座位名称</el-button>
|
|
|
- <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaType')">座位类型</el-button>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaPriority')">优先级</el-button>
|
|
|
- <el-button type="danger" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaDisable')">批量禁用</el-button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="qu-batch-table">
|
|
|
- <el-table
|
|
|
- size="mini"
|
|
|
- :data="batchTableList"
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- style="width: 100%"
|
|
|
- height="100%"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- type="selection"
|
|
|
- align="center"
|
|
|
- width="40">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="name"
|
|
|
- align="center"
|
|
|
- label="名称">
|
|
|
- <template slot-scope="scope">
|
|
|
+ </div>
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane label="当前选择" name="select">
|
|
|
+ <!-- 当前选择 -->
|
|
|
+ <div class="qu-select-box">
|
|
|
+ <div class="qu-select-select">
|
|
|
+ <span>提示：</span>
|
|
|
+ <span>鼠标左右键按下拖动可进行多选</span>
|
|
|
+ </div>
|
|
|
+ <div class="qu-select-tool">
|
|
|
<div>
|
|
|
- <span>{{ scope.row.name ? scope.row.name : '暂未命名' }}</span>
|
|
|
- <span>({{ scope.row.rowNo}}-{{ scope.row.columnNo}})</span>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="优先级">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.priority }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
-
|
|
|
- <!-- 当前选择 -->
|
|
|
- <div v-if="activeName == 'select'" class="qu-select-box">
|
|
|
- <div class="qu-select-select">
|
|
|
- <span>提示：</span>
|
|
|
- <span>鼠标左右键按下拖动可进行多选</span>
|
|
|
- </div>
|
|
|
- <div class="qu-select-tool">
|
|
|
- <div>
|
|
|
- <el-button type="primary" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaName')">座位名称</el-button>
|
|
|
- <el-button type="primary" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaType')">座位类型</el-button>
|
|
|
- <el-button type="primary" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaPriority')">优先级</el-button>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <el-button type="danger" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaDisable')">批量禁用</el-button>
|
|
|
- <el-button type="info" :disabled="selectTabelList.length==0" size="mini" @click="delSelectTabelList">清除选择</el-button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="qu-select-table">
|
|
|
- <el-table
|
|
|
- size="mini"
|
|
|
- :data="selectTabelList"
|
|
|
- style="width: 100%"
|
|
|
- height="100%"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- prop="name"
|
|
|
- align="center"
|
|
|
- label="名称">
|
|
|
- <template slot-scope="scope">
|
|
|
+ <el-button type="primary" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaName')">座位名称</el-button>
|
|
|
+ <el-button type="primary" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaType')">座位类型</el-button>
|
|
|
+ <el-button type="primary" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaPriority')">优先级</el-button>
|
|
|
+ </div>
|
|
|
<div>
|
|
|
- <span>{{ scope.row.name ? scope.row.name : '暂未命名' }}</span>
|
|
|
- <span>({{ scope.row.rowNo}}-{{ scope.row.columnNo}})</span>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- label="优先级">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ scope.row.priority }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
+ <el-button type="danger" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaDisable')">批量禁用</el-button>
|
|
|
+ <el-button type="info" :disabled="selectTabelList.length==0" size="mini" @click="delSelectTabelList">清除选择</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="qu-select-table">
|
|
|
+ <el-table
|
|
|
+ size="mini"
|
|
|
+ :data="selectTabelList"
|
|
|
+ style="width: 100%"
|
|
|
+ height="100%"
|
|
|
+ row-key="styleCss.id"
|
|
|
+ >
|
|
|
+ <el-table-column
|
|
|
+ prop="name"
|
|
|
+ align="center"
|
|
|
+ label="名称">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>
|
|
|
+ <span>{{ scope.row.name ? scope.row.name : '暂未命名' }}</span>
|
|
|
+ <span>({{ scope.row.rowNo}}-{{ scope.row.columnNo}})</span>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="优先级">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ scope.row.priority }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-tab-pane>
|
|
|
+ </el-tabs>
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
@@ -322,30 +331,6 @@
|
|
|
<el-radio :label="2">使用行列号</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item v-if="formAll.seatWay == 2" label="座号规律" prop="seatParity">
|
|
|
- <el-radio-group v-model="formAll.seatParity">
|
|
|
- <el-radio :label="1">奇偶列</el-radio>
|
|
|
- <el-radio :label="2">奇数列</el-radio>
|
|
|
- <el-radio :label="3">偶数列</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item v-if="formAll.seatWay == 2" label="座号顺序" prop="seatWell">
|
|
|
- <el-radio-group v-model="formAll.seatWell">
|
|
|
- <el-radio :label="1">递增</el-radio>
|
|
|
- <el-radio :label="2">递减</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item v-if="formAll.seatWay == 2" label="单排座位区间" prop="colMin">
|
|
|
- <div style="display: flex;">
|
|
|
- <el-form-item label="" label-width="0">
|
|
|
- <el-input v-model="formAll.colMin" placeholder="最小座位号"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <span style="white-space: nowrap;">--</span>
|
|
|
- <el-form-item label="" prop="colMax">
|
|
|
- <el-input v-model="formAll.colMax" placeholder="最大座位号"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </div>
|
|
|
- </el-form-item> -->
|
|
|
<el-form-item v-if="formAll.seatWay == 2" label="座位名称" prop="name">
|
|
|
<div style="display: flex;">
|
|
|
<el-input v-model="formAll.name1"></el-input>
|
|
|
@@ -385,6 +370,41 @@
|
|
|
<el-input v-model="formAll.setaPriorityNum" placeholder="等级数"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
+
|
|
|
+ <!-- 单个编辑 -->
|
|
|
+ <div v-if="['singleEdit'].indexOf(formAllType) !=-1">
|
|
|
+ <el-form-item label="座位名称" prop="name">
|
|
|
+ <el-input v-model="formAll.name" placeholder="座位名称"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="优先级" prop="priority">
|
|
|
+ <el-input v-model="formAll.priority" placeholder="优先级"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="座位类型" prop="seatTypeId">
|
|
|
+ <el-select
|
|
|
+ v-model="formAll.seatTypeId"
|
|
|
+ placeholder="请选择座位类型">
|
|
|
+ <el-option
|
|
|
+ v-for="(item,index) in seatTypeList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="座位状态" prop="status">
|
|
|
+ <el-radio-group v-model="formAll.status">
|
|
|
+ <el-radio :label="0">初始(该状态下不C端显示)</el-radio>
|
|
|
+ <el-radio :label="1">可用</el-radio>
|
|
|
+ <el-radio :label="2">不可用</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="是否禁用" prop="delFlag">
|
|
|
+ <el-radio-group v-model="formAll.delFlag">
|
|
|
+ <el-radio :label="0">禁用</el-radio>
|
|
|
+ <el-radio :label="1">启用</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
</el-form>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="formDialogVisible = false">取 消</el-button>
|
|
|
@@ -500,10 +520,7 @@ export default {
|
|
|
formAllType: '', // region 区域
|
|
|
/** 编辑区域 结束 */
|
|
|
|
|
|
- /** 多选 */
|
|
|
- selectList: [],
|
|
|
- selectTabelList: [],
|
|
|
- multipleSelection_1: []
|
|
|
+
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -636,6 +653,14 @@ export default {
|
|
|
this.resetQuery()
|
|
|
}else if(this.activeName=='select'){
|
|
|
this.addSelectTabelList()
|
|
|
+ }else if(this.activeName=='second'){
|
|
|
+ if(this.currentRow){
|
|
|
+ let list = this.tableData[this.currentRow-1][this.currentProperty]
|
|
|
+ this.currentTabelList = list && list.length>0 ? JSON.parse(JSON.stringify(list)) : []
|
|
|
+ }else {
|
|
|
+ this.currentTabelList = []
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -909,6 +934,15 @@ export default {
|
|
|
if(type == 'selectBatchSetaDisable') { // 批量禁用
|
|
|
this.formAllType = 'selectBatchSetaDisable'
|
|
|
}
|
|
|
+ if(type == 'singleEdit') { // 单个编辑
|
|
|
+ console.log("data===",data)
|
|
|
+ this.formAllType = 'singleEdit'
|
|
|
+ this.formDialogVisibleTitle = "修改" + data.name
|
|
|
+ this.formDialogVisible = true
|
|
|
+ this.$set(this,'formAll',JSON.parse(JSON.stringify({
|
|
|
+ ...data
|
|
|
+ })))
|
|
|
+ }
|
|
|
},
|
|
|
// 批量操作 表单验证
|
|
|
chekeFormAll(formName){
|
|
|
@@ -926,13 +960,43 @@ export default {
|
|
|
this.selectBatchSetaNameFun()
|
|
|
}else if(this.formAllType == 'selectBatchSetaPriority') {
|
|
|
this.selectBatchSetaPriorityFun()
|
|
|
- }
|
|
|
+ }else if(this.formAllType == 'singleEdit') {
|
|
|
+ this.singleEditFun()
|
|
|
+ }
|
|
|
} else {
|
|
|
console.log('error submit!!');
|
|
|
return false;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ // 修改单个
|
|
|
+ singleEditFun(){
|
|
|
+ let color = ''
|
|
|
+ let seatLabel = ''
|
|
|
+ this.seatTypeList.forEach((item,index)=>{
|
|
|
+ if(this.formAll.seatTypeId == item.id) {
|
|
|
+ color = item.color
|
|
|
+ seatLabel = item.name
|
|
|
+ }
|
|
|
+ })
|
|
|
+ for(let j=0;j<this.tableDataAll.length;j++){
|
|
|
+ if(this.formAll.styleCss.id == this.tableDataAll[j].styleCss.id){
|
|
|
+ this.tableDataAll[j] = {
|
|
|
+ ...this.tableDataAll[j],
|
|
|
+ name: this.formAll.name,
|
|
|
+ priority: this.formAll.priority,
|
|
|
+ seatTypeId: this.formAll.seatTypeId,
|
|
|
+ seatLabel: seatLabel,
|
|
|
+ color: color,// 座位类型对应的颜色
|
|
|
+ status: this.formAll.status,
|
|
|
+ delFlag: this.formAll.delFlag,
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.formDialogVisible = false
|
|
|
+ this.dataProcess()
|
|
|
+ },
|
|
|
// 批量禁用
|
|
|
batchDisable() {
|
|
|
|
|
|
@@ -950,7 +1014,7 @@ export default {
|
|
|
})
|
|
|
for(let i=0;i<this.multipleSelection.length;i++){
|
|
|
for(let j=0;j<this.tableDataAll.length;j++){
|
|
|
- if(this.multipleSelection[i].id == this.tableDataAll[j].id){
|
|
|
+ if(this.multipleSelection[i].styleCss.id == this.tableDataAll[j].styleCss.id){
|
|
|
listTabel[j] = {
|
|
|
...this.tableDataAll[j],
|
|
|
seatLabel: seatLabel,
|
|
|
@@ -974,7 +1038,7 @@ export default {
|
|
|
let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
|
|
|
for(let i=0;i<this.multipleSelection.length;i++){
|
|
|
for(let j=0;j<this.tableDataAll.length;j++){
|
|
|
- if(this.multipleSelection[i].id == this.tableDataAll[j].id){
|
|
|
+ if(this.multipleSelection[i].styleCss.id == this.tableDataAll[j].styleCss.id){
|
|
|
listTabel[j] = {
|
|
|
...this.tableDataAll[j],
|
|
|
name: this.formAll.name
|
|
|
@@ -989,7 +1053,7 @@ export default {
|
|
|
let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
|
|
|
for(let i=0;i<this.multipleSelection.length;i++){
|
|
|
for(let j=0;j<this.tableDataAll.length;j++){
|
|
|
- if(this.multipleSelection[i].id == this.tableDataAll[j].id){
|
|
|
+ if(this.multipleSelection[i].styleCss.id == this.tableDataAll[j].styleCss.id){
|
|
|
listTabel[j] = {
|
|
|
...this.tableDataAll[j],
|
|
|
name: name.replace('${row}',this.tableDataAll[j].rowNo).replace('${col}',this.tableDataAll[j].columnNo)
|
|
|
@@ -1010,7 +1074,7 @@ export default {
|
|
|
let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
|
|
|
for(let i=0;i<this.multipleSelection.length;i++){
|
|
|
for(let j=0;j<this.tableDataAll.length;j++){
|
|
|
- if(this.multipleSelection[i].id == this.tableDataAll[j].id){
|
|
|
+ if(this.multipleSelection[i].styleCss.id == this.tableDataAll[j].styleCss.id){
|
|
|
listTabel[j] = {
|
|
|
...this.tableDataAll[j],
|
|
|
priority: this.formAll.setaPriorityNum
|
|
|
@@ -1025,7 +1089,7 @@ export default {
|
|
|
let num = Number(this.formAll.setaPriorityNum)
|
|
|
for(let i=0;i<this.multipleSelection.length;i++){
|
|
|
for(let j=0;j<this.tableDataAll.length;j++){
|
|
|
- if(this.multipleSelection[i].id == this.tableDataAll[j].id){
|
|
|
+ if(this.multipleSelection[i].styleCss.id == this.tableDataAll[j].styleCss.id){
|
|
|
listTabel[j] = {
|
|
|
...this.tableDataAll[j],
|
|
|
priority: num
|
|
|
@@ -1323,7 +1387,16 @@ export default {
|
|
|
border: 1px solid #ccc;
|
|
|
}
|
|
|
.table-tool-tab {
|
|
|
- height: 40px;
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ ::v-deep .el-tabs {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%
|
|
|
+ }
|
|
|
+ ::v-deep .el-tabs__content {
|
|
|
+ width: 100%;
|
|
|
+ height: calc( 100% - 60px );
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.qu-first-box {
|
|
|
@@ -1510,6 +1583,7 @@ export default {
|
|
|
align-items: center;
|
|
|
font-size: 16px;
|
|
|
border-radius: 10px;
|
|
|
+ padding: 0 10px;
|
|
|
>span {
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
@@ -1520,6 +1594,7 @@ export default {
|
|
|
}
|
|
|
>div {
|
|
|
display: flex;
|
|
|
+ flex-direction: column;
|
|
|
span {
|
|
|
display: flex;
|
|
|
padding: 0 10px;
|
