feat:创建新分支

charles

2024-04-29 b95cf940af8e01e4eca30b2599b029c2f645bd1e

 src/views/dashboard/components/TaskControl.vue

@@ -22,7 +22,20 @@
      </BigButton>
      <template v-if="task?.Procedure.Status === 2 || task?.Procedure.Status === 3">
        <BigButton class="btn" bg-color="#ff9933" :disabled="task?.Procedure.Status === 3">打印</BigButton>
        <BigButton class="btn" bg-color="#00cc33" :disabled="task?.Procedure.Status === 3" @click="openReportModal">
        <BigButton
          v-if="task?.ShowCheck"
          class="btn"
          bg-color="#00cc33"
          :disabled="task?.Procedure.Status === 3"
          @click="openQualityModal"
          >质检</BigButton
        >
        <BigButton
          class="btn"
          :bg-color="task?.ShowCheck ? '#0066ff' : '#00cc33'"
          :disabled="task?.Procedure.Status === 3"
          @click="openReportModal"
        >
          报工
        </BigButton>
        <el-popconfirm
@@ -33,7 +46,7 @@
          icon-color="red"
          :hide-after="0"
          :teleported="false"
          title="请确认是否已完成此生产任务?"
          :title="Number(processingPercent) < 100 ? '进度未完成，是否提前完成任务？' : '请确认是否已完成此生产任务?'"
          placement="top"
          @confirm="finishTaskProduce"
        >
@@ -47,21 +60,33 @@
  <TaskControlModal v-model="showTaskControlModal" :task="task" @produce-start="onProduceStart"></TaskControlModal>
  <ReportProductionModal
    v-model="showReportModal"
    :model-title="modelTitle"
    :amount="plcInfo?.finishNumber ?? 0"
    @close="showReportModal = false"
    @submit="onReportProduction"
  ></ReportProductionModal>
  <ReportProductionModal1
    v-model="showReportModal1"
    :model-title="modelTitle"
    :amount="plcInfo?.finishNumber ?? 0"
    :pass-amount="passAmount"
    :rework-amount="reworkAmount"
    :scrapped-amount="scrappedAmount"
    @close="showReportModal1 = false"
    @submit="onReportCheck"
  ></ReportProductionModal1>
</template>
<script setup lang="ts">
import type { Task, Worker } from '@/api/task'
import { ref, toRefs } from 'vue'
import { ref, toRefs, computed } from 'vue'
import BigButton from '@/views/dashboard/components/BigButton.vue'
import { useDateFormat } from '@vueuse/core'
import TaskControlModal from '@/views/dashboard/components/TaskControlModal.vue'
import { CircleCloseFilled } from '@element-plus/icons-vue'
import { apiReportWork, finishTask } from '@/api'
import { apiReportWork, procedureUpdate, bulletinReport, bulletinQualityInspection, getQualityInspection } from '@/api'
import { ElMessage } from 'element-plus'
import ReportProductionModal from '@/views/dashboard/components/ReportProductionModal.vue'
import ReportProductionModal1 from '@/views/dashboard/components/ReportProductionModal1.vue'
import { usePLCStore } from '@/stores/plc'
import { storeToRefs } from 'pinia'

@@ -76,6 +101,10 @@
}>()

const showTaskControlModal = ref(false)
const modelTitle = ref('')
const passAmount = ref(0)
const reworkAmount = ref(0)
const scrappedAmount = ref(0)

