odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 统一按钮颜色

Browse Source
This commit is contained in:
odjbin
2024-07-04 13:58:26 +08:00
parent 05585bb980
commit c065008da0
13 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/system/config/index.vue
View File

@@ -18,14 +18,13 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
<el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
<el-button @click="handleReset" :icon="Refresh">重置</el-button>
</el-form-item>
</el-form>
<div class="query-btn">
<el-button type="primary" v-perm="['admin:config:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<el-button color="#DED0B2" v-perm="['admin:config:add']" @click="handleAdd" >新增</el-button>
<el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)"
:icon="Delete" plain
:disabled="disabled">删除
</el-button>
<!-- <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->

6
src/views/system/department/index.vue
View File

@@ -10,12 +10,12 @@
<el-input v-model="queryParams.departmentName" placeholder="请输入部门名称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
<el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
<el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
<el-button @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
</el-form-item>
</el-form>
<div class="table-header-btn">
<el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
<el-button color="#DED0B2" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
</div>
<el-table
:data="list"

8
src/views/system/menu/index.vue
View File

@@ -11,13 +11,13 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getList">搜索</el-button>
<el-button type="primary" @click="handleReset(queryInstance)">重置</el-button>
<el-button color="#DED0B2" @click="getList">搜索</el-button>
<el-button @click="handleReset(queryInstance)">重置</el-button>
</el-form-item>
</el-form>
<div class="table-header-btn">
<el-button type="primary" @click="handleAdd" :icon="Plus" v-perm="['admin:menu:add']">新增</el-button>
<el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
<el-button color="#DED0B2" @click="handleAdd" v-perm="['admin:menu:add']">新增</el-button>
<el-button type="" color="#DED0B2" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
</div>
<el-table :data="list" ref="tableTree" :default-expand-all="isExpand"

4
src/views/system/role/add.vue
View File

@@ -27,8 +27,8 @@
/>
</div>
<div class="oper-page-btn">
<el-button type="primary" @click="handleSubmit">提交</el-button>
<el-button type="primary" @click="handleBack">返回</el-button>
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
<el-button @click="handleBack">返回</el-button>
</div>
</div>
</template>

2
src/views/system/role/index.vue
View File

@@ -186,7 +186,7 @@ const tableConfig = reactive({
}
],
api: '/admin/role',
btns: [{name: '新增', key: 'add', auth: auths.add, type: 'primary'}],
btns: [{name: '新增', key: 'add', auth: auths.add, color:"#DED0B2"}],
params: {}
})

6
src/views/system/subsidiary/index.vue
View File

@@ -10,12 +10,12 @@
<el-input v-model="queryParams.companyName" placeholder="请输入子公司简称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
<el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
<el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
<el-button @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
</el-form-item>
</el-form>
<div class="table-header-btn">
<el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
<el-button color="#DED0B2" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
</div>
<el-table
:data="list"

6
src/views/system/user/add.vue
View File

