parent: af1a961e | 补丁 | 提交 | ignore whitespace
廖井涛
2024-04-11 85fd67441f91dc48673324f6a4bd1198280dc585 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
4个文件已修改
157 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/BasicTable.vue 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderDetail.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/northglass-erp/src/components/BasicTable.vue


@@ -65,6 +65,21 @@


  }




})






const props = defineProps({


  childrenData:{


    Object,


    default: ''


  }


})


const basicProp = ref({


  pageSize : 100,//页面显示数量


  pageNum:1,//当前页


  selectDate:['',''],//查询的日期


  pageTotal : 0,//总页数


  dataTotal : 0,//数据总条数


})


const sumNum = (list, field) => {


  let count = 0


  list.forEach(item => {


@@ -73,22 +88,18 @@


  return count.toFixed(2)


}




const props = defineProps({


  childrenData:{


    Object,


    default: ''


  }


})






watch(props, (newVal) => {


  gridOptions.loading = true


  xGrid.value.loadData(props.childrenData.data)


  gridOptions.loading = false


})


onMounted(() => {


  gridOptions.columns = props.childrenData.columns


  getReportData()






})


const emit = defineEmits(['getData'])


function filterChanged(column){


  //gridOptions.loading=true


  //筛选条件发生变化条件发生变化


@@ -103,32 +114,46 @@


  }else{


    filterData.value[column.property] = value


  }


  const gaveParentData = {


    selectDate:props.childrenData.selectDate,


    filterData:filterData.value


  }


  emit('getData',filterData.value)




  gridOptions.loading = true


  getReportData()




}




const handlePageChange = ({ currentPage, pageSize }) => {


  props.childrenData.pageNum = currentPage


  props.childrenData.pageTotal = pageSize


  emit('getData',filterData.value)


  basicProp.value.pageNum = currentPage


  basicProp.value.pageTotal = pageSize


  gridOptions.loading = true


  getReportData()


}


const dateChanged = () => {


  emit('getData',filterData.value)


  gridOptions.loading = true


  getReportData()


}




const  getReportData = () => {


  request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${basicProp.value.selectDate}`,filterData.value).then(res => {


    if(res.code === '200'){


      props.childrenData.data = res.data.data


      basicProp.value.pageTotal = res.data.total.pageTotal


      basicProp.value.dataTotal = res.data.total.total


      basicProp.value.selectDate = res.data.selectDate


    }


  })


}






</script>




<template>


  <div class="main-div">


    <el-date-picker


        v-model="props.childrenData.selectDate"


        v-model="basicProp.selectDate"


        type="daterange"


        start-placeholder="开始时间"


        end-placeholder="结束时间"


        format="YYYY-MM-DD"


        value-format="YYYY-MM-DD"


    />


    <el-button


        @click="dateChanged"


@@ -157,10 +182,10 @@


          <vxe-pager


              @page-change="handlePageChange"


              :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  'Total']"


              v-model:current-page="props.childrenData.pageNum"


              v-model:page-size="props.childrenData.pageSize"


              v-model:pager-count="props.childrenData.pageTotal"


              :total="props.childrenData.dataTotal"


              v-model:current-page="basicProp.pageNum"


              v-model:page-size="basicProp.pageSize"


              v-model:pager-count="basicProp.pageTotal"


              :total="basicProp.dataTotal"


          >


          </vxe-pager>


        </template>




 north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue


@@ -1,9 +1,7 @@


<script setup>


import BasicTable from "@/components/BasicTable.vue"


import request from "@/utils/request"


import {onMounted, reactive, ref} from "vue"


const selectData = ref(["",""])


let filterData = ref({})


import { ref} from "vue"




const childrenData = ref({


  columns:[


@@ -47,40 +45,14 @@


    {field: 'order.customerBatch',width:120, title: '客户批次',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}


  ],//表格表头字段


  data:[],//表格数据


  pageTotal : 0,//总页数


  dataTotal : 0,//数据总条数


  pageSize : 100,//页面显示数量


  pageNum:1,//当前页


  selectDate:['',''],//查询的日期


  url :'/order/getOrderReport/1',


  footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount']


})


//页面第一次加载


onMounted(() => {


  getReportData()


})




//封装获取数据方法方法


const  getReportData = () => {


  request.post(`/order/getOrderReport/${childrenData.value.pageNum}/${childrenData.value.pageSize}/${childrenData.value.selectDate}`,filterData.value).then(res => {


    if(res.code === '200'){


      childrenData.value.data = res.data.data


      childrenData.value.pageTotal = res.data.total.pageTotal


      childrenData.value.dataTotal = res.data.total.total


      childrenData.value.selectDate = res.data.selectDate


    }


  })


}




const getData = (filter) => {


  filterData.value = filter


  getReportData()


}




</script>




<template>


  <basic-table


      @getData="getData"


      :childrenData="childrenData"/>


</template>






 north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml


@@ -91,21 +91,19 @@


        <result column="total_thickness" property="totalThickness"/>


        <result column="createTime" property="createTime"/>




        <association property="order" javaType="com.example.erp.entity.sd.Order">


            <result column="order_type" property="orderType"/>


            <result column="customer_name" property="customerName"/>


            <result column="project" property="project"/>


            <result column="order_id" property="orderId"/>


            <result column="batch" property="batch"/>


            <result column="b.processing_note" property="processingNote"/>


            <result column="icon" property="icon"/>


            <result column="packType" property="packType"/>


            <result column="salesman" property="salesman"/>


            <result column="delivery_address" property="deliveryAddress"/>


            <result column="creator" property="creator"/>


            <result column="verifier" property="verifier"/>


            <result column="customer_batch" property="customerBatch"/>


        </association>


        <result column="order_type" property="order.orderType"/>


        <result column="customer_name" property="order.customerName"/>


        <result column="project" property="order.project"/>


        <result column="order_id" property="order.orderId"/>


        <result column="batch" property="order.batch"/>


        <result column="b.processing_note" property="order.processingNote"/>


        <result column="icon" property="order.icon"/>


        <result column="packType" property="order.packType"/>


        <result column="salesman" property="order.salesman"/>


        <result column="delivery_address" property="order.deliveryAddress"/>


        <result column="creator" property="order.creator"/>


        <result column="verifier" property="order.verifier"/>


        <result column="customer_batch" property="order.customerBatch"/>




    </resultMap>






 north-glass-erp/target/classes/mapper/sd/OrderDetail.xml


@@ -91,21 +91,19 @@


        <result column="total_thickness" property="totalThickness"/>


        <result column="createTime" property="createTime"/>




        <association property="order" javaType="com.example.erp.entity.sd.Order">


            <result column="order_type" property="orderType"/>


            <result column="customer_name" property="customerName"/>


            <result column="project" property="project"/>


            <result column="order_id" property="orderId"/>


            <result column="batch" property="batch"/>


            <result column="b.processing_note" property="processingNote"/>


            <result column="icon" property="icon"/>


            <result column="packType" property="packType"/>


            <result column="salesman" property="salesman"/>


            <result column="delivery_address" property="deliveryAddress"/>


            <result column="creator" property="creator"/>


            <result column="verifier" property="verifier"/>


            <result column="customer_batch" property="customerBatch"/>


        </association>


        <result column="order_type" property="order.orderType"/>


        <result column="customer_name" property="order.customerName"/>


        <result column="project" property="order.project"/>


        <result column="order_id" property="order.orderId"/>


        <result column="batch" property="order.batch"/>


        <result column="b.processing_note" property="order.processingNote"/>


        <result column="icon" property="order.icon"/>


        <result column="packType" property="order.packType"/>


        <result column="salesman" property="order.salesman"/>


        <result column="delivery_address" property="order.deliveryAddress"/>


        <result column="creator" property="order.creator"/>


        <result column="verifier" property="order.verifier"/>


        <result column="customer_batch" property="order.customerBatch"/>




    </resultMap>