From 0b28598dabd95862411a75a3cd2152f896671261 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 五月 2025 16:12:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index fd68574..80972b3 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -95,6 +95,7 @@
</el-table-column>
<el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
<el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -113,21 +114,21 @@
<!-- 涓┖閰嶆柟娣诲姞 -->
<el-dialog v-model="add" top="23vh" width="55%" :title="$t('hellow.hollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -136,35 +137,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -185,21 +186,21 @@
<!-- 涓┖閰嶆柟淇敼 -->
<el-dialog v-model="adda" top="23vh" width="55%" :title="$t('hellow.edithollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -208,35 +209,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -360,7 +361,7 @@
<el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
<div style="margin-top: -20px;text-align: center;margin-left: 400px;">
<el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
- {{ currentRow.projectNumber }}
+ {{ currentRow.flowCardId }}
</el-form-item>
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -567,7 +568,7 @@
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
try {
@@ -666,20 +667,20 @@
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
currentPage2.value = 1;
- const { projectNumber, layer } = row;
- currentRow.projectNumber = row.projectNumber;
+ const { flowCardId } = row;
+ currentRow.flowCardId = row.flowCardId;
dialogFormVisibleb.value = true;
- fetchFlowBind(projectNumber, layer,currentPage2.value);
+ fetchFlowBind(flowCardId,currentPage2.value);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
fetchmulan()
};
// 寮哄埗鍑虹墖
const handleout = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisibled.value = true;
fetchmulan()
};
@@ -885,9 +886,9 @@
};
});
};
-const fetchFlowBind = async (flowCardId, layer, page) => {
+const fetchFlowBind = async (flowCardId, page) => {
try {
- var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
+ var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
const response = await request.post(url)
if (response.code == 200) {
tableDatac.value = response.data[page];
@@ -1007,11 +1008,11 @@
});
</script>
<style scoped>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
-#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
+#dt { display:block; float:left;line-height: 20px;margin-left: 10px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 70%;}
#dialog-footer {
text-align: center;
- margin-top: -15px;
+ margin-top: -5px;
}
#dotClass {
display: flex;
--
Gitblit v1.8.0