From 08bae96ce03625f054f3977147a7e9861c51209d Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期五, 28 六月 2024 08:21:52 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- UI-Project/src/views/GlassStorage/MaterialRackManagement.vue | 70 ++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 13 deletions(-) diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue index b97b5c7..830f6d8 100644 --- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue +++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue @@ -7,7 +7,7 @@ <div > <el-button type="success" size="mini" @click="handleInbound()">鍏ュ簱</el-button> <el-button type="success" size="mini" @click="handleInbound()">鍚婅浣嶅叆搴�</el-button> - <el-button type="success" size="mini" @click="addglass()">娣诲姞鍘熺墖</el-button> + </div> <!-- 鍙充晶閫夋嫨妗� --> @@ -55,12 +55,12 @@ </el-table-column> <!-- 鎿嶄綔鍒� --> - <el-table-column label="鎿嶄綔" width="300"> + <el-table-column label="鎿嶄綔" width="350"> <template #default="{ row }"> - <el-button type="primary" size="mini" @click="handleEdit(row)">淇敼</el-button> + <el-button type="primary" size="mini" @click="edithandleRowClick(row)">淇敼</el-button> <el-button type="danger" size="mini" @click="handleDelete(row)">鍒犻櫎</el-button> <el-button type="warning" size="mini" @click="handleCheckout(row)">鍑哄簱</el-button> - + <el-button type="success" size="mini" @click="addglass()">娣诲姞鍘熺墖</el-button> </template> </el-table-column> </el-table> @@ -197,7 +197,21 @@ </span> </el-dialog> + <el-dialog title="缂栬緫" v-model="editdialogVisible" width="30%" @close="edithandleDialogClose"> + <el-form :model="editForm" ref="editForm" label-width="80px"> + <el-form-item label="鏁伴噺"> + <el-input v-model="editForm.quantity"></el-input> + </el-form-item> + <el-form-item label="鎵规鍙�"> + <el-input v-model="editForm.batchnumber"></el-input> + </el-form-item> + </el-form> + <div slot="footer" class="dialog-footer"> + <el-button @click="editdialogVisible = false">鍙栨秷</el-button> + <el-button type="primary" @click="editsaveEdit">淇濆瓨</el-button> + </div> + </el-dialog> <!-- <div ref="chart" id="chart" style="width: 100%; height: 400px;"></div> --> @@ -327,16 +341,9 @@ }); - const handleEdit = (row) => { - // 澶勭悊淇敼鏁伴噺閫昏緫 - console.log('Edit Quantity:', row); - }; + - const handleDelete = (row) => { - // 澶勭悊鍒犻櫎閫昏緫 - console.log('Delete:', row); - }; - + const handleCheckout = (row) => { // 澶勭悊鍑哄簱閫昏緫 console.log('Checkout:', row); @@ -408,6 +415,43 @@ + + const editdialogVisible = ref(false); + const editForm = ref({ + quantity: '', + batchnumber: '' + }); + let currentRow = ref(null); + + // 澶勭悊琛岀偣鍑讳簨浠� + const edithandleRowClick = (row) => { + currentRow.value = row; + editForm.value.quantity = row.quantity; + editForm.value.batchnumber = row.batchnumber; + editdialogVisible.value = true; + console.log(editForm.value) + }; + + // 娣诲姞淇濆瓨缂栬緫鍐呭 + const editsaveEdit = () => { + if (!currentRow.value) return; + + // 鏇存柊褰撳墠琛屾暟鎹� + currentRow.value.quantity = parseInt(editForm.value.quantity); + currentRow.value.batchnumber = editForm.value.batchnumber; + + // 鍏抽棴瀵硅瘽妗� + editdialogVisible.value = false; + }; + + // 瀵硅瘽妗嗗叧闂椂閲嶇疆缂栬緫琛ㄥ崟鍜屽綋鍓嶈鏁版嵁 + const edithandleDialogClose = () => { + editForm.value.quantity = ''; + editForm.value.batchnumber = ''; + currentRow.value = null; + }; + + let chartInstance = null; onMounted(() => { -- Gitblit v1.8.0