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

廖井涛

4 天以前 ac225bd66eb7c21b5af1d8533dc59376ea53da6c

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

@@ -19,6 +19,7 @@
import useOrderInfoStore from "@/stores/sd/order/orderInfo"
import {Printer} from "@element-plus/icons-vue/global";
import SelectProcessCardDetail from "@/components/pp/SelectProcessCardDetail.vue";
import OrderProcessCollect from "@/components/sd/order/OrderProcessCollect.vue";

//语言获取
const {t} = useI18n()
@@ -28,6 +29,7 @@

let productGlassTypeStore = useProductGlassTypeStore()
const dialogTableVisible = ref(false)
const dialogProcess = ref(false)
let router = useRouter()
let props = defineProps({
  rowIndex: {}
@@ -36,8 +38,6 @@
  list: null,
})
const getTableRow = (row, type) => {
  let startTime = form.date1[0]
  let endTime = form.date1[1]
  switch (type) {
    case 'select' : {
      router.push({path: '/main/processCard/SelectDetailProcessCard', query: {processId: row.processId}})
@@ -106,6 +106,12 @@
  }

})
//流程卡进度用值
let processVal = ref({
  orderId:null,
  row: {},
  processId:null//用于后端数据返回，结果筛选
})
//定义页面总页数
let pageTotal = ref('')
//定义数据返回结果
@@ -114,75 +120,109 @@
let pageNum = ref(1)
let pageState = null

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
      .toISOString()
      .replace('T', ' ')
      .slice(0, 10) //默认开始时间7天前
  const end = new Date(new Date().getTime())
      .toISOString()
      .replace('T', ' ')
      .slice(0, 10)//默认结束时间当前时间
  return [start, end]
}


//第一次加载获取近七天时间和默认状态
if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
  orderInfo.workOrderDate=getNowTime()
}
let startTime = orderInfo.workOrderDate[0]
let endTime = orderInfo.workOrderDate[1]
let total = reactive({
  pageTotal: 0,
  dataTotal: 0,
  pageSize: 100
})

const getFlowCardList = async () => {
  gridOptions.loading = true
//第一次加载数据
request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
  await request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {

  if (res.code == 200) {
    total.dataTotal = res.data.total.total * 1
    total.pageTotal = res.data.total.pageTotal
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
    ElMessage.warning(res.msg)
  }
})

//页脚翻页查询
const selectPageList = () => {
  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]
  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
    if (res.code == 200) {

      produceList = deepClone(res.data.data)
      xGrid.value.reloadData(produceList)
      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
      produceList.value = produceList.value.concat(deepClone(res.data.data))
      produceList.value.forEach(item => {
        switch (item.layoutStatus) {
          case "0":
            item.layoutStatus = t('processCard.composingNo');
            break;
          case "1":
            item.layoutStatus = t('processCard.composingOk');
            break;
          case "2":
            item.layoutStatus = t('processCard.typesetter');
            break;
        }
      });
      xGrid.value.loadData(produceList.value)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}
onMounted(async () => {
  filterData.value = orderInfo.selectProcessCardFilter.data
  await getFlowCardList()
  orderInfo.selectProcessCardFilter.list.forEach(item =>{
    xGrid.value.getColumnByField(item.field).filters = item.column.filters
  })
})
//页脚翻页查询
const selectPageList = () => {
  gridOptions.loading = true
  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
    if (res.code == 200) {

      produceList.value = deepClone(res.data.data)
      produceList.value.forEach(item => {
        switch (item.layoutStatus) {
          case "0":
            item.layoutStatus = t('processCard.composingNo');
            break;
          case "1":
            item.layoutStatus = t('processCard.composingOk');
            break;
          case "2":
            item.layoutStatus = t('processCard.typesetter');
            break;
        }
      });
      xGrid.value.loadData(produceList.value)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}

//点击查询
const getWorkOrder = () => {

  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]
  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
  gridOptions.loading = true
  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
    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":
            item.layoutStatus = t('processCard.composingNo');
            break;
          case "1":
            item.layoutStatus = t('processCard.composingOk');
            break;
          case "2":
            item.layoutStatus = t('processCard.typesetter');
            break;
        }
      });
      xGrid.value.loadData(res.data.data)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}
@@ -215,20 +255,34 @@
    filterData.value[column.property] = value
  }

