From 38e2fda87c28fa7128d971e7afac1b05a06872d6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期日, 31 三月 2024 13:54:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Returns/returns.vue | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/sd/returns/Returns.vue b/UI-Project/src/views/Returns/returns.vue
similarity index 87%
rename from UI-Project/src/views/sd/returns/Returns.vue
rename to UI-Project/src/views/Returns/returns.vue
index 457ef97..a0a97f9 100644
--- a/UI-Project/src/views/sd/returns/Returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -220,6 +220,7 @@
<el-table-column prop="wide" label="鍘熺墖闀�" align="center"/>
<el-table-column prop="thick" label="鑶滅郴" align="center"/>
<el-table-column prop="thick" label="鏁伴噺" align="center"/>
+ <el-table-column prop="wide" label="鍘氬害" align="center"/>
<el-table-column
align="center"
label="鐘舵��"
@@ -232,11 +233,11 @@
</div>
</el-card>
<div id="parent">
- <img src="../../../assets/shangpianji .png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 130px;">
+ <img src="../../assets/shangpianji .png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 130px;">
<el-button style="margin-top: -830px;margin-left: -40px;" size="mini" id="searchButton" @click="add = true">娣诲姞鍘熺墖</el-button>
<el-button style="margin-top: -10px;margin-left: -80px;" size="mini" id="searchButton" @click="adda = true">娣诲姞鍘熺墖</el-button>
- <div id="overlay" v-show="state"></div>
- <div id="overlaya" v-show="statea"></div>
+ <!-- <div id="overlay" v-show="state"></div> -->
+ <!-- <div id="overlaya" v-show="statea"></div> -->
</div>
</div>
@@ -268,22 +269,22 @@
</div>
</template>
</el-dialog>
- <el-dialog v-model="add" top="23vh" width="40%" title="娣诲姞鍘熺墖" >
+ <el-dialog v-model="add" top="23vh" width="45%" title="娣诲姞鍘熺墖" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form size="mini" label-width="150px">
- <el-form >
+ <el-form label-width="70px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="瀹斤細" :required="true" style="width: 14vw">
+ <el-form-item label="闀匡細" :required="true" style="width: 14vw">
<el-input 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="闀匡細" :required="true" style="width: 14vw">
+ <el-form-item label="瀹斤細" :required="true" style="width: 14vw">
<el-input autocomplete="off" />
</el-form-item></div>
</div>
@@ -300,7 +301,16 @@
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item label="鏁伴噺锛�" :required="true" style="width: 14vw">
+ <el-form-item label="鍘氬害锛�" :required="true" style="width: 14vw">
+ <el-input autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item label="鏁伴噺锛�" :required="true" style="width: 14vw;">
<el-input autocomplete="off" />
</el-form-item></div></div>
</el-col>
@@ -317,23 +327,23 @@
</div>
</template>
</el-dialog>
- <el-dialog v-model="adda" top="23vh" width="40%" title="娣诲姞鍘熺墖" >
+ <el-dialog v-model="adda" top="23vh" width="45%" title="娣诲姞鍘熺墖" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form >
+ <el-form size="mini" >
+ <el-form label-width="70px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="瀹斤細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
+ <el-form-item label="闀匡細" :required="true" style="width: 14vw">
+ <el-input autocomplete="off" style="width: 180px" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item label="闀匡細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
+ <el-form-item label="瀹斤細" :required="true" style="width: 14vw">
+ <el-input autocomplete="off" style="width: 180px" />
</el-form-item></div>
</div>
</el-col>
@@ -343,14 +353,23 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item label="鑶滅郴锛�" :required="true" style="width: 14vw;">
- <el-input autocomplete="off" />
+ <el-input autocomplete="off" style="width: 180px" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item label="鏁伴噺锛�" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
+ <el-form-item label="鍘氬害锛�" :required="true" style="width: 14vw">
+ <el-input autocomplete="off" style="width: 180px" />
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item label="鏁伴噺锛�" :required="true" style="width: 14vw;">
+ <el-input autocomplete="off" style="width: 180px" />
</el-form-item></div></div>
</el-col>
</el-row>
--
Gitblit v1.8.0