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

廖井涛

2024-10-14 6ac9391135ded7e668d2d42f408f4a6c59b27d23

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

@@ -13,11 +13,15 @@
import OrderSortDetail from '@/components/pp/OrderSortDetail.vue'
import companyInfo from "@/stores/sd/companyInfo"
import useUserInfoStore from "@/stores/userInfo";
import useOrderInfoStore from "@/stores/sd/order/orderInfo"

//语言获取
const {t} = useI18n()
const company = companyInfo()
let router = useRouter()
const printVisible= ref(false)
const orderInfo = useOrderInfoStore()


const userStore = useUserInfoStore()
const userId = userStore.user.userId
@@ -93,9 +97,11 @@
}

//第一次加载获取近七天时间和默认状态
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
  orderInfo.workOrderDate=getNowTime()
}
let startTime = orderInfo.workOrderDate[0]
let endTime = orderInfo.workOrderDate[1]
let orderId=form.orderId
let project=form.project

@@ -128,8 +134,8 @@
//点击查询
const getWorkOrder = () => {

  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]
  let orderId=form.orderId
  let project=form.project

@@ -225,6 +231,7 @@
      {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
      {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
      {code: 'detailsPrint', name: '明细打印', status: 'primary'},
      {code: 'detailsProcessPrint', name: '明细分架打印', status: 'primary'},

    ],

@@ -295,10 +302,31 @@
            }
          }
          let array = orderIdList.split('|');
          router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
          router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:1}})
          return;

        }
        case 'detailsProcessPrint': {
          const selectRecords = $grid.getCheckboxRecords()
          if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }

          let orderIdList = ""
          for (let i = 0; i < selectRecords.length; i++) {
            if (i + 1 === selectRecords.length) {
              orderIdList += selectRecords[i].order_id
            } else {
              orderIdList += selectRecords[i].order_id + "|"
            }
          }
          let array = orderIdList.split('|');
          router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:2}})
          return;

        }

      }
    }
  }
@@ -311,7 +339,7 @@
    <div id="selectForm">
      <el-row :gutter="0">
        <el-date-picker
            v-model="form.date1"
            v-model="orderInfo.workOrderDate"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
@@ -360,7 +388,9 @@
      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
            <input v-model="option.data" type="text"
                   @keyup.enter.native="$panel.confirmFilter()"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>