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 | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 f13b25d..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
@@ -152,6 +152,7 @@
//route.query.reportingWorkId = 'BG2403150004'
//鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
if(route.query.reportingWorkId !== '' && route.query.reportingWorkId!=null){
+ gridOptions.loading = true
request.post(`reportingWork/selectUpdateReportingWork/${route.query.reportingWorkId}`).then(res=>{
if(res.code === '200'){
titleUploadData.value = res.data.reportingWork
@@ -206,6 +207,7 @@
}
}
// getQuantity()
+ gridOptions.loading = false
inputDisabled.value = true
})
}
@@ -451,7 +453,6 @@
//褰撳彲鎿嶄綔鏁伴噺涓�0锛屽苟涓斿畬宸ユ暟閲忎笉绛変簬鍙畬宸ユ暟閲忔椂
if(row.minQuantity===0 && val!==(totalQuantity-row.breakageQuantity) ){
- console.log(12312312312)
return new Error(`${t('reportingWorks.pleaseNumber12')} ${okVal}+${val}=${okVal+val}\n
${t('reportingWorks.pleaseNumber13')} ${nextQuantitySum}\n
${t('reportingWorks.pleaseNumber14')}
@@ -620,7 +621,7 @@
}
}
},
- cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
+ cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑娆＄牬鐣岄潰
const { row } = params
brokenRow.value = row
if(brokenRow.value.damageDetails=== undefined){
@@ -898,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)
@@ -1037,7 +1044,7 @@
const diffMs = currentTime - targetTime
// 杞崲涓哄ぉ鏁�
const diffDays = diffMs / (1000 * 60 * 60 * 24)
- if (diffDays > 15) {
+ if (diffDays > 396 && saveType!="update") {
ElMessage.error(t('reportingWorks.longTime'))
return
}
@@ -1124,10 +1131,11 @@
}
}).catch(err =>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ gridOptions.loading=false
}).finally(()=>{
-
gridOptions.toolbarConfig.buttons[0].disabled=false
gridOptions.toolbarConfig.buttons[1].disabled=false
+ gridOptions.loading=false
})
}
@@ -1322,7 +1330,7 @@
//鍒ゆ柇鏃╂櫄鐝�
titleUploadData.value.classes=t('reportingWorks.early')
- titleUploadData.value.reportingWorkTime = formatCurrentTime()
+ titleUploadData.value.reportingWorkTime = res.data.reportingWorkTiem
//缁戝畾涓嬫柟琛ㄦ牸
@@ -1888,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"
@@ -1927,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>
@@ -1938,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