From ca3d7079ea8d06599ff322daac616ea60ed6329d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 10:17:11 +0800
Subject: [PATCH] 字典
---
iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js | 6
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue | 6
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue | 222 ++++++++++++++++++++++++--------------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue | 16 +-
4 files changed, 137 insertions(+), 113 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js b/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js
index 12af838..82ea67d 100644
--- a/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js
+++ b/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js
@@ -77,15 +77,15 @@
handleTableHt() {
this.$nextTick(() => {
if (!this.$refs.boxOutWrap) {
- console.log("娌℃湁DOM:boxOutWrap,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
+ // console.log("娌℃湁DOM:boxOutWrap,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
return
}
if (!this.$refs.boxForm) {
- console.log("娌℃湁DOM:boxForm,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
+ // console.log("娌℃湁DOM:boxForm,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
return
}
if (!this.$refs.actionBar) {
- console.log("娌℃湁DOM:actionBar,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
+ // console.log("娌℃湁DOM:actionBar,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
return
}
let mainTableHt = 0
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
index 653979d..478e054 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
@@ -98,15 +98,10 @@
}
},
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- add(record) {
- this.visible = true;
- WmsContainerTypePage().then((d) => {
+ created() {
+ WmsContainerTypePage().then((d) => {
this.selectTypeData = d.data.rows || []
}).catch(() => {
-
})
WmsContainerPackagingPage().then((d) => {
@@ -114,8 +109,13 @@
}).catch(() => {
})
+ },
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ add(record) {
+ this.visible = true;
this.$nextTick(() => {
-
});
},
/**
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
index 9d32d6c..279acb1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
@@ -1,27 +1,36 @@
锘�<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-item label="缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ紪鍙�" v-decorator="['containerCode', {rules: [{required: true, message: '璇疯緭鍏ョ紪鍙凤紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ョ紪鍙�"
+ v-decorator="['containerCode', { rules: [{ required: true, message: '璇疯緭鍏ョ紪鍙凤紒' }] }]" />
</a-form-item>
<a-form-item label="鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ悕绉�" v-decorator="['containerName', {rules: [{required: true, message: '璇疯緭鍏ュ悕绉帮紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ュ悕绉�"
+ v-decorator="['containerName', { rules: [{ required: true, message: '璇疯緭鍏ュ悕绉帮紒' }] }]" />
</a-form-item>
- <a-form-item label="绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨婭D锛�'}]}]" />
+ <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ョ被鍨�" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨婭D锛�'}]}]" /> -->
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨绫诲瀷" v-decorator="['containerTypeId']">
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{
+ item.typeName }}</a-select-option>
+ </a-select>
+
</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="['containerTypeName', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨嬪悕绉帮紒'}]}]" />
- </a-form-item>
- <a-form-item label="瀹瑰櫒鍏崇郴ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鍣ㄥ叧绯籌D" v-decorator="['packagingId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯籌D锛�'}]}]" />
+ </a-form-item> -->
+ <a-form-item label="瀹瑰櫒鍏崇郴" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄥ叧绯籌D"
+ v-decorator="['packagingId', { rules: [{ required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯籌D锛�' }] }]" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒鍏崇郴" v-decorator="['packagingId']">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.containerTypeId">{{
+ item.containerTypeName }}</a-select-option>
+ </a-select>
+
</a-form-item>
<a-form-item label="闀垮害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ暱搴�" v-decorator="['specLength']" />
@@ -44,19 +53,18 @@
<a-form-item label="杞介噸涓婇檺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヨ浇閲嶄笂闄�" v-decorator="['maxWeight']" />
</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="['parentContainerName']" />
</a-form-item>
<a-form-item label="鐖跺鍣↖d" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ埗瀹瑰櫒Id" v-decorator="['parentContainerId']" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="鏄惁铏氭嫙" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="璇疯緭鍏ユ槸鍚﹁櫄鎷�" style="width: 100%" v-decorator="['isVirtually']" />
</a-form-item>
<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>
@@ -64,96 +72,110 @@
<script>
import moment from 'moment'
- import {
+import {
WmsContainerEdit
- } from '@/api/modular/main/WmsBase/WmsContainerManage'
- export default {
- data () {
- return {
- Id: 0,
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsContainerManage'
+import { WmsContainerTypePage, WmsContainerTypeDelete, WmsContainerTypeToExcel } from '@/api/modular/main/WmsBase/WmsContainerTypeManage'
+import { WmsContainerPackagingPage, WmsContainerPackagingDelete, WmsContainerPackagingToExcel } from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
+export default {
+ data() {
+ return {
+ Id: 0,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ record: {},
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
},
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
+ created() {
+ WmsContainerTypePage().then((d) => {
+ this.selectTypeData = d.data.rows || []
+ }).catch(() => {
+ })
+
+ WmsContainerPackagingPage().then((d) => {
+ this.selectTypeData2 = d.data.rows || []
+ }).catch(() => {
+
+ })
},
- 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))
+ this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ id: record.id,
+ containerCode: record.containerCode,
+ containerName: record.containerName,
+ containerTypeId: record.containerTypeId,
+ containerTypeName: record.containerTypeName,
+ packagingId: record.packagingId,
+ specLength: record.specLength,
+ specWidth: record.specWidth,
+ specHeight: record.specHeight,
+ limitLength: record.limitLength,
+ limitWidth: record.limitWidth,
+ limitHeight: record.limitHeight,
+ maxWeight: record.maxWeight,
+ parentContainerName: record.parentContainerName,
+ parentContainerId: record.parentContainerId,
+ isVirtually: record.isVirtually,
+ isDisabled: record.isDisabled
+ }
+ )
+ })
},
- 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,
- containerCode: record.containerCode,
- containerName: record.containerName,
- containerTypeId: record.containerTypeId,
- containerTypeName: record.containerTypeName,
- packagingId: record.packagingId,
- specLength: record.specLength,
- specWidth: record.specWidth,
- specHeight: record.specHeight,
- limitLength: record.limitLength,
- limitWidth: record.limitWidth,
- limitHeight: record.limitHeight,
- maxWeight: record.maxWeight,
- parentContainerName: record.parentContainerName,
- parentContainerId: record.parentContainerId,
- 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]
- }
- }
- WmsContainerEdit(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) => {
+ }
+ WmsContainerEdit(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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue
index b7eae40..8b25e71 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue
@@ -15,12 +15,14 @@
<a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О">
<a-input v-model="queryParam.containerTypeName" allow-clear placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�" />
</a-form-item>
- </a-col><template v-if="advanced">
- <a-col :md="8" :sm="24">
+ </a-col>
+ <a-col :md="8" :sm="24">
<a-form-item label="鐗╂枡绫诲瀷">
<a-input v-model="queryParam.materialTypeId" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" />
</a-form-item>
</a-col>
+ <template v-if="advanced">
+
<a-col :md="8" :sm="24">
<a-form-item label="鐗╂枡绫诲瀷缂栧彿">
<a-input v-model="queryParam.materialTypeCode" allow-clear
--
Gitblit v1.9.3