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

View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="创建时间" prop="time"> <el-form-item label="创建时间" prop="time">
<el-date-picker <el-date-picker
v-model="queryParams.time" v-model="queryParams.time"
@ -28,7 +28,7 @@
filterable filterable
style="width: 240px" style="width: 240px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
v-for="dict in dict.type.repair_task_status" v-for="dict in dict.type.repair_task_status"
v-if="dict.value == 0 || dict.value == 1 || dict.value == 2" v-if="dict.value == 0 || dict.value == 1 || dict.value == 2"
@ -38,7 +38,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -98,9 +98,9 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" plain icon="el-icon-zoom-in" @click="handleSee(scope.row)" >查看</el-button> <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="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" @click="handleReject(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> <el-button size="mini" type="success" @click="handlePrint(scope.row)">维修单</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -243,7 +243,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div <div
class="tabelAll" class="tabelAll"
> >
<div class="columnAllNum">总计</div> <div class="columnAllNum">总计</div>
@ -260,7 +260,7 @@
{{ "¥"+" "+repairNum4 }} {{ "¥"+" "+repairNum4 }}
</div> </div>
<div class="columnAll"> <div class="columnAll">
</div> </div>
</div> </div>
<div <div
@ -287,15 +287,15 @@
<el-table-column label="修理项目" align="center" prop="repairName" > <el-table-column label="修理项目" align="center" prop="repairName" >
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.maTypeName }}-{{ scope.row.typeName }}</div> <div>{{ scope.row.maTypeName }}-{{ scope.row.typeName }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="配件名称 * 数量 / 单价" align="center" prop="specificationType" > <el-table-column label="配件名称 * 数量 / 单价" align="center" prop="specificationType" >
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.partName + " " }}*{{ " "+scope.row.partNum + " " }}/{{" ¥"+" "}}{{ scope.row.partPrice }}</div> <div>{{ scope.row.partName + " " }}*{{ " "+scope.row.partNum + " " }}/{{" ¥"+" "}}{{ scope.row.partPrice }}</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div <div
class="tabelAll" class="tabelAll"
> >
<div class="columnAllNumTwo">合计</div> <div class="columnAllNumTwo">合计</div>
@ -416,29 +416,29 @@
<i class="el-icon-caret-right" style="font-size: 32px;" @click="imgIndex=imgIndex+1" v-show="(imgIndex+1)<(dialogImageUrls.length)"></i> <i class="el-icon-caret-right" style="font-size: 32px;" @click="imgIndex=imgIndex+1" v-show="(imgIndex+1)<(dialogImageUrls.length)"></i>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
getRepairTaskList, getRepairTaskList,
getRepaiDocumentInfo, getRepaiDocumentInfo,
rejectRepair, rejectRepair,
sendList, sendList,
getRepairDocumentInfo, getRepairDocumentInfo,
} from '@/api/repair/repair.js' } from '@/api/repair/repair.js'
import { getInfo, h } from '@/api/login' import { getInfo, h } from '@/api/login'
import vueEasyPrint from "vue-easy-print"; import vueEasyPrint from "vue-easy-print";
export default { export default {
name: '', name: '',
dicts: ['repair_task_status'], dicts: ['repair_task_status'],
data() { data() {
return { return {
type: '', type: '',
isShowOneFlag: false, isShowOneFlag: false,
priKey: '', priKey: '',
@ -472,9 +472,9 @@ export default {
time: [],// time: [],//
agreementCode: '', // agreementCode: '', //
startTime: '', startTime: '',
endTime: '', endTime: '',
}, },
companyId: '', companyId: '',
unitList: [], unitList: [],
proList: [], proList: [],
// //
@ -552,7 +552,7 @@ export default {
resetQuery() { resetQuery() {
this.queryParams.time = [] this.queryParams.time = []
// this.resetForm("queryForm"); // this.resetForm("queryForm");
this.$refs.queryForm.resetFields() this.$refs.queryForm.resetFields()
this.handleQuery() this.handleQuery()
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -566,7 +566,7 @@ export default {
/** 查看按钮操作 */ /** 查看按钮操作 */
handleSee(row) { handleSee(row) {
this.$emit("handelView",row); this.$emit("handelView",row);
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleReject(row) { handleReject(row) {
const taskIds = row.taskId || this.ids; const taskIds = row.taskId || this.ids;
@ -576,13 +576,13 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
'material/repair/export', 'material/repair/export',
{ {
...this.queryParams, ...this.queryParams,
startTime:this.queryParams.time[0], startTime:this.queryParams.time[0],
endTime:this.queryParams.time[1] endTime:this.queryParams.time[1]
@ -689,7 +689,7 @@ export default {
// //
selectable(row) { selectable(row) {
if (row.repairStatusCode == "1") { if (row.repairStatusCode == "1" || row.repairStatusCode == "2") {
return false; return false;
} else { } else {
return true; return true;