From 76746dcdb6f0572c4b3349056421369aa7a34b09 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 11:12:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 929ad0f..47d70ab 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -621,7 +621,7 @@
}
}
},
- cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
+ cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑娆＄牬鐣岄潰
const { row } = params
brokenRow.value = row
if(brokenRow.value.damageDetails=== undefined){
@@ -899,7 +899,13 @@
}
}
}
-const openedBrokenTable = () => {
+
+const brokenGridKey = ref(0)
+const openedBrokenTable = async () => {
+ brokenGridKey.value++
+ await nextTick()
+ console.log('breakageType:', titleSelectJson.value.breakageType)
+ console.log('breakageReason:', titleSelectJson.value.breakageReason)
//addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
@@ -1890,7 +1896,7 @@
+brokenRow.glass_child+'.'+brokenRow.order_number+'.'+brokenRow.technology_number"
style="width: 80%;height:75% ">
<vxe-grid
-
+ :key="brokenGridKey"
height="400px"
ref="brokenGrid"
class="mytable-scrollbar"
@@ -1929,7 +1935,7 @@
</template>
<!-- 鍒虹牬绫诲瀷breakageType -->
<template #breakageType="{ row }">
- <vxe-select v-model="row.breakageType "
+ <vxe-select v-model="row.breakageType"
clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageType" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
@@ -1940,7 +1946,7 @@
<!--娆＄牬鍘熷洜-->
<template #breakageReason="{ row }">
- <vxe-select v-model="row.breakageReason "
+ <vxe-select v-model="row.breakageReason"
clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageReason" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
--
Gitblit v1.8.0