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

chenlu

2024-03-07 de18cca83738bdf6b279046e34b910ccd5b73a84

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

@@ -86,7 +86,7 @@


//第一次调用
request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -122,7 +122,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -141,7 +141,7 @@

const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getseletdeliveryDetail/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)
@@ -265,7 +265,7 @@
              orderDetail:selectRecords
            })

            request.post("/FinishedGoodsInventory/adddeliveryDetail",orderDetailData.value).then((res) => {
            request.post("/FinishedGoodsInventory/addDeliveryDetail",orderDetailData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("出库成功")
                location.reload();