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

projects/mesxc-zjl #321

Merged
juzi merged 3 commits from projects/mesxc-zjl into projects/mesxc-test 2024-04-09 13:09:56 +08:00
Conversation 0 Commits 3 Files Changed 3 +51 -44
12 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84468cc883 - Show all commits

2
.env.dev
View File

@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-04-03 11:22:19
# @LastEditTime: 2024-04-08 16:46:49
# @LastEditors: DY
# @Description:
###

6
src/views/base/coreWorkOrder/allocation.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-03-22 08:53:20
* @LastEditTime: 2024-04-08 10:21:46
* @Description:
-->
<template>
@ -214,7 +214,9 @@ export default {
actualQuantity: this.dataForm.actualQuantity
}).then(response => {
this.$modal.msgSuccess("操作成功！工单状态稍后将会更新！");
this.saveData(tempList)
if (tempList.length > 0) {
this.saveData(tempList)
}
this.visible = false;
this.$emit("refreshDataList");
});

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

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-03-21 16:52:46
* @LastEditTime: 2024-04-08 14:27:29
* @Description:
-->
<template>
@ -182,7 +182,8 @@
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:table-data="orderList">
:table-data="orderList"
:max-height="tableH">
<method-btn
v-if="!isdetail"
slot="handleBtn"
@ -209,7 +210,8 @@
:table-props="tableProps1"
:page="listQuery1.pageNo"
:limit="listQuery1.pageSize"
:table-data="materialList" />
:table-data="materialList"
:max-height="tableH" />
<!-- <pagination
v-show="listQuery1.total > 0"
:total="listQuery1.total"
@ -235,6 +237,7 @@ import SmallTitle from './SmallTitle';
import { publicFormatter } from "@/utils/dict";
import { parseTime } from '@/utils/ruoyi'
import topTabVue from '../../order/base/orderManage/components/topTab.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableBtn = [
{
@ -292,9 +295,11 @@ const tableProps1 = [
];
export default {
mixins: [tableHeightMixin],
components: { SmallTitle, topTabVue },
data() {
return {
heightNum: 380,
tableBtn,
tableProps,
tableProps1,
@ -455,7 +460,7 @@ export default {
// this.listQuery.total = response.data.total;
});
// 获取预使用原料列表
console.log()
console.log('111我看看', this.dataForm.materialMethod)
if (this.dataForm.id) {
if (this.dataForm.materialMethod === 1) {
// 产品

7
src/views/base/coreWorkOrder/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:table-data="tableData">
:table-data="tableData"
:max-height="tableH">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
@ -62,7 +63,7 @@ import {
getCoreWOList
} from '@/api/base/coreWorkOrder';
import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
@ -132,7 +133,7 @@ const tableProps = [
];
export default {
mixins: [basicPage],
mixins: [basicPage, tableHeightMixin],
components: {
AddWorkOrder,
AddOrUpdate,

7
src/views/cost/energyCost/index.vue
View File

@ -32,6 +32,7 @@ import {
import { getEnergyTypeListAll } from '@/api/base/energyType';
import { publicFormatter } from '@/utils/dict';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
@ -61,7 +62,7 @@ const tableProps = [
];
export default {
mixins: [basicPage],
mixins: [basicPage,tableHeightMixin],
data() {
return {
urlOptions: {
@ -70,7 +71,6 @@ export default {
},
tableData: [],
tableProps,
tableH: this.tableHeight(260),
drawerVisible: false,
formConfig: [
{
@ -113,9 +113,6 @@ export default {
},
components: {},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
getEnergyTypeListAll().then((response) => {
this.formConfig[0].selectOptions = response.data;
});

7
src/views/cost/energyCostHis/index.vue
View File

@ -32,6 +32,7 @@ import {
import { getEnergyTypeListAll } from '@/api/base/energyType';
import { publicFormatter } from '@/utils/dict';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
@ -71,7 +72,7 @@ const tableProps = [
];
export default {
mixins: [basicPage],
mixins: [basicPage,tableHeightMixin],
data() {
return {
urlOptions: {
@ -80,7 +81,6 @@ export default {
},
tableData: [],
tableProps,
tableH: this.tableHeight(260),
drawerVisible: false,
formConfig: [
{
@ -137,9 +137,6 @@ export default {
},
components: {},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);

15
src/views/cost/rawMaterialConfig/index.vue
View File

@ -12,7 +12,7 @@
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:max-height="tableH"
:max-height="tableH"
:table-data="tableData">
<method-btn
v-if="tableBtn.length"
@ -53,6 +53,7 @@ import {
} from '@/api/cost/costMaterialSet';
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
@ -91,7 +92,7 @@ const tableProps = [
];
export default {
mixins: [basicPage],
mixins: [basicPage,tableHeightMixin],
data() {
return {
urlOptions: {
@ -99,7 +100,6 @@ export default {
deleteURL: deleteCostMaterialSet,
},
tableProps,
tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
? {
@ -132,7 +132,11 @@ export default {
color: 'primary',
},
{
type: 'separate',
type:
this.$auth.hasPermi('cost:rawMaterialConfig:create') &&
this.$auth.hasPermi('cost:rawMaterialConfig:query')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
@ -150,9 +154,6 @@ export default {
AddOrUpdate,
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
getHotMaterialList().then((response) => {
this.formConfig[0].selectOptions = response.data;
});

7
src/views/cost/rawMaterialCost/index.vue
View File

@ -32,6 +32,7 @@ import {
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
import { publicFormatter } from '@/utils/dict';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
@ -66,7 +67,7 @@ const tableProps = [
];
export default {
mixins: [basicPage],
mixins: [basicPage,tableHeightMixin],
data() {
return {
urlOptions: {
@ -75,7 +76,6 @@ export default {
},
tableData: [],
tableProps,
tableH: this.tableHeight(260),
drawerVisible: false,
formConfig: [
{
@ -118,9 +118,6 @@ export default {
},
components: {},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
getHotMaterialList().then((response) => {
this.formConfig[0].selectOptions = response.data;
});

7
src/views/cost/rawMaterialCostHis/index.vue
View File

@ -32,6 +32,7 @@ import {
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
import { publicFormatter } from '@/utils/dict';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
@ -70,7 +71,7 @@ const tableProps = [
];
export default {
mixins: [basicPage],
mixins: [basicPage,tableHeightMixin],
data() {
return {
urlOptions: {
@ -79,7 +80,6 @@ export default {
},
tableData: [],
tableProps,
tableH: this.tableHeight(260),
drawerVisible: false,
formConfig: [
{
@ -136,9 +136,6 @@ export default {
},
components: {},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);

12
src/views/equipment/base/inspection/Confirm/index.vue
View File

@ -104,21 +104,27 @@ export default {
type: 'separate',
},
{
type: 'button',
type: this.$auth.hasPermi('equipment:inspection-confirm:create')
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,
color: 'success',
},
{
type: 'button',
type: this.$auth.hasPermi('equipment:inspection-confirm:confirm')
? 'button'
: '',
btnName: '批量确认',
name: 'batchConfirm',
color: 'primary',
plain: true,
},
{
type: 'button',
type: this.$auth.hasPermi('equipment:inspection-confirm:export')
? 'button'
: '',
btnName: '导出',
name: 'export',
plain: true,

10
src/views/equipment/base/maintain/Confirm/index.vue
View File

@ -160,21 +160,25 @@ export default {
type: 'separate',
},
{
type: 'button',
type: this.$auth.hasPermi('equipment:maintain-confirm:create')
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,
color: 'success',
},
{
type: 'button',
type: this.$auth.hasPermi('equipment:maintain-confirm:confirm')
? 'button'
: '',
btnName: '批量确认',
name: 'batchConfirm',
color: 'primary',
plain: true,
},
{
type: this.$auth.hasPermi('equipment:maintain-record:export')
type: this.$auth.hasPermi('equipment:maintain-confirm:export')
? 'button'
: '',
btnName: '导出',

2
src/views/equipment/base/maintain/Monitor/index.vue
View File

@ -193,7 +193,7 @@ export default {
type: 'separate',
},
{
type: this.$auth.hasPermi('base:quality-inspection-type:export')
type: this.$auth.hasPermi('equipment:maintain-monitor:export')
? 'button'
: '',
btnName: '导出',