Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-23 7b57ec2b2004aec51d62af4ae2260f42f81e278c

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

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

@@ -58,7 +58,6 @@

const {currentRoute} = useRouter()
const route = currentRoute.value

let id = route.query.orderId

// 第一次加载查询

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

@@ -20,7 +20,7 @@
const titleUploadData = ref({
  reportingWorkId: null,
  //流程卡号
  processId: '',
  processId: null,
  //销售单号
  orderId: '',
  reviewedState:0,
@@ -105,6 +105,7 @@

        gridOptions.toolbarConfig.buttons.push(button)
      }
      getQuantity()
      inputDisabled.value = true
    })
  }
@@ -784,17 +785,18 @@
const getWork = () => {

  let processId = titleUploadData.value.processId
  // if (processId.indexOf("/") < 0) {
  //
  //   ElMessage.warning("请输入正确格式流程卡")
  //   return
  // }
  // let indexOfChar = processId.indexOf("/")
  // let leftString = processId.slice(0, indexOfChar)
  // if (leftString.length != 13) {
  //   ElMessage.warning("请输入正确位数的流程卡")
  //   return
  // }
  let parts = processId.split('/');

  if (processId.indexOf("/") < 0 ||parts[1].trim() == '') {
    ElMessage.warning("请输入正确格式流程卡")
    return
  }
  let indexOfChar = processId.indexOf("/")
  let leftString = processId.slice(0, indexOfChar)
  if (leftString.length != 14) {
    ElMessage.warning("请输入正确位数的流程卡")
    return
  }
//工序
  let process = titleUploadData.value.thisProcess
  if (process == "" || process == null) {
@@ -817,10 +819,11 @@

  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
    if (res.code == 200) {
      if(res.data.data===null){
      if(res.data.data==null){
        ElMessage.error("未查询到此流程卡数据")
        return
      }

      //表头赋值
      titleUploadData.value = res.data.data
      titleUploadData.value.processId = processId
@@ -917,6 +920,8 @@
  }
}
const  getQuantity = () => {
  titleUploadData.value.thisCompletedQuantity = 0
  titleUploadData.value.thisWornQuantity = 0
  const arr = xGrid.value.getTableData().fullData
  const returnArr =  arr.filter((obj, index, self) =>
      self.findIndex((t) => t.order_number === obj.order_number) === index
@@ -935,16 +940,21 @@
  titleUploadData.value.thisWornQuantity = sumBreak
}

const changeTable=()=>{
  const $grid = xGrid.value
  this.$grid.commitProxy('data', yourData)
}

</script>

<template>
  <div style="height: 100%;width: 100%">
    <div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
      <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" placeholder="报工编号" style="width: 200px" />
      <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" placeholder="流程卡号" style="width: 200px" @keyup.enter.native="getWork"/>
      <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" placeholder="流程卡号" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
      &nbsp;
      <el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable placeholder="请选择工序" style="width: 120px"
                 @change="getWork">
                 @change="getWork();getQuantity()">
        <el-option
            v-for="item in titleSelectJson['processType']"
            :key="item.id"
@@ -998,7 +1008,7 @@
          <el-text>{{$t('reportingWorks.deviceType')}}：</el-text>
        </el-col>
        <el-col :span="3">
          <el-select v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
          <el-select @change="getQuantity" v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
            <el-option
                v-for="item in titleSelectJson['deviceType']"
                :key="item.id"
@@ -1040,7 +1050,7 @@
          <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  v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
            <el-option
                v-for="item in titleSelectJson['teamsType']"
                :key="item.id"

 north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue

@@ -224,7 +224,8 @@
            request.post("/workOrder/addOrderWork", workOrderData.value).then((res) => {
              if (res.code == 200) {
                ElMessage.success(t('basicData.msg.saveSuccess'))
                location.reload();
                //location.reload();
                router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:id,random:Math.random()}})
              } else {
                ElMessage.warning(res.msg)
               // router.push("/login")