From be23ab353c618c254ed81a79f6e9175cb953e69e Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 27 十二月 2024 16:35:16 +0800
Subject: [PATCH] 卧式缓存入参，上片模块结束工程逻辑更改,钢化模块删除拿走打印功能，中空新增二线
---
UI-Project/src/views/hollow/hollowequipment.vue | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 24392bd..23f1df8 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -5,7 +5,10 @@
<el-button id="searchButton" type="success" @click="handlezhiban">
{{ $t('hellow.createtask') }}
</el-button>
- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinda">
+ <el-button type="success" @click="selectproject">
+ {{ $t('basicData.selectproject') }}
+ </el-button>
+ <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
{{ $t('hellow.starttask') }}
</el-button>
<el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBindb">{{
@@ -229,6 +232,36 @@
</div>
</template>
</el-dialog>
+ <!-- 棰勮 -->
+ <el-dialog v-model="dialogFormVisiblee" top="24vh" width="30%" :title="$t('basicData.project')" >
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item :label="$t('basicData.projectnumber')" :required="true">
+ <el-select
+ v-model="selectedProjectNo"
+ filterable
+ clearable
+ :placeholder="$t('basicData.plselectproject')"
+ style="width: 220px"
+ @input="handleInputChange"
+ >
+ <el-option
+ v-for="item in titleSelectJson.processType"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleup">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="dialogFormVisiblee = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
</template>
<script setup>
import {ElMessage} from 'element-plus'
@@ -247,6 +280,7 @@
const flowCard = ref('')
const cell = ref('')
const cella = ref('')
+const selectedProjectNo = ref('');
const ganghua = ref(true)
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
@@ -254,8 +288,11 @@
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
const dialogFormVisibled = ref(false)
+const dialogFormVisiblee = ref(false)
const currentPage2 = ref(1)
const currentRow = reactive({});
+const formattedProcessType = ref([]);
+const titleSelectJson = ref({ processType: [] });
const options = [
{
value: 930,
@@ -320,6 +357,11 @@
dialogFormVisiblea.value = true;
fetchFlowCardId();
};
+// 棰勮
+const selectproject = () => {
+ dialogFormVisiblee.value = true;
+ selectgong();
+};
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
currentPage2.value = 1;
@@ -353,6 +395,24 @@
ElMessage.error('Error fetching data');
}
};
+// 宸ョ▼鍙�
+const selectgong = async () => {
+ try {
+ var url="/hollowGlass/hollowGlassOutRelationInfo/hollowTaskList?cell="+ 931;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ const processTypes = response.data.map((projectNo, index) => ({
+ value: projectNo,
+ label: projectNo
+ }));
+ titleSelectJson.value.processType = processTypes;
+ } else {
+ ElMessage.error('Failed to fetch data');
+ }
+ } catch (error) {
+ ElMessage.error('Error fetching data');
+ }
+};
const parseData = (rawData) => {
return Object.keys(rawData).map(projectNumber => ({
projectNumber,
--
Gitblit v1.8.0