css

liuying

2024-04-25 264795ac21be1ef5e36ec431005acb84777dad79

css

 iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/WmsMaterialManage.js

@@ -25,7 +25,13 @@
    params: parameter
  })
}

export function WmsMaterialDetailList (parameter) {
  return axios({
    url: '/WmsMaterial/detail',
    method: 'get',
    params: parameter
  })
}
/**
 * 添加物料信息表
 *
@@ -112,3 +118,10 @@



export function materialTypeDataList (parameter) {
  return axios({
    url: 'WmsMaterialType/listNonPage ',
    method: 'get',
    params: parameter
  })
}

 iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsMaterialManage.js

@@ -101,10 +101,3 @@
  })
}

export function materialTypeDataList (parameter) {
  return axios({
    url: 'WmsMaterialType/listNonPage ',
    method: 'get',
    params: parameter
  })
}

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue

@@ -92,7 +92,8 @@
      record: {},
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this)
      form: this.$form.createForm(this),
      selectTypeData2:[]
    }
  },
  created() {

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue

@@ -1,10 +1,5 @@
<template>
  <a-modal
    title="新增容器关系"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
  <a-modal title="新增容器关系" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
        <a-form :form="form">
@@ -12,8 +7,8 @@
          <!-- <a-input placeholder="请输入容器类型ID" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入容器类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择容器类型名称" v-decorator="['containerTypeId']">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index"
              :value="item.typeCode">{{ item.typeName }}</a-select-option>
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{ item.typeName
            }}</a-select-option>
          </a-select>

        </a-form-item>
@@ -24,8 +19,8 @@
          <!-- <a-input placeholder="请输入物料类型ID" v-decorator="['materialTypeId', {rules: [{required: true, message: '请输入物料类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择物料类型名称" v-decorator="['materialTypeId']">
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index"
              :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
              item.materialTypeName }}</a-select-option>
          </a-select>

        </a-form-item>
@@ -64,7 +59,8 @@
  },
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      form: this.$form.createForm(this),
      selectTypeData2:[]
      }
    },
    created() {

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue

@@ -1,10 +1,5 @@
<template>
  <a-modal
    title="编辑容器关系"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
  <a-modal title="编辑容器关系" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
@@ -12,8 +7,8 @@
          <!-- <a-input placeholder="请输入容器类型ID" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入容器类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择容器类型名称" v-decorator="['containerTypeId']">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index"
              :value="item.typeCode">{{ item.typeName }}</a-select-option>
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{ item.typeName
            }}</a-select-option>
          </a-select>

        </a-form-item>
@@ -24,8 +19,8 @@
          <!-- <a-input placeholder="请输入物料类型ID" v-decorator="['materialTypeId', {rules: [{required: true, message: '请输入物料类型ID！'}]}]" /> -->

          <a-select style="width: 100%" placeholder="请选择物料类型名称" v-decorator="['materialTypeId']">
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index"
              :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
              item.materialTypeName }}</a-select-option>
          </a-select>

        </a-form-item>
@@ -68,7 +63,8 @@
  record: {},
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      form: this.$form.createForm(this),
      selectTypeData2:[]
      }
    },
    created() {

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

@@ -194,7 +194,8 @@
            
            <!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">编辑</a> -->
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">编辑</a>

            <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record,'详情')">详情</a>
          <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsMaterialDelete(record)">
            <a>删除</a>

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

@@ -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,
@@ -165,7 +168,9 @@
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this),
      materialTypeData2:[]
      materialTypeData2: [],
      selectTypeData2:[],
      selectTypeData1:[]
    }
  },
  methods: {
@@ -210,20 +215,43 @@
    },
    handleOk() { },
    // 初始化方法
    add(record) {
     

    add(record, type) {
      this.visible = true
      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 = '新增基础物料信息';
      } else {
        this.title = '新增基础物料信息';// 新增
      }
    },
    getSelects() {
@@ -297,6 +325,7 @@
            // ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //包装关系
          }
          this.confirmLoading = true
          if (this.title == '新增基础物料信息') {
          WmsMaterialAdd(param)
            .then(res => {
              if (res.success) {
@@ -312,6 +341,23 @@
              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
        }
      })