-
+
- 工单名称:{{ dataForm.name }}
- 工单编码:{{ dataForm.code }}
+ 工单名称:{{ dataForm.name }}
+ 工单编码:{{ dataForm.code }}
- 产品名称:{{ dataForm.productName }}
- 产品规格:{{ dataForm.specifications }}
+ 产品名称:{{ dataForm.productName }}
+ 产品规格:{{ dataForm.specifications }}
- 实际生产数量:{{ dataForm.expectedTime }}
+ 实际生产数量:{{ dataForm.actualQuantity }}
-
-
+
-
-
+
-
+ {{scope.row.priority == 1 ? '低' : scope.row.priority == 2 ? '正常' : scope.row.priority == 3 ? '高' : ''}}
+
-
-
-
-
-
- 保存
-
-
-
+
-
- 关闭
-
+ 关闭
+ 保存
-
-
diff --git a/src/views/produce/workOrder/index.vue b/src/views/produce/workOrder/index.vue
index d4669390..b4f72ee3 100644
--- a/src/views/produce/workOrder/index.vue
+++ b/src/views/produce/workOrder/index.vue
@@ -130,17 +130,7 @@ export default {
{
name: 'status',
type: 'equal',
- value: 2
- },
- {
- name: 'status',
- type: 'equal',
- value: 3
- },
- {
- name: 'status',
- type: 'equal',
- value: 4
+ value: 1
}
]
}
@@ -315,7 +305,14 @@ export default {
{
prop: 'status',
label: '工单状态',
- filter: (val) => ['', '等待', '激活', '暂停', '完成', '', '', '', '', '作废'][val]
+ filter: (val) => ['', '等待', '激活', '暂停', '完成', '作废', '终止', '', '', ''][val]
+ },
+ {
+ prop: 'startProduceTime',
+ label: '实际开始时间',
+ filter: parseTime,
+ minWidth: 150,
+ showOverflowtooltip: true
},
{
prop: 'planFinishTime',
@@ -362,20 +359,20 @@ export default {
})
},
refreshWorkOrder(val) {
- console.log(val)
- if (val) {
- // 预使用原料信息
- console.log('预使用原料信息')
- this.handleCancel()
- this.getDataList()
- this.materialVisible = true;
- this.addOrEditTitle = "预使用主原料信息";
- this.$nextTick(() => {
- this.$refs.material.init(val, true);
- });
- } else {
- this.successSubmit()
- }
+ // if (val) {
+ // // 预使用原料信息
+ // console.log('预使用原料信息')
+ // this.handleCancel()
+ // this.getDataList()
+ // this.materialVisible = true;
+ // this.addOrEditTitle = "预使用主原料信息";
+ // this.$nextTick(() => {
+ // this.$refs.material.init(val, true);
+ // });
+ // } else {
+ // this.successSubmit()
+ // }
+ this.successSubmit()
},
closeDetail() {
this.detailVisible = false
@@ -417,7 +414,7 @@ export default {
opration = '暂停'
}
if (val.type === 'nullify') {
- param.status = 9
+ param.status = 5
opration = '报废'
}
if (val.type === 'finish') {
@@ -475,7 +472,6 @@ export default {
switch (val.btnName) {
case 'search':
this.listQuery.pageNo = 1;
- this.listQuery.pageSize = 10;
this.listQuery.name = val.name ? val.name : undefined;
this.listQuery.status = val.status ? val.status : undefined;
this.listQuery.startProduceTime = val.time ? val.time : undefined
@@ -484,7 +480,6 @@ export default {
case 'reset':
this.$refs.searchBarForm.resetForm();
this.listQuery = {
- pageSize: 10,
pageNo: 1,
total: 1,
};
diff --git a/src/views/produce/workOrder/workOrderNav.vue b/src/views/produce/workOrder/workOrderNav.vue
index ec754008..12c5b066 100644
--- a/src/views/produce/workOrder/workOrderNav.vue
+++ b/src/views/produce/workOrder/workOrderNav.vue
@@ -1,23 +1,20 @@
-
-
@@ -84,16 +81,19 @@ export default {