Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

schangxiang@126.com

2024-04-25 1eb08ced0ef966804e96c9b792bba45ca6eb6601

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

@@ -1,51 +1,60 @@
<template>
  <a-modal
    title="编辑库区信息"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
  <a-modal title="编辑库区信息" :width="1100" :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-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-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" has-feedback>
          <a-input placeholder="请输入所属仓库" v-decorator="['warehouseId', {rules: [{required: true, message: '请输入所属仓库！'}]}]" />
        <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>
        </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' }]" />
@@ -53,7 +62,6 @@
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
@@ -61,95 +69,97 @@

<script>
import moment from 'moment'
  import {
import {
  WmsAreaEdit
  } from '@/api/modular/main/WmsBase/WmsAreaManage'
  export default {
  data () {
  return {
  Id: 0,
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
} from '@/api/modular/main/WmsBase/WmsAreaManage'
import { WmsWarehousePage, WmsWarehouseDelete, WmsWarehouseToExcel } from '@/api/modular/main/WmsBase/WmsWarehouseManage'

export default {
  data() {
    return {
      Id: 0,
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 15 }
      },
      record: {},
      warehouseIdData: [],
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this)
    }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  created() {
    WmsWarehousePage().then((d) => {
        this.warehouseIdData = d.data.rows || []
      }).catch(() => {
      })
  },
  record: {},
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
  methods: {
    moment,
    // 初始化方法
    edit(record) {
      this.visible = true;
      this.Id = record.id;
      this.$nextTick(() => {
      });
      //深度拷贝 移除VUE的监听，防止INDEX页面值变动
      this.record = JSON.parse(JSON.stringify(record))
      // const warehouseIdOption = this.$options
      // this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
      this.$nextTick(() => {
        this.form.setFieldsValue(
          {
            ...record
          }
        )
      })
    },
    methods: {
   moment,
      // 初始化方法
      edit (record) {
        this.visible = true;
      this.Id = record.id;
        this.$nextTick(() => {
        });
        //深度拷贝 移除VUE的监听，防止INDEX页面值变动
        this.record = JSON.parse(JSON.stringify(record))
        this.$nextTick(() => {
          this.form.setFieldsValue(
            {
              id: record.id,
              areaCode: record.areaCode,
              warehouseCode: record.warehouseCode,
              warehouseName: record.warehouseName,
              areaName: record.areaName,
              areaDesc: record.areaDesc,
              areaStatus: record.areaStatus,
              erpCode: record.erpCode,
              warehouseId: record.warehouseId,
              isBarcodeLevelControl: record.isBarcodeLevelControl,
              isFIFO: record.isFIFO,
              isPartLevelControl: record.isPartLevelControl,
              isAllowConfusion: record.isAllowConfusion,
              isAllowNegativeInventory: record.isAllowNegativeInventory,
              isVirtually: record.isVirtually,
              isDisabled: record.isDisabled
    handleSubmit() {
      const { form: { validateFields } } = this
      this.confirmLoading = true
      validateFields((errors, values) => {
        if (!errors) {
          for (const key in values) {
            if (values[key] == null) continue
            if (typeof (values[key]) === 'object') {
              values[key] = JSON.stringify(values[key])
              this.record[key] = values[key]
            } else {
              this.record[key] = values[key]
            }
          )
        })
      },
      handleSubmit () {
        const { form: { validateFields } } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (values[key] == null) continue
              if (typeof (values[key]) === 'object') {
                values[key] = JSON.stringify(values[key])
                 this.record[key] = values[key]
              } else {
                 this.record[key] = values[key]
              }
            }
            WmsAreaEdit(this.record).then((res) => {
              if (res.success) {
                this.$message.success('编辑成功')
                this.confirmLoading = false
                this.$emit('ok', this.record)
                this.handleCancel()
              } else {
                this.$message.error('编辑失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
          }
          WmsAreaEdit(this.record).then((res) => {
            if (res.success) {
              this.$message.success('编辑成功')
              this.confirmLoading = false
            })
          }else{
              this.$emit('ok', this.record)
              this.handleCancel()
            } else {
              this.$message.error('编辑失败：' + JSON.stringify(res.message))
            }
          }).finally((res) => {
            this.confirmLoading = false
          } 
        });
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
          })
        } else {
          this.confirmLoading = false
        }
      });
    },
    handleCancel() {
      this.form.resetFields()
      this.visible = false
    }
  }
}
</script>
<style lang="less" scoped>
  .ant-row.ant-form-item {
    width: 50% !important;
    display: inline-block;
  }
</style>