|
|
@@ -33,6 +33,7 @@
|
|
|
import { batchRecordPage } from '@/api/workOrderList';
|
|
|
import detailsPop from '@/views/produceOrder/components/details/index.vue';
|
|
|
import { getById } from '@/api/produceOrder/index';
|
|
|
+ import { getAllProduceTaskByUsing } from '@/api/InTheSystem/index';
|
|
|
|
|
|
export default {
|
|
|
mixins: [dictMixins, tableColumnsMixin],
|
|
|
@@ -122,7 +123,34 @@
|
|
|
fixed: 'right'
|
|
|
}
|
|
|
],
|
|
|
- cacheKeyUrl: 'mes-922194-work-order-table'
|
|
|
+ cacheKeyUrl: 'mes-922194-work-order-table',
|
|
|
+ orderStatus: [
|
|
|
+ {
|
|
|
+ value: 4,
|
|
|
+ label: '待生产'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 5,
|
|
|
+ label: '生产中'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 6,
|
|
|
+ label: '已完成'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 7,
|
|
|
+ label: '已延期'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 9,
|
|
|
+ label: '暂停'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 10,
|
|
|
+ label: '终止'
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ taskList: []
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -135,26 +163,44 @@
|
|
|
placeholder: '请输入'
|
|
|
},
|
|
|
{
|
|
|
- label: '创建时间开始',
|
|
|
- value: 'createTimeStart',
|
|
|
- type: 'date',
|
|
|
- dateType: 'date',
|
|
|
- placeholder: '请输入',
|
|
|
- width: '230',
|
|
|
- labelWidth: 110
|
|
|
+ label: '工序进度:',
|
|
|
+ value: 'taskName',
|
|
|
+ type: 'select',
|
|
|
+ placeholder: '请选择',
|
|
|
+ planList: this.taskList
|
|
|
},
|
|
|
{
|
|
|
- label: '创建时间结束',
|
|
|
- value: 'createTimeEnd',
|
|
|
- type: 'date',
|
|
|
- dateType: 'date',
|
|
|
- placeholder: '请输入',
|
|
|
- width: '230',
|
|
|
- labelWidth: 110
|
|
|
- }
|
|
|
+ label: '工单状态:',
|
|
|
+ value: 'statuses',
|
|
|
+ type: 'select',
|
|
|
+ multiple: true,
|
|
|
+ placeholder: '请选择',
|
|
|
+ planList: this.orderStatus
|
|
|
+ },
|
|
|
+ // {
|
|
|
+ // label: '创建时间开始',
|
|
|
+ // value: 'createTimeStart',
|
|
|
+ // type: 'date',
|
|
|
+ // dateType: 'date',
|
|
|
+ // placeholder: '请输入',
|
|
|
+ // width: '230',
|
|
|
+ // labelWidth: 110
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // label: '创建时间结束',
|
|
|
+ // value: 'createTimeEnd',
|
|
|
+ // type: 'date',
|
|
|
+ // dateType: 'date',
|
|
|
+ // placeholder: '请输入',
|
|
|
+ // width: '230',
|
|
|
+ // labelWidth: 110
|
|
|
+ // }
|
|
|
];
|
|
|
}
|
|
|
},
|
|
|
+ created() {
|
|
|
+ this.getproduceTask();
|
|
|
+ },
|
|
|
methods: {
|
|
|
// 刷新表格
|
|
|
reload(where = {}) {
|
|
|
@@ -182,6 +228,26 @@
|
|
|
// 查询详情
|
|
|
const data = await getById(row.id);
|
|
|
this.$refs.detailsRef.open(data);
|
|
|
+ },
|
|
|
+ // 工序
|
|
|
+ async getproduceTask() {
|
|
|
+ // 查询详情
|
|
|
+ const data = await getAllProduceTaskByUsing({
|
|
|
+ size: 9999
|
|
|
+ });
|
|
|
+ this.taskList = data.map(item => ({
|
|
|
+ value: item.produceTaskName,
|
|
|
+ label: item.produceTaskName
|
|
|
+ }))
|
|
|
+ // -1 入库,-2完结
|
|
|
+ this.taskList.push({
|
|
|
+ value: '入库',
|
|
|
+ label: '入库'
|
|
|
+ },{
|
|
|
+ value: '完结',
|
|
|
+ label: '完结'
|
|
|
+ })
|
|
|
+ console.log('工序', this.taskList);
|
|
|
}
|
|
|
}
|
|
|
};
|