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

guoyuji

2024-03-01 67bb8ed26f127d39fc0f747aef32881af14b7ca6

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

@@ -15,7 +15,6 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'edit' :{
      console.log(row)
      router.push({path: '/main/delivery/createDelivery', query: { deliveryID: row.deliveryId }})
      break
    }
@@ -101,7 +100,6 @@
  request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data)
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      pageNum.value=1
@@ -120,7 +118,6 @@
  request.post(`/Delivery/getseletShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data)
      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false