1

liuying

2024-04-24 4c3931896363cf3400c00937bf72cea2da4a213c

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

@@ -6,7 +6,6 @@
      <a-tabs default-active-key="1" @change="callbacktab">
        <a-tab-pane key="1" tab="基本信息">
          <!-- <add-form ref="addFormRef" @ok="handleOk" /> -->

          <!-- 基本信息 -->
          <a-form :form="form">
            <a-form-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -89,21 +88,21 @@
          </a-form>
        </a-tab-pane>
        <a-tab-pane key="2" tab="控制属性" force-render>
          <add-control-rule ref="WmsControlRule" @ok="handleOk" />
          <add-control-rule v-if="visible" ref="WmsControlRule" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="批次属性">
          需求待定
        </a-tab-pane>
        <a-tab-pane key="4" tab="替代品管理">
          <add-form-sub ref="addFormWmsSubstituteGoodRef" @ok="handleOk" />
          <add-form-sub v-if="visible" ref="addFormWmsSubstituteGoodRef" />
        </a-tab-pane>
        <a-tab-pane key="5" tab="客户">
          <add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
          <add-form-base-customer v-if="visible" ref="addFormBaseCustomer" />
        </a-tab-pane>

        <a-tab-pane key="6" tab="包装关系">
        <!-- <a-tab-pane key="6" tab="包装关系">
          <add-form-container-packaging ref="addFormContainerPackagingRef" @ok="handleOk" />
        </a-tab-pane>
        </a-tab-pane> -->
      </a-tabs>
    </a-spin>
  </a-modal>
@@ -115,7 +114,7 @@
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/index.vue'
import addControlRule from './tabItem/WmsControlRule/addForm.vue'

export default {
  components: {
@@ -160,19 +159,18 @@
    callbacktab(e) {

      //包装关系
      if (e == 6) {
        this.$nextTick(() => {
          let materialType = this.form.getFieldValue('materialType');
          // 调接口 传物料类型
          this.$refs.addFormContainerPackagingRef.initShow(materialType)

        })
      }
      // if (e == 6) {
      //   this.$nextTick(() => {
      //     let materialType = this.form.getFieldValue('materialType');
      //     // 调接口 传物料类型
      //     this.$refs.addFormContainerPackagingRef.initShow(materialType)
      //   })
      // }
      // 替代品
      if (e == 4) {
        let materialCode = this.form.getFieldValue('materialCode');
        let materialName = this.form.getFieldValue('materialName');
        this.$refs.addFormWmsSubstituteGoodRef.initShow(materialCode, materialName)
        // let materialCode = this.form.getFieldValue('materialCode');
        // let materialName = this.form.getFieldValue('materialName');
        this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
      }
    },
    handleOk() { },
@@ -208,44 +206,51 @@
      const {
        form: { validateFields }
      } = this
      this.confirmLoading = true

      validateFields((errors, values) => {
        if (!errors) {
          if (this.$getObjectType(values.areas) === 'array') {
            values.areaIds = values.areas.join(',')
            values.areaNameParameterArr = values.areas.map(val => {
              return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
            })
            values.areaNameParameter = values.areaNameParameterArr.join(',')
          }
          if (this.$getObjectType(values.stations) === 'array') {
            values.stationIds = values.stations.join(',')
            values.stationNameParameterArr = values.stations.map(val => {
              return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
            })
            values.stationNameParameter = values.stationNameParameterArr.join(',')
          }
          // if (this.$getObjectType(values.areas) === 'array') {
          //   values.areaIds = values.areas.join(',')
          //   values.areaNameParameterArr = values.areas.map(val => {
          //     return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
          //   })
          //   values.areaNameParameter = values.areaNameParameterArr.join(',')
          // }
          // if (this.$getObjectType(values.stations) === 'array') {
          //   values.stationIds = values.stations.join(',')
          //   values.stationNameParameterArr = values.stations.map(val => {
          //     return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
          //   })
          //   values.stationNameParameter = values.stationNameParameterArr.join(',')
          // }

          console.log(6666666666666 + '控制属性')
          console.log(this.$refs.WmsControlRule.selectedRows)
          var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id
          var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''

          let SubstituteGoodList = []
          if (this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length > 0) {
            SubstituteGoodList = this.$refs.addFormWmsSubstituteGoodRef.list
          }
          console.log(6666666666666 + '替代品')
          console.log(this.$refs.addFormWmsSubstituteGoodRef.list)


          let BaseCustomerList = [];
          if (this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length > 0) {
            BaseCustomerList = this.$refs.addFormBaseCustomer.list
          }
          console.log(6666666666666 + '客户档案集合')
          console.log(this.$refs.addFormBaseCustomer.list)

          // console.log(6666666666666 + '包装关系')
          // console.log(this.$refs.addFormContainerPackagingRef.list)

          console.log(6666666666666 + '包装关系')
          console.log(this.$refs.addFormContainerPackagingRef.list)
          var param = {
            MaterialInput: values,
            ControlRuleld: ControlRuleld, //控制属性
            SubstituteGoodLis: this.$refs.addFormWmsSubstituteGoodRef.list, //替代品
            BaseCustomerList: this.$refs.addFormBaseCustomer.list, //客户档案集合
            ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //包装关系
            SubstituteGoodList: SubstituteGoodList, //替代品
            BaseCustomerList: BaseCustomerList, //客户档案集合
            // ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //包装关系
          }
          this.confirmLoading = true
          WmsMaterialAdd(param)
            .then(res => {
              if (res.success) {
@@ -278,6 +283,10 @@
    handleCancel() {
      this.form.resetFields()
      this.visible = false
      // this.$refs.WmsControlRule.form.resetFields()
      // this.$refs.addFormWmsSubstituteGoodRef.list =[]
      // this.$refs.addFormWmsSubstituteGoodRef.list =[]

    }
  }
}