排产工单齐套性检查、设备/工艺点检与执行限制逻辑调整

cuilei

3 天以前 1c2db1635c5656dd13d94c7ea7640a8dfced27cf

排产工单齐套性检查、设备/工艺点检与执行限制逻辑调整

 src/views/mes/MesProductionWorkOrderListView.vue

@@ -103,19 +103,7 @@
              <a-divider type="vertical" />
              <a @click="handleRePublish(record)">重发布</a>
            </span>
            <span v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '0'">
              <a-divider type="vertical" />
              <a @click="handleCompletenessCheck(record)">齐套性检查</a>
            </span>
            <span v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '1' && record.equipmentInspectionFlag === '0'">
              <a-divider type="vertical" />
              <a @click="handleEquipmentInspection(record)">设备点检</a>
            </span>
            <span v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '1' && record.equipmentInspectionFlag === '1' && record.processInspectionFlag === '0'">
              <a-divider type="vertical" />
              <a @click="handleProcessCheck(record)">工艺点检</a>
            </span>
            <span v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '1' && record.equipmentInspectionFlag === '1' && record.processInspectionFlag === '1'">
            <span v-if="record.workOrderStatus === 'PUBLISHED'">
              <a-divider type="vertical" />
              <a-popconfirm title="确定开始执行吗?" @confirm="() => handleExecute(record.id)">
                  <a>执行</a>
@@ -131,6 +119,15 @@
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '0'">
                <a @click="handleCompletenessCheck(record)">齐套性检查</a>
              </a-menu-item>
              <a-menu-item v-if="record.workOrderStatus === 'PUBLISHED' && record.equipmentInspectionFlag === '0'">
                <a @click="handleEquipmentInspection(record)">设备点检</a>
              </a-menu-item>
              <a-menu-item v-if="record.workOrderStatus === 'PUBLISHED' && record.processInspectionFlag === '0'">
                <a @click="handleProcessCheck(record)">工艺点检</a>
              </a-menu-item>
              <a-menu-item v-if="record.workOrderStatus === 'NEW'">
                <a @click="handleEdit(record)">编辑</a>
@@ -197,6 +194,7 @@
    <MesProductionWorkOrderCompletenessCheckModal ref="MesProductionWorkOrderCompletenessCheckModal" @ok="modalFormOk"></MesProductionWorkOrderCompletenessCheckModal>
    <MesProductionWorkOrderEquipmentInspectionModal ref="MesProductionWorkOrderEquipmentInspectionModal" @ok="modalFormOk"></MesProductionWorkOrderEquipmentInspectionModal>
    <MesProductionWorkOrderProcessCheckModal ref="MesProductionWorkOrderProcessCheckModal" @ok="modalFormOk"></MesProductionWorkOrderProcessCheckModal>
    <MesProductionWorkOrderCheckBeforeExecuteModal ref="MesProductionWorkOrderCheckBeforeExecuteModal" @ok="modalFormOk"></MesProductionWorkOrderCheckBeforeExecuteModal>
  </a-card>
</template>

@@ -216,6 +214,7 @@
import MesProductionWorkOrderCompletenessCheckModal from '@views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue'
import MesProductionWorkOrderEquipmentInspectionModal from '@views/mes/modules/MesProductionWorkOrderEquipmentInspectionModal.vue'
import MesProductionWorkOrderProcessCheckModal from '@views/mes/modules/MesProductionWorkOrderProcessCheckModal.vue'
import MesProductionWorkOrderCheckBeforeExecuteModal from '@views/mes/modules/MesProductionWorkOrderCheckBeforeExecuteModal.vue'
import JSelectFactory from '@comp/jeecgbiz/JSelectFactory.vue'
import moment from 'moment/moment'

