From 0a69f79af938212890472de705f95afe650814a3 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 17:01:49 +0800
Subject: [PATCH] bug
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue | 80 ++++++++++++++++++++--------------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue | 20 ++++++---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue | 13 ++++--
3 files changed, 62 insertions(+), 51 deletions(-)
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 3363085..b982b7f 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
@@ -22,15 +22,14 @@
<!-- <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="瀹瑰櫒鍏崇郴" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄥ叧绯籌D"
- v-decorator="['packagingId', { rules: [{ required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯伙紒' }] }]" /> -->
+
+ <!-- <a-form-item label="瀹瑰櫒鍏崇郴" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒鍏崇郴" v-decorator="['packagingId', { rules: [{ required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯伙紒' }] }]">
<a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.id">{{
item.containerTypeName }}</a-select-option>
</a-select>
+ </a-form-item> -->
- </a-form-item>
<a-form-item label="闀垮害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ暱搴�" v-decorator="['specLength']" />
</a-form-item>
@@ -155,3 +154,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
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 04b8ee4..2e67520 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
@@ -22,15 +22,14 @@
<!-- <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="瀹瑰櫒鍏崇郴" :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', { rules: [{ required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯籌D锛�' }] }]">
- <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.containerTypeId">{{
+
+ <!-- <a-form-item label="瀹瑰櫒鍏崇郴" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒鍏崇郴" v-decorator="['packagingId', { rules: [{ required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯伙紒' }] }]">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.id">{{
item.containerTypeName }}</a-select-option>
</a-select>
+ </a-form-item> -->
- </a-form-item>
<a-form-item label="闀垮害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ暱搴�" v-decorator="['specLength']" />
</a-form-item>
@@ -59,7 +58,8 @@
<a-input placeholder="璇疯緭鍏ョ埗瀹瑰櫒Id" v-decorator="['parentContainerId']" />
</a-form-item> -->
<a-form-item label="鏄惁铏氭嫙" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏ユ槸鍚﹁櫄鎷�" style="width: 100%" v-decorator="['isVirtually']" />
+ <!-- <a-input-number placeholder="璇疯緭鍏ユ槸鍚﹁櫄鎷�" style="width: 100%" v-decorator="['isVirtually']" /> -->
+ <a-switch v-decorator="['isVirtually', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
@@ -180,3 +180,9 @@
}
}
</script>
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue
index 4b6a571..3c4bbbe 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue
@@ -311,26 +311,26 @@
sorter: true,
dataIndex: 'containerTypeName'
},
- {
- title: '瀹瑰櫒鍏崇郴ID',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'packagingId'
- },
+ // {
+ // title: '瀹瑰櫒鍏崇郴ID',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'packagingId'
+ // },
{
title: '闀垮害',
align: 'center',
@@ -471,26 +471,26 @@
sorter: true,
dataIndex: 'maxWeight'
},
- {
- title: '鐖跺鍣ㄥ悕绉�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'parentContainerName'
- },
+ // {
+ // title: '鐖跺鍣ㄥ悕绉�',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'parentContainerName'
+ // },
// {
// title: '鐖跺鍣↖d',
// align: 'center',
--
Gitblit v1.9.3