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

廖井涛

2025-09-29 2ad329b52d19e48bcdc9013aaf3fcee460456548

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue

@@ -127,7 +127,9 @@
      total.pageTotal = res.data.total.pageTotal
      orderInfo.workOrderDate = res.data.selectDate
      pageTotal.value = res.data.total
      total.value = res.data.total
      produceList.value = produceList.value.concat(deepClone(res.data.data))
      console.log(produceList.value)
      produceList.value.forEach(item => {
        switch (item.layoutStatus) {
          case "0":
@@ -187,7 +189,9 @@
    if (res.code == 200) {
      total.dataTotal = res.data.total.total * 1
      total.pageTotal = res.data.total.pageTotal
      orderInfo.workOrderDate = res.data.selectDate
      pageTotal.value = res.data.total
      total.value = res.data.total
      res.data.data.forEach(item => {
        switch (item.layoutStatus) {
          case "0":
@@ -243,6 +247,7 @@
      total.dataTotal = res.data.total.total*1
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      total.value = res.data.total
      produceList.value = deepClone(res.data.data)
      produceList.value.forEach(item => {
        switch (item.layoutStatus) {
@@ -335,10 +340,10 @@
    },
    {field: 'order.project', title: t('order.project'), showOverflow: "ellipsis"},
    {field: 'quantity', title: t('order.quantity'),},
    {field: 'orderDetail.computeGrossArea', title: t('order.area'),},
    {field: 'computeGrossArea', title: t('order.area'),},
    {field: 'founder', title: t('processCard.founder'),},
    {field: 'orderDetail.processingNote', title: t('order.processingNote'),},

    {field: 'order.createTime', title: t('report.orderTime'),width: 110},
    {field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}},
    {field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'rack',width:100, title:t('processCard.shelfNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
@@ -351,6 +356,9 @@
      {code: 'delete', name: t('basicData.delete'), status: 'primary'},
      {code: 'rack', name: t('processCard.combinedFrame'), status: 'primary'},
    ],
    slots: {
      tools: 'toolbar_buttons'
    },
    import: false,
    // export: true,
    // print: true,
@@ -365,9 +373,10 @@
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'orderDetail.computeGrossArea']
        const List = ["quantity",'computeGrossArea']
        if (List.includes(column.field)) {
          return footSum(data, column.field)
          //return footSum(data, column.field)
          return total.value?.[column.field] ?? 0
        }
        return ''
      })
@@ -399,6 +408,8 @@

            let composingData = ref({
              composing: selectRecords,
              userId: user.user.userId,
              userName:user.user.userName
            })

            //修改排版状态
@@ -433,7 +444,7 @@
              composing: selectRecords,
            })
            selectRecords.forEach(item => {
                if (item.layoutStatus == "已排版"){
                if (item.layoutStatus == t('processCard.typesetter')){
                  ElMessage.warning(t('processCard.notSelectTheOptionData'))
                  return;
                }
@@ -448,7 +459,7 @@
                })
              } else {

                ElMessage.warning("撤销失败，请检查是否已生成工程号")
                ElMessage.warning(t('processCard.msg.msg7'))

              }
            })
@@ -534,7 +545,41 @@
  reserve: true
}

function exportExcel(url, fileName,date) {
  if(date===null){
    ElMessage.warning(t('report.pleaseSelectADateFirst'))
    return
  }


  const date1 = new Date(date[0]);
  const date2 = new Date(date[1]);
  const timeDiff = Math.abs(date2.getTime() - date1.getTime());
  const daysDiff = timeDiff / (1000 * 3600 * 24);
  if(Math.floor(daysDiff)>180){
    ElMessage.warning(t('report.theFilteringTimeForExportCannotExceed180Days'))
    return
  }
  let dataMp = ref({
    date: date,
  })
  request.post(url,dataMp.value,{responseType :'blob'}).then(res => {
    const blob = new Blob([res])
    if ('download' in document.createElement('a')) { // 非IE下载
      const elink = document.createElement('a')
      elink.download = `${fileName}.xlsx`
      elink.style.display = 'none'
      elink.href = URL.createObjectURL(blob)
      document.body.appendChild(elink)
      elink.click()
      URL.revokeObjectURL(elink.href) // 释放URL 对象
      document.body.removeChild(elink)
    } else { // IE10+下载
      navigator.msSaveBlob(blob, fileName)
    }

  })
}
</script>

<template>
@@ -642,6 +687,13 @@
          >
          </vxe-pager>
        </template>
        <template #toolbar_buttons>
          <vxe-button style="margin-right: 0.5rem"
                      @click="exportExcel('/processCard/exportDateProcess',
                                          t('order.processCard'),
                                          orderInfo.workOrderDate)">
            {{t('basicData.export')}}</vxe-button>
        </template>

      </vxe-grid>
    </div>
@@ -649,7 +701,7 @@
    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisible"
        :title="$t('流程卡合架')"
        :title="$t('processCard.combinedFrame')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <select-process-card-detail