From 14e8b217fa514d3bdceda7a126b8052c8c45870a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 01 十一月 2023 19:31:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 152 ++++++++++++++++++++++++++------------------------
1 files changed, 78 insertions(+), 74 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 847ed74..50deca2 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -320,79 +320,81 @@
></refer-config-dialog>
</div>
- <el-table v-if="this.crudArrayFlag"
- ref="referAttrCrud"
- v-loading="loading"
- :data="ProData"
- :height="this.tableHeight"
- border
- style="width: 100%"
- @select="selectHandle"
- @cell-click="handleCellClicks"
- @selection-change="selectionChange"
- @row-click="rowClick"
- >
- <el-table-column
- :fixed="!editStyleFlag ? 'left' : undefined"
- type="selection" width="55">
- </el-table-column>
- <!--<el-table-column fixed label="搴忓彿" type="index" width="55"></el-table-column>-->
- <el-table-column v-for="(item,index) in this.option.column" v-if="item.edit !='referName'"
- :key="item.id"
- :fixed="!editStyleFlag ? item.fixed : undefined"
- :formatter="formAttr"
- :label="item.label"
- :prop="item.prop"
- :show-overflow-tooltip="true"
- :sortable="item.sortable"
- :width="item.width||(item.label.length >=4 ?'160':item.label.length==3 ?'130':'100')"
- align="center"
+ <div>
+ <el-table v-if="this.crudArrayFlag"
+ ref="referAttrCrud"
+ v-loading="loading"
+ :data="ProData"
+ :height="this.tableHeight"
+ border
+ style="width: 100%"
+ @select="selectHandle"
+ @cell-click="handleCellClicks"
+ @selection-change="selectionChange"
+ @row-click="rowClick"
>
- <template slot-scope="{ row }">
- <el-input
- v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )"
- v-show="!AddCellFlag"
- :ref="'input' + row.oid"
- v-model="row[item.prop]"
- @blur="saveRows(row)"
- ></el-input>
- <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'"
- v-model="row[item.prop]"
- :style="{width:(item.width-10)+'px'}"
- controls-position="right"
- size="small" @blur="saveRows"></el-input-number>
- <el-select v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " slot="prepend"
- v-model="row[item.prop]" allow-create default-first-option
- filterable
- @blur="selectChangeHandler(item.editConfig,index)">
- <el-option
- v-for="optionItem in item.data"
- :key="optionItem.dictValue"
- :label="optionItem.dictValue"
- :value="optionItem.dictValue">
- </el-option>
- </el-select>
- <el-switch
- v-if="item.edit === 'switch'" v-model="row[item.prop]" :disabled="!editOpenFlag" active-value="true"
- inactive-value="false">
- </el-switch>
- <span v-else>{{ row[item.prop] }}</span>
- </template>
- </el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- width="70">
- <template slot-scope="scope">
- <el-button
- size="small"
- type="text"
- @click.native.prevent="CrudRowDel(scope.$index)">
- 绉婚櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table>
+ <el-table-column
+ :fixed="!editStyleFlag ? 'left' : undefined"
+ type="selection" width="55">
+ </el-table-column>
+ <!--<el-table-column fixed label="搴忓彿" type="index" width="55"></el-table-column>-->
+ <el-table-column v-for="(item,index) in this.option.column" v-if="item.edit !='referName'"
+ :key="item.id"
+ :fixed="!editStyleFlag ? item.fixed : undefined"
+ :formatter="formAttr"
+ :label="item.label"
+ :prop="item.prop"
+ :show-overflow-tooltip="true"
+ :sortable="item.sortable"
+ :width="item.width||(item.label.length >=4 ?'160':item.label.length==3 ?'130':'100')"
+ align="center"
+ >
+ <template slot-scope="{ row }">
+ <el-input
+ v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )"
+ v-show="!AddCellFlag"
+ :ref="'input' + row.oid"
+ v-model="row[item.prop]"
+ @blur="saveRows(row)"
+ ></el-input>
+ <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'"
+ v-model="row[item.prop]"
+ :style="{width:(item.width-10)+'px'}"
+ controls-position="right"
+ size="small" @blur="saveRows"></el-input-number>
+ <el-select v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " slot="prepend"
+ v-model="row[item.prop]" allow-create default-first-option
+ filterable
+ @blur="selectChangeHandler(item.editConfig,index)">
+ <el-option
+ v-for="optionItem in item.data"
+ :key="optionItem.dictValue"
+ :label="optionItem.dictValue"
+ :value="optionItem.dictValue">
+ </el-option>
+ </el-select>
+ <el-switch
+ v-if="item.edit === 'switch'" v-model="row[item.prop]" :disabled="!editOpenFlag" active-value="true"
+ inactive-value="false">
+ </el-switch>
+ <span v-else>{{ row[item.prop] }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ width="70">
+ <template slot-scope="scope">
+ <el-button
+ size="small"
+ type="text"
+ @click.native.prevent="CrudRowDel(scope.$index)">
+ 绉婚櫎
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
</template>
@@ -1104,6 +1106,8 @@
indexClassName: "搴忓彿",
indexLabelClassName: '搴忓彿',
index: true,
+ indexFixed:false,
+ selectionFixed:false,
border: true,
addBtn: false,
menu: false,
@@ -1113,7 +1117,7 @@
{
label: "灞炴�ц嫳鏂囧悕绉�",
prop: "id",
- width: 100,
+ width: 130,
},
{
label: "灞炴�т腑鏂囧悕绉�",
@@ -1551,6 +1555,7 @@
},
computed: {
...mapGetters(["permission"]),
+ //椤甸潰鎸夐挳鏉冮檺
permissionList() {
return {
busineStatus: this.vaildData(this.permission.classifyTree.attr_add, false),
@@ -1795,7 +1800,6 @@
this.attrSelectList = [row];
this.$refs.referAttrCrud.setCurrentRow(row);
this.$refs.referAttrCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
-
this.attrOid = row.oid;
this.attrRow = row;
},
--
Gitblit v1.9.3