若干页面基础数据下拉匹配

Signed-off-by: TanYibin <5491541@qq.com>

若干页面基础数据下拉匹配
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 10a82eaa
Showing 8 changed files with 163 additions and 21 deletions
ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
ant-design-vue-jeecg/src/views/system/config/modules/ContainerForm.vue
ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
ant-design-vue-jeecg/src/views/system/config/modules/ZoneForm.vue
ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/containerType/entity/ContainerType.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/entity/Zone.java
@@ -82,6 +82,18 @@
         class="j-table-force-nowrap"
         @change="handleTableChange"
       >
+        <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color=blue>
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
+
+        <span slot="locationTypes" slot-scope="locationTypes" >
+          <a-tag v-for="locationType in locationTypes" :key="locationType" color=pink>
+            {{ solutionLocationType(locationType) }}
+          </a-tag>
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -130,6 +142,7 @@ import &#39;@/assets/less/TableExpand.less&#39;
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import ContainerTypeModal from './modules/ContainerTypeModal'
+import {getCompanyList, getLocationTypeList } from '@/api/api'
  
 export default {
   name: 'ContainerTypeList',
@@ -139,6 +152,8 @@ export default {
   },
   data() {
     return {
+      companyList: [],
+      locationTypeList: [],
       description: '容器类型管理页面',
       // 表头
       columns: [
@@ -163,14 +178,18 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '货主编码',
+          title: '货主',
           align: 'center',
-          dataIndex: 'companyCode'
+          dataIndex: 'companyCode',
+          key: 'companyCode',
+          scopedSlots: {customRender: 'companyCode'}
         },
         {
           title: '绑定的库位类型',
           align: 'center',
-          dataIndex: 'locationType'
+          dataIndex: 'locationTypes',
+          key: 'locationTypes',
+          scopedSlots: {customRender: 'locationTypes'}
         },
         {
           title: '长',
@@ -239,6 +258,7 @@ export default {
   },
   created() {
     this.getSuperFieldList()
+    this.loadFrom()
   },
   computed: {
     importExcelUrl: function() {
@@ -247,6 +267,38 @@ export default {
   },
   methods: {
     initDictConfig() {},
+    loadFrom() {
+      getCompanyList().then((res) => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      });
+      getLocationTypeList().then(res => {
+        if (res.success) {
+          this.locationTypeList = res.result
+        }
+      });
+    },
+    solutionCompany(value) {
+      var actions = []
+      Object.keys(this.companyList).some((key) => {
+        if (this.companyList[key].code == ('' + value)) {
+          actions.push(this.companyList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionLocationType(value) {
+      var actions = []
+      Object.keys(this.locationTypeList).some(key => {
+        if (this.locationTypeList[key].code == '' + value) {
+          actions.push(this.locationTypeList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
     getSuperFieldList() {
       let fieldList = []
       fieldList.push({ type: 'string', value: 'code', text: '编码', dictCode: '' })
@@ -82,8 +82,8 @@
         class="j-table-force-nowrap"
         @change="handleTableChange"
       >
-        <span slot="locationTypeCode" slot-scope="locationTypeCode">
-          <a-tag :key="locationTypeCode" color="pink">
+        <span slot="locationTypeCodes" slot-scope="locationTypeCodes" >
+          <a-tag v-for="locationTypeCode in locationTypeCodes" :key="locationTypeCode" color=pink>
             {{ solutionLocationType(locationTypeCode) }}
           </a-tag>
         </span>
@@ -173,7 +173,9 @@ export default {
         {
           title: '包含库位类型',
           align: 'center',
-          dataIndex: 'locationTypeCode'
+          dataIndex: 'locationTypeCodes',
+          key: 'locationTypeCodes',
+          scopedSlots: {customRender: 'locationTypeCodes'}
         },
         {
           title: '创建人',
@@ -254,7 +256,7 @@ export default {
         }
       })
       return actions.join('')
-    }
+    },
   }
 }
 </script>
@@ -9,11 +9,9 @@
                 show-search
                 placeholder="请选择容器类型"
                 option-filter-prop="children"
-                
                 v-model="model.containerTypeCode">
-                <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">{{
-                    item.name
-                  }}
+                <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -14,13 +14,25 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="货主编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
-              <a-input v-model="model.companyCode" placeholder="请输入货主编码"></a-input>
+            <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
+              <a-select
+                show-search
+                placeholder="请选择货主编码"
+                option-filter-prop="children"
+                v-model="model.companyCode">
+                <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="绑定的库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationType">
-              <a-input v-model="model.locationType" placeholder="请输入绑定的库位类型"></a-input>
+              <j-multi-select-tag
+                v-model="model.locationType"
+                :options="locationTypeOptions"
+                placeholder="请选择库位类型">
+              </j-multi-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -58,6 +70,8 @@
  
 import {httpAction, getAction} from '@/api/manage'
 import {validateDuplicateValue} from '@/utils/util'
+import {getCompanyList, getLocationTypeList} from '@/api/api'
+import {disabledAuthFilter} from "@/utils/authFilter"
  
 export default {
   name: 'ContainerTypeForm',
@@ -73,6 +87,8 @@ export default {
   data() {
     return {
       model: {},
+      companyList: [],
+      locationTypeOptions: [],
       labelCol: {
         xs: {span: 24},
         sm: {span: 5},
@@ -107,9 +123,28 @@ export default {
   },
   created() {
     //备份model原始值
+    this.loadFrom();
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
   },
   methods: {
+    loadFrom() {
+      getCompanyList().then((res) => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      });
+      getLocationTypeList().then((res) => {
+        if (res.success) {
+          this.locationTypeOptions = res.result.map((item, index, arr) => {
+            return {label: item.name, value: item.code}
+          })
+        }
+      });
+    },
+    // 禁用异步获取API数据
+    isDisabledAuth(code) {
+      return disabledAuthFilter(code);
+    },
     add() {
       this.edit(this.modelDefault);
     },
@@ -15,7 +15,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="包含库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationTypeCode">
-              <a-input v-model="model.locationTypeCode" placeholder="请输入库位类型编码"></a-input>
+              <a-input v-model="model.locationTypeCode" placeholder="请输入包含库位类型编码，用英文逗号分割"></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -100,12 +100,12 @@ export default {
       let multi_depart = loginResult.multi_depart
       //0:无部门 1:一个部门 2:多个部门
       if (multi_depart == 0) {
-        this.$notification.warn({
-          message: '提示',
-          description: `您尚未归属部门,请确认账号信息`,
-          duration: 3
-        });
-        this.isMultiDepart = false
+        // this.$notification.warn({
+        //   message: '提示',
+        //   description: `您尚未归属部门,请确认账号信息`,
+        //   duration: 3
+        // });
+        // this.isMultiDepart = false
       } else if (multi_depart == 2) {
         this.visible = true
         this.isMultiDepart = true
@@ -2,9 +2,12 @@ package org.jeecg.modules.wms.config.containerType.entity;
  
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -35,67 +38,94 @@ public class ContainerType implements Serializable {
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;
+
     /** 编码 */
     @Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
+
     /** 名称 */
     @Excel(name = "名称", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
+
     /** 仓库编码 */
     @Excel(name = "仓库编码", width = 15)
     @ApiModelProperty(value = "仓库编码")
     private String warehouseCode;
+
     /** 货主编码 */
     @Excel(name = "货主编码", width = 15)
     @ApiModelProperty(value = "货主编码")
     private String companyCode;
+
     /** 绑定的库位类型 */
     @Excel(name = "绑定的库位类型", width = 15)
     @ApiModelProperty(value = "绑定的库位类型")
     private String locationType;
+
+    public void setLocationType(String locationType) {
+        if (locationType != null) {
+            this.locationType = locationType;
+            this.locationTypes = Arrays.asList(locationType.split(","));
+        }
+    }
+
+    @TableField(exist = false)
+    private List<String> locationTypes;
+
     /** 长 */
     @Excel(name = "长", width = 15)
     @ApiModelProperty(value = "长")
     private Integer length;
+
     /** 宽 */
     @Excel(name = "宽", width = 15)
     @ApiModelProperty(value = "宽")
     private Integer width;
+
     /** 高 */
     @Excel(name = "高", width = 15)
     @ApiModelProperty(value = "高")
     private Integer height;
+
     /** 空容器重量 */
     @Excel(name = "空容器重量", width = 15)
     @ApiModelProperty(value = "空容器重量")
     private Integer emptyweight;
+
     /** 容器最大承重 */
     @Excel(name = "容器最大承重", width = 15)
     @ApiModelProperty(value = "容器最大承重")
     private Integer maxweight;
+
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
     private String userdef1;
+
     /** 备用字段2 */
     @Excel(name = "备用字段2", width = 15)
     @ApiModelProperty(value = "备用字段2")
     private String userdef2;
+
     /** 备用字段3 */
     @Excel(name = "备用字段3", width = 15)
     @ApiModelProperty(value = "备用字段3")
     private String userdef3;
+
     /** 创建人 */
     @ApiModelProperty(value = "创建人")
     private String createBy;
+
     /** 创建日期 */
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
+
     /** 更新人 */
     @ApiModelProperty(value = "更新人")
     private String updateBy;
+
     /** 更新日期 */
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
@@ -2,9 +2,12 @@ package org.jeecg.modules.wms.config.zone.entity;
  
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -35,46 +38,68 @@ public class Zone implements Serializable {
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;
+
     /** 编码 */
     @Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
+
     /** 名称 */
     @Excel(name = "名称", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
+
     /** 仓库编码 */
     @Excel(name = "仓库编码", width = 15)
     @ApiModelProperty(value = "仓库编码")
     private String warehouseCode;
+
     /** 货主编码 */
     @Excel(name = "货主编码", width = 15)
     @ApiModelProperty(value = "货主编码")
     private String companyCode;
+
     /** 库位类型 */
     @Excel(name = "库位类型", width = 15)
     @ApiModelProperty(value = "库位类型")
     private String locationTypeCode;
+
+    public void setLocationTypeCode(String locationTypeCode) {
+        if (locationTypeCode != null) {
+            this.locationTypeCode = locationTypeCode;
+            this.locationTypeCodes = Arrays.asList(locationTypeCode.split(","));
+        }
+    }
+
+    @TableField(exist = false)
+    private List<String> locationTypeCodes;
+
     /** 创建人 */
     @ApiModelProperty(value = "创建人")
     private String createBy;
+
     /** 创建日期 */
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
+
     /** 更新人 */
     @ApiModelProperty(value = "更新人")
     private String updateBy;
+
     /** 更新日期 */
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
+
     /** 自定义字段1 */
     @Excel(name = "自定义字段1", width = 15)
     @ApiModelProperty(value = "自定义字段1")
     private String userdef1;
+
     /** 自定义字段2 */
     @Excel(name = "自定义字段2", width = 15)
     @ApiModelProperty(value = "自定义字段2")
     private String userdef2;
+
     /** 自定义字段3 */
     @Excel(name = "自定义字段3", width = 15)
     @ApiModelProperty(value = "自定义字段3")