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

guoyuji

2024-12-11 69c3c53dab092e0fd618a84934f333030e769926

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

@@ -15,12 +15,14 @@
import {useI18n} from 'vue-i18n'
import footSum from "@/hook/footSum"
import {changeFilterEvent,filterChanged} from "@/hook"
import userInfo from "@/stores/userInfo"
//语言获取
const {t} = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
const user=userInfo()
let flag = $ref(true)

function intoCreateProduct() {
@@ -74,13 +76,14 @@

const orderOtherMoney = ref(null)


let maxProcseeId=null
//第一次加载数据

request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {

  if (res.code == 200) {
    pageTotal.value = res.data.total
    maxProcseeId=res.data.maxFlowCard[0].process_id
    orderOtherMoney.value = res.data.orderOtherMoney
    orderOtherMoney.value.forEach(item => {
      let column = {
@@ -90,6 +93,7 @@
        filters: [{data: ''}],
        slots: {filter: 'num1_filter'},
        filterMethod: filterChanged,
        sortable: true
      }

      gridOptions.columns.push(column)
@@ -189,12 +193,24 @@
      filterMethod: filterChanged,
      width: '78px'
    },
    {
      field: 'building_number',
      title: t('order.buildingNumber'),
      sortable: true,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      width: '120px'
    },
    {field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '80px'},
    {field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
    {field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
    {field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
    {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
    {field: 'remarks', title: t('processCard.notes'),  width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged}
    {field: 'remarks', title: t('processCard.notes'),  width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
    {field: 'processing_note', title: t('order.processingNote'),  width: '105px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
    {field: 'bend_radius', title: t('order.bendRadius'),  width: '120px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged,sortable: true,}

  ],//表头按钮

  toolbarConfig: {
@@ -301,6 +317,15 @@
      filterMethod: filterChanged,
      width:70
    },
    {
      field: 'building_number',
      title: t('order.buildingNumber'),
      sortable: true,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      width: '120px'
    },
    {field: 'width', title: t('order.width'), showOverflow: "ellipsis",width:70},
    {field: 'height', title: t('order.height'),width:70},
    {field: 'quantity', title: t('order.quantity'),width:70},
@@ -354,7 +379,32 @@
    index = leftData[0].landingSequence + 1
    //index = index.toString().padStart(2, '0')
  }
  const processId = productionId + index.toString().padStart(3, '0')
  let processId= null
  // if (leftData.length !== 0){
  //   processId = productionId + index.toString().padStart(3, '0')
  // }
  // else {
    if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
      if (leftData.length !== 0){
        const str=leftData[0].processId
        const lastThree = str.slice(-3);
        const result =  lastThree*1 + 1;
        processId= productionId + result.toString().padStart(3, '0')
      }
      else {
        // 截取后三位
        const lastThree = maxProcseeId.slice(-3);
        const result =  lastThree*1 + 1;
        processId= productionId + result.toString().padStart(3, '0')
      }

    }
    else {
      processId = productionId + index.toString().padStart(3, '0')
    }
  //}


  const regex = /^(\d+|)$/;
  if (!regex.test(checkedNum.value)) {
    ElMessage.warning(t('processCard.schedulingNo'))
@@ -403,6 +453,78 @@
    $gridLeft.clearCheckboxRow()
    $grid.clearCheckboxRow()
  }
  if (checkedNum.value){
    checkedNum.value =''
  }
}


//按编号创建流程卡
const createProcessCardNo = () => {
  const $grid = xGrid.value
  const checkedList = $grid.getCheckboxRecords()

  if (checkedList.length === 0) {
    ElMessage.warning(t('processCard.schedulingOk'))
    return
  }
  //productionId
  const $gridLeft = xGridLeft.value
  const leftData = $gridLeft.getTableData().fullData
  let index = 0
  if (leftData.length !== 0) {
    index = leftData[0].landingSequence + 1
    //index = index.toString().padStart(2, '0')
  }

  let processId= null

  if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
    if (leftData.length !== 0){
      const str=leftData[0].processId
      const lastThree = str.slice(-3);
      const result =  lastThree*1 + 1;
      processId= productionId + result.toString().padStart(3, '0')
    }
    else {
      // 截取后三位
      const lastThree = maxProcseeId.slice(-3);
      const result =  lastThree*1 + 1;
      processId= productionId + result.toString().padStart(3, '0')
    }

  }
  else {

      processId = productionId + index.toString().padStart(3, '0')


  }


  const regex = /^(\d+|)$/;
  if (!regex.test(checkedNum.value)) {
    ElMessage.warning(t('processCard.schedulingNo'))
    return
  }

    checkedList.forEach((item) => {
      index++
      processId = productionId + index.toString().padStart(3, '0')
      item.processId = processId
      item.landingSequence = index
      item.quantity = item.baiscQuantity
    })
    //删除key
    checkedList.forEach((item) => {
      delete item._X_ROW_KEY
    })
    $gridLeft.insertAt(checkedList)
    $grid.remove(checkedList)
    //清除两边复选框
    $gridLeft.clearCheckboxRow()
    $grid.clearCheckboxRow()

}


@@ -499,19 +621,49 @@
          delete item._X_ROW_KEY
          $grid.insert(item)


        }

        $gridLeft.remove(item)
      })


    }

    let leftDataList = $gridLeft.getTableData().fullData;
    let baseProcessId = productionId; // 固定的前缀

    // 统计所有不重复的 processId
    let uniqueProcessIds = new Set(leftDataList.map(item => item.processId));
    // 不重复的 processId 的总个数
    let totalUniqueCount = uniqueProcessIds.size;
    // 用于记录已经分配的 processId
    let usedProcessIds = new Set();

    leftDataList.forEach((item) => {
      let newProcessId;
      // 如果该 processId 是第一次出现，使用递减的编号生成新的 processId
      if (!usedProcessIds.has(item.processId)) {
        newProcessId = `${baseProcessId}${(totalUniqueCount).toString().padStart(3, '0')}`;
        usedProcessIds.add(item.processId); // 标记该 processId 已使用
        totalUniqueCount--; // 递减

      } else {
        // 如果该 processId 已经使用过，继续使用已分配的编号
        newProcessId = `${baseProcessId}${(totalUniqueCount + 1).toString().padStart(3, '0')}`;
        
      }
      // 更新 item.processId
      item.processId = newProcessId;
    });

    //清除两边复选框
    $gridLeft.clearCheckboxRow()
    $grid.clearCheckboxRow()

  } catch (e) {
    ElMessage.warning(e.message)
  }
  if (checkedNum.value){
    checkedNum.value =''
  }
}
//向左边表格添加数据
@@ -631,6 +783,9 @@
  } catch (e) {
    ElMessage.warning(e.message)
  }
  if (checkedNum.value){
    checkedNum.value =''
  }
}


