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

guoyuji

2024-10-12 acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd

 north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue

@@ -79,9 +79,8 @@
          $table.forEach((item,index)=>{
            for(let key in item){
              if(key!=='id' && key!=='_X_ROW_KEY'){
                console.log( key)
                const oldVal = $oldTable.getTableData().fullData[index][key]*1
                if(item[key]!==oldVal){
                if(item[key]*1!==oldVal){
                  item[key] = null
                }
              }
@@ -96,7 +95,7 @@
            ElMessage.error(t('basicData.msg.checkoutLose'))
            return
          }
          emit('getParent')
          //emit('getParent')
          break
        }
      }