From 1d5806bb69891d4045438b12c15cd42cc937e5a2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 24 4月 2024 11:14:24 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue | 175 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 92 insertions(+), 83 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
index 23359a0..dd3f5fc 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
@@ -1,5 +1,5 @@
锘�<template>
- <a-modal
+ <a-modal
title="鏂板鏇夸唬鍝佺鐞�"
:width="900"
:visible="visible"
@@ -7,97 +7,106 @@
@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="['substituteCode', {rules: [{required: true, message: '璇疯緭鍏ユ浛浠ｇ紪鍙凤紒'}]}]" />
- </a-form-item>
- <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-decorator="['materialCode', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒'}]}]" />
- </a-form-item>
- <a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-decorator="['materialName', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒'}]}]" />
- </a-form-item>
- <a-form-item label="鏇夸唬鍝佺墿鏂欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿" v-decorator="['substituteMaterialCode', {rules: [{required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�'}]}]" />
- </a-form-item>
- <a-form-item label="鏇夸唬鍝佺墿鏂欏悕绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡鍚嶇О" v-decorator="['substituteMaterialName', {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="['substituteIndex', {rules: [{required: true, message: '璇疯緭鍏ユ浛浠ｆ搴忥紒'}]}]" />
- </a-form-item>
- <a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+
+ </a-spin> <a-form :form="form">
+ <a-form-item label="鏇夸唬缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ浛浠ｇ紪鍙�"
+ v-decorator="['substituteCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｇ紪鍙凤紒' }] }]" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]" />
+ </a-form-item>
+ <a-form-item label="鏇夸唬鍝佺墿鏂欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿"
+ v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" />
+ </a-form-item>
+ <a-form-item label="鏇夸唬鍝佺墿鏂欏悕绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡鍚嶇О"
+ v-decorator="['substituteMaterialName', { 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="['substituteIndex', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｆ搴忥紒' }] }]" />
+ </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-form-item>
- </a-form>
- </a-spin>
- </a-modal>
+ </a-form-item> -->
+ </a-form>
+ </a-modal>
</template>
<script>
- import moment from 'moment'
- import {
+import moment from 'moment'
+import {
WmsSubstituteGoodAdd
- } from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'
- export default {
- data () {
- return {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'
+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)
+ }
},
- 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(() => {
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ 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])
- }
+ });
+ },
+ /**
+ * 鎻愪氦琛ㄥ崟
+ */
+ 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])
}
- WmsSubstituteGoodAdd(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
- }
+ this.confirmLoading = false
+ this.$emit('ok', values)
+ this.handleCancel()
+
+
+ // WmsSubstituteGoodAdd(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>
--
Gitblit v1.9.3