Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 426226f665ee5a3af873c8e839d8f9e4a6036752

 src/views/mes/MesProductionWorkOrderListView.vue

@@ -6,8 +6,9 @@
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="产线">
              <j-tree-select dict="base_factory,factory_name,id" pid-field="parent_id"
                             v-model="queryParam.factoryId" style="width: 100%"></j-tree-select>
              <j-search-select-tag placeholder="请选择" v-model="queryParam.factoryId"
                                   dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
              ></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -102,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="handleCompletenessCheck(record)">设备点检</a>
            </span>
            <span v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '1' && record.equipmentInspectionFlag === '1' && record.processInspectionFlag === '0'">
              <a-divider type="vertical" />
              <a @click="handleCompletenessCheck(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>
@@ -130,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>
@@ -194,6 +192,9 @@
    <MesProductionWorkOrderRepublishModal ref="MesProductionWorkOrderRepublishModal" @ok="modalFormOk"></MesProductionWorkOrderRepublishModal>
    <MesProductionWorkOrderReportModal ref="MesProductionWorkOrderReportModal" @ok="modalFormOk"></MesProductionWorkOrderReportModal>
    <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>

@@ -211,6 +212,9 @@
import MesProductionWorkOrderRepublishModal from '@views/mes/modules/MesProductionWorkOrderRepublishModal.vue'
import MesProductionWorkOrderReportModal from '@views/mes/modules/MesProductionWorkOrderReportModal.vue'
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'

@@ -225,7 +229,10 @@
    MesProductionWorkOrderScheduleModal,
    MesProductionWorkOrderRepublishModal,
    MesProductionWorkOrderReportModal,
    MesProductionWorkOrderCompletenessCheckModal
    MesProductionWorkOrderCompletenessCheckModal,
    MesProductionWorkOrderEquipmentInspectionModal,
    MesProductionWorkOrderProcessCheckModal,
    MesProductionWorkOrderCheckBeforeExecuteModal
  },
  data() {
    return {
@@ -523,6 +530,7 @@
        queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
        publish: '/mes/mesProductionWorkOrder/publish',
        execute: '/mes/mesProductionWorkOrder/execute',
        checkBeforeExecute: '/mes/mesProductionWorkOrder/checkBeforeExecute'
      },
      dictOptions: {},
      superFieldList: [],
@@ -626,10 +634,38 @@
      })
    },
    handleExecute(id) {
      getAction(this.url.execute, { id: id }).then((res) => {
      getAction(this.url.checkBeforeExecute, { id: id }).then((res) => {
        if (res.success) {
          this.$message.success(res.message)
          this.loadData()
          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)
                this.loadData()
              } else {
                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)
        }
@@ -644,6 +680,12 @@
    handleCompletenessCheck(record) {
      this.$refs.MesProductionWorkOrderCompletenessCheckModal.check(record)
    },
    handleEquipmentInspection(record) {
      this.$refs.MesProductionWorkOrderEquipmentInspectionModal.inspect(record)
    },
    handleProcessCheck(record) {
      this.$refs.MesProductionWorkOrderProcessCheckModal.inspect(record)
    },
    async handleUnLoadingDetail(row){
      console.log('row---->',row)
      const unloadingResult = await getAction(this.url.queryUnloadingByLoadingId,{'loadingId':row.id})