From 1e31f9f7fe6f04236e97f72c0df3ce051d5f867e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 24 十一月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 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 eab016e..929ad0f 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
@@ -820,7 +822,7 @@
     },
     {
       field: 'responsiblePersonnel',
-      title: '璐ｄ换淇℃伅',
+      title: t('rework.responsibilityInformation'),
       editRender: {name: 'input', attrs: {placeholder: ''}}
 
     },
@@ -1036,7 +1038,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 +1093,7 @@
   }
   gridOptions.toolbarConfig.buttons[0].disabled=true
   gridOptions.toolbarConfig.buttons[1].disabled=true
+  gridOptions.loading=true
   //鍒ゆ柇淇濆瓨杩樻槸淇敼
   if(saveType==='save'){
     saveReportingWorkRequest(requestData)
@@ -1108,6 +1111,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 +1120,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 +1324,7 @@
 
       //鍒ゆ柇鏃╂櫄鐝�
       titleUploadData.value.classes=t('reportingWorks.early')
-      titleUploadData.value.reportingWorkTime = formatCurrentTime()
+      titleUploadData.value.reportingWorkTime = res.data.reportingWorkTiem
 
 
       //缁戝畾涓嬫柟琛ㄦ牸
@@ -1327,10 +1332,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 {
           // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
@@ -1557,6 +1562,7 @@
     remark: remark.value,
     container: container.value,
     flowCard: resultData,
+    createTime: titleUploadData.value.reportingWorkTime
   })
   //璋冪敤鍏ュ簱鎺ュ彛
   request.post("/finishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
@@ -2065,8 +2071,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