From 2b05362eba2f989b7857349cc9a3a1c12f8181b6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 26 9月 2025 11:35:50 +0800
Subject: [PATCH] 222
---
yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue b/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue
index a332b98..9eebd27 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue
@@ -10,12 +10,17 @@
</a-form-item>
</a-col>
<a-col :md="colMd" :sm="colSm">
- <a-form-item label="OP80鎴愬搧鐮�">
- <a-input v-model="queryParam.oP80NewCode" allow-clear placeholder="璇疯緭鍏P80鎴愬搧鐮�" />
+ <a-form-item label="鎴愬搧鐮�">
+ <a-input v-model="queryParam.oP80NewCode" allow-clear placeholder="璇疯緭鍏ユ垚鍝佺爜" />
</a-form-item>
</a-col>
<a-col :md="colMd" :sm="colSm">
- <a-form-item label="鍑哄簱鏃堕棿">
+ <a-form-item label="鍏ュ簱浜�">
+ <a-input v-model="queryParam.workPieceOutboundUserName" allow-clear placeholder="璇疯緭鍏ュ叆搴撲汉" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="colMd" :sm="colSm">
+ <a-form-item label="鍏ュ簱鏃堕棿">
<a-range-picker style="width:100%" :show-time="{format:'HH:mm'}" v-model="queryParam.dates" format="YYYY-MM-DD HH:mm" />
</a-form-item>
</a-col>
@@ -26,7 +31,7 @@
<a-col :md="colMd" :sm="colSm">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="$refs.table.refresh(true)">鏌ヨ</a-button>
- <a-button style="margin-left: 8px" @click="() => (queryParam = {})">閲嶇疆</a-button>
+ <a-button style="margin-left: 8px" @click="resetQueryData">閲嶇疆</a-button>
<!-- <a @click="toggleAdvanced" style="margin-left: 8px">
{{ advanced ? '鏀惰捣' : '灞曞紑' }}
<a-icon :type="advanced ? 'up' : 'down'" />
@@ -69,6 +74,7 @@
<script>
import { STable } from '@/components'
import moment from 'moment'
+import { downloadFile,getThisWeekRange } from '@/utils/util'
import { WorkPieceOutboundPage, WorkPieceOutboundRevoke } from '@/api/modular/main/WorkPieceOutboundManage'
import addForm from './addForm.vue'
import editForm from './editForm.vue'
@@ -92,7 +98,9 @@
sm: { span: 15 }
},
advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
- queryParam: {},
+ queryParam: {
+ dates:[],
+ },
columns: [
{
title: '搴忓彿',
@@ -102,26 +110,50 @@
align: 'center',
customRender: (text, record, index) => `${index + 1}`
},
+ {
+ title: '鎴愬搧鐮�',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'oP80NewCode'
+ },
+ // {
+ // title: '闃舵',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'unLineStageName'
+ // },
+ // {
+ // title: '灏忚溅鐮�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'carNo'
+ // },
{
title: '宸ヤ欢鍙�',
align: 'center',
sorter: true,
dataIndex: 'workPieceID'
},
+ // {
+ // title: '涓嬬嚎鏃堕棿',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'workPieceUnLineTime'
+ // },
+ // {
+ // title: '涓嬬嚎浜�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'workPieceUnLineUserName'
+ // },
{
- title: 'OP80鎴愬搧鐮�',
- align: 'center',
- sorter: true,
- dataIndex: 'oP80NewCode'
- },
- {
- title: '鍑哄簱鏃堕棿',
+ title: '鍏ュ簱鏃堕棿',
align: 'center',
sorter: true,
dataIndex: 'workPieceOutboundTime'
},
{
- title: '鍑哄簱浜�',
+ title: '鍏ュ簱浜�',
align: 'center',
sorter: true,
dataIndex: 'workPieceOutboundUserName'
@@ -147,9 +179,19 @@
scopedSlots: { customRender: 'action' }
})
}
+ this.initData();
},
methods: {
moment,
+ initData(){
+ this.queryParam.dates = [];
+ this.queryParam.dates = getThisWeekRange();
+ },
+ //閲嶇疆
+ resetQueryData(){
+ this.queryParam = { dates:[] }
+ this.initData();
+ },
/**
* 鏌ヨ鍙傛暟缁勮
*/
@@ -179,7 +221,7 @@
allRevoke() {
this.$confirm({
title: '鎾ら攢纭',
- content: '纭畾鎾ら攢閫変腑宸ヤ欢鍑哄簱淇℃伅锛�',
+ content: '纭畾鎾ら攢閫変腑宸ヤ欢鍏ュ簱淇℃伅锛�',
onOk: () => {
this.WorkPieceOutboundDelete(this.selectedRows)
},
--
Gitblit v1.9.3