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

Merge branch 'projects/mesxc-test' into projects/mesxc-lb

Browse Source
This commit is contained in:
lb 2024-04-12 16:46:20 +08:00
commit 92b9ec7da7
12 changed files with 192 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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'

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,

52
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 = [
]
export default {
mixins: [basicAdd],
components: { SmallTitle, attrAdd },
data() {
return {
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:[
{
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,
tableProps,
topBtnConfig,
],
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',

11
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>
@ -97,10 +97,13 @@ export default {
// }
// : 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 {

11
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>
@ -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 {

10
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>

10
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>

10
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>