Compare commits
No commits in common. "84468cc8834bed1ee5b736f1fd92d4be111486f7" and "ea04d55fc1e35232c370143512ce2ed1bbdfb0af" have entirely different histories.
84468cc883
...
ea04d55fc1
2
.env.dev
2
.env.dev
@ -1,7 +1,7 @@
|
||||
###
|
||||
# @Author: Do not edit
|
||||
# @Date: 2023-08-29 09:40:39
|
||||
# @LastEditTime: 2024-04-08 16:46:49
|
||||
# @LastEditTime: 2024-04-03 11:22:19
|
||||
# @LastEditors: DY
|
||||
# @Description:
|
||||
###
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-18 14:16:25
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2024-04-08 10:21:46
|
||||
* @LastEditTime: 2024-03-22 08:53:20
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -214,9 +214,7 @@ export default {
|
||||
actualQuantity: this.dataForm.actualQuantity
|
||||
}).then(response => {
|
||||
this.$modal.msgSuccess("操作成功!工单状态稍后将会更新!");
|
||||
if (tempList.length > 0) {
|
||||
this.saveData(tempList)
|
||||
}
|
||||
this.visible = false;
|
||||
this.$emit("refreshDataList");
|
||||
});
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-18 14:16:25
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2024-04-08 14:27:29
|
||||
* @LastEditTime: 2024-03-21 16:52:46
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -182,8 +182,7 @@
|
||||
:table-props="tableProps"
|
||||
:page="listQuery.pageNo"
|
||||
:limit="listQuery.pageSize"
|
||||
:table-data="orderList"
|
||||
:max-height="tableH">
|
||||
:table-data="orderList">
|
||||
<method-btn
|
||||
v-if="!isdetail"
|
||||
slot="handleBtn"
|
||||
@ -210,8 +209,7 @@
|
||||
:table-props="tableProps1"
|
||||
:page="listQuery1.pageNo"
|
||||
:limit="listQuery1.pageSize"
|
||||
:table-data="materialList"
|
||||
:max-height="tableH" />
|
||||
:table-data="materialList" />
|
||||
<!-- <pagination
|
||||
v-show="listQuery1.total > 0"
|
||||
:total="listQuery1.total"
|
||||
@ -237,7 +235,6 @@ 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 = [
|
||||
{
|
||||
@ -295,11 +292,9 @@ const tableProps1 = [
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [tableHeightMixin],
|
||||
components: { SmallTitle, topTabVue },
|
||||
data() {
|
||||
return {
|
||||
heightNum: 380,
|
||||
tableBtn,
|
||||
tableProps,
|
||||
tableProps1,
|
||||
@ -460,7 +455,7 @@ export default {
|
||||
// this.listQuery.total = response.data.total;
|
||||
});
|
||||
// 获取预使用原料列表
|
||||
console.log('111我看看', this.dataForm.materialMethod)
|
||||
console.log()
|
||||
if (this.dataForm.id) {
|
||||
if (this.dataForm.materialMethod === 1) {
|
||||
// 产品
|
||||
|
@ -9,8 +9,7 @@
|
||||
:table-props="tableProps"
|
||||
:page="listQuery.pageNo"
|
||||
:limit="listQuery.pageSize"
|
||||
:table-data="tableData"
|
||||
:max-height="tableH">
|
||||
:table-data="tableData">
|
||||
<method-btn
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
@ -63,7 +62,7 @@ import {
|
||||
getCoreWOList
|
||||
} from '@/api/base/coreWorkOrder';
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
|
||||
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -133,7 +132,7 @@ const tableProps = [
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [basicPage, tableHeightMixin],
|
||||
mixins: [basicPage],
|
||||
components: {
|
||||
AddWorkOrder,
|
||||
AddOrUpdate,
|
||||
|
@ -32,7 +32,6 @@ import {
|
||||
import { getEnergyTypeListAll } from '@/api/base/energyType';
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
import moment from 'moment';
|
||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -62,7 +61,7 @@ const tableProps = [
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [basicPage,tableHeightMixin],
|
||||
mixins: [basicPage],
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
@ -71,6 +70,7 @@ export default {
|
||||
},
|
||||
tableData: [],
|
||||
tableProps,
|
||||
tableH: this.tableHeight(260),
|
||||
drawerVisible: false,
|
||||
formConfig: [
|
||||
{
|
||||
@ -113,6 +113,9 @@ export default {
|
||||
},
|
||||
components: {},
|
||||
created() {
|
||||
window.addEventListener('resize', () => {
|
||||
this.tableH = this.tableHeight(260)
|
||||
})
|
||||
getEnergyTypeListAll().then((response) => {
|
||||
this.formConfig[0].selectOptions = response.data;
|
||||
});
|
||||
|
@ -32,7 +32,6 @@ import {
|
||||
import { getEnergyTypeListAll } from '@/api/base/energyType';
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
import moment from 'moment';
|
||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -72,7 +71,7 @@ const tableProps = [
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [basicPage,tableHeightMixin],
|
||||
mixins: [basicPage],
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
@ -81,6 +80,7 @@ export default {
|
||||
},
|
||||
tableData: [],
|
||||
tableProps,
|
||||
tableH: this.tableHeight(260),
|
||||
drawerVisible: false,
|
||||
formConfig: [
|
||||
{
|
||||
@ -137,6 +137,9 @@ 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);
|
||||
|
@ -53,7 +53,6 @@ import {
|
||||
} from '@/api/cost/costMaterialSet';
|
||||
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -92,7 +91,7 @@ const tableProps = [
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [basicPage,tableHeightMixin],
|
||||
mixins: [basicPage],
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
@ -100,6 +99,7 @@ export default {
|
||||
deleteURL: deleteCostMaterialSet,
|
||||
},
|
||||
tableProps,
|
||||
tableH: this.tableHeight(260),
|
||||
tableBtn: [
|
||||
this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
|
||||
? {
|
||||
@ -132,11 +132,7 @@ export default {
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type:
|
||||
this.$auth.hasPermi('cost:rawMaterialConfig:create') &&
|
||||
this.$auth.hasPermi('cost:rawMaterialConfig:query')
|
||||
? 'separate'
|
||||
: '',
|
||||
type: 'separate',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
|
||||
@ -154,6 +150,9 @@ export default {
|
||||
AddOrUpdate,
|
||||
},
|
||||
created() {
|
||||
window.addEventListener('resize', () => {
|
||||
this.tableH = this.tableHeight(260)
|
||||
})
|
||||
getHotMaterialList().then((response) => {
|
||||
this.formConfig[0].selectOptions = response.data;
|
||||
});
|
||||
|
@ -32,7 +32,6 @@ import {
|
||||
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
import moment from 'moment';
|
||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -67,7 +66,7 @@ const tableProps = [
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [basicPage,tableHeightMixin],
|
||||
mixins: [basicPage],
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
@ -76,6 +75,7 @@ export default {
|
||||
},
|
||||
tableData: [],
|
||||
tableProps,
|
||||
tableH: this.tableHeight(260),
|
||||
drawerVisible: false,
|
||||
formConfig: [
|
||||
{
|
||||
@ -118,6 +118,9 @@ export default {
|
||||
},
|
||||
components: {},
|
||||
created() {
|
||||
window.addEventListener('resize', () => {
|
||||
this.tableH = this.tableHeight(260)
|
||||
})
|
||||
getHotMaterialList().then((response) => {
|
||||
this.formConfig[0].selectOptions = response.data;
|
||||
});
|
||||
|
@ -32,7 +32,6 @@ import {
|
||||
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
import moment from 'moment';
|
||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -71,7 +70,7 @@ const tableProps = [
|
||||
];
|
||||
|
||||
export default {
|
||||
mixins: [basicPage,tableHeightMixin],
|
||||
mixins: [basicPage],
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
@ -80,6 +79,7 @@ export default {
|
||||
},
|
||||
tableData: [],
|
||||
tableProps,
|
||||
tableH: this.tableHeight(260),
|
||||
drawerVisible: false,
|
||||
formConfig: [
|
||||
{
|
||||
@ -136,6 +136,9 @@ 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);
|
||||
|
@ -104,27 +104,21 @@ export default {
|
||||
type: 'separate',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:inspection-confirm:create')
|
||||
? 'button'
|
||||
: '',
|
||||
type: 'button',
|
||||
btnName: '新增',
|
||||
name: 'add',
|
||||
plain: true,
|
||||
color: 'success',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:inspection-confirm:confirm')
|
||||
? 'button'
|
||||
: '',
|
||||
type: 'button',
|
||||
btnName: '批量确认',
|
||||
name: 'batchConfirm',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:inspection-confirm:export')
|
||||
? 'button'
|
||||
: '',
|
||||
type: 'button',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
plain: true,
|
||||
|
@ -160,25 +160,21 @@ export default {
|
||||
type: 'separate',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:maintain-confirm:create')
|
||||
? 'button'
|
||||
: '',
|
||||
type: 'button',
|
||||
btnName: '新增',
|
||||
name: 'add',
|
||||
plain: true,
|
||||
color: 'success',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:maintain-confirm:confirm')
|
||||
? 'button'
|
||||
: '',
|
||||
type: 'button',
|
||||
btnName: '批量确认',
|
||||
name: 'batchConfirm',
|
||||
color: 'primary',
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:maintain-confirm:export')
|
||||
type: this.$auth.hasPermi('equipment:maintain-record:export')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '导出',
|
||||
|
@ -193,7 +193,7 @@ export default {
|
||||
type: 'separate',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('equipment:maintain-monitor:export')
|
||||
type: this.$auth.hasPermi('base:quality-inspection-type:export')
|
||||
? 'button'
|
||||
: '',
|
||||
btnName: '导出',
|
||||
|
Loading…
Reference in New Issue
Block a user