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

修改 #420

Merged
juzi merged 1 commits from projects/mes-zjl into projects/mes-test 2025-01-24 14:29:38 +08:00
Conversation 0 Commits 1 Files Changed 12 +143 -162
12 changed files with 143 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/ButtonNav/index.vue
View File

@ -1,10 +1,3 @@
<!--
filename: index.vue
author: liubin
date: 2024-04-02 09:49:36
description:
-->
<template> <template>
<!-- 按钮切换 --> <!-- 按钮切换 -->
<div v-if="buttonMode" class="button-nav"> <div v-if="buttonMode" class="button-nav">
@ -12,9 +5,8 @@
v-for="m in menus" v-for="m in menus"
:key="m" :key="m"
@click="currentMenu = m" @click="currentMenu = m"
:data-text="m"
:class="[m === currentMenu ? 'active' : '']" :class="[m === currentMenu ? 'active' : '']"
></button> >{{m}}</button>
</div> </div>
<!-- 标签切换 --> <!-- 标签切换 -->
<div v-else class="custom-tabs" style="height: 100%; width: 100%"> <div v-else class="custom-tabs" style="height: 100%; width: 100%">
@ -75,33 +67,24 @@ export default {
} }
button { button {
height: 48px;
line-height: 48px;
cursor: pointer; cursor: pointer;
appearance: none; appearance: none;
outline: none; outline: none;
border: none; border: none;
background: #fff; background: #fff;
border-radius: 8px; border-radius: 8px;
padding: 15px; font-size: 16px;
color: #888; font-weight: 500;
color: rgba(22, 22, 22, 0.65);
letter-spacing: 2px; letter-spacing: 2px;
flex: 1; flex: 1;
box-sizing: padding-box; box-sizing: padding-box;
position: relative; position: relative;
&::after {
content: attr(data-text);
position: absolute;
top: 5px;
left: 50%;
font-size: 16px;
font-weight: 500;
transform: translate(-50%);
}
&.active { &.active {
color: #111; color: rgba(22, 22, 22, 1);
//border-bottom: 2px solid #0b58ff; border-bottom: 4px solid #0b58ff;
box-shadow: 0px 2px 1px 1px #0b58ff;
} }
} }
} }

2
src/views/energy/analysis/index.vue
View File

@ -7,7 +7,7 @@
--> -->
<template> <template>
<div> <div>
<div style="background: #f2f4f9; height: 40px; width: 100%"> <div style="background: #f2f4f9; height: 56px; width: 100%">
<ButtonNav <ButtonNav
:menus="['走势分析', '对比分析', '同比分析', '环比分析']" :menus="['走势分析', '对比分析', '同比分析', '环比分析']"
@change="currentMenu"> @change="currentMenu">

2
src/views/group/base/groupTeamScheduling/index.vue
View File

