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 | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 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 c7b5e62..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
@@ -119,16 +119,16 @@
// label: t('reportingWorks.nightShift'),
// },
{
- value: '鏈ㄧ',
- label: '鏈ㄧ',
+ value: t('reportingWorks.woodenBox'),
+ label: t('reportingWorks.woodenBox'),
},
{
- value: '閾佹灦',
- label: '閾佹灦',
+ value: t('reportingWorks.brandreth'),
+ label: t('reportingWorks.brandreth'),
},
{
- value: '鍊掓灦',
- label: '鍊掓灦',
+ value: t('reportingWorks.tilting'),
+ label: t('reportingWorks.tilting'),
},
]
@@ -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
})
}
@@ -305,14 +307,14 @@
},
{
code: 'SecondaryBreakage',
- name: "搴忓彿娆＄牬鐩稿悓",
+ name: t('reportingWorks.secondaryBreakage'),
prefixIcon: 'vxe-icon-indicator',
visible: true,
disabled: false
},
{
code: 'checkedBreakage',
- name: "閫変腑娆＄牬鐩稿悓",
+ name: t('reportingWorks.checkedBreakage'),
prefixIcon: 'vxe-icon-indicator',
visible: true,
disabled: false
@@ -608,7 +610,7 @@
//灞傚彿
let technologyStr = resultProcessId[2];
if (last != titleUploadData.value.thisProcess){
- ElMessage.error('璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�')
+ ElMessage.error(t('reportingWorks.pleaseNumber16'))
return
}
storageBtn.value = true
@@ -619,7 +621,7 @@
}
}
},
- cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
+ cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑娆＄牬鐣岄潰
const { row } = params
brokenRow.value = row
if(brokenRow.value.damageDetails=== undefined){
@@ -820,7 +822,7 @@
},
{
field: 'responsiblePersonnel',
- title: '璐ｄ换淇℃伅',
+ title: t('rework.responsibilityInformation'),
editRender: {name: 'input', attrs: {placeholder: ''}}
},
@@ -897,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)
@@ -1036,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
}
@@ -1091,6 +1099,7 @@
}
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
+ gridOptions.loading=true
//鍒ゆ柇淇濆瓨杩樻槸淇敼
if(saveType==='save'){
saveReportingWorkRequest(requestData)
@@ -1108,6 +1117,7 @@
if(storageBtn.value == true){
getStorageWork();
}
+ gridOptions.loading=false
router.push({path:'/main/reportingWorks/AddReportingWork',query:{processId:titleUploadData.value.processId,random:Math.random()}})
}else{
const errorObj = JSON.parse(res.msg)
@@ -1116,15 +1126,16 @@
+t('reportingWorks.pleaseNumber3')+'锛�'+errorObj.processNum+'<'+
+t('reportingWorks.pleaseNumber4')+'锛�'+errorObj.sumNum+'\n'
+t('reportingWorks.pleaseNumber5')
-
+ gridOptions.loading=false
ElMessage.error(msg)
}
}).catch(err =>{
- ElMessage.error('鎻愪氦澶辫触锛岃鍒锋柊鍚庨噸璇�')
+ 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
})
}
@@ -1319,7 +1330,7 @@
//鍒ゆ柇鏃╂櫄鐝�
titleUploadData.value.classes=t('reportingWorks.early')
- titleUploadData.value.reportingWorkTime = formatCurrentTime()
+ titleUploadData.value.reportingWorkTime = res.data.reportingWorkTiem
//缁戝畾涓嬫柟琛ㄦ牸
@@ -1327,10 +1338,10 @@
// 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
let modifiedCollection = res.data.Detail.map(item => {
if (item.reviewed_state === 1) {
- return { ...item, reviewed_state: "宸插鏍�" };
+ return { ...item, reviewed_state: t('productStock.approved') };
}
else if (item.reviewed_state === 0) {
- return { ...item, reviewed_state: "鏈鏍�" };
+ return { ...item, reviewed_state: t('reportingWorks.unreviewed') };
}
else {
// 鍏朵粬鎯呭喌淇濇寔涓嶅彉
@@ -1885,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"
@@ -1924,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>
@@ -1935,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>
@@ -2066,8 +2077,7 @@
}
::v-deep(.mytable-scrollbar .col-red) {
- background-color: rgb(66,159,254);
- color: #fff;
+ background-color: rgb(66,159,254)!important;
}
--
Gitblit v1.8.0