This commit is contained in:
2022-06-28 08:56:16 +08:00
parent bcf2da5305
commit 5e8af632cb
3 changed files with 56 additions and 34 deletions

View File

@@ -89,7 +89,7 @@
:disabled="sub_flag"
@click="submit('20')"
>
提交
提交
</el-button>
<el-button
slot="right"
@@ -122,7 +122,7 @@
size="mini"
@click="openWork"
>
开工
开工
</el-button>
<el-button
slot="right"
@@ -219,12 +219,14 @@ import ViewDialog from '@/views/wms/pdm/produce/workorder/ViewDialog'
import ChangeDialog from '@/views/wms/pdm/produce/workorder/ChangeDialog'
import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
import {getLodop} from "@/assets/js/lodop/LodopFuncs";
import Date from "@/utils/datetime";
export default {
name: 'workorder',
components: { ChangeDialog, ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({ title: '工令', idField: 'workorder_id', url: 'api/workorder', crudMethod: { ...workorder },
//query:{createTime:[new Date(), new Date().daysLater(2)]},
optShow: {
add: true,
edit: false,
@@ -268,6 +270,8 @@ export default {
crudseriesProcessRoute.getXLlist2().then(res => {
this.XLList = res
})
this.crud.query.createTime= [new Date(), new Date().daysLater(2)]
this.crud.toQuery()
},
methods: {
canUd(row) {

View File

@@ -107,7 +107,7 @@
:disabled="device_flag"
@click="deviceset"
>
指定设备
指定设备
</el-button>
<el-button
slot="right"
@@ -140,7 +140,7 @@
size="mini"
@click="confirmWork"
>
任务结束
任务结束
</el-button>
<el-button
slot="right"
@@ -153,17 +153,17 @@
>
异常结束
</el-button>
<!-- <el-button
slot="right"
class="filter-item"
type="success"
:disabled="print1_flag"
icon="el-icon-check"
size="mini"
@click="print1"
>
打印工艺指令卡
</el-button>-->
<!-- <el-button
slot="right"
class="filter-item"
type="success"
:disabled="print1_flag"
icon="el-icon-check"
size="mini"
@click="print1"
>
打印工艺指令卡
</el-button>-->
<el-button
slot="right"
class="filter-item"
@@ -233,12 +233,14 @@ import ViewDialog from '@/views/wms/pdm/produce/workorder/ViewDialog'
import print2Dialog from '@/views/wms/pdm/produce/worktask/print2Dialog'
import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
import Date from "@/utils/datetime";
export default {
name: 'worktask',
components: { print2Dialog, ViewDialog, DeviceDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({ title: '工令工序任务', idField: 'worktask_id', url: 'api/worktask',
//query:{createTime:[new Date().daysAgo(2), new Date()]},
optShow: {
add: false,
edit: false,
@@ -284,6 +286,8 @@ export default {
crudseriesProcessRoute.getXLlist2().then(res => {
this.XLList = res
})
this.crud.query.createTime= [new Date().daysAgo(2), new Date()]
this.crud.toQuery()
},
methods: {
[CRUD.HOOK.beforeRefresh]() {