mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-zjl #335

Merged
juzi merged 2 commits from projects/mesxc-zjl into projects/mesxc-test 2024-04-12 17:02:46 +08:00
Conversation 0 Commits 2 Files Changed 3 +518 -283
29 changed files with 518 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b2c16fcdb - Show all commits

7
.env.dev
View File

@ -1,3 +1,10 @@
###
# @Author: zhp
# @Date: 2024-04-12 14:30:48
# @LastEditTime: 2024-04-12 14:31:16
# @LastEditors: zhp
# @Description:
###
# 开发环境配置
ENV = 'development'

2
src/views/base/coreWorkOrder/detail.vue
View File

@ -201,7 +201,7 @@
@pagination="getList" /> -->
</div>
<div v-if="this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
<div v-if="$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
<div class="card" style="padding-bottom: 16px;">
<div class="boxTitle">
<span class="blueTitle"></span>

4
src/views/base/materialProductBom/add-or-updata.vue
View File

@ -56,14 +56,14 @@
</el-row>
</el-form>
</div>
<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
<div class="attr-list" v-if="idAttrShow && $auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
<small-title
style="margin: 16px 0; padding-left: 8px"
:no-padding="true">
BOM明细
</small-title>
<div v-if="!isdetail && this.$auth.hasPermi('base:material-product-bom:create')" class="action_btn">
<div v-if="!isdetail && $auth.hasPermi('base:material-product-bom:create')" class="action_btn">
<template>
<span style="display: inline-block;">
<el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>

1
src/views/energy/monitoring/energyStatistics/index.vue
View File