@@ -641,6 +796,7 @@
    if ($grid) {
      switch (code) {
        case 'saveFlowCard': {
          gridLeftOptions.toolbarConfig.buttons[0].disabled=true
          const $table = xGridLeft.value
          const $tableRight = xGrid.value
          if ($table) {
@@ -649,20 +805,28 @@
            let leftData = $tableRight.getTableData().fullData
            if (selectRecords.length === 0) {
              ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
              gridLeftOptions.toolbarConfig.buttons[0].disabled=false
              return
            }

            if (leftData.length > 0) {
              ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
              gridLeftOptions.toolbarConfig.buttons[0].disabled=false
              return;
            }
            // if (leftData.length!=selectRecords.length){
            //   ElMessage.warning('请勾选所有数据进行保存')
            //   gridLeftOptions.toolbarConfig.buttons[0].disabled=false
            //   return;
            // }
            let flowCardData = ref({
              flowCard: selectRecords,
              userName: username,
              productionId: productionId
              productionId: productionId,
              userId:user.user.userId
            })

            request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
            request.post(`/processCard/addFlowCard/${orderId}`, flowCardData.value).then((res) => {
              if (res.code == 200) {
                ElMessage.success(t('basicData.msg.saveSuccess'))
                //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
@@ -710,9 +874,7 @@

<template>
  <div style="width: 75%;height: 90%">

    <div class="common-layout" style="width: 100%;height: 100%">

    <div class="common-layout">
      <el-button
          id="searchButton1"
          :icon="ArrowLeftBold"
@@ -753,6 +915,7 @@
                <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)"/>
                </div>
              </div>
@@ -767,7 +930,7 @@
              <span><el-input v-model="quantit" style="width: 80px;"/></span>
              <span><el-input v-model="weight" style="width: 80px;"/></span>
            </div>
            <span>{{ $t('processCard.selectedQuantity') }}:<el-input v-model="checkedNum" clearable
            <span>{{ $t('processCard.selectedQuantity') }}:<el-input id="checkedNum" v-model="checkedNum" clearable
                                                                     type="number"></el-input></span><br>
            <el-button style="width: 40px;" type="primary" @click="addRight"> →</el-button>
            <br>
@@ -776,6 +939,9 @@
            <br>
            <br>
            <el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
            </el-button>
            <br><br><br><br><br>
            <el-button type="primary" @click="createProcessCardNo">{{ $t('processCard.createBySequenceNumber') }}
            </el-button>
          </el-main>
        </div>
@@ -816,6 +982,7 @@
                  <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)"/>
                  </div>
                </div>
@@ -835,7 +1002,8 @@
}

.common-layout {
  height: 100%;
  width: 99%;
  height: 96%;
}

.header {