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

廖井涛

2024-09-25 b5a9dccccaf5bed064891a05ec8ff3f21de9cff0

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -4,11 +4,15 @@
import request from "@/utils/request";
import {ElMessage} from "element-plus";
import {changeFilterEvent, filterChanged} from "@/hook"
import domZIndex from 'dom-zindex'
import {indexOf} from "xe-utils";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import userInfo from "@/stores/userInfo"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"
domZIndex.setCurrent(3000)
const company = companyInfo()
//语言获取
const { t } = useI18n()
let brokenVisible = ref(false)
@@ -66,6 +70,7 @@
})
let detail = ref([])
let layer=''
let technologicalProcess=''

//定义接收加载表头下拉数据
const titleSelectJson = ref({
@@ -98,31 +103,30 @@
        titleSelectJson.value = res.data.basic
        layer= res.data.layer

        //添加补片状态列
        let column = {field: 'patchStatusOther', width: 90,title: res.data.title}
        gridOptions.columns.push(column)

        const s01Values = [];
        // 遍历 res.data.numberList 数组，获取每个元素的 S01 值并存储到 s01Values 数组中
        res.data.numberList.forEach(element => {
          try {
            const otherColumnsObject = JSON.parse(element.other_columns);
            const s01Value = otherColumnsObject.S01;
            if (s01Value) {
              s01Values.push(s01Value);
            } else {
              // 如果 S01 值为空，可以选择添加默认值或者忽略这个元素
              s01Values.push(''); // 例如添加空字符串
            }
          } catch (error) {
            // console.error('Error parsing JSON or accessing S01 value:', error);
            // 处理 JSON 解析错误或其他异常情况
        for (let i = 0; i < res.data.reportingWorkDetails.length; i++) {
          const s01Values = [];
          // 遍历 detailList 数组，提取 S01 值到 s01Values 数组
          if (res.data.reportingWorkDetails[i].other_columns!=null|| res.data.reportingWorkDetails[i].other_columns!=undefined){
            res.data.reportingWorkDetails.forEach(element => {
              const otherColumnsObject = JSON.parse(element.other_columns);
              const s01Value = otherColumnsObject.S01;
              s01Values.push(s01Value || ''); // 如果 S01 值为空，添加空字符串或者其他默认值
            });

            // 将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
            res.data.reportingWorkDetails.forEach((detail, index) => {
              detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 赋值给 s01Value 属性
            });
          }
        });
        // 遍历 res.data.Detail 数组，将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
        res.data.reportingWorkDetails.forEach((detail, index) => {
          if (index < s01Values.length) {
            detail.s01Value = s01Values[index]; // 添加一个名为 s01Value 的新属性，存储对应的 S01 值
          } else {
            detail.s01Value = ''; // 如果 s01Values 中的值不足，可以添加默认值或者不进行赋值处理
          }
        });

        }


        //titleUploadData.value.processId=titleUploadData.value.processId+'/'+layer
        xGrid.value.reloadData(res.data.reportingWorkDetails)
        let button =  {
@@ -135,6 +139,7 @@
          titleUploadData.value.qualityInspector=user.user.userName
        }


        gridOptions.toolbarConfig.buttons.push(button)
      }
     // getQuantity()
@@ -144,7 +149,6 @@
})

const data = [{id:1,num:2},{id:1,num:3},{id:2,num:2},{id:1,num:2}];


