Merge remote-tracking branch 'origin/master'

Houjie

3 天以前 3c5205d857446563b3f89ae7432d76ba6d945a69

 src/views/mes/modules/MesMaterialTransferRequestForm.vue

@@ -42,11 +42,9 @@
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="拉动物料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialNumber">
              <a-select v-model="model.materialNumber" placeholder="请选择拉动物料" @change="handleMaterialNumberChange">
                <a-select-option v-for="item in materialList" :value="item.materialNumber" :title="item.materialName" :key="item.materialNumber">
                  {{ item.materialName }}
                </a-select-option>
              </a-select>
              <j-search-select-tag v-model="model.materialNumber" placeholder="请选择拉动物料"
                                   :dict-options="materialList" @change="handleMaterialNumberChange">
              </j-search-select-tag>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -118,7 +116,7 @@
        workOrderQuery: '/mes/mesProductionWorkOrder/queryById'
      },
      materialList: [], //物料列表
      workOrderObj: {}, //工单对象
      workOrderObj: {} //工单对象
    }
  },
  computed: {
@@ -140,17 +138,21 @@
      this.model.workOrderCode = this.model.workOrderId_dictText
      this.visible = true
      if (this.model.workOrderId) {
        this.editable = true;
        this.editable = true
        let workOrderRes = await this.loadProductionWorkOrder(this.model.workOrderId)
        if(!workOrderRes.success || !workOrderRes.result) {
          return;
        if (!workOrderRes.success || !workOrderRes.result) {
          return
        }
        //排产工单赋值
        this.workOrderObj = Object.assign({}, workOrderRes.result);
        this.workOrderObj = Object.assign({}, workOrderRes.result)
        //物料列表
        let materialListRes = await this.loadMaterialList(workOrderRes.result.materialNumber)
        if (materialListRes.success && materialListRes.result && materialListRes.result.length > 0) {
          this.materialList = [...materialListRes.result]
          this.materialList = materialListRes.result.map(item => ({
            ...item,
            value: item.materialNumber,
            text: item.materialName
          }))
        } else {
          this.materialList = []
        }
@@ -163,24 +165,28 @@
          this.model.targetWarehouseId = undefined
          this.model.warehouseName = ''
        }
      }else {
        this.editable = false;
      } else {
        this.editable = false
      }
    },
    async selectConfirm(rows) {
      if (rows && rows.length > 0) {
        //清空关联数据
        this.model.materialNumber = undefined;
        this.model.materialName = '';
        this.model.specifiedQuantity = 0;
        this.model.materialNumber = undefined
        this.model.materialName = ''
        this.model.specifiedQuantity = 0
        //赋值新的数据
        this.model.workOrderId = rows[0].id
        this.model.workOrderCode = rows[0].workOrderCode
        //排产工单赋值
        this.workOrderObj = Object.assign({}, rows[0]);
        this.workOrderObj = Object.assign({}, rows[0])
        let materialListRes = await this.loadMaterialList(rows[0].materialNumber)
        if (materialListRes.success && materialListRes.result && materialListRes.result.length > 0) {
          this.materialList = [...materialListRes.result]
          this.materialList = materialListRes.result.map(item => ({
            ...item,
            value: item.materialNumber,
            text: item.materialName
          }))
        } else {
          this.materialList = []
        }
@@ -194,13 +200,13 @@
        }
      } else {
        //清空关联数据
        this.model.materialNumber = undefined;
        this.model.materialName = '';
        this.model.specifiedQuantity = 0;
        this.model.materialNumber = undefined
        this.model.materialName = ''
        this.model.specifiedQuantity = 0
        this.materialList = []
        this.model.targetWarehouseId = undefined
        this.model.warehouseName = ''
        this.workOrderObj = {};
        this.workOrderObj = {}
      }
    },
    submitForm() {