src/views/mes/MesProductionOrderList.vue

@@ -143,6 +143,16 @@
          dataIndex: 'orderQuantity'
        },
        {
          title: '合格数量',
          align: 'center',
          dataIndex: 'qualifiedQuantity'
        },
        {
          title: '报废数量',
          align: 'center',
          dataIndex: 'scrapQuantity'
        },
        {
          title: '基本计量单位',
          align: 'center',
          dataIndex: 'productionUnit'

 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})

 src/views/mes/modules/MesProductionWorkOrderReportModal.vue

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

    <a-spin :spinning="confirmLoading">
      <j-form-container :disabled="formDisabled">
        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
          <a-row :gutter="24">
            <a-col :span="12">
              <a-form-model-item label="报工订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
                <a-select
                  v-model="model.orderId"
                  :options="workOrderOptions"
                  placeholder="请选择报工订单">
                </a-select>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item label="报工工单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderCode">
                <a-input
                  v-model="model.workOrderCode"
                  :disabled="true"
                  placeholder="请选择报工工单">
                </a-input>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId_dictText">
                <a-input
                  v-model="model.factoryId_dictText"
                  :disabled="true"
                  placeholder="请选择产线">
                </a-input>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item label="报工数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity">
                <a-input-number
                  v-model="model.quantity"
                  placeholder="请填写报工数量"
                  style="width: 100%"
                  :min="0">
                </a-input-number>
              </a-form-model-item>
            </a-col>
          </a-row>
        </a-form-model>
      </j-form-container>
    </a-spin>
  </j-modal>
</template>

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

export default {
  name: 'MesProductionWorkOrderRepublishModal',
  data () {
    return {
      title: '报工',
      width: 800,
      visible: false,
      disableSubmit: false,
      confirmLoading: false,
      model: {},
      validatorRules: {
      },
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 },
      },
      url: {
        republish: '/mesproductionworkorder/mesProductionWorkOrder/republish',
        selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList'
      },
      workOrderOptions: []
    }
  },
  computed: {
    formDisabled(){
      return this.disabled
    },
  },
  methods: {
    add (record) {
      // é‡ç½®è¡¨å•
      this.$refs.form && this.$refs.form.resetFields()
      // è®¾ç½®åˆå§‹å€¼
      this.model = Object.assign({}, record);
      getAction(this.url.selectReportWorkOrderList, {materialNumber: record.materialNumber}).then(res => {
        if (res.success) {
          this.workOrderOptions = res.result
        }
      })
      this.visible = true
    },
    close () {
      this.$emit('close');
      this.visible = false;
    },
    handleOk () {
      this.$refs.form.validate(valid => {
        if (valid) {
          this.confirmLoading = true
          let formData = {
            id: this.model.id,
            planQuantity: this.model.planQuantity,
            republishReason: this.model.republishReason
          }
          postAction(this.url.republish, formData).then(res => {
            if (res.success) {
              this.$message.success(res.message)
              this.submitCallback()
            } else {
              this.$message.warning(res.message)
            }
          }).finally(() => {
            this.confirmLoading = false
          })
        }
      })
    },
    submitCallback(){
      this.$emit('ok');
      this.visible = false;
    },
    handleCancel () {
      this.close()
    }
  }
}
</script>

 src/views/system/SysApiLogList.vue

@@ -87,20 +87,17 @@
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          },
          fixed: 'left',
        },
        {
          title: 'API分类',
          align: 'center',
          dataIndex: 'apiCategory',
          fixed: 'left',
          width: 100,
        },
        {
          title: '接口名称',
          align: 'center',
          dataIndex: 'apiName',
          fixed: 'left',
          width: 200,
          ellipsis: true,
        },