@ -288,7 +288,7 @@ export default {
if ( if (
moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM') moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
) { ) {
num = Number(moment().format('DD')); num = Number(moment().format('DD'))-1;
} else { } else {
num = 0; num = 0;
} }

2
src/views/group/base/schedulingPlanConfig/index.vue
View File

@ -177,6 +177,8 @@ export default {
res.data.list.forEach(item => { res.data.list.forEach(item => {
if(item.isProduction){ if(item.isProduction){
item.str = item.strList?item.strList.join('，'):'-' item.str = item.strList?item.strList.join('，'):'-'
}else{
item.str = '-'
} }
}); });
this.list = res.data.list; this.list = res.data.list;

31
src/views/group/base/schedulingRuleConfig/index.vue
View File

@ -46,6 +46,7 @@ import {
getGroupRule, getGroupRule,
disableGroupRule disableGroupRule
} from '@/api/base/groupSchedulingRule'; } from '@/api/base/groupSchedulingRule';
import { groupClassesListAll } from '@/api/monitoring/teamProduction';
import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue'; import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
import { formatDate } from '@/utils'; import { formatDate } from '@/utils';
import tableHeightMixin from '@/mixins/tableHeightMixin'; import tableHeightMixin from '@/mixins/tableHeightMixin';
@ -78,10 +79,12 @@ export default {
return { return {
formConfig: [ formConfig: [
{ {
type: 'input', type: 'select',
label: '班次', label: '班次',
placeholder: '班次', selectOptions: [],
param: 'name', param: 'id',
defaultSelect: '',
filterable: true,
}, },
{ {
type: 'button', type: 'button',
@ -155,19 +158,35 @@ export default {
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 20,
name: null, id: null,
}, },
classNameList:[]
}; };
}, },
created() { created() {
this.getClassNameList();
this.getList(); this.getList();
}, },
methods: { methods: {
getClassNameList() {
groupClassesListAll().then((res) => {
this.formConfig[0].selectOptions = res.data;
this.classNameList = res.data;
})
},
buttonClick(val) { buttonClick(val) {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.queryParams.classesName = val.name || undefined; if (val.id) {
this.classNameList.map((item) => {
if (val.id === item.id) {
this.queryParams.classesName = item.name
}
})
}else{
this.queryParams.classesName = ''
}
this.getList(); this.getList();
break; break;
default: default:
@ -187,7 +206,7 @@ export default {
formatDate(item.startDay) + formatDate(item.startDay) +
'至' + '至' +
(item.endDay ? formatDate(item.endDay) : '永久'); (item.endDay ? formatDate(item.endDay) : '永久');
item.str = item.strList.join(','); item.str = item.strList.join('，');
}); });
this.list = res.data.list; this.list = res.data.list;
this.total = res.data.total; this.total = res.data.total;

28
src/views/produce/order/base/orderManage/components/addWorkOrder.vue
View File

@ -103,21 +103,6 @@
style="width: 100%"></el-input-number> style="width: 100%"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="优先级" prop="priority">
<el-select
v-model="form.priority"
placeholder="请选择"
style="width: 100%"
:disabled="isBind">
<el-option
v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
:key="item.value"
:label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="工单类型" prop="type"> <el-form-item label="工单类型" prop="type">
<el-select <el-select
@ -148,11 +133,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="负责人" prop="workers">
<el-input v-model="form.workers" :disabled="isBind"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
@ -293,10 +273,8 @@ export default {
deptId: undefined, deptId: undefined,
planQuantity: 0, planQuantity: 0,
materialMethod: 1, materialMethod: 1,
priority: '',
productLineIds: [{ lineId: null, processId: null, num: null }], productLineIds: [{ lineId: null, processId: null, num: null }],
type: '', type: '',
workers: '',
planAssignmentQuantity: '', planAssignmentQuantity: '',
}, },
deptList: [], deptList: [],
@ -304,6 +282,9 @@ export default {
name: [ name: [
{ required: true, message: '工单名称不能为空', trigger: 'blur' }, { required: true, message: '工单名称不能为空', trigger: 'blur' },
], ],
workOrderId:[
{ required: true, message: '工单名称不能为空', trigger: 'change' },
],
planProductId: [ planProductId: [
{ required: true, message: '产品名称不能为空', trigger: 'change' }, { required: true, message: '产品名称不能为空', trigger: 'change' },
], ],
@ -476,9 +457,6 @@ export default {
? moment(res.data.planFinishTime) ? moment(res.data.planFinishTime)
.format('YYYY-MM-DD HH:mm:ss') .format('YYYY-MM-DD HH:mm:ss')
: null; : null;
this.form.priority = res.data.priority
? res.data.priority + ''
: '';
// 根据产线获取工艺 // 根据产线获取工艺
if (this.form.materialMethod === 2) { if (this.form.materialMethod === 2) {
this.form.productLineIds.forEach((item) => { this.form.productLineIds.forEach((item) => {

22
src/views/produce/order/base/orderManage/components/orderAdd.vue
View File

@ -56,16 +56,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span='6'>
<el-form-item label="单价" prop="price">
<el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;">
</el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
</el-row>
<el-row :gutter="20">
<el-col :span='6'> <el-col :span='6'>
<el-form-item label="包装规格" prop="packSpec"> <el-form-item label="包装规格" prop="packSpec">
<el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable> <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable>
@ -75,7 +65,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span='12'> </el-row>
<el-row :gutter="20">
<el-col :span='24'>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark"></el-input> <el-input v-model="form.remark"></el-input>
</el-form-item> </el-form-item>
@ -99,9 +91,7 @@ export default {
planQuantity: '', planQuantity: '',
planProductId: '', planProductId: '',
specifications:undefined, specifications:undefined,
price: '',
customerId: '', customerId: '',
priority: '',
packSpec: '', packSpec: '',
workers: '', workers: '',
materialMethod: 1, materialMethod: 1,
@ -114,7 +104,8 @@ export default {
name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }], name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
code: [{ required: true, message: "订单号不能为空", trigger: "blur" }], code: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }], planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }] planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
deliveTime: [{ required: true, message: "交货日期不能为空", trigger: "change" }]
}, },
productList: [], productList: [],
customerList: [], customerList: [],
@ -142,9 +133,7 @@ export default {
this.form.code = res.data.code this.form.code = res.data.code
this.form.planQuantity = res.data.planQuantity this.form.planQuantity = res.data.planQuantity
this.form.planProductId = res.data.planProductId this.form.planProductId = res.data.planProductId
this.form.price = res.data.price
this.form.customerId = res.data.customerId this.form.customerId = res.data.customerId
this.form.priority = res.data.priority ? res.data.priority + '' : ''
this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : '' this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
this.form.workers = res.data.workers this.form.workers = res.data.workers
@ -235,7 +224,6 @@ export default {
formClear() { formClear() {
this.$refs.orderAddForm.resetFields() this.$refs.orderAddForm.resetFields()
this.form.materialMethod = 1 this.form.materialMethod = 1
this.form.price = 0.00
this.form.planQuantity = 0 this.form.planQuantity = 0
this.isEdit = false this.isEdit = false
} }

15
src/views/produce/order/base/orderManage/components/orderSplit.vue
View File

@ -73,11 +73,6 @@ const tableProps = [
label: '产品规格', label: '产品规格',
showOverflowtooltip: true, showOverflowtooltip: true,
}, },
// {
// prop: 'priority',
// label: '优先级',
// filter: publicFormatter('order_priority')
// },
{ {
prop: 'planQuantity', prop: 'planQuantity',
label: '计划加工量', label: '计划加工量',
@ -97,12 +92,6 @@ const tableProps = [
showOverflowtooltip: true, showOverflowtooltip: true,
// subcomponent: selectMember, // subcomponent: selectMember,
}, },
{
prop: 'price',
label: '单价',
width: 100,
// subcomponent: inputArea,
},
{ {
prop: 'packSpec', prop: 'packSpec',
label: '包装规格', label: '包装规格',
@ -130,10 +119,8 @@ export default {
code: '', code: '',
planQuantity: '', planQuantity: '',
planProductId: '', planProductId: '',
price: '',
customerId: '', customerId: '',
attr3: undefined, attr3: undefined,
priority: '',
packSpec: '', packSpec: '',
workers: '', workers: '',
materialMethod: 1, materialMethod: 1,
@ -190,9 +177,7 @@ export default {
// this.form.code = res.data.code // this.form.code = res.data.code
// this.form.planQuantity = res.data.planQuantity // this.form.planQuantity = res.data.planQuantity
// this.form.planProductId = res.data.planProductId // this.form.planProductId = res.data.planProductId
// this.form.price = res.data.price
// this.form.customerId = res.data.customerId // this.form.customerId = res.data.customerId
// this.form.priority = res.data.priority ? res.data.priority + '' : ''
// this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null // this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
// this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : '' // this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
// this.form.workers = res.data.workers // this.form.workers = res.data.workers

32
src/views/produce/order/base/orderManage/index.vue
View File

@ -62,14 +62,14 @@
label="产品" label="产品"
show-overflow-tooltip show-overflow-tooltip
min-width="120" /> min-width="120" />
<el-table-column prop="deliveTime" label="交货时间" width="160"> <el-table-column prop="deliveTime" label="交货日期" width="160">
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.deliveTime) }}</span> <span>{{ parseTime(scope.row.deliveTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="workOrderNum" label="工单数量" width="140"> <el-table-column prop="workOrderNum" label="工单数量" width="140">
<template v-slot="scope"> <template v-slot="scope">
<el-button @click="handleRoute(scope.row)" type="text"> <el-button @click="handleRoute(scope.row)" type="text" style='padding: 0px;'>
{{ scope.row.workOrderNum }} {{ scope.row.workOrderNum }}
</el-button> </el-button>
</template> </template>
@ -78,6 +78,7 @@
<template v-slot="scope"> <template v-slot="scope">
<el-button <el-button
type="text" type="text"
style='padding: 0px;'
:disabled="!(scope.row.status != 5 && scope.row.workOrderNum === 0)" :disabled="!(scope.row.status != 5 && scope.row.workOrderNum === 0)"
@click="handleClick({ data: scope.row, type: 'split' })" @click="handleClick({ data: scope.row, type: 'split' })"
v-hasPermi="['base:order-manage:split']"> v-hasPermi="['base:order-manage:split']">
@ -86,6 +87,7 @@
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button <el-button
type="text" type="text"
style='padding: 0px;'
:disabled=" :disabled="
!( !(
scope.row.status === 1 || scope.row.status === 1 ||
@ -97,10 +99,20 @@
v-hasPermi="['base:order-manage:bindWorkOrder']"> v-hasPermi="['base:order-manage:bindWorkOrder']">
绑定工单 绑定工单
</el-button> </el-button>
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button
type="text"
style='padding: 0px;'
:disabled="!(scope.row.status === 2 || scope.row.status === 3)"
@click="handleClick({ data: scope.row, type: 'stop' })"
v-hasPermi="['base:order-manage:stop']">
终止
</el-button>
<!-- addWorkOrder --> <!-- addWorkOrder -->
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button <el-button
type="text" type="text"
style='padding: 0px;'
:disabled="!(scope.row.status === 2 || scope.row.status === 3)" :disabled="!(scope.row.status === 2 || scope.row.status === 3)"
@click="handleClick({ data: scope.row, type: 'complete' })" @click="handleClick({ data: scope.row, type: 'complete' })"
v-hasPermi="['base:order-manage:bindWorkOrder']"> v-hasPermi="['base:order-manage:bindWorkOrder']">
@ -109,6 +121,7 @@
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button <el-button
type="text" type="text"
style='padding: 0px;'
@click="handleClick({ data: scope.row, type: 'detail' })" @click="handleClick({ data: scope.row, type: 'detail' })"
v-hasPermi="['base:order-manage:detail']"> v-hasPermi="['base:order-manage:detail']">
<span class="iconfont icon-detail primary-color" /> <span class="iconfont icon-detail primary-color" />
@ -116,6 +129,7 @@
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button <el-button
type="text" type="text"
style='padding: 0px;'
:disabled=" :disabled="
!(scope.row.status === 1) !(scope.row.status === 1)
" "
@ -132,18 +146,12 @@
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button <el-button
type="text" type="text"
style='padding: 0px;'
:disabled="scope.row.status != 1" :disabled="scope.row.status != 1"
@click="handleClick({ data: scope.row, type: 'void' })" @click="handleClick({ data: scope.row, type: 'void' })"
v-hasPermi="['base:order-manage:delete']"> v-hasPermi="['base:order-manage:delete']">
作废 作废
</el-button> </el-button>
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button
type="text"
@click="handleClick({ data: scope.row, type: 'stop' })"
v-hasPermi="['base:order-manage:stop']">
终止
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -546,3 +554,9 @@ export default {
background-color: unset !important; background-color: unset !important;
} }
</style> </style>
<style>
.orderTable .el-table__cell {
padding: 0 !important;
height: 35px !important;
}
</style>

8
src/views/produce/order/base/orderManage/orderDetailData.vue
View File

@ -116,10 +116,6 @@
<div class="blodTip">备注</div> <div class="blodTip">备注</div>
<div class="lightTip">{{ orderMsg.remark }}</div> <div class="lightTip">{{ orderMsg.remark }}</div>
</el-col> </el-col>
<!-- <el-col :span="3">
<div class="blodTip">负责人</div>
<div class="lightTip">{{ orderMsg.workers }}</div>
</el-col> -->
<!-- <el-col :span='3'> <!-- <el-col :span='3'>
<div class="blodTip">关联工艺</div> <div class="blodTip">关联工艺</div>
<div class="lightTip">{{processFlowName}}</div> <div class="lightTip">{{processFlowName}}</div>
@ -249,10 +245,6 @@ const tableProps1 = [
filter: (val) => (val ? val.join(',') : ''), filter: (val) => (val ? val.join(',') : ''),
showOverflowtooltip: true, showOverflowtooltip: true,
}, },
{
prop: 'workers',
label: '负责人',
},
{ {
prop: 'remark', prop: 'remark',
label: '备注', label: '备注',

8
src/views/produce/workOrder/addWorkOrder.vue
View File

@ -133,13 +133,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="负责人" prop="workers">
<el-input
v-model="dataForm.workers"
placeholder="请输入负责人"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -288,7 +281,6 @@ export default {
priority: '', priority: '',
productLineIds: [{ lineId: null, processId: null, num: null }], productLineIds: [{ lineId: null, processId: null, num: null }],
type: '', type: '',
workers: '',
status: 1, status: 1,
}, },
rules: { rules: {

96
src/views/produce/workOrder/index.vue
View File

@ -9,11 +9,12 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:max-height="tableH"
:table-data="tableData"> :table-data="tableData">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="350" :width="300"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -61,10 +62,11 @@ import {
getCoreWOList getCoreWOList
} from '@/api/base/coreWorkOrder'; } from '@/api/base/coreWorkOrder';
import { listDept } from '@/api/system/dept'; import { listDept } from '@/api/system/dept';
import tableHeightMixin from '@/mixins/tableHeightMixin';
export default { export default {
mixins: [basicPage], mixins: [basicPage,tableHeightMixin],
components: { components: {
AddWorkOrder, AddWorkOrder,
AddOrUpdate, AddOrUpdate,
@ -88,25 +90,25 @@ export default {
// btnName: '原料信息', // btnName: '原料信息',
// } // }
// : undefined, // : undefined,
// { {
// type: 'active', type: 'active',
// btnName: '激活', btnName: '开始',
// showParam: { showParam: {
// type: '|', type: '|',
// data: [ data: [
// { {
// name: 'status', name: 'status',
// type: 'equal', type: 'equal',
// value: 1 value: 1
// }, },
// { {
// name: 'status', name: 'status',
// type: 'equal', type: 'equal',
// value: 3 value: 3
// } }
// ] ]
// } }
// }, },
{ {
type: 'pause', type: 'pause',
btnName: '暂停', btnName: '暂停',
@ -122,15 +124,20 @@ export default {
} }
}, },
{ {
type: 'nullify', type: 'terminate',
btnName: '作废', btnName: '终止',
showParam: { showParam: {
type: '|', type: '|',
data: [ data: [
{ {
name: 'status', name: 'status',
type: 'equal', type: 'equal',
value: 1 value: 2
},
{
name: 'status',
type: 'equal',
value: 3
} }
] ]
} }
@ -176,10 +183,9 @@ export default {
} }
} }
: undefined, : undefined,
this.$auth.hasPermi(`base:core-work-order:delete`) {
? { type: 'nullify',
type: 'delete', btnName: '作废',
btnName: '删除',
showParam: { showParam: {
type: '|', type: '|',
data: [ data: [
@ -190,8 +196,23 @@ export default {
} }
] ]
} }
} },
: undefined // this.$auth.hasPermi(`base:core-work-order:delete`)
// ? {
// type: 'delete',
// btnName: '删除',
// showParam: {
// type: '|',
// data: [
// {
// name: 'status',
// type: 'equal',
// value: 1
// }
// ]
// }
// }
// : undefined
].filter((v)=>v), ].filter((v)=>v),
tableData: [], tableData: [],
formConfig: [ formConfig: [
@ -220,7 +241,8 @@ export default {
{ id: 2, name: '激活' }, { id: 2, name: '激活' },
{ id: 3, name: '暂停' }, { id: 3, name: '暂停' },
{ id: 4, name: '完成' }, { id: 4, name: '完成' },
{ id: 9, name: '作废' } { id: 5, name: '作废' },
{ id: 6, name: '终止' }
], ],
param: 'status', param: 'status',
clearable: true clearable: true
@ -269,7 +291,7 @@ export default {
{ {
prop: 'name', prop: 'name',
label: '工单名称', label: '工单名称',
minWidth: 120, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true
}, },
{ {
@ -300,6 +322,7 @@ export default {
{ {
prop: 'triggerOrigin', prop: 'triggerOrigin',
label: '来源', label: '来源',
width: 120,
filter: (val) => ['', 'MES-手动', 'MES-订单下发', 'ERP'][val] filter: (val) => ['', 'MES-手动', 'MES-订单下发', 'ERP'][val]
}, },
{ {
@ -413,15 +436,18 @@ export default {
param.status = 3 param.status = 3
opration = '暂停' opration = '暂停'
} }
if (val.type === 'terminate') {
param.status = 6
opration = '终止'
}
if (val.type === 'nullify') { if (val.type === 'nullify') {
param.status = 5 param.status = 5
opration = '报废' opration = '作废'
} }
if (val.type === 'finish') { if (val.type === 'finish') {
param.status = 4 param.status = 4
opration = '完成' opration = '完成'
} }
console.log('22',val)
this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", { this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -434,7 +460,9 @@ export default {
type: 'success', type: 'success',
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
setTimeout(() => {
this.getDataList(); this.getDataList();
}, 1000);
// 分配产量 // 分配产量
if (param.status === 4) { if (param.status === 4) {
this.allocationOrder(param); this.allocationOrder(param);