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

chenlu

2024-07-17 59958f4c35abc1ae902a87dfb56f6dbadd36ad49

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -196,17 +196,26 @@
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          dialogTableVisible.value = true
          sheetIndex.value=1
          if(rowClickIndex.value.deliveryState>0){
            dialogTableVisible.value = true
            sheetIndex.value=1
          }else{
            ElMessage.warning(t('order.orderNotApproved'))
          }
          break

        }
        case 'sheet2': {
          if(rowClickIndex.value===null){
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          dialogTableVisible.value = true
          sheetIndex.value=2
          if(rowClickIndex.value.deliveryState>0){
            dialogTableVisible.value = true
            sheetIndex.value=2
          }else{
            ElMessage.warning(t('order.orderNotApproved'))
          }
          break
        }
      }