src/views/mes/MesMaterialLoadingList.vue

@@ -79,17 +79,16 @@
        </span>
        <span slot="unloadingFlagSlot" slot-scope="text, record">
            <a-tag color="green" v-if="record.unloadingFlag === '0'">正常</a-tag>
            <a-tag color="red" v-else-if="record.unloadingFlag === '1'">已下料</a-tag>
            <a-tag color="red" v-else-if="record.unloadingFlag === '1' && record.category === 'LOADING'">已下料</a-tag>
        </span>
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">下料</a>
          <a-divider type="vertical" />
          <a @click="handleDetail(record)">详情</a>
          <a @click="handleUnloading(record)" v-if="record.category === 'LOADING' && record.unloadingFlag === '0' && record.remainingQuantity > 0">下料</a>
        </span>
      </a-table>
    </div>

    <mes-material-loading-modal ref="modalForm" @ok="modalFormOk"></mes-material-loading-modal>
    <mes-material-unloading-modal ref="unloadingModalForm" @ok="modalFormOk" ></mes-material-unloading-modal>
  </a-card>
</template>

@@ -99,12 +98,14 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MesMaterialLoadingModal from './modules/MesMaterialLoadingModal'
import MesMaterialUnloadingModal from './modules/MesMaterialUnloadingModal'

export default {
  name: 'MesMaterialLoadingList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    MesMaterialLoadingModal
    MesMaterialLoadingModal,
    MesMaterialUnloadingModal
  },
  data() {
    return {
@@ -188,6 +189,16 @@
          },
        },
        {
          title: '操作人',
          align: 'center',
          dataIndex: 'createBy_dictText'
        },
        {
          title: '操作时间',
          align: 'center',
          dataIndex: 'createTime'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
@@ -204,7 +215,13 @@
  created() {
  },
  computed: {},
  methods: {}
  methods: {
    handleUnloading(record) {
      this.$refs.unloadingModalForm.edit(record);
      this.$refs.unloadingModalForm.title = "下料";
      this.$refs.unloadingModalForm.disableSubmit = false;
    }
  }
}
</script>
<style scoped>

 src/views/mes/modules/MesMaterialUnloadingForm.vue

@@ -1,36 +1,49 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
    <j-form-container :disabled="true">
      <a-form-model ref="form1" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="删除标记" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
              <a-input-number v-model="model.delFlag" placeholder="请输入删除标记" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="上料id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="loadingId">
              <a-input v-model="model.loadingId" placeholder="请输入上料id"  ></a-input>
            <a-form-model-item label="产线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryId">
              <j-search-select-tag placeholder="请选择产线" v-model="model.factoryId"
                                   dict="base_factory,factory_name,id,del_flag=0 and factory_category='3'"
                                 ></j-search-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialNumber">
              <a-input v-model="model.materialNumber" placeholder="请输入物料编码"  ></a-input>
              <a-input v-model="model.materialNumber" ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
              <a-input v-model="model.materialName" placeholder="请输入物料名称"  ></a-input>
              <a-input v-model="model.materialName"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="批次号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batchNumber">
              <a-input v-model="model.batchNumber" placeholder="请输入批次号"  ></a-input>
              <a-input v-model="model.batchNumber"></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%" />
              <a-input-number v-model="model.quantity" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="剩余数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remainingQuantity">
              <a-input-number v-model="model.remainingQuantity" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </j-form-container>
    <j-form-container :disabled="formDisabled">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="下料数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unloadingQuantity">
              <a-input-number v-model="model.unloadingQuantity" placeholder="请输入下料数量" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -70,11 +83,12 @@
        },
        confirmLoading: false,
        validatorRules: {
          unloadingQuantity: [
            { required: true, message: '下料数量为必填项', trigger: 'change' }
          ]
        },
        url: {
          add: "/mes/mesMaterialUnloading/add",
          edit: "/mes/mesMaterialUnloading/edit",
          queryById: "/mes/mesMaterialUnloading/queryById"
          add: "/mes/mesMaterialLoading/unloading",
        }
      }
    },
@@ -101,16 +115,7 @@
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            }
            httpAction(httpurl,this.model,method).then((res)=>{
            httpAction(this.url.add,this.model,'post').then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
@@ -121,7 +126,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }

 src/views/mes/modules/MesProductionWorkOrderReportModal.vue

@@ -13,7 +13,7 @@
      <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-col :span="12" v-if="!heatTreatmentFlag">
              <a-form-model-item label="报工订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
                <a-select
                  v-model="model.orderId"
@@ -143,7 +143,8 @@
        selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList'
      },
      workOrderOptions: [],
      finishedProductLabel: {}
      finishedProductLabel: {},
      heatTreatmentFlag: false
    }
  },
  computed: {
@@ -241,11 +242,15 @@
      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
        }
      })
      if (record.productionType === 'HEATTREATMENT') {
        this.heatTreatmentFlag = true
      } else {
        getAction(this.url.selectReportWorkOrderList, {materialNumber: record.materialNumber}).then(res => {
          if (res.success) {
            this.workOrderOptions = res.result
          }
        })
      }
      this.visible = true
    },
    close () {