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

guoyujie

4 天以前 130fe64dd3eb0617ddc1f38afcd07656d56db27c

 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: {}
@@ -104,6 +106,12 @@
  }

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

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

@@ -129,7 +138,6 @@
      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":
@@ -144,8 +152,10 @@
        }
      });
      xGrid.value.loadData(produceList.value)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}
@@ -158,6 +168,7 @@
})
//页脚翻页查询
const selectPageList = () => {
  gridOptions.loading = true
  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
    if (res.code == 200) {

@@ -176,15 +187,17 @@
        }
      });
      xGrid.value.loadData(produceList.value)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}

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

  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
@@ -209,6 +222,7 @@
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}
@@ -268,6 +282,7 @@
      orderInfo.selectProcessCardFilter.data = filterData.value
    } else {
      ElMessage.warning(res.msg)
      gridOptions.loading = false
    }
  })
}
@@ -343,7 +358,8 @@
    {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('processCard.shelfNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
@@ -444,7 +460,7 @@
              composing: selectRecords,
            })
            selectRecords.forEach(item => {
                if (item.layoutStatus == "已排版"){
                if (item.layoutStatus == t('processCard.typesetter')){
                  ElMessage.warning(t('processCard.notSelectTheOptionData'))
                  return;
                }
@@ -580,6 +596,12 @@

  })
}

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

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

      >
        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -700,6 +723,20 @@

    <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('processCard.combinedFrame')"
        destroy-on-close
@@ -722,4 +759,9 @@
  width: 100%;
  height: calc(100% - 35px);
}

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