From cba49adf091f3becb8da93215927027f3b8bb2a6 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 03 三月 2025 11:06:31 +0800
Subject: [PATCH] 中空两个页面新建任务新增厚度筛选，原片仓储任务状态更改显示
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 22 ++++++++++++++++------
UI-Project/src/lang/en.js | 3 +++
UI-Project/src/lang/py.js | 3 +++
UI-Project/src/lang/zh.js | 3 +++
UI-Project/src/views/hollow/hollowequipment.vue | 4 ++++
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 4 ++++
6 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 4287482..c233405 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -96,6 +96,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 1e53c24..ce44e86 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -96,6 +96,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index a0306ae..759bbc6 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -95,6 +95,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index f3c75a8..d8235b6 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -310,16 +310,24 @@
return 'warning';
case 3:
return 'success';
+ case 4:
+ return 'danger';
+ case 5:
+ return 'primary';
}
}
function getStatusText1(taskType) {
switch (taskType) {
case 1:
- return t('film.stocke');//鍏ュ簱
+ return t('sorter.advancetask');//杩涚墖浠诲姟
case 2:
- return t('film.outbound');//鍑哄簱
+ return t('sorter.outputtasks');//鍑虹墖浠诲姟
case 3:
- return t('film.dispatch');//璋冨害
+ return t('sorter.schedulingtasks');//璋冨害浠诲姟
+ case 4:
+ return t('sorter.advancerequests');//杩涚墖璇锋眰
+ case 5:
+ return t('sorter.releaserequest');//鍑虹墖璇锋眰
}
}
function getStatusType2(taskState) {
@@ -374,9 +382,11 @@
<el-option :label="$t('film.fail')" value="2"></el-option>
</el-select>
<el-select v-model="selectValuesa[1]" clearable :placeholder="$t('film.tasktype')" style="margin-left: 10px;" >
- <el-option :label="$t('film.stocke')" value="1"></el-option>
- <el-option :label="$t('film.outbound')" value="2"></el-option>
- <el-option :label="$t('film.dispatch')" value="3"></el-option>
+ <el-option :label="$t('sorter.advancetask')" value="1"></el-option>
+ <el-option :label="$t('sorter.outputtasks')" value="2"></el-option>
+ <el-option :label="$t('sorter.schedulingtasks')" value="3"></el-option>
+ <el-option :label="$t('sorter.advancerequests')" value="4"></el-option>
+ <el-option :label="$t('sorter.releaserequest')" value="5"></el-option>
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('film.inquire') }}</el-button>
</div>
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 4a192a7..960454e 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -95,6 +95,7 @@
<div style="display: flex;">
<el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
{{$t('reportmanage.inquire')}}</el-button>
</div>
@@ -1028,6 +1029,7 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
+const thickness = ref('')
const flowCardId = ref('')
const casFour = ref('')
const casOne = ref('')
@@ -1406,6 +1408,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: '',
flowCardId: '',
+ thickness: '',
});
if (response.code == 200) {
ElMessage.success(response.message);
@@ -1423,6 +1426,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ thickness: thickness.value
});
if (response.code == 200) {
ElMessage.success(response.message);
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index fa0c416..861978e 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -68,6 +68,7 @@
<div style="display: flex;">
<el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
{{$t('reportmanage.inquire')}}</el-button>
</div>
@@ -519,6 +520,7 @@
const filmRemove = ref('')
const formulaName = ref('')
const leftRemove = ref('')
+const thickness = ref('')
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
@@ -689,6 +691,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: '',
flowCardId: '',
+ thickness: '',
});
if (response.code == 200) {
ElMessage.success(response.message);
@@ -706,6 +709,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ thickness: thickness.value
});
if (response.code == 200) {
ElMessage.success(response.message);
--
Gitblit v1.8.0