From 1eb08ced0ef966804e96c9b792bba45ca6eb6601 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:25:45 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue | 160 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 90 insertions(+), 70 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
index 5c9eb3c..ce4ea2c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
@@ -1,24 +1,26 @@
锘�<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 :form="form">
<a-form-item label="浠撳簱缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" v-decorator="['code', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撶紪鍙凤紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" v-decorator="['code', { rules: [{ required: true, message: '璇疯緭鍏ヤ粨搴撶紪鍙凤紒' }] }]" />
</a-form-item>
<a-form-item label="浠撳簱鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-decorator="['name', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撳悕绉帮紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-decorator="['name', { rules: [{ required: true, message: '璇疯緭鍏ヤ粨搴撳悕绉帮紒' }] }]" />
</a-form-item>
<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']" />
+ <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']" />
@@ -36,7 +38,7 @@
<a-input placeholder="璇疯緭鍏ュ畾浣�" v-decorator="['position']" />
</a-form-item>
<a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '璇烽�夋嫨鏄惁绂佺敤锛�' }], valuePropName: 'checked'}]" />
+ <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="['remarks']" />
@@ -47,69 +49,87 @@
</template>
<script>
- import moment from 'moment'
- import {
+import moment from 'moment'
+import {
WmsWarehouseAdd
- } from '@/api/modular/main/WmsBase/WmsWarehouseManage'
- export default {
- data () {
- return {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
- },
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
- },
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- add (record) {
- this.visible = true
- this.$nextTick(() => {
+} from '@/api/modular/main/WmsBase/WmsWarehouseManage'
- });
+import { WmsFactoryPage } from '@/api/modular/main/WmsBase/WmsFactoryManage'
+export default {
+ created() {
+ this.getSelectDataList()
+ },
+ data() {
+ return {
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
},
- /**
- * 鎻愪氦琛ㄥ崟
- */
- handleSubmit () {
- 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])
- }
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
+ },
+ methods: {
+ moment,
+ getSelectDataList() {
+ WmsFactoryPage().then((d) => {
+ this.selectTypeData = d.data.rows || []
+ }).catch(() => {
+
+ })
+ },
+ // 鍒濆鍖栨柟娉�
+ add(record) {
+ this.visible = true
+ this.$nextTick(() => {
+
+ });
+ },
+ /**
+ * 鎻愪氦琛ㄥ崟
+ */
+ handleSubmit() {
+ 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])
}
- WmsWarehouseAdd(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
- })
- } else {
- this.confirmLoading = false
}
- })
- },
- handleCancel () {
- this.form.resetFields()
- this.visible = false
- }
+ WmsWarehouseAdd(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
+ })
+ } 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>
\ No newline at end of file
--
Gitblit v1.9.3