liuying
2024-04-24 24dbf4b349d8f966689d8e7b5cc59eebaa934277
物料
已修改4个文件
225 ■■■■■ 文件已修改
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsMaterialManage.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue 160 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsMaterialManage.js
@@ -27,7 +27,7 @@
}
/**
 * 添加物料信息
 * 添加物料信息888
 *
 * @author XJF
 */
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,11 +1,90 @@
<template>
  <a-modal title="新增物料信息" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
  <a-modal
    title="新增物料信息"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel"
  >
    <a-spin :spinning="confirmLoading">
      <!-- tab @change="callback"-->
      <a-tabs default-active-key="1">
      <!-- tab -->
      <a-tabs default-active-key="1" @change="callbacktab">
        <a-tab-pane key="1" tab="基本信息">
          <add-form ref="addForm" @ok="handleOk" />
          <!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
          <!-- 基本信息 -->
          <a-form :form="form">
            <a-form-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input
                placeholder="请输入物料名称"
                v-decorator="['materialName', { rules: [{ required: true, message: '请输入物料名称!' }] }]"
              />
            </a-form-item>
            <a-form-item label="物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input
                placeholder="请输入物料编号"
                v-decorator="['materialCode', { rules: [{ required: true, message: '请输入物料编号!' }] }]"
              />
            </a-form-item>
            <a-form-item label="ERP编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入ERP编号" v-decorator="['erpCode']" />
            </a-form-item>
            <a-form-item label="物料类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料类型名称" v-decorator="['materialTypeName']" />
            </a-form-item>
            <a-form-item label="物料类型描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料类型描述" v-decorator="['materialTypeDescr']" />
            </a-form-item>
            <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input-number placeholder="请输入物料类型" style="width: 100%" v-decorator="['materialType']" />
            </a-form-item>
            <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料组" v-decorator="['materialGroup']" />
            </a-form-item>
            <a-form-item label="ABC分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <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-form-item>
            <a-form-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入物料规格" v-decorator="['materialSpec']" />
            </a-form-item>
            <a-form-item label="默认入库库位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <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-form-item>
            <a-form-item label="采购单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" />
            </a-form-item>
            <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入颜色" v-decorator="['color']" />
            </a-form-item>
            <a-form-item label="重量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入重量" v-decorator="['weight']" />
            </a-form-item>
            <a-form-item label="标包数量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入标包数量" v-decorator="['sNP']" />
            </a-form-item>
            <a-form-item label="换算率" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入换算率" v-decorator="['translateRate']" />
            </a-form-item>
            <a-form-item label="批次属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入批次属性规则" v-decorator="['batchRuleId']" />
            </a-form-item>
            <a-form-item label="控制属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入控制属性规则" v-decorator="['controlRuleId']" />
            </a-form-item>
            <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
            </a-form-item>
            <a-form-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-input placeholder="请输入描述" v-decorator="['materialDesc']" />
            </a-form-item>
          </a-form>
        </a-tab-pane>
        <a-tab-pane key="2" tab="控制属性" force-render>
          <add-control-rule ref="WmsControlRule" @ok="handleOk" />
@@ -20,11 +99,10 @@
          <add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
        </a-tab-pane>
        <a-tab-pane key="7" tab="包装关系">
          <add-form-container-packaging ref="addFormContainerPackaging" @ok="handleOk" />
        <a-tab-pane key="6" tab="包装关系">
          <add-form-container-packaging ref="addFormContainerPackagingRef" @ok="handleOk" />
        </a-tab-pane>
      </a-tabs>
    </a-spin>
  </a-modal>
</template>
@@ -67,9 +145,58 @@
    }
  },
  methods: {
    handleOk() {
    callbacktab(e) {
      if (e == 6) {
        this.$nextTick(() => {
          // 调接口 传物料类型
          console.log(99999999999999)
          console.log(this.data)
          const {
            form: { validateFields }
          } = this
          this.confirmLoading = true
          validateFields((errors, values) => {
            if (!errors) {
              for (const key in values) {
                if (typeof values[key] === 'object') {
                  values[key] = JSON.stringify(values[key])
                }
              }
              console.log(22222222222222222)
              console.log(values)
              this.confirmLoading = false
              // var res1 = this.$refs.addFormRef.handleSubmit2()
              // console.log("5555555")
              // console.log( res1 )
              // console.log(this.$refs.addFormRef.data)
              // console.log(this.$refs.addFormRef.form.materialType)
              this.$refs.addFormContainerPackagingRef.initShow(values.materialType)
              // WmsMaterialAdd(values).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
              // })
              // return values
            } else {
              this.confirmLoading = false
            }
          })
        })
      }
    },
    handleOk() {},
    // 初始化方法
    add(record) {
      this.visible = true
@@ -119,11 +246,10 @@
            })
            values.stationNameParameter = values.stationNameParameterArr.join(',')
          }
          console.log(6666666666666)
          console.log()
          console.log(6666666666666 + '控制属性')
          console.log(this.$refs.WmsControlRule.selectedRows)
          var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id;
          var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id
          console.log(6666666666666 + '替代品')
          console.log(this.$refs.addFormWmsSubstituteGood.list)