@@ -3,8 +3,8 @@
<baseTitle :title="'用户信息录入'"></baseTitle>
<fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>
<div class="oper-page-btn">
<el-button type="primary" @click="handleSubmit">提交</el-button>
<el-button type="primary" @click="handleBack">返回</el-button>
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
<el-button @click="handleBack">返回</el-button>
</div>
</div>
</template>
@@ -246,4 +246,4 @@ onMounted(async ()=>{
<style lang="scss" scoped>
</style>
</style>

2
src/views/system/user/index.vue
View File

@@ -167,7 +167,7 @@ const tableConfig = reactive({
api: '/admin/mosr/user',
params: {},
btns: [
{name: '新增', type: 'primary', auth: ['admin:user:add'], key: 'add'}
{name: '新增', color:"#DED0B2", auth: ['admin:user:add'], key: 'add'}
]
})

8
src/views/tool/dict/index.vue
View File

@@ -3,13 +3,13 @@
<div class="layout">
<div class="layout-left">
<div class="query-btn">
<el-button type="primary" v-perm="['dict:type:add']" @click="handleAddType" :icon="Plus" plain>新增</el-button>
<el-button color="#DED0B2" v-perm="['dict:type:add']" @click="handleAddType" plain >新增</el-button>
<!-- <el-button type="warning" v-perm="['dict:type:export']" @click="handleExport" :icon="Download" plain>导出-->
<!-- </el-button>-->
<el-button type="primary" :icon="Edit" v-perm="['dict:type:edit']"
<el-button type="primary" v-perm="['dict:type:edit']"
@click.stop="handleEditType" plain>修改
</el-button>
<el-button type="danger" :icon="Delete" v-perm="['dict:type:del']"
<el-button type="danger" v-perm="['dict:type:del']"
@click.stop="handleDeleteType" :disabled="disabledDelete" plain>删除
</el-button>
</div>
@@ -40,7 +40,7 @@
</div>
<div class="layout-right" style="margin-top: 15px;">
<div class="query-btn">
<el-button type="primary" v-perm="['dict:data:add']" @click="handleAddData" :icon="Plus" plain>新增</el-button>
<el-button type="primary" v-perm="['dict:data:add']" @click="handleAddData" plain>新增</el-button>
</div>
<el-form :model="queryData">
<el-form-item prop="dictLabel">

12
src/views/workflow/process/ProcessDesign.vue
View File

@@ -1,14 +1,14 @@
<template>
<div class="scale">
<el-button icon="Plus" size="mini" @click.stop="scale += 10" :disabled="scale >= 150" circle></el-button>
<span>{{ scale }}%</span>
<el-button icon="Minus" size="mini" @click.stop="scale -= 10" :disabled="scale <= 40" circle></el-button>
<span>{{ scale }}%</span>
<el-button icon="Plus" size="mini" @click.stop="scale += 10" :disabled="scale >= 150" circle></el-button>
</div>
<div :style="'transform: scale('+ scale / 100 +');'">
<div id="processTree">
<process-tree ref="processTree" mode="design" id-name="processTree" @selectedNode="nodeSelected"/>
</div>
<div :style="'transform: scale('+ scale / 100 +');margin-top: 100px;'">
<div id="processTree">
<process-tree ref="processTree" mode="design" id-name="processTree" @selectedNode="nodeSelected"/>
</div>
</div>
<el-drawer :title="selectedNode.name" v-model="showConfig"

8
src/views/workflow/process/ProcessSetting.vue
View File

@@ -1,7 +1,7 @@
<template>
<div v-if="processData.processDefinitionKey">
<p>
流程名称: {{ processData.deploymentName }}
<p style="margin-top: 10px">
流程名称 : {{ processData.deploymentName }}
</p>
</div>
<div v-if="!processData.processDefinitionKey">
@@ -31,7 +31,9 @@ const processData = computed(() => {
const validate = () => {
return []
}
onActivated(()=>{
init()
})
const init = () => {
getTypeOption().then(res => {
optionList.value = res.data

13
src/views/workflow/process/config/ApprovalNodeConfig.vue
View File

@@ -4,12 +4,18 @@
<el-radio-group v-model="nodeProps.assignedType">
<el-radio v-for="item in approvalTypes" :label="item.type" :key="item.type">{{ item.name }}</el-radio>
</el-radio-group>
<div v-if="nodeProps.assignedType === 'ASSIGN_USER'">
<!-- <div v-else>-->
<!-- <span class="item-desc">发起人自己作为审批人进行审批</span>-->
<!-- </div>-->
</el-form-item>
<el-form-item style="margin-top: -18px">
<div v-if="nodeProps.assignedType === 'ASSIGN_USER'" >
<el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round>
选择人员
</el-button>
<user-picker :check-matrix="true" title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
<!-- <ellipsis :row="3" :user-info="assignedUser"/>-->
<!-- <ellipsis :row="3" :user-info="assignedUser"/>-->
<role-items v-model="assignedUser"/>
</div>
<div v-else-if="nodeProps.assignedType === 'SELF_SELECT'">
@@ -56,9 +62,6 @@
</el-select>
</el-form-item>
</div>
<!-- <div v-else>-->
<!-- <span class="item-desc">发起人自己作为审批人进行审批</span>-->
<!-- </div>-->
</el-form-item>
<!-- <el-divider></el-divider>-->
<!-- <el-form-item label="审批人为空时" prop="text" class="line-mode">-->

6
src/views/workflow/process/index.vue
View File

@@ -15,9 +15,9 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
<el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
<el-button type="primary" @click="handleReset" :icon="Refresh" plain>重置</el-button>
<el-button color="#DED0B2" @click="getList" :icon="Refresh">搜索</el-button>
<el-button color="#DED0B2" @click="handleAdd" :icon="Plus">新增</el-button>
<el-button @click="handleReset" :icon="Refresh" >重置</el-button>
<!-- <el-button type="primary" @click="handleExport" :icon="Download" plain>导出-->
<!-- </el-button>-->
</el-form-item>