@@ -232,7 +231,8 @@
    MesProductionWorkOrderReportModal,
    MesProductionWorkOrderCompletenessCheckModal,
    MesProductionWorkOrderEquipmentInspectionModal,
    MesProductionWorkOrderProcessCheckModal
    MesProductionWorkOrderProcessCheckModal,
    MesProductionWorkOrderCheckBeforeExecuteModal
  },
  data() {
    return {
@@ -530,6 +530,7 @@
        queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
        publish: '/mes/mesProductionWorkOrder/publish',
        execute: '/mes/mesProductionWorkOrder/execute',
        checkBeforeExecute: '/mes/mesProductionWorkOrder/checkBeforeExecute'
      },
      dictOptions: {},
      superFieldList: [],
@@ -633,6 +634,12 @@
      })
    },
    handleExecute(id) {
      getAction(this.url.checkBeforeExecute, { id: id }).then((res) => {
        if (res.success) {
          const completenessCheckFlag = res.result.completenessCheckFlag
          const equipmentInspectFlag = res.result.equipmentInspectFlag
          const processCheckFlag = res.result.processCheckFlag
          if (completenessCheckFlag && equipmentInspectFlag && processCheckFlag) {
      getAction(this.url.execute, { id: id }).then((res) => {
        if (res.success) {
          this.$message.success(res.message)
@@ -641,6 +648,28 @@
          this.$message.warning(res.message)
        }
      })
          } else {
            const unCompletenessCheckList = res.result.unCompletenessCheckList
            const unInspectEquipmentList = res.result.unInspectEquipmentList
            const unCheckEquipmentList = res.result.unCheckEquipmentList
            if (!completenessCheckFlag && !unCompletenessCheckList) {
              this.$message.warning('请先进行齐套性检查！')
              return
            }
            if (!equipmentInspectFlag && !unInspectEquipmentList) {
              this.$message.warning('请先进行设备点检！')
              return
            }
            if (!processCheckFlag && !unCheckEquipmentList) {
              this.$message.warning('请先进行工艺点检！')
              return
            }
            this.$refs.MesProductionWorkOrderCheckBeforeExecuteModal.open(id, res.result)
          }
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    handleRePublish(record) {
      this.$refs.MesProductionWorkOrderRepublishModal.add(record)

 src/views/mes/modules/MesProductionWorkOrderCheckBeforeExecuteModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,121 @@
<template>
  <j-modal
    :title="title"
    :width="width"
    :visible="visible"
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel"
    cancelText="关闭">

    <a-divider class="divider-title">齐套性检查</a-divider>
    <a-list>
      <a-list-item v-for="(item, index) in unCompletenessCheckList" :key="index">
        <span>物料 <strong>{{ item }}</strong> é½å¥—性检查不通过</span>
      </a-list-item>
    </a-list>
    <a-divider class="divider-title">设备点检</a-divider>
    <a-list>
      <a-list-item v-for="(item, index) in unInspectEquipmentList" :key="index">
        <span>设备 <strong>{{ item }}</strong> æœªè¿›è¡Œè®¾å¤‡ç‚¹æ£€</span>
      </a-list-item>
    </a-list>
    <a-divider class="divider-title">工艺点检</a-divider>
    <a-list>
      <a-list-item v-for="(item, index) in unCheckEquipmentList" :key="index">
        <span>设备 <strong>{{ item }}</strong> æœªè¿›è¡Œå·¥è‰ºç‚¹æ£€</span>
      </a-list-item>
    </a-list>
  </j-modal>
</template>

<script>
import { postAction, getAction } from '@api/manage'

export default {
  name: 'MesProductionWorkOrderCheckBeforeExecuteModal',
  data () {
    return {
      title: '工单执行前检查',
      width: 800,
      visible: false,
      loading: false,
      disableSubmit: false,
      model: {},
      validatorRules: {
      },
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 },
      },
      url: {
        execute: '/mes/mesProductionWorkOrder/execute'
      },
      orderId: null,
      unCompletenessCheckList: [],
      unInspectEquipmentList: [],
      unCheckEquipmentList: []
    }
  },
  computed: {
    formDisabled(){
      return this.disabled
    },
  },
  methods: {
    open (id, record) {
      this.orderId = id
      this.unCompletenessCheckList = record.unCompletenessCheckList
      this.unInspectEquipmentList = record.unInspectEquipmentList
      this.unCheckEquipmentList = record.unCheckEquipmentList
      this.visible = true
    },
    close () {
      this.$emit('close');
      this.visible = false;
    },
    handleOk () {
      this.$confirm({
        title: '确认操作',
        content: '以上检查、点检项未完成，确认继续执行工单？',
        onOk: () => {
          getAction(this.url.execute, {id: this.orderId}).then(res => {
            if (res.success) {
              this.$message.success(res.message)
              this.submitCallback()
            } else {
              this.$message.warning(res.message)
            }
          })
        },
        onCancel: () => {
        }
      })
    },
    submitCallback(){
      this.$emit('ok');
      this.unCompletenessCheckList = []
      this.unInspectEquipmentList = []
      this.unCheckEquipmentList = []
      this.visible = false;
    },
    handleCancel () {
      this.close()
    }
  }
}
</script>

<style scoped>

.divider-title {
  font-style: italic;
  color: blue;
}

</style>