@@ -131,13 +257,15 @@
          console.log(6666666666666 + '客户档案集合')
          console.log(this.$refs.addFormBaseCustomer.list)
          console.log(6666666666666 + '包装关系')
          console.log(this.$refs.addFormContainerPackagingRef.list)
          var param = {
            value1: values,
            MaterialInput: values,
            ControlRuleld: ControlRuleld, //控制属性
            BaseCustomerList: this.$refs.addFormBaseCustomer.list, //客户档案集合
            SubstituteGoodLis: this.$refs.addFormWmsSubstituteGood.list, //替代品
            value5: {},
            value6: {},
            BaseCustomerList: this.$refs.addFormBaseCustomer.list, //客户档案集合
            ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //包装关系
          }
          WmsMaterialAdd(param)
            .then(res => {
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue
@@ -7,6 +7,7 @@
        <!-- <span style="font-weight:bold;cursor:default;">
          <a style="cursor:default;">{{ row.no }}</a>单据详情
        </span> -->
        物料类型: {{ materialType }}
        <div style="margin-top: 10px;">
          <a-table :columns="columns" :data-source="list" row-key="id" :pagination="false" :scroll="{ x: true }">
            <template slot="index" slot-scope="text, record, index">{{ index + 1 }}</template>
@@ -40,7 +41,11 @@
<script>
import { WmsOrderRukuDetail } from '@/api/modular/main/WmsOrderManage'
import showList from './index.vue'
import {
  WmsContainerPackagingPage,
  WmsContainerPackagingDelete,
  WmsContainerPackagingToExcel
} from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
export default {
  name: 'wmsOrderRukuManagementDetailDrawer',
  emits: ['update:visible'],
@@ -166,7 +171,8 @@
        showSizeChanger: true,
        total: 0,
        size: 'small'
      }
      },
      materialType:''
    }
  },
@@ -195,7 +201,13 @@
        this.afterClsoe()
      }
    },
    initShow() {
    initShow(materialType) {
      alert(1)
      if(materialType==''||materialType==null||materialType==undefined){
        this.$message.warning("请选择物料类型")
        return
      }
      this.materialType = materialType
      this.loading = true
      this.getList(() => {
        this.loading = false
@@ -203,7 +215,10 @@
    },
    getList(row) {
      let params = { id: row.id }
      WmsOrderRukuDetail(params)
      WmsContainerPackagingPage({
        // materialTypeCode: 'test2'
        materialTypeCode: this.materialType
      })
        .then(d => {
          this.list = d.data.rows || []
          this.$emit('update:visible', true)
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue
@@ -97,6 +97,42 @@
        });
      },
    handleSubmit2(){
      alert(this.form)
      console.log( 99999999999999)
      console.log( this.data)
      const { form: { validateFields } } = this
      this.confirmLoading = true
      validateFields((errors, values) => {
        if (!errors) {
          for (const key in values) {
            if (typeof (values[key]) === 'object') {
              values[key] = JSON.stringify(values[key])
            }
          }
          console.log(22222222222222222)
          console.log(values )
          this.confirmLoading = false
          // WmsMaterialAdd(values).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
          // })
          // return values
        } else {
          this.confirmLoading = false
        }
      })
    },
      /**
       * 提交表单
       */
@@ -110,6 +146,7 @@
                values[key] = JSON.stringify(values[key])
              }
            }
            WmsMaterialAdd(values).then((res) => {
              if (res.success) {
                this.$message.success('新增成功')
@@ -122,6 +159,9 @@
            }).finally((res) => {
              this.confirmLoading = false
            })
          // return values
          } else {
            this.confirmLoading = false
          }