Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-06-30 ab6ac91b7ed9ae3f9c68766f499ece11585c8859

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -152,7 +152,12 @@
    productTotal.value.id = null
    productTotal.value.state = 0
  }
  if(productTotal.value.id!==null && productTotal.value.creator!==userInfo.user.userName || company.notChangeProduct){
  console.log(productTotal.value.id)
  if(productTotal.value.id != null
      &&
          productTotal.value.creator !== userInfo.user.userName
          & company.notChangeProduct
      ){
    ElMessage.warning('创建人是：'+productTotal.value.creator+'    无法操作！')
    return;
  }
@@ -191,7 +196,7 @@

//审核产品状态
const updateProductState =  (state) => {
  if(productTotal.value.id!==null && productTotal.value.creator!==userInfo.user.userName || company.notChangeProduct){
  if(productTotal.value.id!==null && productTotal.value.creator!==userInfo.user.userName && company.notChangeProduct){
    ElMessage.warning('创建人是：'+productTotal.value.creator+'    无法操作！')
    return;
  }