//表尾求和
const sumNum = (list, field) => {
@@ -179,7 +183,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'AddReportingWork_1',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -196,13 +200,23 @@
  customConfig: {
    storage: true
  },
  mouseConfig:{selected: true},//鼠标选中
  keyboardConfig:{
    isArrow: true,
    isDel: true,
    isEnter: true,
    isTab: true,
    isEdit: true,
    isChecked: true
  },
  editConfig: {
    trigger: 'click',
    trigger: 'dblclick',
    mode: 'row',
    showStatus: true
  },
  menuConfig: {
    body: {
    //右键菜单
      options: [
        [
          {
@@ -222,6 +236,20 @@
          {
            code: 'clearChecked',
            name: t('basicData.clearSelection'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'SecondaryBreakage',
            name: "序号次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'checkedBreakage',
            name: "选中次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
@@ -402,13 +430,26 @@
          break
        }
        case 'update':  {
          getQuantity()
          const errMap = await $grid.validate(true)
          if (errMap) {
            ElMessage.error(t('basicData.msg.checkoutLose'))
            return
          }
          saveReportingWork(0,'update')
          //根据补片状态判断是否能修改
          // request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
          //   if (res.code == 200) {
          //     if (res.data > 0) {
          //       ElMessage.error("该报工包含已补片数据，不可修改!")
          //       return
          //     } else {
                getQuantity()
                const errMap = await $grid.validate(true)
                if (errMap) {
                  ElMessage.error(t('basicData.msg.checkoutLose'))
                  return
                }
                saveReportingWork(0, 'update')
           //   }
          //   } else {
          //     ElMessage.warning(res.msg)
          //   }
          // })

          break
        }
      }
@@ -425,7 +466,9 @@
    const { rows, column, cell } = params; // 解构获取行、列和单元格信息
    //点击次破数量时打开明细界面
    if(column.field=="breakageQuantity"){
      brokenVisible.value = true
      if (row.patchStatusOther!="已补片"){
        brokenVisible.value = true
      }
    }
  },
  menuClick({menu, row, column}) {
@@ -477,6 +520,56 @@
          }
          break
        }
        case 'SecondaryBreakage' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const seenOrders = {}
              dataList.forEach((item, index) => {
                const list = item.damageDetails
                if (list!== null || list.length > 0){
                  const { order_number, damageDetails, breakageQuantity } = item;
                  // 如果 order_number 还没有处理过
                  if (!seenOrders[order_number]) {
                    // 记录第一个出现的 damageDetails 和 breakageQuantity
                    seenOrders[order_number] = {
                      damageDetails,
                      breakageQuantity
                    };
                  } else {
                    // 将后续的 damageDetails 和 breakageQuantity 更新为第一个的
                    item.damageDetails = seenOrders[order_number].damageDetails;
                    item.breakageQuantity = seenOrders[order_number].breakageQuantity;
                  }
                }

              })
            }
          }
          break
        }
        case 'checkedBreakage' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start].damageDetails
              const quantity = dataList[result.start].breakageQuantity
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item.damageDetails = val
                  item.breakageQuantity =  quantity
                  if (index!=result.start){
                    item.completedQuantity = item.completedQuantity - quantity
                  }

                }
              })
            }
          }
          break
        }
      }
    }
  },
@@ -490,7 +583,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'AddReportingWork_2',
  //showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -513,6 +606,7 @@
    showStatus: true
  },//表头参数
  columns: [
    {type: 'checkbox', fixed: "left", title: t('basicData.check'),width: 78},
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    // {
    //   field: 'order_number',
@@ -562,7 +656,7 @@
    },
    {
      field: 'responsiblePersonnel',
      title: t('reportingWorks.responsiblePersonnel'),
      title: '责任信息',
      editRender: {name: 'input', attrs: {placeholder: ''}}

    },
@@ -628,9 +722,10 @@
          break
        }
        case 'removeRow':  {
          let result = toolbarButtonClickEvent()
          if(result){
            $grid.remove(result.row)
          const $grid = brokenGrid.value
          const checkedList = $grid.getCheckboxRecords()
          if(checkedList){
            $grid.remove(checkedList)
          }
          break
        }
@@ -639,10 +734,9 @@
  }
}
const openedBrokenTable = () => {
  addListener(brokenGrid.value,brokenGridOptions)
  //addListener(brokenGrid.value,brokenGridOptions)
  let damage =ref(brokenRow.value.damageDetails)
  brokenGrid.value.reloadData(damage.value)
  addListener(xGrid.value, gridOptions)
}


@@ -682,8 +776,12 @@
    return row.order_number === brokenRow.value.order_number
  })
  const maxQuantity =  Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
  let process = titleUploadData.value.thisProcess
  equalByOrderNum.forEach((row) =>{
    row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
    if (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框'){
      row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
    }

  })


@@ -694,10 +792,20 @@


//第一次加载数据

request.post(`/reportingWork/selectProcess`).then((res) => {
let groupChangeProcess = ref(false)//用于本班组显示问题
request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
  if (res.code == 200) {
    titleSelectJson.value.processType = res.data.process;
    titleSelectJson.value.processType = res.data.process
    if(user.user.address!==null && user.user.address!==''){
      titleUploadData.value.thisProcess = user.user.address
      titleUploadData.value.teamsGroupsName = user.user.userName
      groupChangeProcess.value = true
      if (user.user.address==='技术部多曲' || user.user.address==='夹胶'){
        groupChangeProcess.value = false
      }
      gridOptions.toolbarConfig.buttons[1].visible=false
    }

  } else {
    ElMessage.warning(res.msg)
  }
@@ -761,16 +869,15 @@
  const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
    return item.saveFlag === 0
  })

  let process = titleUploadData.value.thisProcess
  for(let item of uniqueByOrderNum){
    if(!checkSameNumForId(notFinishList,item.order_number)){
    if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){
      ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
      ${item.order_number}
       ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
      return false
    }
  }


  titleUploadData.value.creator = user.user.userName
  titleUploadData.value.creatorId = user.user.userId
