Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

payne

2024-04-26 3946fe3c23ff022b7e1d27c2a29041496ef6d529

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue

@@ -114,7 +114,7 @@
                        <a-col :md="8" :sm="24">
                           <a-form-item label="所在库区">
                              <!-- <a-input v-model="queryParam.areaId" allow-clear placeholder="请输入所在库区" /> -->
                              <a-select v-model="queryParam.areaCode"  style="width: 100%" placeholder="请选择所在库区">
                              <a-select v-model="queryParam.areaId"  style="width: 100%" placeholder="请选择所在库区">
                                 <a-select-option  v-for="(item, index) in WmsAreaData" :key="index"
                                    :value="item.areaCode">{{ item.areaName
                                    }}</a-select-option>
@@ -469,6 +469,46 @@
               dataIndex: 'placeAlias'
            },
            {
               title: '所在库区',
               align: 'center',
               customHeaderCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               customCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               sorter: true,
               dataIndex: 'areaName'
            },
            {
               title: '库区编号',
               align: 'center',
               customHeaderCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               customCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               sorter: true,
               dataIndex: 'areaCode'
            },
            {
               title: '库位类型',
               align: 'center',
               customHeaderCell: () => {
@@ -735,26 +775,7 @@
               sorter: true,
               dataIndex: 'environment'
            },
            {
               title: '库区编号',
               align: 'center',
               customHeaderCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               customCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               sorter: true,
               dataIndex: 'areaCode'
            },
			
            // {
            //    title: '所在库区',
            //    align: 'center',
@@ -775,26 +796,7 @@
            //    sorter: true,
            //    dataIndex: 'areaId'
            // },
            {
               title: '库区名称',
               align: 'center',
               customHeaderCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               customCell: () => {
                  return {
                     style: {
                        'min-width': '120px'//最小列宽设置
                     }
                  }
               },
               sorter: true,
               dataIndex: 'areaName'
            },
				
            {
               title: '检验码',
               align: 'center',