Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 6fc7bb975eca07193843a031e378ac3f82317d35

 src/views/mes/MesProductionWorkOrderListView.vue

@@ -83,9 +83,19 @@

          <span slot="action" slot-scope="text, record">
            <a @click="handleDetail(record)">详情</a>
          <span v-if="record.workOrderStatus === 'PUBLISHED'">
          <span v-if="record.workOrderStatus === 'PUBLISHED' || record.workOrderStatus === 'EXECUTING'">
            <a-divider type="vertical" />
            <a @click="handleRePublish(record)">重发布</a>
          </span>
            <span v-if="record.workOrderStatus === 'PUBLISHED'">
            <a-divider type="vertical" />
            <a-popconfirm title="确定开始执行吗?" @confirm="() => handleExecute(record.id)">
                <a>执行</a>
            </a-popconfirm>
          </span>
          <span v-if="record.workOrderStatus === 'EXECUTING'">
            <a-divider type="vertical" />
            <a @click="handleWorkReport(record)">报工</a>
          </span>
          <span v-if="record.workOrderStatus === 'NEW'">
            <a-divider type="vertical" />
@@ -195,6 +205,7 @@
    <MesMaterialTransferDetailList ref="MesMaterialTransferDetailList"></MesMaterialTransferDetailList>
    <MesProductionWorkOrderScheduleModal ref="MesProductionWorkOrderScheduleModal"></MesProductionWorkOrderScheduleModal>
    <MesProductionWorkOrderRepublishModal ref="MesProductionWorkOrderRepublishModal" @ok="modalFormOk"></MesProductionWorkOrderRepublishModal>
    <MesProductionWorkOrderReportModal ref="MesProductionWorkOrderReportModal" @ok="modalFormOk"></MesProductionWorkOrderReportModal>
  </a-card>
</template>

@@ -213,6 +224,7 @@
import MesMaterialTransferDetailList from '@views/mes/MesMaterialTransferDetailList.vue'
import MesProductionWorkOrderScheduleModal from '@views/mes/modules/MesProductionWorkOrderScheduleModal.vue'
import MesProductionWorkOrderRepublishModal from '@views/mes/modules/MesProductionWorkOrderRepublishModal.vue'
import MesProductionWorkOrderReportModal from '@views/mes/modules/MesProductionWorkOrderReportModal.vue'

export default {
  name: 'MesProductionWorkOrderList',
@@ -223,7 +235,8 @@
    MesMaterialUnloadingList,
    MesMaterialTransferDetailList,
    MesProductionWorkOrderScheduleModal,
    MesProductionWorkOrderRepublishModal
    MesProductionWorkOrderRepublishModal,
    MesProductionWorkOrderReportModal,
  },
  data() {
    return {
@@ -274,7 +287,7 @@
          dataIndex: 'planQuantity'
        },
        {
          title: '产线(冗余)',
          title: '产线',
          align: 'center',
          dataIndex: 'factoryId_dictText'
        },
@@ -284,7 +297,7 @@
          dataIndex: 'groupId_dictText'
        },
        {
          title: '班次(冗余)',
          title: '班次',
          align: 'center',
          dataIndex: 'shiftId_dictText'
        },
@@ -674,7 +687,8 @@
        queryOrderById:'/mesproductionwork/mesProductionOrder/queryById',
        queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
        queryTransferDetailBy:'/mes/mesMaterialTransferDetail/queryTransferDetailBy',
        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish'
        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish',
        execute: '/mesproductionworkorder/mesProductionWorkOrder/execute',
      },
      dictOptions: {},
      superFieldList: []
@@ -702,9 +716,22 @@
        }
      })
    },
    handleExecute(id) {
      getAction(this.url.execute, { id: id }).then((res) => {
        if (res.success) {
          this.$message.success(res.message)
          this.loadData()
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    handleRePublish(record) {
      this.$refs.MesProductionWorkOrderRepublishModal.add(record)
    },
    handleWorkReport(record) {
      this.$refs.MesProductionWorkOrderReportModal.add(record)
    },
    async handleTransferDetail(row){
      console.log('row---->',row)
      const transferDetailResult = await getAction(this.url.queryTransferDetailBy,{'requestId':row.id})