liuying
2024-04-24 8b6bd923ede2ea17ee572c6f17acef42c29b359c
下拉
已修改3个文件
99 ■■■■■ 文件已修改
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -1,53 +1,60 @@
<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">
        <a-form-item label="库区编码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库区编码" v-decorator="['areaCode', {rules: [{required: true, message: '请输入库区编码!'}]}]" />
          <a-input placeholder="请输入库区编码"
            v-decorator="['areaCode', { rules: [{ required: true, message: '请输入库区编码!' }] }]" />
        </a-form-item>
        <a-form-item label="仓库编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <!-- <a-form-item label="仓库编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入仓库编号" v-decorator="['warehouseCode', {rules: [{required: true, message: '请输入仓库编号!'}]}]" />
        </a-form-item>
        </a-form-item> -->
        <a-form-item label="仓库名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入仓库名称" v-decorator="['warehouseName', {rules: [{required: true, message: '请输入仓库名称!'}]}]" />
          <a-input placeholder="请输入仓库名称"
            v-decorator="['warehouseName', { rules: [{ required: true, message: '请输入仓库名称!' }] }]" />
        </a-form-item>
        <a-form-item label="库区名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库区名称" v-decorator="['areaName', {rules: [{required: true, message: '请输入库区名称!'}]}]" />
          <a-input placeholder="请输入库区名称"
            v-decorator="['areaName', { rules: [{ required: true, message: '请输入库区名称!' }] }]" />
        </a-form-item>
        <a-form-item label="库区描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库区描述" v-decorator="['areaDesc']" />
        </a-form-item>
        <a-form-item label="库区状态" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入库区状态" style="width: 100%" v-decorator="['areaStatus', {rules: [{required: true, message: '请输入库区状态!'}]}]" />
          <a-input-number placeholder="请输入库区状态" style="width: 100%"
            v-decorator="['areaStatus', { 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', {rules: [{required: true, message: '请输入ERP代码!'}]}]" />
          <a-input placeholder="请输入ERP代码"
            v-decorator="['erpCode', { rules: [{ required: true, message: '请输入ERP代码!' }] }]" />
        </a-form-item>
        <a-form-item label="所属仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-select style="width: 100%" placeholder="请选择所属仓库" v-decorator="['warehouseId', {rules: [{ required: true, message: '请选择所属仓库!' }]}]">
            <a-select-option v-for="(item,index) in warehouseIdData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
          <a-select style="width: 100%" placeholder="请选择所属仓库"
            v-decorator="['warehouseId', { rules: [{ required: true, message: '请选择所属仓库!' }] }]">
            <a-select-option v-for="(item, index) in warehouseIdData" :key="index" :value="item.code">{{ item.name
            }}</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label="零件级管控" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isBarcodeLevelControl',{rules: [{ required: true, message: '请选择零件级管控!' }], valuePropName: 'checked'}]" />
          <a-switch
            v-decorator="['isBarcodeLevelControl', { rules: [{ required: true, message: '请选择零件级管控!' }], valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="检验先进先出" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isFIFO',{rules: [{ required: true, message: '请选择检验先进先出!' }], valuePropName: 'checked'}]" />
          <a-switch
            v-decorator="['isFIFO', { rules: [{ required: true, message: '请选择检验先进先出!' }], valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="零件级管控" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isPartLevelControl',{rules: [{ required: true, message: '请选择零件级管控!' }], valuePropName: 'checked'}]" />
          <a-switch
            v-decorator="['isPartLevelControl', { rules: [{ required: true, message: '请选择零件级管控!' }], valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="允许混淆" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isAllowConfusion',{rules: [{ required: true, message: '请选择允许混淆!' }], valuePropName: 'checked'}]" />
          <a-switch
            v-decorator="['isAllowConfusion', { rules: [{ required: true, message: '请选择允许混淆!' }], valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="允许负库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isAllowNegativeInventory',{rules: [{ required: true, message: '请选择允许负库存!' }], valuePropName: 'checked'}]" />
          <a-switch
            v-decorator="['isAllowNegativeInventory', { rules: [{ required: true, message: '请选择允许负库存!' }], valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="是否虚拟" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isVirtually', { valuePropName: 'checked' }]" />
@@ -65,6 +72,9 @@
  import {
  WmsAreaAdd
  } from '@/api/modular/main/WmsBase/WmsAreaManage'
import { WmsWarehousePage, WmsWarehouseDelete, WmsWarehouseToExcel } from '@/api/modular/main/WmsBase/WmsWarehouseManage'
  export default {
  data () {
  return {
@@ -90,8 +100,15 @@
        this.$nextTick(() => {
        });
        const warehouseIdOption = this.$options
        this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
      // const warehouseIdOption = this.$options
      // this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
      WmsWarehousePage().then((d) => {
        // this.selectTypeData = d.data || []
        this.warehouseIdData = d.data.rows || []
      }).catch(() => {
      })
      },
      /**
       * 提交表单
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
@@ -11,18 +11,18 @@
        <a-form-item label="容器类型ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入容器类型ID" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入容器类型ID!'}]}]" />
        </a-form-item>
        <a-form-item label="容器类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <!-- <a-form-item label="容器类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入容器类型名称" v-decorator="['containerTypeName', {rules: [{required: true, message: '请输入容器类型名称!'}]}]" />
        </a-form-item>
        </a-form-item> -->
        <a-form-item label="物料类型ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型ID" v-decorator="['materialTypeId', {rules: [{required: true, message: '请输入物料类型ID!'}]}]" />
        </a-form-item>
        <a-form-item label="物料类型编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
        <!-- <a-form-item label="物料类型编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型编号" v-decorator="['materialTypeCode', {rules: [{required: true, message: '请输入物料类型编号!'}]}]" />
        </a-form-item>
        <a-form-item label="物料类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型名称" v-decorator="['materialTypeName', {rules: [{required: true, message: '请输入物料类型名称!'}]}]" />
        </a-form-item>
        </a-form-item> -->
        <a-form-item label="物料容器容量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料容器容量" v-decorator="['boxQty', {rules: [{required: true, message: '请输入物料容器容量!'}]}]" />
        </a-form-item>
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/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">
@@ -17,8 +12,15 @@
        <a-form-item label="仓库地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入仓库地址" v-decorator="['address']" />
        </a-form-item>
        <a-form-item label="工厂编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入工厂编号" v-decorator="['factoryCode', {rules: [{required: true, message: '请输入工厂编号!'}]}]" />
        <a-form-item label="所属工厂" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请选择所属工厂" v-decorator="['factoryCode', {rules: [{required: true, message: '请选择所属工厂!'}]}]" /> -->
          <a-select style="width: 100%" placeholder="请选择所属工厂" v-decorator="['factoryCode']">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index"
              :value="item.factoryCode">{{ item.factoryName }}</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label="长" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入长" v-decorator="['length']" />
@@ -51,7 +53,12 @@
  import {
  WmsWarehouseAdd
  } from '@/api/modular/main/WmsBase/WmsWarehouseManage'
import { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
  export default {
  created() {
    this.getSelectDataList()
  },
  data () {
  return {
  labelCol: {
@@ -69,6 +76,13 @@
    },
    methods: {
    moment,
    getSelectDataList() {
      WmsFactoryPage().then((d) => {
        this.selectTypeData = d.data.rows || []
      }).catch(() => {
      })
    },
      // 初始化方法
      add (record) {
        this.visible = true