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/sd/delivery/SelectDelivery.vue

@@ -57,7 +57,7 @@
})

//第一次调用
request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data.data)
@@ -98,7 +98,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

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


const selectOrderList = ()=>{
  request.post(`/Delivery/getseletShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)
@@ -195,9 +195,9 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [],
    import: false,
    export: true,
    print: true,
    /*import: false,
   export: true,
   print: true,*/
    zoom: true,
    custom: true
  },