//获取选中时间
  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]

  request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
  request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
    if (res.code == 200) {
      total.dataTotal = res.data.total.total*1
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      produceList = deepClone(res.data.data)
      xGrid.value.reloadData(produceList)
      total.value = res.data.total
      produceList.value = deepClone(res.data.data)
      produceList.value.forEach(item => {
        switch (item.layoutStatus) {
          case "0":
            item.layoutStatus = t('processCard.composingNo');
            break;
          case "1":
            item.layoutStatus = t('processCard.composingOk');
            break;
          case "2":
            item.layoutStatus = t('processCard.typesetter');
            break;
        }
      });
      xGrid.value.loadData(produceList.value)
      gridOptions.loading=false
      orderInfo.selectProcessCardFilter.list = xGrid.value.getCheckedFilters()
      orderInfo.selectProcessCardFilter.data = filterData.value
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}
@@ -242,7 +296,6 @@
//子组件接收参数
const xGrid = ref()
const gridOptions = reactive({
  loading: true,
  border: "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
@@ -277,6 +330,8 @@
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
    {field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
    {field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},

    {
      field: 'processId',
      width: 140,
@@ -300,21 +355,26 @@
    },
    {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: 'order.updateTime', title: t('productStock.approvedDate'),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('架号'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
    {field: 'rack',width:100, title:t('processCard.shelfNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
  ],//表头按钮

  toolbarConfig: {
    buttons: [
      {code: 'update', name: t('processCard.composing'), status: 'primary'},
      {code: 'revoke', name: t('processCard.revoke'), status: 'primary'},
      {code: 'delete', name: t('basicData.delete'), status: 'primary'},
      {code: 'rack', name: t('合架'), status: 'primary'},
      {code: 'rack', name: t('processCard.combinedFrame'), status: 'primary'},
    ],
    slots: {
      tools: 'toolbar_buttons'
    },
    import: false,
    // export: true,
    // print: true,
@@ -329,9 +389,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 ''
      })
@@ -363,6 +424,8 @@

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

            //修改排版状态
@@ -376,6 +439,43 @@
              } else {

                ElMessage.warning(t('basicData.msg.saveFail'))

              }
            })

          }
          return;

        }
        case 'revoke': {
          const $table = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            if (selectRecords.length == 0) {
              ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
              return;
            }

            let composingData = ref({
              composing: selectRecords,
            })
            selectRecords.forEach(item => {
                if (item.layoutStatus == t('processCard.typesetter')){
                  ElMessage.warning(t('processCard.notSelectTheOptionData'))
                  return;
                }
            });
            //撤销可排版状态
            request.post("/processCard/revokeComposing", composingData.value).then((res) => {
              if (res.code == 200 && res.data === true) {
                ElMessage.success(t('basicData.msg.saveSuccess'))
                router.push({
                  path: '/main/processCard/SelectProcessCard',
                  query: {random: Math.random()}
                })
              } else {

                ElMessage.warning(t('processCard.msg.msg7'))

              }
            })
@@ -461,7 +561,47 @@
  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)
    }

  })
}

const onCellDblClick = ({ row, column }) => {
  processVal.value.orderId = row.orderId
  processVal.value.processId = row.processId
  dialogProcess.value = true
};
</script>

<template>
@@ -496,6 +636,7 @@
          v-bind="gridOptions"
          v-on="gridEvents"
          @filter-change="filterChanged"
          @cell-dblclick="onCellDblClick"

      >
        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -537,9 +678,10 @@
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input v-model="option.data" type="text"
                     @keyup.enter.native="$panel.confirmFilter()"
                     @input="changeFilterEvent($event, option, $panel)"/>
              <input
                  v-model="option.data"
                  @keyup.enter.native="$panel.confirmFilter()"
                  @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>
@@ -568,14 +710,35 @@
          >
          </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>

    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogProcess"
        :title="$t('order.processCardCollect')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <order-process-collect
          :orderId="processVal.orderId"
          :processId="processVal.processId"
          :row="processVal.row"
          style="width: 100%;height: 100%"
      />
    </el-dialog>

    <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
@@ -596,4 +759,9 @@
  width: 100%;
  height: calc(100% - 35px);
}

:deep(.el-dialog__body){
  height: 90%;
  width: 100%;
}
</style>