Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-09-29 2ad329b52d19e48bcdc9013aaf3fcee460456548

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/public/config.js

@@ -10,4 +10,4 @@
//公司 bore.pub 10.153.19.150
//洛阳 172.17.2.7
//天津 192.168.150.39
//上海 192.168.2.8
//上海 10.153.18.3

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -1244,6 +1244,8 @@
                gridOptions.loading=false
                gridLeftOptions.loading=false
              } else {
                gridOptions.loading=false
                gridLeftOptions.loading=false
                ElMessage.warning(res.msg)
              }
            })

 north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue

@@ -207,8 +207,8 @@
              router.push({path:'/main/Replenish/AddReplenish',query:{random:Math.random()}})
              gridOptions.loading=false
            }else{
              gridOptions.loading=false
              ElMessage.warning(t('basicData.msg.saveFail'))
              router.push("/login")
            }
          }).catch(err =>{
            ElMessage.error(t('basicData.msg.ServerConnectionError'))

 north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue

@@ -296,6 +296,7 @@
                router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
                gridOptions.loading=false
              }else{
                gridOptions.loading=false
                ElMessage.warning(t('basicData.msg.cancelReviewFailWork'))
              }
            })

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -1092,6 +1092,7 @@
  }
  gridOptions.toolbarConfig.buttons[0].disabled=true
  gridOptions.toolbarConfig.buttons[1].disabled=true
  gridOptions.loading=true
  //判断保存还是修改
  if(saveType==='save'){
    saveReportingWorkRequest(requestData)
@@ -1109,6 +1110,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)
@@ -1117,7 +1119,7 @@
          +t('reportingWorks.pleaseNumber3')+'：'+errorObj.processNum+'<'+
          +t('reportingWorks.pleaseNumber4')+'：'+errorObj.sumNum+'\n'
          +t('reportingWorks.pleaseNumber5')

      gridOptions.loading=false
      ElMessage.error(msg)
    }
  }).catch(err =>{

 north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue

@@ -187,8 +187,8 @@
              router.push({path:'/main/rework/AddRework',query:{random:Math.random()}})
              gridOptions.loading=false
            }else{
              gridOptions.loading=false
              ElMessage.warning(t('basicData.msg.saveFail'))
              router.push("/login")
            }
          }).catch((err)=>{
            ElMessage.error(t('basicData.msg.ServerConnectionError'))

 north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue

@@ -232,6 +232,7 @@
                router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:route.query.orderId,random:Math.random()}})
                gridOptions.loading=false
              } else {
                gridOptions.loading=false
                ElMessage.warning(res.msg)
              }
            })