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

廖井涛

2024-02-20 149d60a12ef635c2b08e4ebedfc9afa7363a6562

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

@@ -7,6 +7,7 @@
  import request from "@/utils/request";
  import deepClone from "@/utils/deepClone";
  import {ElMessage} from "element-plus";
  import {VXETable} from "vxe-table";


  const xGrid = ref()
@@ -47,7 +48,7 @@
      {field:'processReview',title: '工艺', width: 40, slots: { default: 'state' }},
      {field:'orderReview',title: '审核', width: 40, slots: { default: 'state' }},
      {field:'productionOrder',title: '工单', width: 40, slots: { default: 'state' }},
      {field:'processingCard',title: '流程卡', width: 40, slots: { default: 'state' }},
      {field:'processingCard',title: '流程', width: 40, slots: { default: 'state' }},
      {field:'warehousing',title: '入库', width: 40, slots: { default: 'state' }},
      {field:'delivery',title: '发货', width: 40, slots: { default: 'state' }},

@@ -101,14 +102,40 @@
    }

  })
  const gridEvents = {
    toolbarButtonClick ({ code }) {
      const $grid = xGrid.value
      if ($grid) {
        switch (code) {
          case 'checkList': {
            if($grid.getCheckboxRecords().length==0){
              VXETable.modal.message( '请选择一条数据！')
              return
            }
            break
          }

        }
      }
    },
  }
  const dialogTableVisible = ref(false)
  let orderType = ref("2")
  let selectDate = ref(["",""])
  let filterData = ref({})
  let orderList = ref([])
  request.post(`/order/getOrderList/1/100/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
  let pageNum=ref(1)
  let total = reactive({
    pageTotal : 0,
    dataTotal : 0,
    pageSize : 100
  })
  //加载请求
  request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
    if(res.code==200){
      console.log(res.data)
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      selectDate.value = res.data.selectDate
      orderList.value = deepClone(res.data.data)
      xGrid.value.loadData(orderList.value)
    }else{
@@ -116,12 +143,94 @@
    }
  })

  const changeFilterEvent = (event, option, $panel) => {
    // 手动触发筛选
    $panel.changeOption(event, !!option.data, option)
  }

  function filterChanged(column){
    gridOptions.loading=true
    //筛选条件发生变化条件发生变化
    let value = column.datas[0]!=undefined?column.datas[0]:''
    value = value.trim()
    //判断是否存在外键
    if (column.property.indexOf('.')>-1){
      const  columnArr = column.property.split('.')
      filterData.value[columnArr[0]] = {
        [columnArr[1]]:value
      }
    }else{
      filterData.value[column.property] = value
    }
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
      if(res.code==200){
        total.pageTotal=parseInt(res.data.total)
        pageNum.value=1
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
        gridOptions.loading=false
      }else{
        ElMessage.warning(res.msg)
      }
    })
  }

  //双击表格行
  // const cellClickEvent =()=>{
  //     dialogTableVisible.value = true
  // }
  const cellClickEvent =()=>{
    return
      dialogTableVisible.value = true
  }
  const selectOrderList = ()=>{
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
        ,filterData).then((res) => {
      if(res.code==200){
        //total.pageTotal = res.data.total.pageTotal
        selectDate.value=res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
      }else{
        ElMessage.warning(res.msg)
      }
    })
  }

  const changeOrderType = ()=>{
    pageNum.value=1
    selectOrderList()
  }
 const changeDate =  ()=>{
   pageNum.value=1
   selectOrderList()
 }

 //页脚跳转
  const handlePageChange = ({ currentPage, pageSize }) => {
    pageNum.value=currentPage
    total.pageTotal    = pageSize
    selectOrderList()
  }

  //页面跳转更新或者删除订单
  const getTableRow =  (row,type) => {
    switch (type) {
      case 'edit': {
        router.push({path:'/main/order/createOrder',query:{orderId:row.orderId}})
        break
      }
      case 'delete': {
        request.post(`/order/deleteOrder/${row.orderId}`).then((res) => {
          if(res.code==200){
            ElMessage.success('删除成功')
            location.reload()
          }else{
            ElMessage.warning('删除失败')
          }
        })
        break
      }

    }
  }


</script>
@@ -129,13 +238,17 @@
<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
        @filter-change="filterChanged"
        @cell-dblclick="cellClickEvent"
        max-height="97%"
        class="mytable-scrollbar"
@@ -155,13 +268,17 @@

      <template #state="{ row,column}">
<!--        <p>{{row[column.field]}}</p>-->
        <el-checkbox @click.native.prevent :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
        <el-checkbox @click.native.prevent  :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
      </template>

      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>
        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>
        <el-popconfirm @confirm="getTableRow(row,'delete')" title="确认删除订单?">
          <template #reference>
            <el-button  link type="primary" size="small">删除</el-button>
          </template>
        </el-popconfirm>
      </template>

      <template #num1_filter="{ column, $panel }">
@@ -172,14 +289,26 @@
        </div>
      </template>


      <template #toolbar_buttons>
        <vxe-select v-model="orderType" placeholder="订单类型">
        <vxe-select @change="changeOrderType" v-model="orderType" placeholder="订单类型">
          <vxe-option value="2" label="正常订单"></vxe-option>
          <vxe-option value="-2" label="作废订单"></vxe-option>
          <vxe-option value="" label="全部订单"></vxe-option>
          <vxe-option value="0" label="全部订单"></vxe-option>
        </vxe-select>
      </template>

      <template #pager>
        <!--使用 pager 插槽-->
        <vxe-pager
            @page-change="handlePageChange"
            :layouts="[ 'PrevJump', 'PrevPage', 'Jump','PageCount', 'NextPage', 'NextJump',  'Total']"
            v-model:current-page="pageNum"
            v-model:page-size="total.pageSize"
            v-model:pager-count="total.pageTotal"
            :total="total.dataTotal"
        >
        </vxe-pager>
      </template>
    </vxe-grid>

    <el-dialog v-model="dialogTableVisible" title="流程卡进度" style="width: 80%;height:75% ">