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

guoyuji

2024-02-22 3ed2e039353daa5a29b822faa135663965f81d29

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

@@ -53,13 +53,15 @@
  },

})
let selectDate = ref(["",""])


//第一次调用
request.post("/Delivery/getSelectOrderInventory/1/100",filterData.value).then((res) => {
request.post("/Delivery/getSelectOrderInventory/1/100/"+selectDate.value,filterData.value).then((res) => {

  if(res.code==200){
    pageTotal.value=res.data.total
    selectDate.value = res.data.selectDate
    pageNum=1
    produceList = deepClone(res.data.data)
    xGrid.value.loadData(produceList)
@@ -93,11 +95,12 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post("/Delivery/getSelectOrderInventory/1/100",filterData.value).then((res) => {
  request.post("/Delivery/getSelectOrderInventory/1/100/"+selectDate.value,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data)
      pageTotal.value=res.data.total
      selectDate.value = res.data.selectDate
      pageNum=1
      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
@@ -107,6 +110,28 @@
      router.push("/login")
    }
  })
}

const selectOrderList = ()=>{
  request.post("/Delivery/getSelectOrderInventory/1/100/"+selectDate.value,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data)
      pageTotal.value=res.data.total
      selectDate.value = res.data.selectDate
      pageNum=1
      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
      router.push("/login")
    }
  })
}

const changeDate =  ()=>{
  selectOrderList()
}


@@ -232,12 +257,15 @@
<template>
  <div  style="width: 100%;height: 100%">
    <el-date-picker
        v-model="value1"
        v-model="selectDate"
        type="daterange"
        start-placeholder="开始时间"
        end-placeholder="结束时间"
        format="YYYY-MM-DD"
        value-format="YYYY-MM-DD"

    />
    <el-button style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    <vxe-grid
        max-height="97%"
        class="mytable-scrollbar"