bug
liuying
2024-04-25 0a69f79af938212890472de705f95afe650814a3
bug
已修改3个文件
113 ■■■■ 文件已修改
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/index.vue 80 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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="请输入容器关系ID"
            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>
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="请输入容器关系ID"
            v-decorator="['packagingId', { rules: [{ required: true, message: '请输入容器关系ID!' }] }]" /> -->
          <a-select style="width: 100%" placeholder="请选择容器关系" v-decorator="['packagingId', { rules: [{ required: true, message: '请输入容器关系ID!' }] }]">
            <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>
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: '父容器Id',
                //     align: 'center',