Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-03-26 7a0527e207c59cdcce0b1f7a41bd7457a236ab23

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

@@ -4,7 +4,7 @@
import {computed, onMounted, reactive, ref} from "vue"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElMessage} from "element-plus"
import {ElMessage, ElMessageBox} from "element-plus"
import { VXETable} from "vxe-table"
import  useUserInfoStore from '@/stores/userInfo'
import companyInfo from "@/stores/sd/companyInfo"
@@ -34,9 +34,13 @@
  let sheetIndex = ref(-1)
  let orderType = ref("2")
  let filterData = ref({})
  let sortData = ref({
    field:'id',
    order:null
  })
  let orderList = ref([])
  let pageNum=ref(1)
  let total = reactive({
  let total = ref({
    pageTotal : 0,
    dataTotal : 0,
    pageSize : 50
@@ -64,6 +68,9 @@
    filterConfig: {   //筛选配置项
      remote: true
    },
    sortConfig: {   //排序配置项
      remote: true//是否服务端排序
    },
    customConfig: {
      storage: true
    },
@@ -87,6 +94,18 @@
                { code: 'sheet4', name: t('order.sheet4') },
                { code: 'sheet3', name: t('order.sheet3') },
                { code: 'sheet5', name: t('order.sheet5')},

              ]
            },
            {
              prefixIcon: 'vxe-icon-repeat',
              name: t('order.oneClickReturn'),
              children: [
                // { code: 'sheet1', name: '横版-普通' },
                { code: 'back1', name: t('searchOrder.createOrder'),disabled:true },
                { code: 'back2', name: t('order.technology'),disabled:true  },
                { code: 'back3', name: t('basicData.review'),disabled:true  },
                { code: 'back4', name: t('searchOrder.production'),disabled:true },

              ]
            },
@@ -164,7 +183,8 @@
          }
          const List = ["quantity",'goodsQuantity','area','perimeter','money']
          if (List.includes(column.field)) {
            return footSum(data, column.field)
            //return footSum(data, column.field)
            return total.value[column.field]
          }
          return ''
        })
@@ -254,6 +274,22 @@
            }
            break
          }
          case 'back1': {
            backProcess(1)
            break
          }
          case 'back2': {
            backProcess(2)
            break
          }
          case 'back3': {
            backProcess(3)
            break
          }
          case 'back4': {
            backProcess(4)
            break
          }

          case 'copy': {
            if(rowClickIndex.value===null){
@@ -308,15 +344,74 @@
    },
    cellClick({ row }){
      rowClickIndex.value = row
      xGrid.value.menuConfig.body.options[0][3].children.forEach((item)=>{
        item.disabled=true
      })
      //判断是否入库
      if(row.warehousing>0){
        return
      }
      if(row.processReview===2){
        xGrid.value.menuConfig.body.options[0][3].children[0].disabled=false
      }
      if(row.orderReview===2){
        xGrid.value.menuConfig.body.options[0][3].children[1].disabled=false
      }
      if(row.productionOrder>0){
        xGrid.value.menuConfig.body.options[0][3].children[2].disabled=false
      }
      if(row.processingCard>0){
        xGrid.value.menuConfig.body.options[0][3].children[3].disabled=false
      }
    },
    sortChange ({ field, order }) {
      sortData.value = {field,order}
      selectOrderList()
    }
  }
  const backProcess = (status) => {
    if(rowClickIndex.value===null){
      ElMessage.warning(t('searchOrder.msgList.checkOrder'))
      return
    }

  const getOrderList = () => {
    ElMessageBox.confirm(
        '确定一键退回相应流程?',
        'Warning',
        {
          confirmButtonText: t('basicData.confirmButtonText'),
          cancelButtonText: t('basicData.cancelButtonText'),
          type: 'warning',
        }
    )
        .then(() => {
          request.post(`/order/processBack/${rowClickIndex.value.orderId}/${status}`).then((res) => {
            if(res.code==='200' && res.data===true){
              ElMessage.success(t('product.msg.operateSuccess')+'!')
              selectOrderList()
            }else if(res.data==='false1'){
              ElMessage.warning('此订单已转优化，回退失败！')
            }else if(res.data==='false2'){
              ElMessage.warning('此订单已报工，回退失败！')
            }else if(res.data==='false3'){
              ElMessage.warning('此订单已入库，回退失败！')
            }
          })
        })
  }


  const getOrderList = async () => {
    //加载请求
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData).then((res) => {
    const config = {
      filter: filterData.value,
      sort: sortData.value
    }
    await request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal= res.data.total.pageTotal
        total.value = res.data.total
        /*total.dataTotal = res.data.total.dataTotal*1
        total.pageTotal= res.data.total.pageTotal*/
        orderInfo.selectDate = res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
@@ -325,8 +420,12 @@
      }
    })
  }
  onMounted(() => {
    getOrderList()
  onMounted(async () => {
    filterData.value = orderInfo.searchOrderFilter.data
    await getOrderList()
    orderInfo.searchOrderFilter.list.forEach(item =>{
      xGrid.value.getColumnByField(item.field).filters = item.column.filters
    })
  })

  const changeFilterEvent = (event, option, $panel) => {
@@ -348,14 +447,22 @@
    }else{
      filterData.value[column.property] = value
    }
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData.value).then((res) => {

    const config = {
      filter: filterData.value,
      sort: sortData.value
    }
    request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal=parseInt(res.data.total)
        total.value = res.data.total
        /*total.dataTotal = res.data.total.total*1
        total.pageTotal=parseInt(res.data.total)*/
        pageNum.value=1
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
        gridOptions.loading=false
        orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
        orderInfo.searchOrderFilter.data = filterData.value
      }else{
        ElMessage.warning(res.msg)
      }
@@ -365,11 +472,16 @@
  //双击表格行

  const selectOrderList = ()=>{
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`
        ,filterData.value).then((res) => {
    const config = {
      filter: filterData.value,
      sort: sortData.value
    }
    request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`
        ,config).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal = res.data.total.pageTotal
        total.value = res.data.total
        /*total.dataTotal = res.data.total.total*1
        total.pageTotal = res.data.total.pageTotal*/
        orderInfo.selectDate=res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
@@ -561,14 +673,20 @@
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
              <input
                  v-model="option.data"
                  @keyup.enter.native="$panel.confirmFilter()"
                  @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data"  @change="changeFilterEvent($event, option, $panel)" :placeholder="$t('processCard.pleaseSelect')">
              <vxe-select
                  v-model="option.data"
                  @change="changeFilterEvent($event, option, $panel)"
                  :placeholder="$t('processCard.pleaseSelect')">
                <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
                <vxe-option value="1" :label="$t('basicData.partiallySelected')"></vxe-option>
                <vxe-option value="2" :label="$t('basicData.selected')"></vxe-option>