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

chenlu

2025-11-19 260ad701e251aaa71a1bf5531bd98d93cb91c2bf

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

@@ -22,7 +22,7 @@
const printVisible= ref(false)
const orderInfo = useOrderInfoStore()


let printNumberFc = company.printNumber;
const userStore = useUserInfoStore()
const userId = userStore.user.userId

@@ -127,16 +127,16 @@

//第一次加载数据

request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {

  if (res.code == 200) {
    produceList = produceList.value.concat(deepClone(res.data.data))
    gridOptions.toolbarConfig.buttons[2].visible=false
    /*gridOptions.toolbarConfig.buttons[2].visible=false
    let roleId=res.data.user
    if (roleId=='1' || roleId=='17'){
      gridOptions.toolbarConfig.buttons[2].visible=true
    }

    }*/
    orderInfo.workOrderDate = res.data.selectDate
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
@@ -147,8 +147,7 @@
//点击查询
const getWorkOrder = () => {

  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]

  let orderId=form.orderId
  let project=form.project

@@ -160,9 +159,9 @@
  }
  let state = optionVal.value

  request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
  request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
    if (res.code == 200) {

      orderInfo.workOrderDate = res.data.selectDate
      xGrid.value.loadData(res.data.data)
      gridOptions.loading = false
    } else {
@@ -225,6 +224,7 @@
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {field: 'batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110,filterMethod: filterChanged},
    {
      field: 'quantity',
      title: t('order.quantity'),
@@ -301,7 +301,10 @@
            }
          }
          let array = orderIdList.split('|');
         router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
          if (selectRecords.length==1){
            printNumberFc = true
          }
         router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,printNumberFc:printNumberFc}})
          return;

        }