bug

liuying

2024-04-25 6cc226dbf5626b27dd179984bc9dd977225fd21e

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue

@@ -1,12 +1,12 @@
<template>
  <a-modal title="新增基础物料信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
  <a-modal :title="title" :width="1300" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <!-- tab -->
      <a-tabs default-active-key="1" @change="callbacktab">
        <a-tab-pane key="1" tab="基本信息">
          <!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
          <!-- 基本信息 -->
          <!-- 基本信息  layout="inline"  layout="vertical" -->
          <a-form :form="form">
            <a-form-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料名称"
@@ -30,15 +30,9 @@
            <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-select style="width: 100%" placeholder="请选择物料类型" v-decorator="['materialType']">
                <a-select-option v-for="(item, index) in materialTypeData" :key="index"
                  :value="Number(item.materialTypeCode)">{{ item.materialTypeName }}</a-select-option>
                  :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
              </a-select>
            </a-form-item>

            <!-- <a-col :md="8" :sm="24">
    
              </a-col> -->



            <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料组" v-decorator="['materialGroup']" />
@@ -47,7 +41,15 @@
              <a-input placeholder="请输入ABC分类名称" v-decorator="['aBCClassName']" />
            </a-form-item> -->
            <a-form-item label="ABC分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" />
              <!-- <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" /> -->

              <a-select style="width: 100%" placeholder="请选择ABC分类" v-decorator="['aBCClass']">
                <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="Number(item.code)">{{
                  item.name }}</a-select-option>
              </a-select>



            </a-form-item>
            <a-form-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料规格" v-decorator="['materialSpec']" />
@@ -56,10 +58,24 @@
              <a-input placeholder="请输入默认入库库位" v-decorator="['inPlaceCode']" />
            </a-form-item>
            <a-form-item label="库存单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入库存单位" v-decorator="['materialUnit']" />
              <!-- <a-input placeholder="请输入库存单位" v-decorator="['materialUnit']" /> -->

              <a-select style="width: 100%" placeholder="请选择库存单位" v-decorator="['materialUnit']">
                <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="item.unitCode">{{
                  item.unitName }}</a-select-option>
              </a-select>


            </a-form-item>
            <a-form-item label="采购单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" />
              <!-- <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" /> -->

              <a-select style="width: 100%" placeholder="请选择采购单位" v-decorator="['pOUnit']">
                <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitCode">{{
                  item.unitName }}</a-select-option>
              </a-select>


            </a-form-item>
            <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入颜色" v-decorator="['color']" />
@@ -109,13 +125,16 @@
</template>

<script>
import { WmsMaterialAdd, GetAreas, GetStations, materialTypeDataList } from '@/api/modular/main/WmsMaterialManage'

import {
  WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList,materialTypeDataList
} from '@/api/modular/main/WmsBase/WmsMaterialManage'
import addForm from './tabItem/addForm.vue'
import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
import addControlRule from './tabItem/WmsControlRule/addForm.vue'

