projects/mesxc-zhp #332
7
.env.dev
7
.env.dev
@ -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'
|
ENV = 'development'
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2021-11-18 14:16:25
|
* @Date: 2021-11-18 14:16:25
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-11 13:35:46
|
* @LastEditTime: 2024-04-12 14:26:22
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -100,20 +100,6 @@ import { parseTime } from '../../core/mixins/code-filter';
|
|||||||
import attrAdd from './attr-add';
|
import attrAdd from './attr-add';
|
||||||
// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
|
// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
|
||||||
import { publicFormatter } 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 = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
prop: 'materialName',
|
prop: 'materialName',
|
||||||
@ -137,22 +123,36 @@ const tableProps = [
|
|||||||
label: '备注',
|
label: '备注',
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const topBtnConfig = [
|
|
||||||
{
|
|
||||||
type: 'add',
|
|
||||||
btnName: 'btn.add'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
mixins: [basicAdd],
|
mixins: [basicAdd],
|
||||||
components: { SmallTitle, attrAdd },
|
components: { SmallTitle, attrAdd },
|
||||||
data() {
|
data() {
|
||||||
return {
|
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,
|
tableProps,
|
||||||
topBtnConfig,
|
topBtnConfig:[
|
||||||
|
{
|
||||||
|
type: this.$auth.hasPermi('extend:process-equ-material-bom-det:add')
|
||||||
|
? 'add'
|
||||||
|
: '',
|
||||||
|
btnName: 'btn.add'
|
||||||
|
}
|
||||||
|
],
|
||||||
addOrUpdateVisible: false,
|
addOrUpdateVisible: false,
|
||||||
urlOptions: {
|
urlOptions: {
|
||||||
isGetCode: false,
|
isGetCode: false,
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2021-11-18 14:16:25
|
* @Date: 2021-11-18 14:16:25
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-11 13:35:42
|
* @LastEditTime: 2024-04-12 14:28:44
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -110,20 +110,6 @@ import { parseTime } from '../../core/mixins/code-filter';
|
|||||||
import attrAdd from './attr-add';
|
import attrAdd from './attr-add';
|
||||||
// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
|
// 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 = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
prop: 'valueName',
|
prop: 'valueName',
|
||||||
@ -157,25 +143,35 @@ const tableProps = [
|
|||||||
prop: 'remark',
|
prop: 'remark',
|
||||||
label: '备注',
|
label: '备注',
|
||||||
},
|
},
|
||||||
];
|
]
|
||||||
|
export default {
|
||||||
const topBtnConfig = [
|
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')
|
type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
|
||||||
? 'add'
|
? 'add'
|
||||||
: '',
|
: '',
|
||||||
btnName: 'btn.add'
|
btnName: 'btn.add'
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
|
||||||
export default {
|
|
||||||
mixins: [basicAdd],
|
|
||||||
components: { SmallTitle, attrAdd },
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
tableBtn,
|
|
||||||
tableProps,
|
|
||||||
topBtnConfig,
|
|
||||||
addOrUpdateVisible: false,
|
addOrUpdateVisible: false,
|
||||||
enableList: [
|
enableList: [
|
||||||
{
|
{
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2023-08-01 14:55:51
|
* @Date: 2023-08-01 14:55:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-10 16:31:48
|
* @LastEditTime: 2024-04-12 14:12:55
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -131,7 +131,7 @@ export default {
|
|||||||
width: 250
|
width: 250
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
|
type: this.$auth.hasPermi('base:material-use-log:query') ? 'button' : '',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
@ -163,13 +163,13 @@ export default {
|
|||||||
// },
|
// },
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi(
|
type: this.$auth.hasPermi(
|
||||||
'monitoring:materiel-date-from:export'
|
'base:material-use-log:export'
|
||||||
)
|
)
|
||||||
? 'separate'
|
? 'separate'
|
||||||
: '',
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
|
type: this.$auth.hasPermi('base:material-use-log:export') ? 'button' : '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
name: 'export',
|
name: 'export',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2023-08-01 14:55:51
|
* @Date: 2023-08-01 14:55:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-04-07 16:26:56
|
* @LastEditTime: 2024-04-12 14:16:03
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -97,10 +97,13 @@ export default {
|
|||||||
// }
|
// }
|
||||||
// : undefined,
|
// : undefined,
|
||||||
{
|
{
|
||||||
type: 'processDetail',
|
type: this.$auth.hasPermi(
|
||||||
|
'extend:process-retrospect:query'
|
||||||
|
)
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '查看工艺详情',
|
btnName: '查看工艺详情',
|
||||||
},
|
},
|
||||||
|
|
||||||
].filter((v) => v),
|
].filter((v) => v),
|
||||||
list: [],
|
list: [],
|
||||||
listQuery: {
|
listQuery: {
|
||||||
@ -137,7 +140,7 @@ export default {
|
|||||||
{
|
{
|
||||||
|
|
||||||
type: this.$auth.hasPermi(
|
type: this.$auth.hasPermi(
|
||||||
'monitoring:process-traceability:query'
|
'extend:process-retrospect:query'
|
||||||
)
|
)
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
|
@ -1,14 +1,15 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: Do not edit
|
* @Author: Do not edit
|
||||||
* @Date: 2023-12-13 14:10:04
|
* @Date: 2023-12-13 14:10:04
|
||||||
* @LastEditTime: 2024-03-29 09:43:52
|
* @LastEditTime: 2024-04-12 14:21:34
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-row style="float: right; margin-bottom: 5px">
|
<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="handleReturn()">返回</el-button>
|
||||||
<el-button v-if="edit" size="small" @click="updateData">保存</el-button>
|
<el-button v-if="edit" size="small" @click="updateData">保存</el-button>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-03-29 09:48:24
|
* @LastEditTime: 2024-04-12 14:22:16
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -13,11 +13,12 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button type="primary" @click="getDataList()">查询</el-button>
|
<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>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row style="float: right; margin-bottom: 5px">
|
<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 v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
|
||||||
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-04-08 11:45:52
|
* @LastEditTime: 2024-04-12 14:22:46
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -12,13 +12,15 @@
|
|||||||
<el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
|
<el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</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>
|
||||||
<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>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row style="float: right; margin-bottom: 5px">
|
<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 v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
|
||||||
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-03-29 09:48:41
|
* @LastEditTime: 2024-04-12 14:22:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -14,13 +14,15 @@
|
|||||||
style="width: 350px" placeholder="选择周">
|
style="width: 350px" placeholder="选择周">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</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>
|
||||||
<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>
|
@click="handleExport">导出</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row style="float: right; margin-bottom: 5px">
|
<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 v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
|
||||||
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-04-08 11:46:49
|
* @LastEditTime: 2024-04-12 14:22:54
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -14,15 +14,17 @@
|
|||||||
style="width: 350px" placeholder="选择年">
|
style="width: 350px" placeholder="选择年">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</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>
|
||||||
<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>
|
@click="handleExport">导出</el-button>
|
||||||
<!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</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-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row style="float: right; margin-bottom: 5px">
|
<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 v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
|
||||||
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
<el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
Loading…
Reference in New Issue
Block a user