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":
@@ -189,6 +191,7 @@
      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":
@@ -244,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) {
@@ -336,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'}}
@@ -369,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 ''
      })
@@ -439,7 +444,7 @@
              composing: selectRecords,
            })
            selectRecords.forEach(item => {
                if (item.layoutStatus == "已排版"){
                if (item.layoutStatus == t('processCard.typesetter')){
                  ElMessage.warning(t('processCard.notSelectTheOptionData'))
                  return;
                }
@@ -454,7 +459,7 @@
                })
              } else {

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

              }
            })
@@ -696,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