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/WmsPlace/addForm.vue | 187 ++++++++++++++++++++++++++--------------------
1 files changed, 107 insertions(+), 80 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
index d451407..b1ed5b1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
@@ -1,33 +1,35 @@
锘�<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 :form="form">
<a-form-item label="搴撲綅缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ簱浣嶇紪鐮�" v-decorator="['placeCode', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇紪鐮侊紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ュ簱浣嶇紪鐮�"
+ v-decorator="['placeCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱浣嶇紪鐮侊紒' }] }]" />
</a-form-item>
<a-form-item label="搴撲綅鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ簱浣嶅悕绉�" v-decorator="['placeName', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶅悕绉帮紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ュ簱浣嶅悕绉�"
+ v-decorator="['placeName', { rules: [{ required: true, message: '璇疯緭鍏ュ簱浣嶅悕绉帮紒' }] }]" />
</a-form-item>
<a-form-item label="搴撲綅鍒悕" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱浣嶅埆鍚�" v-decorator="['placeAlias']" />
</a-form-item>
- <a-form-item label="搴撲綅绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶇被鍨�" style="width: 100%" v-decorator="['placeType', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇被鍨嬶紒'}]}]" />
+ <a-form-item label="搴撲綅绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅绫诲瀷"
+ v-decorator="['placeType', { rules: [{ required: true, message: '璇烽�夋嫨搴撲綅绫诲瀷锛�' }] }]">
+ <a-select-option v-for="(item, index) in placeTypeData" :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-input placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�" v-decorator="['placeTypeName']" />
- </a-form-item>
- <a-form-item label="瀛樻斁鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ瓨鏀惧崟浣�" v-decorator="['stockUnit']" />
- </a-form-item>
- <a-form-item label="搴撲綅灞炴��" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ュ簱浣嶅睘鎬�" style="width: 100%" v-decorator="['placeStatus']" />
+ <!-- <a-form-item label="搴撲綅绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉�" v-decorator="['placeTypeName', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇被鍨嬪悕绉帮紒'}]}]" />
+ </a-form-item> -->
+ <a-form-item label="搴撲綅灞炴��" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撲綅灞炴��"
+ v-decorator="['placeStatus', { rules: [{ required: true, message: '璇烽�夋嫨搴撲綅灞炴�э紒' }] }]">
+ <a-select-option v-for="(item, index) in placeStatusData" :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="['isSrmPlace', { valuePropName: 'checked' }]" />
@@ -63,11 +65,18 @@
<a-input placeholder="璇疯緭鍏ュ簱鍖虹紪鍙�" v-decorator="['areaCode']" />
</a-form-item>
<a-form-item label="鎵�鍦ㄥ簱鍖�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" v-decorator="['areaId']" />
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�"
+ v-decorator="['areaid', { rules: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ簱鍖猴紒' }] }]">
+ <a-select-option v-for="(item, index) in WmsAreaData" :key="index" :value="item.areaCode">{{ item.areaName
+ }}</a-select-option>
+ </a-select>
+ <!-- <a-input placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" v-decorator="['areaId', {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="['areaName']" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="妫�楠岀爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ユ楠岀爜" v-decorator="['verificationCode']" />
</a-form-item>
@@ -122,69 +131,87 @@
</template>
<script>
- import moment from 'moment'
- import {
+import moment from 'moment'
+import {
WmsPlaceAdd
- } from '@/api/modular/main/WmsBase/WmsPlaceManage'
- export default {
- data () {
- return {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsPlaceManage'
+import { WmsAreaPage, WmsAreaDelete, WmsAreaToExcel } from '@/api/modular/main/WmsBase/WmsAreaManage'
+export default {
+ data() {
+ return {
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ placeTypeData: [],
+ placeStatusData: [],
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ WmsAreaData: [],
+ }
},
- 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])
- }
+ });
+ const placeTypeOption = this.$options
+ this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+ const placeStatusOption = this.$options
+ this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
+
+ WmsAreaPage().then(res => {
+ this.WmsAreaData = res.data.rows
+ })
+ },
+ /**
+ * 鎻愪氦琛ㄥ崟
+ */
+ 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])
}
- WmsPlaceAdd(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
- }
+ WmsPlaceAdd(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