Merge branch 'dev' into 'master'

Dev

See merge request !19

src/views/order/podUs/PodMakeOrder.vue

@@ -800,7 +800,10 @@ const handlePrinterChange = (value: string) => {
 const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
 const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
   const _boxIndex = boxIndex.value
   const _boxIndex = boxIndex.value
 
 
-  if (!forcePrint && data.printResult) return
+  if (!forcePrint && data.printResult) {
+    callback && callback()
+    return
+  }
 
 
   props.printOrder(data, (status: boolean) => {
   props.printOrder(data, (status: boolean) => {
     callback && callback()
     callback && callback()

src/views/order/podUs/index.vue

@@ -1321,6 +1321,7 @@ const handleUpdateRemark = async (item: ProductList) => {
     const loading = ElLoading.service({
     const loading = ElLoading.service({
       fullscreen: true,
       fullscreen: true,
       text: '操作中...',
       text: '操作中...',
+      background: 'rgba(0, 0, 0, 0.3)',
     })
     })
     try {
     try {
       const res = await updateRemarkApi(item.id, value)
       const res = await updateRemarkApi(item.id, value)
@@ -1358,6 +1359,7 @@ const submitConfirm = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await confirmOrderApi(
     const res = await confirmOrderApi(
@@ -1393,6 +1395,7 @@ const updateOrder = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await updateExceptionOrderApi(ids)
     const res = await updateExceptionOrderApi(ids)
@@ -1414,6 +1417,7 @@ const printProductionOrder = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await printProductionOrderApi(orderIds)
     const res = await printProductionOrderApi(orderIds)
@@ -1434,6 +1438,7 @@ const printPickingOrder = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await printPrintOrderApi(orderIds)
     const res = await printPrintOrderApi(orderIds)
@@ -1463,6 +1468,7 @@ const pickingComplete = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await printPickingOrderApi(orderIds)
     const res = await printPickingOrderApi(orderIds)
@@ -1491,6 +1497,7 @@ const changeExceptionOrder = async () => {
     const loading = ElLoading.service({
     const loading = ElLoading.service({
       fullscreen: true,
       fullscreen: true,
       text: '操作中...',
       text: '操作中...',
+      background: 'rgba(0, 0, 0, 0.3)',
     })
     })
     try {
     try {
       const res = await changeExceptionOrderApi(orderIds, value)
       const res = await changeExceptionOrderApi(orderIds, value)
@@ -1519,6 +1526,7 @@ const cancelOrder = async () => {
     const loading = ElLoading.service({
     const loading = ElLoading.service({
       fullscreen: true,
       fullscreen: true,
       text: '操作中...',
       text: '操作中...',
+      background: 'rgba(0, 0, 0, 0.3)',
     })
     })
     try {
     try {
       const res = await cancelOrderApi(orderIds, value)
       const res = await cancelOrderApi(orderIds, value)
@@ -1601,6 +1609,7 @@ const downloadMaterial = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await downloadMaterialApi(selectedIds)
     const res = await downloadMaterialApi(selectedIds)
@@ -1750,7 +1759,8 @@ const stockOutCheck = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
-  })
+    background: 'rgba(0, 0, 0, 0.3)',
+    })
   try {
   try {
     const selectedIds = selection.value.map((item) => item.id)
     const selectedIds = selection.value.map((item) => item.id)
     const res = await stockOutCheckApi(selectedIds)
     const res = await stockOutCheckApi(selectedIds)
@@ -1813,6 +1823,7 @@ const toBePicking = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '操作中...',
     text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await toBePickingApi(selection.value.map((item) => item.id))
     const res = await toBePickingApi(selection.value.map((item) => item.id))
@@ -1995,6 +2006,7 @@ const openDetail = async (id: number) => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '加载中...',
     text: '加载中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await getOrderDetailById(id)
     const res = await getOrderDetailById(id)
@@ -2045,6 +2057,7 @@ const refreshMaterial = async () => {
   const loading = ElLoading.service({
   const loading = ElLoading.service({
     fullscreen: true,
     fullscreen: true,
     text: '刷新中...',
     text: '刷新中...',
+    background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
     const res = await refreshMaterialApi(
     const res = await refreshMaterialApi(
@@ -2184,6 +2197,16 @@ onMounted(() => {
   gap: 10px;
   gap: 10px;
   font-size: 12px;
   font-size: 12px;
   margin-top: 10px;
   margin-top: 10px;
+  .grid-item {
+    display: flex;
+    overflow: hidden;
+    .grid-item-value {
+      flex: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
 }
 }
 
 
 .factory-sub-order-number {
 .factory-sub-order-number {