Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui

This commit is contained in:
zzyuan 2024-12-19 18:26:26 +08:00
commit 2d38ccd56d
2 changed files with 46 additions and 23 deletions

View File

@ -1,33 +1,56 @@
<template>
<!-- 应用程序根容器 -->
<div id="app">
<!-- 路由视图组件用于显示当前路由对应的组件 -->
<router-view />
<!-- 主题选择器组件 -->
<theme-picker />
</div>
</template>
<script>
//
import ThemePicker from "@/components/ThemePicker";
// vuex mapActions
import { mapActions } from 'vuex'
//
import { get } from '@/utils/config'
//
// import AlertNotification from "@/views/warning/AlertNotification.vue";
export default {
//
name: "App",
//
components: { ThemePicker },
//
created() {
//
get();
},
// vue-meta
metaInfo() {
return {
// vuex store
// 使 store
title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
//
titleTemplate: title => {
//
//
return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
}
}
}
};
</script>
<style scoped>
/* 隐藏主题选择器组件 */
#app .theme-picker {
display: none;
}

View File

@ -98,8 +98,8 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
<template slot-scope="scope">
<el-button size="mini" plain icon="el-icon-zoom-in" @click="handleSee(scope.row)" >查看</el-button>
<el-button size="mini" type="primary" plain icon="el-icon-edit" v-if="scope.row.repairStatusCode!='1'" @click="handleUpdate(scope.row)">维修</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleReject(scope.row)">驳回</el-button>
<el-button size="mini" type="primary" plain icon="el-icon-edit" v-if="scope.row.repairStatusCode=='0'" @click="handleUpdate(scope.row)">维修</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" v-if="scope.row.repairStatusCode=='0'" @click="handleReject(scope.row)">驳回</el-button>
<el-button size="mini" type="success" @click="handlePrint(scope.row)">维修单</el-button>
</template>
</el-table-column>
@ -689,7 +689,7 @@ export default {
//
selectable(row) {
if (row.repairStatusCode == "1") {
if (row.repairStatusCode == "1" || row.repairStatusCode == "2") {
return false;
} else {
return true;