@ -103,6 +103,7 @@ export default {
name: 'search',
color: 'primary',
},
{
type: this.$auth.hasPermi('monitoring:energy-statistics:create')
? 'separate'

50
src/views/extend/processEquMaterialBom/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zhp
* @LastEditTime: 2024-04-11 13:35:46
* @LastEditTime: 2024-04-12 14:26:22
* @Description:
-->
<template>
@ -100,20 +100,6 @@ import { parseTime } from '../../core/mixins/code-filter';
import attrAdd from './attr-add';
// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
import { publicFormatter } from '@/utils/dict';
const tableBtn = [
{
type: this.$auth.hasPermi('extend:process-equ-material-bom-det:update')
? 'edit'
: '',
btnName: '编辑',
},
{
type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
? 'delete'
: '',
btnName: '删除',
},
];
const tableProps = [
{
prop: 'materialName',
@ -137,22 +123,36 @@ const tableProps = [
label: '备注',
},
];
const topBtnConfig = [
{
type: 'add',
btnName: 'btn.add'
}
]
export default {
mixins: [basicAdd],
components: { SmallTitle, attrAdd },
data() {
return {
tableBtn,
tableBtn:[
{
type: this.$auth.hasPermi(
'extend:process-equ-material-bom-det:query'
)
? 'edit'
: '',
btnName: '编辑',
},
{
type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
? 'delete'
: '',
btnName: '删除',
},
],
tableProps,
topBtnConfig,
topBtnConfig:[
{
type: this.$auth.hasPermi('extend:process-equ-material-bom-det:add')
? 'add'
: '',
btnName: 'btn.add'
}
],
addOrUpdateVisible: false,
urlOptions: {
isGetCode: false,

50
src/views/extend/processEquValueBom/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zhp
* @LastEditTime: 2024-04-11 13:35:42
* @LastEditTime: 2024-04-12 14:28:44
* @Description:
-->
<template>
@ -110,20 +110,6 @@ import { parseTime } from '../../core/mixins/code-filter';
import attrAdd from './attr-add';
// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
const tableBtn = [
{
type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
? 'edit'
: '',
btnName: '编辑',
},
{
type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
? 'delete'
: '',
btnName: '删除',
},
];
const tableProps = [
{
prop: 'valueName',
@ -157,25 +143,35 @@ const tableProps = [
prop: 'remark',
label: '备注',
},
];
const topBtnConfig = [
{
type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
? 'add'
: '',
btnName: 'btn.add'
}
]
export default {
mixins: [basicAdd],
components: { SmallTitle, attrAdd },
data() {
return {
tableBtn,
tableBtn:[
{
type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
? 'edit'
: '',
btnName: '编辑',
},
{
type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
? 'delete'
: '',
btnName: '删除',
},
],
tableProps,
topBtnConfig,
topBtnConfig:[
{
type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
? 'add'
: '',
btnName: 'btn.add'
}
],
addOrUpdateVisible: false,
enableList: [
{

8
src/views/quality/monitoring/materielDateFrom/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
* @LastEditTime: 2024-04-10 16:31:48
* @LastEditTime: 2024-04-12 14:12:55
* @Description:
-->
<template>
@ -131,7 +131,7 @@ export default {
width: 250
},
{
type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
type: this.$auth.hasPermi('base:material-use-log:query') ? 'button' : '',
btnName: '查询',
name: 'search',
color: 'primary',
@ -163,13 +163,13 @@ export default {
// },
{
type: this.$auth.hasPermi(
'monitoring:materiel-date-from:export'
'base:material-use-log:export'
)
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
type: this.$auth.hasPermi('base:material-use-log:export') ? 'button' : '',
btnName: '导出',
name: 'export',
color: 'primary',

13
src/views/quality/monitoring/processTraceability/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
* @LastEditTime: 2024-04-07 16:26:56
* @LastEditTime: 2024-04-12 14:16:03
* @Description:
-->
<template>
@ -96,11 +96,14 @@ export default {
// btnName: '编辑',
// }
// : undefined,
{
type: 'processDetail',
{
type: this.$auth.hasPermi(
'extend:process-retrospect:query'
)
? 'button'
: '',
btnName: '查看工艺详情',
},
].filter((v) => v),
list: [],
listQuery: {
@ -137,7 +140,7 @@ export default {
{
type: this.$auth.hasPermi(
'monitoring:process-traceability:query'
'extend:process-retrospect:query'
)
? 'button'
: '',

6
src/views/report/glass/day.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-24 15:15:24
* @LastEditTime: 2024-04-08 11:47:39
* @LastEditTime: 2024-04-12 15:13:43
* @LastEditors: zhp
* @Description:
-->
@ -184,8 +184,8 @@ export default {
// console.log(val.setHours(7, 0, 0))
// console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
// let time = this.format(val.setHours(7, 0, 0))
this.endTimeStamp = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.startTimeStamp = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
this.startTimeStamp = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.endTimeStamp = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
// console.log(this.listQuery.reportTime);
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000

5
src/views/report/glass/inputTable.vue
View File

@ -1,14 +1,15 @@
<!--
* @Author: Do not edit
* @Date: 2023-12-13 14:10:04
* @LastEditTime: 2024-03-29 09:43:52
* @LastEditTime: 2024-04-12 14:21:34
* @LastEditors: zhp
* @Description:
-->
<template>
<div>
<el-row style="float: right; margin-bottom: 5px">
<el-button v-if="!edit" :disabled="noData" size="small" @click="edit = true">编辑</el-button>
<el-button v-if="!edit && this.$auth.hasPermi('base:report-auto-original-glass:update')" :disabled="noData"
size="small" @click="edit = true">编辑</el-button>
<el-button v-if="edit" size="small" @click="handleReturn()">返回</el-button>
<el-button v-if="edit" size="small" @click="updateData">保存</el-button>
</el-row>

4
src/views/report/glass/year.vue
View File

@ -160,8 +160,8 @@ export default {
changeTime(val) {
if(val) {
// let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //开始时间
this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()); //结束时间
this.endTimeStamp = this.timeFun(new Date(val.getFullYear(),11, 31, 7, 0, 0).getTime()); //开始时间
this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //结束时间
this.listQuery.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.listQuery.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
} else {

39
src/views/report/productionDayReport/index.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-29 09:48:24
* @LastEditTime: 2024-04-12 15:15:39
* @LastEditors: zhp
* @Description:
-->
@ -13,11 +13,12 @@
</el-date-picker>
</el-form-item>
<el-button type="primary" @click="getDataList()">查询</el-button>
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" plain
@click="handleExport">导出</el-button>
</el-form>
<el-row style="float: right; margin-bottom: 5px">
<el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
</el-row>
@ -28,26 +29,26 @@
<el-table-column :label="'许昌安彩日成品生产汇总' + '(' + timeTips + ')'" align="center">
<el-table-column prop="lineName" label="生产线" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineName }} </span>
</template>
</el-table-column>
<el-table-column label="投入数㎡" align="center">
<el-table-column prop="inputNow" label="今日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputNow }} </span>
</template>
</el-table-column>
<el-table-column prop="inputHis" label="昨日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputHis }} </span>
</template>
</el-table-column>
<el-table-column prop="inputTrend" label="增减" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ? parseFloat((scope.row.inputTrend *
100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 : null }} </span>
</template>
@ -56,24 +57,24 @@
<el-table-column label="完成良品产量" align="center">
<el-table-column prop="goodProductNow" label="今日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
</el-input>
<span v-else>{{ scope.row.goodProductNow }} </span>
</template>
</el-table-column>
<el-table-column prop="goodProductHis" label="昨日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
</el-input>
<span v-else>{{ scope.row.goodProductHis }} </span>
</template>
</el-table-column>
<el-table-column prop="goodProductTrend" label="增减" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
null
}} </span>
</template>
@ -82,7 +83,7 @@
<el-table-column label="原片漏检率" align="center">
<el-table-column prop="missCheckNow" label="今日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
100).toFixed(2)) +
'%' : null }}
@ -91,7 +92,7 @@
</el-table-column>
<el-table-column prop="missCheckHis" label="昨日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
100).toFixed(2)) +
'%' : null }}
@ -100,7 +101,7 @@
</el-table-column>
<el-table-column prop="missCheckTrend" label="增减" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ? 0 : null
@ -111,7 +112,7 @@
<el-table-column label="综合良品率" align="center">
<el-table-column prop="goodProductPassNow" label="今日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
100).toFixed(2)) +
@ -121,7 +122,7 @@
</el-table-column>
<el-table-column prop="goodProductPassHis" label="昨日" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
100).toFixed(2)) +
@ -131,7 +132,7 @@
</el-table-column>
<el-table-column prop="goodProductPassTrend" label="增减" align="center">
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
@ -485,8 +486,8 @@ export default {
// console.log(val.setHours(7, 0, 0))
// console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
// let time = this.format(val.setHours(7, 0, 0))
this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
this.timeTips = this.listQuery.reportTime[0] + ' - ' + this.listQuery.reportTime[1]
// console.log(this.listQuery.reportTime);
} else {

56
src/views/report/productionMonthReport/index.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-04-08 11:45:52
* @LastEditTime: 2024-04-12 14:22:46
* @LastEditors: zhp
* @Description:
-->
@ -12,13 +12,15 @@
<el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
查询
</el-button>
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
@click="handleExport">导出</el-button>
</el-form>
<el-row style="float: right; margin-bottom: 5px">
<el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
</el-row>
@ -51,9 +53,9 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
null
}} </span>
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -77,9 +79,9 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
null
}} </span>
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -88,8 +90,8 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -97,8 +99,8 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -107,10 +109,10 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
0 :
null
}} </span>
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -120,8 +122,8 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -130,8 +132,8 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -140,11 +142,11 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>

66
src/views/report/productionWeekReport/index.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-29 09:48:41
* @LastEditTime: 2024-04-12 14:22:51
* @LastEditors: zhp
* @Description:
-->
@ -14,13 +14,15 @@
style="width: 350px" placeholder="选择周">
</el-date-picker>
</el-form-item>
<el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
查询
</el-button>
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
@click="handleExport">导出</el-button>
</el-form>
<el-row style="float: right; margin-bottom: 5px">
<el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
</el-row>
@ -52,11 +54,11 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -80,11 +82,11 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -93,8 +95,8 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -102,8 +104,8 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -112,11 +114,11 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -126,8 +128,8 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -136,8 +138,8 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -146,11 +148,11 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>

66
src/views/report/productionYearReport/index.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-04-08 11:46:49
* @LastEditTime: 2024-04-12 14:22:54
* @LastEditors: zhp
* @Description:
-->
@ -14,15 +14,17 @@
style="width: 350px" placeholder="选择年">
</el-date-picker>
</el-form-item>
<el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
查询
</el-button>
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
<el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
@click="handleExport">导出</el-button>
<!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
<el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
</el-form>
<el-row style="float: right; margin-bottom: 5px">
<el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
size="small" @click="editDataList()">编辑</el-button>
<el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
</el-row>
@ -55,11 +57,11 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -83,11 +85,11 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -96,8 +98,8 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -105,8 +107,8 @@
<template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -115,11 +117,11 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>
@ -129,8 +131,8 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -139,8 +141,8 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
100).toFixed(2)) +
'%' : null }}
100).toFixed(2)) +
'%' : null }}
</span>
</template>
</el-table-column>
@ -149,11 +151,11 @@
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
</el-input>
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ?
0 :
null
}} </span>
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ?
0 :
null
}} </span>
</template>
</el-table-column>
</el-table-column>