@@ -779,15 +886,18 @@
    const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '' && row.breakageQuantity*1!==0)
    return (a || b)
  })
  if(requestDetailData.length === 0){
  if(requestDetailData.length === 0 &&  (route.query.reportingWorkId===undefined)){
    ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
    return false
  }

  let status=company.qualityInsStatus
  const requestData = {
    title:titleUploadData.value,
    detail:xGrid.value.getTableData().fullData,
    type:state//审核状态
    type:state,//审核状态
    userId:user.user.userId,
    userName:user.user.userName,
    qualityInsStatus:status
  }
  gridOptions.toolbarConfig.buttons[0].disabled=true
  gridOptions.toolbarConfig.buttons[1].disabled=true
@@ -816,7 +926,7 @@
      ElMessage.error(msg)
    }
  }).catch(err =>{
    ElMessage.error(err.message)
    ElMessage.error('提交失败，请刷新后重试')
  }).finally(()=>{

    gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -853,6 +963,7 @@
})
// 查询责任班组
const computedResponsibleTeam = computed((responsibleProcess) => {
  titleSelectJson.value.historyTeams.push({basic_name: user.user.userName, process: titleUploadData.value.thisProcess, basic_type: 'teamsgroups', basic_category: 179, id: 555})
  return function (responsibleProcess){
    return titleSelectJson.value.historyTeams.filter((item) => {
      return item.process === responsibleProcess
@@ -893,9 +1004,20 @@
    ElMessage.warning(t('reportingWorks.firstProcessNotReview'))
    return
  }
  //匹配“/”前后字符串
  const regex =  /([^\/]+)\/([^\/]+)/;
  //查找匹配的字符串
  const result = processId.match(regex);
  //流程卡号
  let processIdStr = result[1];
  //层号
  let technologyStr = result[2];
  const reportWork = {
    process: titleUploadData.value.previousProcess,
    processId:processId
    processId:processId,
    thisProcess:titleUploadData.value.thisProcess,
    technologyStr:technologyStr,
    userName:user.user.userName
  }
  loadingFlag.value= true
  request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
@@ -955,18 +1077,20 @@
  //流程卡号
  let processIdStr = result[1];
  //层号

  let technologyStr = result[2];
  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {

  let reportType= company.reportType
  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}/${reportType}`).then((res) => {
    if (res.code == 200) {
      if(res.data.data==null){
        ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
        return
      }

      technologicalProcess=res.data.technologicalProcess
      //表头赋值
      titleUploadData.value = res.data.data
      titleUploadData.value.processId = processId
      titleUploadData.value.teamsGroupsName = user.user.userName
      //设备下拉框
      titleSelectJson.value.deviceType = res.data.device
      //班组下拉框
@@ -997,34 +1121,26 @@
      titleUploadData.value.classes=t('reportingWorks.early')
      titleUploadData.value.reportingWorkTime = formatCurrentTime()

      // 声明一个空数组，用于存储每个订单的 S01 值
      //处理编号列
      //定义存放编号数组
      const s01Values = [];
      for (let i = 0; i < res.data.Detail.length; i++) {
        const s01Values = [];
        // 遍历 detailList 数组，提取 S01 值到 s01Values 数组
        if (res.data.Detail[i].other_columns!=null|| res.data.Detail[i].other_columns!=undefined){
          res.data.Detail.forEach(element => {
            const otherColumnsObject = JSON.parse(element.other_columns);
            const s01Value = otherColumnsObject.S01;
            s01Values.push(s01Value || ''); // 如果 S01 值为空，添加空字符串或者其他默认值
          });

// 遍历 res.data.numberList 数组，获取每个元素的 S01 值并存储到 s01Values 数组中
      res.data.numberList.forEach(element => {
        try {
          const otherColumnsObject = JSON.parse(element.other_columns);
          const s01Value = otherColumnsObject.S01;
          if (s01Value) {
            s01Values.push(s01Value);
          } else {
            // 如果 S01 值为空，可以选择添加默认值或者忽略这个元素
            s01Values.push(''); // 例如添加空字符串
          }
        } catch (error) {
          // console.error('Error parsing JSON or accessing S01 value:', error);
          // 处理 JSON 解析错误或其他异常情况
          // 将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
          res.data.Detail.forEach((detail, index) => {
            detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 赋值给 s01Value 属性
          });
        }
      });

// 遍历 res.data.Detail 数组，将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
      res.data.Detail.forEach((detail, index) => {
        if (index < s01Values.length) {
          detail.s01Value = s01Values[index]; // 添加一个名为 s01Value 的新属性，存储对应的 S01 值
        } else {
          detail.s01Value = ''; // 如果 s01Values 中的值不足，可以添加默认值或者不进行赋值处理
        }
      });
      }


      //绑定下方表格
@@ -1081,9 +1197,10 @@
}

const editClosedEvent = ({ row, column }) => {
  let process = titleUploadData.value.thisProcess
  if (column.property==='completedQuantity') {
    xGrid.value.getTableData().fullData.forEach((item, index) =>{
      if(item.order_number===row.order_number){
      if(item.order_number===row.order_number && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){
        item.completedQuantity=row.completedQuantity
      }
    })
@@ -1158,6 +1275,9 @@
    if(codeArr.length!==0){
      titleUploadData.value.processId = codeArr.join('')
    }
    if(user.user.address!==null || user.user.address!==''){
      getWork()
    }

    codeArr=[]
    lastTime = ''
@@ -1168,6 +1288,28 @@

}


const cellClassName = ({ row, column }) => {
  if (column.field === 'breakageQuantity') {
      return 'col-red'
  }

}
const changeRowClass =  ({ row, rowIndex, $rowIndex }) => {
    return row?.rowClass

}
const editConfigDisable = reactive({
  trigger: 'click',
  mode: 'cell',
  beforeEditMethod ({ row }) {
    if (row.patchStatusOther === '已补片') {
      return false
    }
    return true
  }
})

</script>

<template>
@@ -1176,7 +1318,11 @@
      <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" :placeholder="$t('reportingWorks.reportingWorkId')" style="width: 200px" />
      <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" :placeholder="$t('processCard.processId')" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
      &nbsp;
      <el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable :placeholder="$t('reportingWorks.selectProcess')" style="width: 120px"
      <el-select :disabled="inputDisabled || groupChangeProcess"
                 v-model="titleUploadData.thisProcess"
                 clearable
                 :placeholder="$t('reportingWorks.selectProcess')"
                 style="width: 120px"
                 @change="getWork();getQuantity()">
        <el-option
            v-for="item in titleSelectJson['processType']"
@@ -1190,7 +1336,7 @@
      </el-button>
<!--      <el-button type="primary">审核不通过</el-button>-->
      &nbsp;
      <label>{{$t('reportingWorks.processCardArea')}}：</label>
      <label>{{technologicalProcess}}</label>
    </div>
    <div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
      <el-row>
@@ -1219,10 +1365,11 @@
          <el-text class="customClass"></el-text>
        </el-col>
        <el-col :span="2">
          <el-text>{{$t('order.project')}}：</el-text>
          <el-text >{{$t('order.project')}}：</el-text>
        </el-col>
        <el-col :span="3">
          <el-text wrap-text="false">{{ titleUploadData.order.project }}</el-text>
          <el-input :readonly="true" v-model="titleUploadData.order.project"/>
<!--          <el-text style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ titleUploadData.order.project }}</el-text>-->
        </el-col>

      </el-row>
@@ -1273,7 +1420,10 @@
          <el-text>{{$t('reportingWorks.teamsType')}}：</el-text>
        </el-col>
        <el-col :span="3">
          <el-select  v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
          <el-select :disabled="groupChangeProcess"
                     v-model="titleUploadData.teamsGroupsName"
                     clearable
                     :placeholder="$t('reportingWorks.selectTeam')">
            <el-option
                v-for="item in titleSelectJson['teamsType']"
                :key="item.id"
@@ -1328,12 +1478,15 @@
      <vxe-grid
          ref="xGrid"
          class="mytable-scrollbar"
          :row-class-name="changeRowClass"
          max-height="100%"
          height="400px"
          height="100%"
          size="small"
          v-bind="gridOptions"
          v-on="gridEvents"
          @edit-closed="editClosedEvent"
          :cell-class-name="cellClassName"
          :edit-config="editConfigDisable"

      >

@@ -1526,4 +1679,13 @@
  user-select: none;
}

::v-deep(.mytable-scrollbar .col-red) {
  background-color: rgb(66,159,254);
  color: #fff;
}


::v-deep(.latter) {
  //display: none;
}
</style>