From 7fd37a99f4bf0a3f2955e60436c63e59b58054f4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 10 八月 2024 09:10:11 +0800
Subject: [PATCH] 新增自动报工功能，磨边队列，下片队列增加查询条件
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 1f798b2..591e943 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -20,8 +20,9 @@
const requestData = {
line: 2001
};
-const timeRange = ref(["2022-01-01", "2025-01-01"])
-const selectValuesa = reactive({});
+const now = new Date();
+const timeRange = ref([new Date(now.setHours(0, 0, 0, 0)), new Date(now.setHours(23, 59, 59, 999))])
+const selectValuesa = reactive([]);
// request.post("/cacheGlass/taskCache/selectEdgTask",{
// ...requestData,
@@ -39,10 +40,23 @@
// 纾ㄨ竟浠诲姟鏌ヨ
const setEdgGlassInfoRequest = async () => {
-
+ let celllist=[]
+ let stateList=[]
+ if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+ }
+ if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
+ if(selectValuesa[1]!=""){
+ stateList=[selectValuesa[1]];
+ }
+ }
+
+
const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", {
- cellList: [selectValuesa[0]],
- stateList: [selectValuesa[1]],
+ cellList: celllist,
+ stateList: stateList,
beginDate: timeRange.value[0],
endDate: timeRange.value[1],
})
@@ -153,9 +167,10 @@
<el-option label="纾ㄨ竟涓�" value="1"></el-option>
<el-option label="宸茬（杈�" value="2"></el-option>
</el-select>
- <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD"
- value-format="YYYY-MM-DD" :start-placeholder="$t('reportmanage.starttime')"
- :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" />
+ <span class="demonstration">鏃堕棿娈�</span>
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
<el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{
$t('reportmanage.inquire')
}}</el-button>
@@ -170,6 +185,13 @@
<el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
<el-table-column prop="glassType" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
<el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" />
+ <el-table-column prop="status" :label="$t('workOrder.status')" align="center" width="200">
+ <template #default="scope">
+ {{ scope.row.status==0?"鏈（杈�":scope.row.status==1?"纾ㄨ竟涓�":"宸茬（杈�" }}
+ </template>
+ </el-table-column>
+
+
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
--
Gitblit v1.8.0