/**
 * 开始生产
@@ -103,8 +132,12 @@
        return true
      }
    }
    finishTask({ id: task!.value.Procedure.ID }).then(
      (res) => {
    procedureUpdate({
      isFinish: true,
      isProcessing: false,
      workOrderProcedureID: Number(task!.value.Procedure.ID)
    }).then(
      (res: any) => {
        ElMessage({
          message: '操作成功！',
          type: 'success'
@@ -147,6 +180,10 @@
const { plcInfo } = storeToRefs(plcStore)
// 报工
const showReportModal = ref(false)
// 报工
const showReportModal1 = ref(false)
const reprotIds = ref([])
const passCount = ref(0)
function openReportModal() {
  // 有人员才可以报工
  if (!workers.value || workers.value.length == 0) {
@@ -175,6 +212,39 @@
  }

  if (workers.value[0].workerId) {
    modelTitle.value = '生产报工'
    if (task?.value?.ShowCheck) {
      getQualityInspection({
        procedureId: task.value?.Procedure?.procedure.procedureId,
        workOrderId: task.value?.Order.workOrderId
      }).then((res: any) => {
        console.log(res, '999999')
        passAmount.value = res.data.passAmount
        passCount.value = res.data.passAmount
        reworkAmount.value = res.data.reworkAmount
        scrappedAmount.value = res.data.scrappedAmount
        reprotIds.value = res.data.ids || []
        showReportModal1.value = true
      })
    } else {
      showReportModal.value = true
    }
  }
}

// 质检
function openQualityModal() {
  // 有人员才可以报工
  if (!workers.value || workers.value.length == 0) {
    ElMessage({
      message: '没有人员信息不允许质检！',
      type: 'error',
      duration: 3000
    })
    return true
  }
  if (workers.value[0].workerId) {
    modelTitle.value = '提交质检'
    showReportModal.value = true
  }
}
@@ -189,19 +259,60 @@
  }
  // 有人员才可以报工
  if (workers.value[0].workerId) {
    apiReportWork({
      procedureId: task.value?.Procedure.ID,
    let requestUrl = task?.value.ShowCheck ? bulletinQualityInspection : apiReportWork
    let tipStr = task?.value.ShowCheck ? '质检' : '报工'
    requestUrl({
      workOrderProcedureID: Number(task.value?.Procedure.ID),
      reportAmount: amount,
      workerID: workers.value[0].workerId
      workerID: workers.value[0].workerId,
      workerName: workers.value[0].workerName
    })
      .then((res) => {
      .then((res: any) => {
        if (res.code === 200) {
          ElMessage({
            message: `${tipStr}成功`,
            type: 'success',
            duration: 2000
          })
          showReportModal.value = false
        } else {
          ElMessage({
            message: `${tipStr}失败`,
            type: 'error',
            duration: 3000
          })
        }
      })
      .catch((err) => {
        console.error(err)
      })
  }
}
/**
 * 质检后的上报加工数
 * @param amount 加工数
 */
function onReportCheck(amount: number) {
  if (!task?.value) {
    return
  }
  // 有人员才可以报工
  if (workers.value[0].workerId) {
    bulletinReport({
      workOrderProcedureID: Number(task.value?.Procedure.ID),
      reportAmount: passCount.value,
      workerID: workers.value[0].workerId,
      workerName: workers.value[0].workerName,
      ids: reprotIds.value
    })
      .then((res: any) => {
        if (res.code === 200) {
          ElMessage({
            message: '报工成功',
            type: 'success',
            duration: 2000
          })
          showReportModal.value = false
          showReportModal1.value = false
        } else {
          ElMessage({
            message: '报工失败',
@@ -215,6 +326,44 @@
      })
  }
}
export interface Statistics {
  totalNumber: number
  finishNumber: number
}
/**
 * 计算生产进度
 * @param statistics
 * @return 进度,0~100
 */
function calculateProgress(statistics: Statistics): number {
  if (!statistics) {
    return 0
  }

  if (statistics.finishNumber === 0) {
    return 0
  }
  if (statistics.finishNumber === statistics.totalNumber) {
    return 100
  }

  const result = Math.floor((statistics.finishNumber / statistics.totalNumber) * 100)
  return result > 100 ? 100 : result
}
const processingPercent = computed(() => {
  // if (task?.value?.Procedure?.Status === 1) {
  //   return 0
  // }

  if (task?.value?.Procedure?.Status === 3) {
    return 100
  }
  // if (task?.value?.Procedure?.Status === 2 || task?.value?.Procedure?.Status === 1) {
  //   return calculateProgress(plcStore.plcInfo as Statistics)
  // }

  return calculateProgress(plcStore.plcInfo as Statistics)
})
</script>
<style scoped lang="scss">
$title-text-color: #9599af;