From 0e394ed580b09329ecaa8476bbb6334f8212b009 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 13:40:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue | 225 ++++++++++++++++++++++++++++---------------------------
1 files changed, 115 insertions(+), 110 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
index 0e283e7..6ff3aa7 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
@@ -1,53 +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 label="浠撳簱鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-decorator="['warehouseName', {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-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="璇疯緭鍏RP浠ｇ爜" v-decorator="['erpCode', {rules: [{required: true, message: '璇疯緭鍏RP浠ｇ爜锛�'}]}]" />
+ <a-input placeholder="璇疯緭鍏RP浠ｇ爜"
+ v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏RP浠ｇ爜锛�' }] }]" />
</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="Number(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' }]" />
@@ -55,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>
@@ -63,98 +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: {},
- warehouseIdData: [],
- 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))
- const warehouseIdOption = this.$options
- this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
- 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>
--
Gitblit v1.9.3