Merge remote-tracking branch 'origin/master'

cuilei

3 天以前 6c6b811b2a5267764c8aa5c7b7ed2d6094f65061

 src/views/mes/modules/MesProductionWorkOrderReportModal.vue

@@ -61,7 +61,7 @@
import { postAction, getAction } from '@api/manage'

export default {
  name: 'MesProductionWorkOrderRepublishModal',
  name: 'MesProductionWorkOrderReportModal',
  data () {
    return {
      title: '报工',
@@ -81,7 +81,7 @@
        sm: { span: 18 },
      },
      url: {
        republish: '/mesproductionworkorder/mesProductionWorkOrder/republish',
        report: '/mesworkreporting/mesWorkReporting/add',
        selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList'
      },
      workOrderOptions: []
@@ -114,11 +114,12 @@
        if (valid) {
          this.confirmLoading = true
          let formData = {
            id: this.model.id,
            planQuantity: this.model.planQuantity,
            republishReason: this.model.republishReason
            orderId: this.model.orderId,
            workOrderId: this.model.id,
            factoryId: this.model.factoryId,
            quantity: this.model.quantity
          }
          postAction(this.url.republish, formData).then(res => {
          postAction(this.url.report, formData).then(res => {
            if (res.success) {
              this.$message.success(res.message)
              this.submitCallback()