From 8114ef9bf2704a2bc05a15a36ab677808195a274 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 10:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturnhistory.vue | 92 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index 4641812..4977bc6 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -6,18 +6,12 @@
<el-input v-model="rawGlassThickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.thickness')" />
<el-input v-model="rawGlassfilmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.coatingtypesbe')" />
<el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
- <el-select
- :placeholder="$t('searchOrder.taskstatus')"
- clearable
- style="width: 270px;margin-left: 10px;"
- v-model="taskStateList">
- <el-option
- v-for="item in optionsa"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+ <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
+ style="width: 200px;margin-left: 10px;">
+ <el-option :label="$t('searchOrder.empty')" value="0"></el-option>
+ <el-option :label="$t('film.execution')" value="1"></el-option>
+ <el-option :label="$t('searchOrder.endtask')" value="2"></el-option>
+ </el-select>
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
@@ -28,7 +22,8 @@
<el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" />
<el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" />
<el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" />
- <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
+ <el-table-column prop="rawGlassFilmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
+ <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
<el-table-column prop="totalCount" align="center" :label="$t('basicData.tonumber')" min-width="80" />
<el-table-column prop="finishCount" align="center" :label="$t('basicData.finishnumber')" min-width="80" />
<el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80" />
@@ -44,7 +39,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
align="center"
:label="$t('sorter.taskRunning')"
min-width="80"
@@ -55,7 +50,7 @@
{{ getStatusTexta(scope.row.taskRunning) }}
</el-tag>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
</el-table>
@@ -87,7 +82,7 @@
const globalDate = inject('globalDate');
const router = useRouter()
const timeRange = ref([])
-const taskStateList = reactive([]);
+const selectValuesa = reactive([]);
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
@@ -107,9 +102,9 @@
rawGlassThickness: '',
rawGlassWidth: '',
rawGlassfilmsId: '',
- slot: '',
+ slot: 0,
station: 1,
- taskStateList: '',
+ taskStateList: [],
beginDate: startTime,
endDate: getglobalDate
})
@@ -140,20 +135,32 @@
};
const historicala = async (page) => {
try {
+let pslot= ''
+let celllist=[]
+if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+}
+if(slot.value != ""){
+ pslot = slot.value
+}else{
+ pslot = '0'
+}
let page = window.localStorage.getItem('pagenumber')
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
pageNo: page,
pageSize: 20,
- rawGlassHeight: '',
- rawGlassThickness: '',
- rawGlassWidth: '',
- rawGlassfilmsId: '',
- slot: '',
+ rawGlassHeight: rawGlassHeight.value,
+ rawGlassThickness: rawGlassThickness.value,
+ rawGlassWidth: rawGlassWidth.value,
+ rawGlassfilmsId: rawGlassfilmsId.value,
+ slot: pslot,
station: 1,
- taskStateList: '',
- beginDate: startTime,
- endDate: getglobalDate
+ taskStateList: celllist,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -176,6 +183,18 @@
// 鍘嗗彶鏌ヨ鐐瑰嚮
const sethistorical = async () => {
try {
+let pslot= ''
+let celllist=[]
+if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+}
+if(slot.value != ""){
+ pslot = slot.value
+}else{
+ pslot = '0'
+}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
console.log(page);
@@ -186,13 +205,14 @@
rawGlassThickness: rawGlassThickness.value,
rawGlassWidth: rawGlassWidth.value,
rawGlassfilmsId: rawGlassfilmsId.value,
- slot: slot.value,
+ slot: pslot,
station: 1,
- taskStateList: '',
+ taskStateList: celllist,
beginDate: (timeRange.value && timeRange.value[0]) || '',
endDate: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
+ currentPage2.value = 1
ElMessage.success(response.message);
const formattedData = response.data.records.map(record => ({
...record,
@@ -238,7 +258,7 @@
case 1:
return 'success';
case 2:
- return 'success';
+ return 'info';
}
}
function getStatusTextb(taskState: number) {
@@ -267,20 +287,6 @@
return t('basicData.up');
}
}
-const optionsa = [
- {
- value: 0,
- label: t('searchOrder.empty'),
- },
- {
- value: 1,
- label: t('film.execution'),
- },
- {
- value: 2,
- label: t('searchOrder.endtask'),
- }
-]
onMounted(() => {
parseAndSetTime();
historical();
--
Gitblit v1.8.0