bug

liuying

2024-04-25 00fa40050801614c079026fc629c0ea0b807ed5d

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

@@ -1,5 +1,5 @@
<template>
  <a-modal :title="title" :width="1200" :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 -->
@@ -29,8 +29,8 @@

            <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>
                <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.materialTypeCode">{{
                  item.materialTypeName }}</a-select-option>
              </a-select>
            </a-form-item>

@@ -43,7 +43,7 @@
            <a-form-item label="ABC分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <!-- <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" /> -->

              <a-select style="width: 100%" placeholder="请选择ABC分类" v-decorator="['factoryCode']">
              <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>
@@ -61,7 +61,7 @@
              <!-- <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="Number(item.unitCode)">{{
                <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="item.unitCode">{{
                  item.unitName }}</a-select-option>
              </a-select>

@@ -71,7 +71,7 @@
              <!-- <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="Number(item.unitCode)">{{
                <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitCode">{{
                  item.unitName }}</a-select-option>
              </a-select>

@@ -104,7 +104,7 @@
          </a-form>
        </a-tab-pane>
        <a-tab-pane key="2" tab="控制属性" force-render>
          <add-control-rule v-if="visible" ref="WmsControlRule" />
          <add-control-rule v-if="visible" ref="WmsControlRuleRef" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="批次属性">
          需求待定
@@ -125,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, WmsUnitDelete, WmsUnitToExcel } from '@/api/modular/main/WmsBase/WmsUnitManage'
import { WmsUnitPage } from '@/api/modular/main/WmsBase/WmsUnitManage'
export default {
  components: {
    addForm,
@@ -142,6 +145,8 @@
  },
  created() {
    this.materialTypeDataList()
    const materialTypeOption = this.$options
    this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type')
  },
  data() {
    return {
@@ -162,7 +167,10 @@
      stationNameParameterData: [],
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this)
      form: this.$form.createForm(this),
      materialTypeData2: [],
      selectTypeData2: [],
      selectTypeData1: []
    }
  },
  methods: {
@@ -200,28 +208,55 @@
      // }
      // 替代品
      if (e == 4) {
        // let materialCode = this.form.getFieldValue('materialCode');
        // let materialName = this.form.getFieldValue('materialName');
        this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
        this.$nextTick(() => {
          // let materialCode = this.form.getFieldValue('materialCode');
          // let materialName = this.form.getFieldValue('materialName');
          this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
        })
      }
    },
    handleOk() { },
    // 初始化方法
    add(record) {
      const materialTypeOption = this.$options
        this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')

    add(record, type) {
      this.visible = true
      if (record) {//编辑
        this.title = '编辑基础物料信息';
        if (type == '详情') {
          this.title = '详情物料信息详情';// 详情
        } else {
          this.title = '编辑基础物料信息';
        }
        this.$nextTick(() => {
          this.form.setFieldsValue({
            ...record
          })
        })
     
      } else { // 新增
        this.title = '新增基础物料信息';
        WmsMaterialDetailList({
          id: record.id
        })
          .then(res => {
            if (res.success) {

              console.log(res)
              this.$nextTick(() => {
                if (res.data.controlRuleDetailList && res.data.controlRuleDetailList.length > 0) {
                  this.$refs.WmsControlRuleRef.form.setFieldsValue({
                    ...res.data.controlRuleDetailList[0]
                  })
                }
                this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
                this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
              })

            } else {
              this.$message.error('详情失败：' + JSON.stringify(res.message))
            }
          })
          .finally(res => {
            this.confirmLoading = false
          })

      } else {
        this.title = '新增基础物料信息';// 新增
      }
    },
    getSelects() {
@@ -264,7 +299,7 @@
          // }

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

          let SubstituteGoodList = []
          if (this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length > 0) {
@@ -282,7 +317,7 @@
            BaseCustomerList = this.$refs.addFormBaseCustomer.list

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

          // console.log(6666666666666 + '包装关系')
          // console.log(this.$refs.addFormContainerPackagingRef.list)
@@ -291,24 +326,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
        }