Commit 8e6e71fd619282823467324639e1c36bfd78130f
1 parent
89122d66
优化代码
Showing
4 changed files
with
67 additions
and
150 deletions
src/App.vue
| @@ -520,4 +520,32 @@ h3 { | @@ -520,4 +520,32 @@ h3 { | ||
| 520 | .el-date-editor.el-input{ | 520 | .el-date-editor.el-input{ |
| 521 | width: 100%; | 521 | width: 100%; |
| 522 | } | 522 | } |
| 523 | + | ||
| 524 | +.list-group-border-radius { | ||
| 525 | + border-radius: 4px; | ||
| 526 | + border: 1px solid #ebeef5; | ||
| 527 | + background: #fff; | ||
| 528 | +} | ||
| 529 | + | ||
| 530 | +.list-group { | ||
| 531 | + list-style: none; | ||
| 532 | + padding: 0; | ||
| 533 | + margin: 0; | ||
| 534 | +} | ||
| 535 | + | ||
| 536 | +.list-group-item { | ||
| 537 | + padding: 12px 15px; | ||
| 538 | + cursor: pointer; | ||
| 539 | + /*border-bottom: 1px solid #ebeef5;*/ | ||
| 540 | +} | ||
| 541 | + | ||
| 542 | +.list-group-item:hover { | ||
| 543 | + background-color: #f5f7fa; | ||
| 544 | +} | ||
| 545 | + | ||
| 546 | +.vc-node-selected { | ||
| 547 | + background-color: #409eff; | ||
| 548 | + color: #fff; | ||
| 549 | + font-weight: bold; | ||
| 550 | +} | ||
| 523 | </style> | 551 | </style> |
| 524 | \ No newline at end of file | 552 | \ No newline at end of file |
src/views/fee/feeConfigManageList.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class="animated fadeInRight padding"> | 2 | <div class="animated fadeInRight padding"> |
| 3 | <el-row :gutter="10"> | 3 | <el-row :gutter="10"> |
| 4 | <el-col :span="3"> | 4 | <el-col :span="3"> |
| 5 | - <div class="border-radius"> | 5 | + <div class="list-group-border-radius"> |
| 6 | <div class=" treeview"> | 6 | <div class=" treeview"> |
| 7 | <ul class="list-group text-center "> | 7 | <ul class="list-group text-center "> |
| 8 | <li v-for="(item, index) in feeTypeCds" :key="index" @click="swatchFeeTypeCd(item)" | 8 | <li v-for="(item, index) in feeTypeCds" :key="index" @click="swatchFeeTypeCd(item)" |
| @@ -310,33 +310,8 @@ export default { | @@ -310,33 +310,8 @@ export default { | ||
| 310 | </script> | 310 | </script> |
| 311 | 311 | ||
| 312 | <style scoped> | 312 | <style scoped> |
| 313 | -.border-radius { | ||
| 314 | - border-radius: 4px; | ||
| 315 | - border: 1px solid #ebeef5; | ||
| 316 | - background: #fff; | ||
| 317 | -} | ||
| 318 | - | ||
| 319 | -.list-group { | ||
| 320 | - list-style: none; | ||
| 321 | - padding: 0; | ||
| 322 | - margin: 0; | ||
| 323 | -} | ||
| 324 | 313 | ||
| 325 | -.list-group-item { | ||
| 326 | - padding: 12px 15px; | ||
| 327 | - cursor: pointer; | ||
| 328 | - /*border-bottom: 1px solid #ebeef5;*/ | ||
| 329 | -} | ||
| 330 | 314 | ||
| 331 | -.list-group-item:hover { | ||
| 332 | - background-color: #f5f7fa; | ||
| 333 | -} | ||
| 334 | - | ||
| 335 | -.vc-node-selected { | ||
| 336 | - background-color: #409eff; | ||
| 337 | - color: #fff; | ||
| 338 | - font-weight: bold; | ||
| 339 | -} | ||
| 340 | 315 | ||
| 341 | .margin-xs-r { | 316 | .margin-xs-r { |
| 342 | margin-right: 5px; | 317 | margin-right: 5px; |
src/views/oa/attendanceClassesStaffManageList.vue
| 1 | <template> | 1 | <template> |
| 2 | <div class="attendance-classes-staff-manage-container"> | 2 | <div class="attendance-classes-staff-manage-container"> |
| 3 | - <el-row :gutter="20"> | ||
| 4 | - <el-col :span="4"> | ||
| 5 | - <el-card class="tree-card"> | ||
| 6 | - <div class="treeview attendance-staff"> | ||
| 7 | - <ul class="list-group"> | ||
| 8 | - <li v-for="(item, index) in attendanceClassesStaffManageInfo.attendanceClassess" :key="index" | ||
| 9 | - class="list-group-item node-orgTree" | 3 | + <el-row :gutter="10"> |
| 4 | + <el-col :span="3"> | ||
| 5 | + <div class="list-group-border-radius"> | ||
| 6 | + <div class=" treeview"> | ||
| 7 | + <ul class="list-group text-center "> | ||
| 8 | + <li v-for="(item, index) in attendanceClassesStaffManageInfo.attendanceClassess" :key="index" @click="swatchClass(item)" | ||
| 10 | :class="{ 'vc-node-selected': attendanceClassesStaffManageInfo.conditions.classesId == item.classesId }" | 9 | :class="{ 'vc-node-selected': attendanceClassesStaffManageInfo.conditions.classesId == item.classesId }" |
| 11 | - @click="swatchClass(item)"> | 10 | + class="list-group-item node-orgTree"> |
| 12 | {{ item.classesName }} | 11 | {{ item.classesName }} |
| 13 | </li> | 12 | </li> |
| 14 | </ul> | 13 | </ul> |
| 15 | </div> | 14 | </div> |
| 16 | - </el-card> | 15 | + </div> |
| 17 | </el-col> | 16 | </el-col> |
| 18 | - <el-col :span="20"> | 17 | + <el-col :span="21"> |
| 19 | <el-card> | 18 | <el-card> |
| 20 | <div slot="header" class="flex justify-between"> | 19 | <div slot="header" class="flex justify-between"> |
| 21 | <span>{{ $t('attendanceClassesStaffManage.search.title') }}</span> | 20 | <span>{{ $t('attendanceClassesStaffManage.search.title') }}</span> |
src/views/oa/oaWorkflowManageList.vue
| @@ -7,28 +7,14 @@ | @@ -7,28 +7,14 @@ | ||
| 7 | </div> | 7 | </div> |
| 8 | <el-row :gutter="20"> | 8 | <el-row :gutter="20"> |
| 9 | <el-col :span="6"> | 9 | <el-col :span="6"> |
| 10 | - <el-input | ||
| 11 | - v-model.trim="searchForm.flowName" | ||
| 12 | - :placeholder="$t('oaWorkflowManage.search.flowNamePlaceholder')" | ||
| 13 | - clearable | ||
| 14 | - /> | 10 | + <el-input v-model.trim="searchForm.flowName" :placeholder="$t('oaWorkflowManage.search.flowNamePlaceholder')" |
| 11 | + clearable /> | ||
| 15 | </el-col> | 12 | </el-col> |
| 16 | <el-col :span="6"> | 13 | <el-col :span="6"> |
| 17 | - <el-select | ||
| 18 | - v-model="searchForm.flowType" | ||
| 19 | - :placeholder="$t('oaWorkflowManage.search.flowTypePlaceholder')" | ||
| 20 | - style="width:100%" | ||
| 21 | - > | ||
| 22 | - <el-option | ||
| 23 | - :label="$t('oaWorkflowManage.search.selectAll')" | ||
| 24 | - value="" | ||
| 25 | - /> | ||
| 26 | - <el-option | ||
| 27 | - v-for="item in flowTypes" | ||
| 28 | - :key="item.statusCd" | ||
| 29 | - :label="item.name" | ||
| 30 | - :value="item.statusCd" | ||
| 31 | - /> | 14 | + <el-select v-model="searchForm.flowType" :placeholder="$t('oaWorkflowManage.search.flowTypePlaceholder')" |
| 15 | + style="width:100%"> | ||
| 16 | + <el-option :label="$t('oaWorkflowManage.search.selectAll')" value="" /> | ||
| 17 | + <el-option v-for="item in flowTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" /> | ||
| 32 | </el-select> | 18 | </el-select> |
| 33 | </el-col> | 19 | </el-col> |
| 34 | <el-col :span="6"> | 20 | <el-col :span="6"> |
| @@ -48,126 +34,55 @@ | @@ -48,126 +34,55 @@ | ||
| 48 | <el-card class="list-wrapper"> | 34 | <el-card class="list-wrapper"> |
| 49 | <div slot="header" class="flex justify-between"> | 35 | <div slot="header" class="flex justify-between"> |
| 50 | <span>{{ $t('oaWorkflowManage.list.title') }}</span> | 36 | <span>{{ $t('oaWorkflowManage.list.title') }}</span> |
| 51 | - <el-button | ||
| 52 | - type="primary" | ||
| 53 | - size="small" | ||
| 54 | - style="float:right" | ||
| 55 | - @click="handleAdd" | ||
| 56 | - > | 37 | + <el-button type="primary" size="small" style="float:right" @click="handleAdd"> |
| 57 | <i class="el-icon-plus"></i> | 38 | <i class="el-icon-plus"></i> |
| 58 | {{ $t('oaWorkflowManage.list.addWorkflow') }} | 39 | {{ $t('oaWorkflowManage.list.addWorkflow') }} |
| 59 | </el-button> | 40 | </el-button> |
| 60 | </div> | 41 | </div> |
| 61 | 42 | ||
| 62 | - <el-table | ||
| 63 | - v-loading="loading" | ||
| 64 | - :data="tableData" | ||
| 65 | - border | ||
| 66 | - style="width:100%" | ||
| 67 | - > | ||
| 68 | - <el-table-column | ||
| 69 | - prop="flowId" | ||
| 70 | - :label="$t('oaWorkflowManage.table.flowId')" | ||
| 71 | - align="center" | ||
| 72 | - /> | ||
| 73 | - <el-table-column | ||
| 74 | - prop="flowName" | ||
| 75 | - :label="$t('oaWorkflowManage.table.flowName')" | ||
| 76 | - align="center" | ||
| 77 | - /> | ||
| 78 | - <el-table-column | ||
| 79 | - prop="flowType" | ||
| 80 | - :label="$t('oaWorkflowManage.table.flowType')" | ||
| 81 | - align="center" | ||
| 82 | - > | 43 | + <el-table v-loading="loading" :data="tableData" border style="width:100%"> |
| 44 | + <el-table-column prop="flowId" :label="$t('oaWorkflowManage.table.flowId')" align="center" /> | ||
| 45 | + <el-table-column prop="flowName" :label="$t('oaWorkflowManage.table.flowName')" align="center" /> | ||
| 46 | + <el-table-column prop="flowType" :label="$t('oaWorkflowManage.table.flowType')" align="center"> | ||
| 83 | <template slot-scope="scope"> | 47 | <template slot-scope="scope"> |
| 84 | - {{ scope.row.flowType === '1001' ? $t('oaWorkflowManage.table.normalFlow') : $t('oaWorkflowManage.table.unknown') }} | 48 | + {{ scope.row.flowType === '1001' ? $t('oaWorkflowManage.table.normalFlow') : |
| 49 | + $t('oaWorkflowManage.table.unknown') }} | ||
| 85 | </template> | 50 | </template> |
| 86 | </el-table-column> | 51 | </el-table-column> |
| 87 | - <el-table-column | ||
| 88 | - prop="modelId" | ||
| 89 | - :label="$t('oaWorkflowManage.table.modelId')" | ||
| 90 | - align="center" | ||
| 91 | - /> | ||
| 92 | - <el-table-column | ||
| 93 | - prop="flowKey" | ||
| 94 | - label="KEY" | ||
| 95 | - align="center" | ||
| 96 | - /> | ||
| 97 | - <el-table-column | ||
| 98 | - prop="state" | ||
| 99 | - :label="$t('oaWorkflowManage.table.state')" | ||
| 100 | - align="center" | ||
| 101 | - > | 52 | + <el-table-column prop="modelId" :label="$t('oaWorkflowManage.table.modelId')" align="center" /> |
| 53 | + <el-table-column prop="flowKey" label="KEY" align="center" /> | ||
| 54 | + <el-table-column prop="state" :label="$t('oaWorkflowManage.table.state')" align="center"> | ||
| 102 | <template slot-scope="scope"> | 55 | <template slot-scope="scope"> |
| 103 | - {{ scope.row.state === 'C' ? $t('oaWorkflowManage.table.deployed') : $t('oaWorkflowManage.table.pendingDeploy') }} | 56 | + {{ scope.row.state === 'C' ? $t('oaWorkflowManage.table.deployed') : |
| 57 | + $t('oaWorkflowManage.table.pendingDeploy') }} | ||
| 104 | </template> | 58 | </template> |
| 105 | </el-table-column> | 59 | </el-table-column> |
| 106 | - <el-table-column | ||
| 107 | - prop="describle" | ||
| 108 | - :label="$t('oaWorkflowManage.table.describle')" | ||
| 109 | - align="center" | ||
| 110 | - width="150" | ||
| 111 | - /> | ||
| 112 | - <el-table-column | ||
| 113 | - prop="createTime" | ||
| 114 | - :label="$t('oaWorkflowManage.table.createTime')" | ||
| 115 | - align="center" | ||
| 116 | - /> | ||
| 117 | - <el-table-column | ||
| 118 | - :label="$t('common.operation')" | ||
| 119 | - align="center" | ||
| 120 | - width="300" | ||
| 121 | - fixed="right" | ||
| 122 | - > | 60 | + <el-table-column prop="describle" :label="$t('oaWorkflowManage.table.describle')" align="center" width="150" /> |
| 61 | + <el-table-column prop="createTime" :label="$t('oaWorkflowManage.table.createTime')" align="center" /> | ||
| 62 | + <el-table-column :label="$t('common.operation')" align="center" width="300" fixed="right"> | ||
| 123 | <template slot-scope="scope"> | 63 | <template slot-scope="scope"> |
| 124 | - <el-button | ||
| 125 | - size="mini" | ||
| 126 | - @click="handleWorkflowEditor(scope.row)" | ||
| 127 | - > | 64 | + <el-button size="mini" type="text" @click="handleWorkflowEditor(scope.row)"> |
| 128 | {{ $t('oaWorkflowManage.table.workflow') }} | 65 | {{ $t('oaWorkflowManage.table.workflow') }} |
| 129 | </el-button> | 66 | </el-button> |
| 130 | - <el-button | ||
| 131 | - size="mini" | ||
| 132 | - @click="handleWorkflowForm(scope.row)" | ||
| 133 | - > | 67 | + <el-button size="mini" type="text" @click="handleWorkflowForm(scope.row)"> |
| 134 | {{ $t('oaWorkflowManage.table.designForm') }} | 68 | {{ $t('oaWorkflowManage.table.designForm') }} |
| 135 | </el-button> | 69 | </el-button> |
| 136 | - <el-button | ||
| 137 | - v-if="scope.row.state === 'W'" | ||
| 138 | - size="mini" | ||
| 139 | - type="success" | ||
| 140 | - @click="handleDeploy(scope.row)" | ||
| 141 | - > | 70 | + <el-button type="text" v-if="scope.row.state === 'W'" size="mini" @click="handleDeploy(scope.row)"> |
| 142 | {{ $t('oaWorkflowManage.table.deploy') }} | 71 | {{ $t('oaWorkflowManage.table.deploy') }} |
| 143 | </el-button> | 72 | </el-button> |
| 144 | - <el-button | ||
| 145 | - size="mini" | ||
| 146 | - type="primary" | ||
| 147 | - @click="handleEdit(scope.row)" | ||
| 148 | - > | 73 | + <el-button size="mini" type="text" @click="handleEdit(scope.row)"> |
| 149 | {{ $t('common.edit') }} | 74 | {{ $t('common.edit') }} |
| 150 | </el-button> | 75 | </el-button> |
| 151 | - <el-button | ||
| 152 | - size="mini" | ||
| 153 | - type="danger" | ||
| 154 | - @click="handleDelete(scope.row)" | ||
| 155 | - > | 76 | + <el-button size="mini" type="text" @click="handleDelete(scope.row)"> |
| 156 | {{ $t('common.delete') }} | 77 | {{ $t('common.delete') }} |
| 157 | </el-button> | 78 | </el-button> |
| 158 | </template> | 79 | </template> |
| 159 | </el-table-column> | 80 | </el-table-column> |
| 160 | </el-table> | 81 | </el-table> |
| 161 | 82 | ||
| 162 | - <el-pagination | ||
| 163 | - :current-page="pagination.current" | ||
| 164 | - :page-sizes="[10, 20, 30, 50]" | ||
| 165 | - :page-size="pagination.size" | ||
| 166 | - :total="pagination.total" | ||
| 167 | - layout="total, sizes, prev, pager, next, jumper" | ||
| 168 | - @size-change="handleSizeChange" | ||
| 169 | - @current-change="handleCurrentChange" | ||
| 170 | - /> | 83 | + <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size" |
| 84 | + :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" | ||
| 85 | + @current-change="handleCurrentChange" /> | ||
| 171 | </el-card> | 86 | </el-card> |
| 172 | 87 | ||
| 173 | <!-- 组件 --> | 88 | <!-- 组件 --> |