import { WmsUnitPage} from '@/api/modular/main/WmsBase/WmsUnitManage'
export default {
  components: {
    addForm,
@@ -126,9 +145,12 @@
  },
  created() {
    this.materialTypeDataList()
    const materialTypeOption = this.$options
    this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type')
  },
  data() {
    return {
      title: '',
      labelCol: {
        // xs: { span: 24 },
        // sm: { span: 5 }
@@ -145,16 +167,34 @@
      stationNameParameterData: [],
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this)
      form: this.$form.createForm(this),
      materialTypeData2: [],
      selectTypeData2:[],
      selectTypeData1:[]
    }
  },
  methods: {
    // 物料类型
    materialTypeDataList() {
      materialTypeDataList().then((d) => {
        this.materialTypeData = d.data || []
      }).catch(() => {

      })
      // 库存单位
      WmsUnitPage().then((d) => {
        this.selectTypeData1 = d.data.rows || []
      }).catch(() => {

      })

      // 采购单位
      WmsUnitPage().then((d) => {
        this.selectTypeData2 = d.data.rows || []
      }).catch(() => {

      })

    },
    callbacktab(e) {

@@ -168,22 +208,53 @@
      // }
      // 替代品
      if (e == 4) {
        this.$nextTick(() => {
        // let materialCode = this.form.getFieldValue('materialCode');
        // let materialName = this.form.getFieldValue('materialName');
        this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
      })
      }
    },
    handleOk() { },
    // 初始化方法
    add(record) {
    add(record, type) {
      this.visible = true
      this.$nextTick(() => {
        // this.getSelects()
      })
      // const materialTypeOption = this.$options
      // this.materialTypeData = materialTypeOption.filters['dictData']('material_type')
      const inspectionMethodOption = this.$options
      this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
      if (record) {//编辑
        if (type == '详情') {
          this.title = '详情物料信息详情';// 详情
        } else {
          this.title = '编辑基础物料信息';
        }
        this.$nextTick(() => {
          this.form.setFieldsValue({
            ...record
          })
        })
        WmsMaterialDetailList({
          id: record.id
        })
          .then(res => {
            if (res.success) {
              console.log("666666666666")
              console.log(res)
              this.$refs.WmsControlRule.list = res.data.baseCustomerList || []
              this.$refs.addFormBaseCustomer.list = res.data.controlRuleDetailList || []
              this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
              // this.$message.success('编辑成功')
              // this.confirmLoading = false
              // this.$emit('ok', values)
              // this.handleCancel()
            } else {
              this.$message.error('详情失败：' + JSON.stringify(res.message))
            }
          })
          .finally(res => {
            this.confirmLoading = false
          })

      } else {
        this.title = '新增基础物料信息';// 新增
      }
    },
    getSelects() {
      if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
@@ -241,9 +312,9 @@
          let BaseCustomerList = [];
          if (this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length > 0) {
            BaseCustomerList = this.$refs.addFormBaseCustomer.list
           

          }
          console.log(6666666666666 + '客户档案集合')
          console.log(6666666666666 + '往来关系集合')

          // console.log(6666666666666 + '包装关系')
          // console.log(this.$refs.addFormContainerPackagingRef.list)
@@ -252,24 +323,42 @@
            MaterialInput: values,
            ControlRuleld: ControlRuleld, //控制属性
            SubstituteGoodList: SubstituteGoodList, //替代品
            BaseCustomerList: BaseCustomerList, //客户档案集合
            BaseCustomerList: BaseCustomerList, //往来关系集合
            // ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //包装关系
          }
          this.confirmLoading = true
          WmsMaterialAdd(param)
            .then(res => {
              if (res.success) {
                this.$message.success('新增成功')
          if (this.title == '新增基础物料信息') {
            WmsMaterialAdd(param)
              .then(res => {
                if (res.success) {
                  this.$message.success('新增成功')
                  this.confirmLoading = false
                  this.$emit('ok', values)
                  this.handleCancel()
                } else {
                  this.$message.error('新增失败：' + JSON.stringify(res.message))
                }
              })
              .finally(res => {
                this.confirmLoading = false
                this.$emit('ok', values)
                this.handleCancel()
              } else {
                this.$message.error('新增失败：' + JSON.stringify(res.message))
              }
            })
            .finally(res => {
              this.confirmLoading = false
            })
              })
          } else {
            WmsMaterialEdit(param)
              .then(res => {
                if (res.success) {
                  this.$message.success('编辑成功')
                  this.confirmLoading = false
                  this.$emit('ok', values)
                  this.handleCancel()
                } else {
                  this.$message.error('编辑失败：' + JSON.stringify(res.message))
                }
              })
              .finally(res => {
                this.confirmLoading = false
              })
          }

        } else {
          this.confirmLoading = false
        }
@@ -296,3 +385,10 @@
  }
}
</script>

<style lang="less" scoped>
.ant-row.ant-form-item {
  width: 50% !important;
  display: inline-block;
}
</style>