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

chenlu

2024-03-12 2780cb79b2239d64f4578e30c255fbd751e12c62

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue

@@ -211,6 +211,10 @@
      {
        'name': '反审',status: 'primary',
        'code':'rework'
      },
      {
        'name': '作废',status: 'primary',
        'code':'cancel'
      }],
    /*import: false,
   export: true,
@@ -271,6 +275,34 @@
          router.push({path: '/main/productStock/ReworkRecord'});
          return
        }
        case 'cancel': {
          const $table = xGrid.value
          //gridOptions.columns.unshift(a)
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()

            let flowData = ref({

              userId:userid,
              userName:username,
              orderDetail:selectRecords

            })
            console.log(flowData)
            request.post("/FinishedGoodsInventory/cancelFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("作废成功")
                router.push({path:'/main/productStock/TakeOutRecord',query:{random:Math.random()}})

              }else{
                ElMessage.warning(res.msg)
                router.push("/login")
              }
            })
          }
          return;

        }


      }