|
@@ -118,10 +118,10 @@
|
|
|
isBindPlan: false,
|
|
isBindPlan: false,
|
|
|
statusOpt: {
|
|
statusOpt: {
|
|
|
first: [
|
|
first: [
|
|
|
- { label: '所有状态', value: '5,4,7' },
|
|
|
|
|
|
|
+ { label: '所有状态', value: '5,4' },
|
|
|
{ label: '待生产', value: '4' },
|
|
{ label: '待生产', value: '4' },
|
|
|
- { label: '生产中', value: '5' },
|
|
|
|
|
- { label: '已延期', value: '7' }
|
|
|
|
|
|
|
+ { label: '生产中', value: '5' }
|
|
|
|
|
+ // { label: '已延期', value: '7' }
|
|
|
],
|
|
],
|
|
|
second: [{ label: '已完成', value: '6' }]
|
|
second: [{ label: '已完成', value: '6' }]
|
|
|
},
|
|
},
|
|
@@ -184,12 +184,12 @@
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
minWidth: 110
|
|
minWidth: 110
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- prop: 'originalCode',
|
|
|
|
|
- label: '原始工单号',
|
|
|
|
|
- align: 'center',
|
|
|
|
|
- minWidth: 110
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ prop: 'originalCode',
|
|
|
|
|
+ label: '原始工单号',
|
|
|
|
|
+ align: 'center',
|
|
|
|
|
+ minWidth: 110
|
|
|
|
|
+ },
|
|
|
{
|
|
{
|
|
|
prop: 'productionPlanCode',
|
|
prop: 'productionPlanCode',
|
|
|
label: '计划编号',
|
|
label: '计划编号',
|
|
@@ -199,12 +199,10 @@
|
|
|
prop: 'planType',
|
|
prop: 'planType',
|
|
|
label: '计划类型',
|
|
label: '计划类型',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- formatter: (row) => {
|
|
|
|
|
- const obj = this.planType.find(
|
|
|
|
|
- (i) => i.value == row.planType
|
|
|
|
|
- );
|
|
|
|
|
- return obj && obj.label;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ formatter: (row) => {
|
|
|
|
|
+ const obj = this.planType.find((i) => i.value == row.planType);
|
|
|
|
|
+ return obj && obj.label;
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
prop: 'produceVersionName',
|
|
prop: 'produceVersionName',
|
|
@@ -366,19 +364,23 @@
|
|
|
this.selection.map((item) => {
|
|
this.selection.map((item) => {
|
|
|
ids.push(item.id);
|
|
ids.push(item.id);
|
|
|
});
|
|
});
|
|
|
- const h = this.$createElement;
|
|
|
|
|
- this.$msgbox({
|
|
|
|
|
- title: '提醒',
|
|
|
|
|
- message: h('p', null, [
|
|
|
|
|
- h('span', null, '是否要完结 '),
|
|
|
|
|
- h('span', { style: 'color: #70B603' }, `${this.selection.length}`),
|
|
|
|
|
- h('span', null, ' 条工单?'),
|
|
|
|
|
- ]),
|
|
|
|
|
- showCancelButton: true,
|
|
|
|
|
- confirmButtonText: '确认',
|
|
|
|
|
- cancelButtonText: '取消',
|
|
|
|
|
- type: 'warning'
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ const h = this.$createElement;
|
|
|
|
|
+ this.$msgbox({
|
|
|
|
|
+ title: '提醒',
|
|
|
|
|
+ message: h('p', null, [
|
|
|
|
|
+ h('span', null, '是否要完结 '),
|
|
|
|
|
+ h(
|
|
|
|
|
+ 'span',
|
|
|
|
|
+ { style: 'color: #70B603' },
|
|
|
|
|
+ `${this.selection.length}`
|
|
|
|
|
+ ),
|
|
|
|
|
+ h('span', null, ' 条工单?')
|
|
|
|
|
+ ]),
|
|
|
|
|
+ showCancelButton: true,
|
|
|
|
|
+ confirmButtonText: '确认',
|
|
|
|
|
+ cancelButtonText: '取消',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ })
|
|
|
.then(() => {
|
|
.then(() => {
|
|
|
batchCompletion(ids).then((res) => {
|
|
batchCompletion(ids).then((res) => {
|
|
|
this.$message.success('成功');
|
|
this.$message.success('成功');
|
|
@@ -420,7 +422,7 @@
|
|
|
path: '/produceOrder/detail',
|
|
path: '/produceOrder/detail',
|
|
|
query: {
|
|
query: {
|
|
|
id: row.id,
|
|
id: row.id,
|
|
|
- produceVersionId: row.produceVersionId
|
|
|
|
|
|
|
+ produceVersionId: row.produceVersionId
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|