Merge remote-tracking branch 'origin/master'

cuilei

19 小时以前 cf9d04b97ef0b8abb63e587e0898e301765ed4b9

 src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue

@@ -157,7 +157,6 @@
<!--              :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"-->
<!--              @page-change="handlePageChange">-->
<!--            </vxe-pager>-->
          </div>
        </a-card>
      </a-col>
      <a-col :span="12">
@@ -241,6 +240,7 @@
        listProductionLinesOption: '/base/factory/queryIdTree',
        queryShiftGroupByFactoryId: '/base/shiftGroup/queryShiftGroupByFactoryId',
        queryFactoryById: '/base/factory/queryById',
        queryLswMaterialByProductionType: '/lsw/lswMaterial/queryLswMaterialByProductionType',
        schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule',
        addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan'
      },
@@ -482,21 +482,20 @@
        });
        promises.push(shiftGroupPromise);

        const materialNumberPromise = ajaxGetDictItems("lsw_material,material_name,material_number,del_flag!='1' order by material_number asc", null).then(res => {
        const materialNumberPromise = getAction(this.url.queryLswMaterialByProductionType, { factoryId: factoryId }).then(res => {
          if (res.success) {
            this.materialOptions = res.result.map(item => {
              return {
                value: item.value,
                label: item.value
                value: item.materialNumber,
                label: item.materialNumber
              }
            });
            })
            this.materNumberNameMap = res.result.reduce((map, item) => {
              map[item.value] = item.text
              map[item.materialNumber] = item.materialName
              return map
            }, {})
          }
        }).catch(() => {
        });
        })
        promises.push(materialNumberPromise);

        // 等待所有请求完成
@@ -522,6 +521,8 @@
          if (this.dateRange[0]) {
            this.calendarStartDate = this.dateRange[0].clone().startOf('week');
          }
        } else {
          this.$message.error(res.message)
        }
      })
    },