From 6e6b156bb0100043214c170d7171eb79e0d7e344 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 26 4月 2024 13:48:42 +0800
Subject: [PATCH] 时间查询 选完时间再清除掉 接口报错
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue | 253 ++++++++++++++++++++++++--------------------------
1 files changed, 123 insertions(+), 130 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
index f66833a..62fb107 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
@@ -1,35 +1,37 @@
锘�<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="['placeCode', {rules: [{required: true, message: '璇疯緭鍏ュ簱浣嶇紪鐮侊紒'}]}]" />
+ <a-form-item label="搴撲綅缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <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="Number(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 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="Number(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="['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>
- <a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="鏄惁鍫嗗灈鏈哄簱浣�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isSrmPlace', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="鍫嗗灈鏈哄簱浣嶅彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -52,22 +54,29 @@
</a-form-item>
<a-form-item label="杈撻�佺嚎搴撲綅鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヨ緭閫佺嚎搴撲綅鍙�" v-decorator="['transPlaceNo']" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="鏄惁婵�娲讳笌浠诲姟璋冨害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isActivateWCS', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="搴撳瓨鐜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱瀛樼幆澧�" v-decorator="['environment']" />
</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="['areaCode']" />
- </a-form-item>
+ </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="Number(item.id)">{{ 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>
@@ -116,7 +125,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>
@@ -124,116 +132,101 @@
<script>
import moment from 'moment'
- import {
+import {
WmsPlaceEdit
- } from '@/api/modular/main/WmsBase/WmsPlaceManage'
- export default {
- data () {
- return {
- Id: 0,
- 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 {
+ Id: 0,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ record: {},
+ placeTypeData: [],
+ placeStatusData: [],
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ WmsAreaData:[]
+ }
},
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
+
+ created() {
+ WmsAreaPage().then(res => {
+ this.WmsAreaData = res.data.rows
+ })
},
- 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 placeTypeOption = this.$options
+ this.placeTypeData = placeTypeOption.filters['dictData']('place_type')
+ const placeStatusOption = this.$options
+ this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
+ 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,
- placeCode: record.placeCode,
- placeName: record.placeName,
- placeAlias: record.placeAlias,
- placeType: record.placeType,
- placeTypeName: record.placeTypeName,
- stockUnit: record.stockUnit,
- placeStatus: record.placeStatus,
- isSrmPlace: record.isSrmPlace,
- srmPlaceNo: record.srmPlaceNo,
- isRgvPlace: record.isRgvPlace,
- rgvPlaceNo: record.rgvPlaceNo,
- isAgvPlace: record.isAgvPlace,
- agvPlaceNo: record.agvPlaceNo,
- isTransPlace: record.isTransPlace,
- transPlaceNo: record.transPlaceNo,
- isActivateWCS: record.isActivateWCS,
- environment: record.environment,
- areaCode: record.areaCode,
- areaId: record.areaId,
- areaName: record.areaName,
- verificationCode: record.verificationCode,
- rowNo: record.rowNo,
- columnNo: record.columnNo,
- layerNo: record.layerNo,
- laneNo: record.laneNo,
- xzb: record.xzb,
- yzb: record.yzb,
- zzb: record.zzb,
- length: record.length,
- width: record.width,
- height: record.height,
- maxWeight: record.maxWeight,
- inSequence: record.inSequence,
- outSequence: record.outSequence,
- 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]
- }
- }
- WmsPlaceEdit(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) => {
+ }
+ WmsPlaceEdit(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>
\ No newline at end of file
--
Gitblit v1.9.3