41
src/views/specialEquipment/basic/FireFighthing.vue
View File

@ -91,13 +91,13 @@
pageSize: 10,
},
tableBtn: [
this.$auth.hasPermi('base:core-equipment-attr:update') // ('se:firefight-attr:update') // TODO 此处需用firefight-attr权限还是core-equipment-attr 权限？
this.$auth.hasPermi('base:core-equipment-attr:update')
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('base:core-equipment-attr:delete') // ('se:firefight-attr:delete')
this.$auth.hasPermi('base:core-equipment-attr:delete')
? {
type: 'delete',
btnName: '删除',
@ -142,19 +142,29 @@ export default {
return {
searchBarKeys: ['name', 'code'],
tableBtn: [
this.$auth.hasPermi(`se:firefight:update`)
this.$auth.hasPermiAnd([
'base:core-equipment:query',
'base:core-equipment-attr:query',
])
? {
type: 'detail',
btnName: '详情',
}
: undefined,
this.$auth.hasPermi('se:firefight:update')
this.$auth.hasPermiAnd([
'base:core-equipment:update',
'base:core-worker:query',
'base:core-equipment:query',
'base:core-equipment-attr:create',
'base:core-equipment-attr:query',
'base:core-equipment-attr:delete',
])
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('se:firefight:delete')
this.$auth.hasPermi('base:core-equipment:delete')
? {
type: 'delete',
btnName: '删除',
@ -205,17 +215,32 @@ export default {
color: 'primary',
},
{
type: 'separate',
type:
this.$auth.hasPermi('base:core-equipment:export') ||
this.$auth.hasPermiAnd([
'base:core-equipment:create',
'base:core-worker:query',
])
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:firefight:export') ? 'button' : '',
type: this.$auth.hasPermi('base:core-equipment:export')
? 'button'
: '',
btnName: '导出',
name: 'export',
plain: true,
color: 'primary',
},
//
{
type: this.$auth.hasPermi('se:firefight:create') ? 'button' : '',
type: this.$auth.hasPermiAnd([
'base:core-equipment:create',
'base:core-worker:query',
])
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,

32
src/views/specialEquipment/basic/Manage.vue
View File

@ -142,19 +142,29 @@ export default {
return {
searchBarKeys: ['name', 'code'],
tableBtn: [
this.$auth.hasPermi(`se:manage:update`)
this.$auth.hasPermiAnd([
'base:core-equipment:query',
'base:core-equipment-attr:query',
])
? {
type: 'detail',
btnName: '详情',
}
: undefined,
this.$auth.hasPermi('se:manage:update')
this.$auth.hasPermiAnd([
'base:core-equipment:update',
'base:core-worker:query',
'base:core-equipment:query',
'base:core-equipment-attr:create',
'base:core-equipment-attr:query',
'base:core-equipment-attr:delete',
])
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('se:manage:delete')
this.$auth.hasPermi('base:core-equipment:delete')
? {
type: 'delete',
btnName: '删除',
@ -204,10 +214,17 @@ export default {
color: 'primary',
},
{
type: 'separate',
type:
this.$auth.hasPermi('base:core-equipment:export') ||
this.$auth.hasPermiAnd([
'base:core-equipment:create',
'base:core-worker:query',
])
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:manage:export')
type: this.$auth.hasPermi('base:core-equipment:export')
? 'button'
: '',
btnName: '导出',
@ -216,7 +233,10 @@ export default {
color: 'primary',
},
{
type: this.$auth.hasPermi('se:manage:create')
type: this.$auth.hasPermiAnd([
'base:core-equipment:create',
'base:core-worker:query',
])
? 'button'
: '',
btnName: '新增',

33
src/views/specialEquipment/basic/Safety.vue
View File

@ -141,19 +141,30 @@ export default {
return {
searchBarKeys: ['name', 'code'],
tableBtn: [
this.$auth.hasPermi(`se:safety:update`)
this.$auth.hasPermiAnd([
'base:core-equipment:query',
'base:core-equipment-attr:query',
])
? {
type: 'detail',
btnName: '详情',
}
: undefined,
this.$auth.hasPermi('se:safety:update')
//
this.$auth.hasPermiAnd([
'base:core-equipment:update',
'base:core-worker:query',
'base:core-equipment:query',
'base:core-equipment-attr:create',
'base:core-equipment-attr:query',
'base:core-equipment-attr:delete',
])
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('se:safety:delete')
this.$auth.hasPermi('base:core-equipment:delete')
? {
type: 'delete',
btnName: '删除',
@ -203,10 +214,17 @@ export default {
color: 'primary',
},
{
type: 'separate',
type:
this.$auth.hasPermi('base:core-equipment:export') ||
this.$auth.hasPermiAnd([
'base:core-equipment:create',
'base:core-worker:query',
])
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:safety:export')
type: this.$auth.hasPermi('base:core-equipment:export')
? 'button'
: '',
btnName: '导出',
@ -215,7 +233,10 @@ export default {
color: 'primary',
},
{
type: this.$auth.hasPermi('se:safety:create')
type: this.$auth.hasPermiAnd([
'base:core-equipment:create',
'base:core-worker:query',
])
? 'button'
: '',
btnName: '新增',

44
src/views/specialEquipment/check/CheckOrderListTable.vue
View File

@ -103,6 +103,7 @@
label="操作">
<template slot-scope="scope">
<el-tooltip
v-if="$auth.hasPermi('equipment:check:update')"
content="确认"
placement="top">
<el-button
@ -114,8 +115,13 @@
</el-button>
</el-tooltip>
<!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<span
v-if="$auth.hasPermi('equipment:check:query')"
style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
|
</span>
<el-tooltip
v-if="$auth.hasPermi('equipment:check:query')"
content="查看详情"
placement="top">
<el-button
@ -126,8 +132,35 @@
</el-button>
</el-tooltip>
<!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<span
v-if="
$auth.hasPermiAnd([
'equipment:check:update',
'base:core-worker:query',
'base:group-classes:query',
'base:core-department:query',
'equipment:check:query',
'equipment:check:create',
'equipment:check:delete',
'base:core-equipment:query',
])
"
style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
|
</span>
<el-tooltip
v-if="
$auth.hasPermiAnd([
'equipment:check:update',
'base:core-worker:query',
'base:group-classes:query',
'base:core-department:query',
'equipment:check:query',
'equipment:check:create',
'equipment:check:delete',
'base:core-equipment:query',
])
"
content="编辑"
placement="top">
<el-button
@ -138,8 +171,13 @@
</el-button>
</el-tooltip>
<!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<span
v-if="$auth.hasPermi('equipment:check:delete')"
style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
|
</span>
<el-tooltip
v-if="$auth.hasPermi('equipment:check:delete')"
content="删除"
placement="top">
<el-button

31
src/views/specialEquipment/check/Config.vue
View File

@ -26,7 +26,7 @@
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
:width="180"
:width="128"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
</base-table>
@ -78,20 +78,29 @@ export default {
addOrEditTitle: '',
searchBarKeys: ['name'],
tableBtn: [
this.$auth.hasPermi('se:check:add-item')
this.$auth.hasPermiAnd([
'equipment:check:create',
'equipment:check:query',
'equipment:check:update',
'equipment:check:delete',
])
? {
type: 'add',
btnName: '添加',
showTip: '添加巡检',
}
: undefined,
this.$auth.hasPermi('se:check:update')
this.$auth.hasPermiAnd([
'equipment:check:update',
'equipment:check:query',
'base:core-department:query',
])
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('se:check:delete')
this.$auth.hasPermi('equipment:check:delete')
? {
type: 'delete',
btnName: '删除',
@ -164,10 +173,20 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermiAnd([
'equipment:check:create',
'base:core-department:query',
])
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:check:create') ? 'button' : '',
type: this.$auth.hasPermiAnd([
'equipment:check:create',
'base:core-department:query',
])
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,

27
src/views/specialEquipment/check/Content.vue
View File

@ -155,10 +155,25 @@ export default {
color: 'primary',
},
{
type: 'separate',
type:
this.$auth.hasPermiAnd([
'equipment:check:create',
'base:core-worker:query',
'base:group-classes:query',
'base:core-department:query',
]) ||
this.$auth.hasPermi('equipment:check:export') ||
this.$auth.hasPermi('equipment:check:update')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:check-unconfirm:create')
type: this.$auth.hasPermiAnd([
'equipment:check:create',
'base:core-worker:query',
'base:group-classes:query',
'base:core-department:query',
])
? 'button'
: '',
btnName: '新增',
@ -167,18 +182,14 @@ export default {
color: 'success',
},
{
type: this.$auth.hasPermi('se:check-unconfirm:export')
? 'button'
: '',
type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
color: 'warning',
},
{
type: this.$auth.hasPermi('se:check-unconfirm:confirm-all')
? 'button'
: '',
type: this.$auth.hasPermi('equipment:check:update') ? 'button' : '',
btnName: '批量确认',
name: 'batch-confirm',
plain: true,

6
src/views/specialEquipment/check/Record.vue
View File

@ -71,7 +71,7 @@ export default {
addOrUpdateVisible: false,
searchBarKeys: ['name', 'actualCheckTime'],
tableBtn: [
this.$auth.hasPermi('se:check-record:detail')
this.$auth.hasPermi('equipment:check:query')
? {
type: 'detail',
btnName: '详情',
@ -147,10 +147,10 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:check:export') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('se:check-record:export') ? 'button' : '',
type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,

24
src/views/specialEquipment/maintain/Monitor.vue
View File

@ -122,20 +122,22 @@ export default {
minWidth: 158,
showOverflowtooltip: true,
},
{
prop: 'opt2',
label: '保养内容',
entryText: '详情',
subcomponent: TableBtn,
width: 100,
},
this.$auth.hasPermi('equipment:plan-config:query')
? {
prop: 'opt2',
label: '保养内容',
entryText: '详情',
subcomponent: TableBtn,
width: 100,
}
: undefined,
{
prop: 'remainDays',
label: '距离下次保养剩余时间(天)',
subcomponent: RemainBox,
minWidth: 210,
},
],
].filter(v => v),
searchBarFormConfig: [
{
type: 'select',
@ -151,10 +153,12 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:plan-config:export')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:maintain-plan:export')
type: this.$auth.hasPermi('equipment:plan-config:export')
? 'button'
: '',
btnName: '导出',

36
src/views/specialEquipment/maintain/PlanConfig.vue
View File

@ -83,19 +83,31 @@ export default {
return {
searchBarKeys: ['planName'],
tableBtn: [
this.$auth.hasPermi('se:maintain:update')
this.$auth.hasPermiAnd([
'equipment:plan-config:query',
'equipment:plan-config:create',
'equipment:plan-config:update',
'equipment:plan-config:delete',
'base:core-equipment:query',
])
? {
type: 'addContent',
btnName: '添加内容',
}
: undefined,
this.$auth.hasPermi('se:maintain:update')
this.$auth.hasPermiAnd([
'equipment:plan-config:update',
'equipment:plan-config:query',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query',
])
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('se:maintain:delete')
this.$auth.hasPermi('equipment:plan-config:delete')
? {
type: 'delete',
btnName: '删除',
@ -166,10 +178,24 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermiAnd([
'equipment:plan-config:create',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query',
])
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:maintain:create') ? 'button' : '',
type: this.$auth.hasPermiAnd([
'equipment:plan-config:create',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query',
])
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,

2
src/views/specialEquipment/maintain/Record--detail.vue
View File

@ -212,7 +212,7 @@ export default {
},
computed: {},
mounted() {
this.loadEquipments();
// this.loadEquipments();
},
methods: {
/** 确认是否关闭 */

64
src/views/specialEquipment/maintain/Record.vue
View File

@ -100,26 +100,26 @@ export default {
return {
recordDetailVisible: false,
searchBarKeys: ['maintainPlanId', 'startTime', 'special'],
tableBtn: [
this.$auth.hasPermi('se:maintain-record:update')
? {
type: 'detail',
btnName: '详情',
}
: undefined,
this.$auth.hasPermi('se:maintain-record:update')
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('se:maintain-record:delete')
? {
type: 'delete',
btnName: '删除',
}
: undefined,
].filter((v) => v),
// tableBtn: [
// this.$auth.hasPermi('se:maintain-record:update')
// ? {
// type: 'detail',
// btnName: '详情',
// }
// : undefined,
// this.$auth.hasPermi('se:maintain-record:update')
// ? {
// type: 'edit',
// btnName: '修改',
// }
// : undefined,
// this.$auth.hasPermi('se:maintain-record:delete')
// ? {
// type: 'delete',
// btnName: '删除',
// }
// : undefined,
// ].filter((v) => v),
tableProps: [
{
prop: 'maintainOrderNumber',
@ -182,14 +182,16 @@ export default {
filter: (val) =>
val != null ? ['-', '计划型', '非计划型'][val] : '-',
},
{
prop: '_detail',
label: '详情',
entryText: '详情',
minWidth: 60,
subcomponent: TableBtn,
},
],
this.$auth.hasPermi('equipment:maintain-record:query')
? {
prop: '_detail',
label: '详情',
entryText: '详情',
minWidth: 60,
subcomponent: TableBtn,
}
: '',
].filter((v) => v),
searchBarFormConfig: [
{
type: 'select',
@ -222,10 +224,12 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:maintain-record:export')
type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'button'
: '',
btnName: '导出',

26
src/views/specialEquipment/maintain/Repair.vue
View File

@ -88,19 +88,19 @@ export default {
'specialType',
],
tableBtn: [
this.$auth.hasPermi('se:repair:finish')
this.$auth.hasPermi('equipment:repair:finish')
? {
type: 'finish',
btnName: '完成',
}
: undefined,
this.$auth.hasPermi('se:repair:update')
this.$auth.hasPermi('equipment:repair:query')
? {
type: 'detail',
btnName: '详情',
}
: undefined,
this.$auth.hasPermi('se:repair:delete')
this.$auth.hasPermi('equipment:repair:delete')
? {
type: 'delete',
btnName: '删除',
@ -212,17 +212,31 @@ export default {
color: 'primary',
},
{
type: 'separate',
type:
this.$auth.hasPermi('equipment:repair:export') ||
this.$auth.hasPermiAnd([
'equipment:repair:create',
'base:core-worker:query',
'system:user:list',
])
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:repair:export') ? 'button' : '',
type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
color: 'primary',
},
{
type: this.$auth.hasPermi('se:repair:create') ? 'button' : '',
type: this.$auth.hasPermiAnd([
'equipment:repair:create',
'base:core-worker:query',
'system:user:list',
])
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,

23
src/views/specialEquipment/maintain/WaitingList.vue
View File

@ -147,10 +147,25 @@ export default {
color: 'primary',
},
{
type: 'separate',
type:
this.$auth.hasPermiAnd([
'equipment:maintain-record:create',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query',
]) ||
this.$auth.hasPermi('equipment:maintain-record:update') ||
this.$auth.hasPermi('equipment:maintain-record:export')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('se:maintain-record-pre:create')
type: this.$auth.hasPermiAnd([
'equipment:maintain-record:create',
'base:core-worker:query',
'base:core-production-line:query',
'base:core-department:query',
])
? 'button'
: '',
btnName: '新增',
@ -159,7 +174,7 @@ export default {
color: 'success',
},
{
type: this.$auth.hasPermi('se:maintain-record-pre:confirm-all')
type: this.$auth.hasPermi('equipment:maintain-record:update')
? 'button'
: '',
btnName: '批量确认',
@ -168,7 +183,7 @@ export default {
plain: true,
},
{
type: this.$auth.hasPermi('se:maintain-record-pre:export')
type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'button'
: '',
btnName: '导出',

35
src/views/specialEquipment/maintain/WaitingListTable.vue
View File

@ -144,7 +144,7 @@
label="操作">
<template slot-scope="scope">
<el-tooltip
v-if="$auth.hasPermi('se:maintain-record-pre:confirm')"
v-if="$auth.hasPermi('equipment:maintain-record:update')"
content="确认"
placement="top">
<el-button
@ -158,11 +158,11 @@
<!-- line -->
<span
style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
v-if="$auth.hasPermi('se:maintain-record-pre:update')">
v-if="$auth.hasPermi('equipment:maintain-record:query')">
|
</span>
<el-tooltip
v-if="$auth.hasPermi('se:maintain-record-pre:update')"
v-if="$auth.hasPermi('equipment:maintain-record:query')"
content="查看详情"
placement="top">
<el-button
@ -175,11 +175,29 @@
<!-- line -->
<span
style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
v-if="$auth.hasPermi('se:maintain-record-pre:update')">
v-if="
$auth.hasPermiAnd([
'equipment:maintain-record:update',
'base:core-production-line:query',
'base:core-department:query',
'equipment:maintain-record:create',
'equipment:maintain-record:query',
'equipment:maintain-record:delete',
])
">
|
</span>
<el-tooltip
v-if="$auth.hasPermi('se:maintain-record-pre:update')"
v-if="
$auth.hasPermiAnd([
'equipment:maintain-record:update',
'base:core-production-line:query',
'base:core-department:query',
'equipment:maintain-record:create',
'equipment:maintain-record:query',
'equipment:maintain-record:delete',
])
"
content="编辑"
placement="top">
<el-button
@ -190,8 +208,13 @@
</el-button>
</el-tooltip>
<!-- line -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<span
v-if="$auth.hasPermi('equipment:maintain-record:delete')"
style="margin: 0 4px; font-size: 18px; color: #e5e7eb">
|
</span>
<el-tooltip
v-if="$auth.hasPermi('equipment:maintain-record:delete')"
content="删除"
placement="top">
<el-button