资产信息添加白名单

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -2,6 +2,10 @@ package com.ruoyi.asset.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +17,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author 原动力
  * @date 2023-05-15
  */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
 public class TbAssetInformation extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -153,8 +161,8 @@ public class TbAssetInformation extends BaseEntity
     private Long recordStatus;
 
     /** 预留字段a */
-    @Excel(name = "预留字段a")
-    private String reservedColumnA;
+    @Excel(name = "是否白名单")
+    private String isWhitelist;
 
     /** 预留字段b */
     @Excel(name = "预留字段b")
@@ -192,445 +200,5 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "预留字段j")
     private String reservedColumnJ;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCode(String code) 
-    {
-        this.code = code;
-    }
-
-    public String getCode() 
-    {
-        return code;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setNumber(String number) 
-    {
-        this.number = number;
-    }
-
-    public String getNumber() 
-    {
-        return number;
-    }
-    public void setImageUrl(String imageUrl) 
-    {
-        this.imageUrl = imageUrl;
-    }
-
-    public String getImageUrl() 
-    {
-        return imageUrl;
-    }
-    public void setCategoryNumber(String categoryNumber) 
-    {
-        this.categoryNumber = categoryNumber;
-    }
-
-    public String getCategoryNumber() 
-    {
-        return categoryNumber;
-    }
-    public void setSpecificationsModel(String specificationsModel) 
-    {
-        this.specificationsModel = specificationsModel;
-    }
-
-    public String getSpecificationsModel() 
-    {
-        return specificationsModel;
-    }
-    public void setAbcCategory(String abcCategory) 
-    {
-        this.abcCategory = abcCategory;
-    }
-
-    public String getAbcCategory() 
-    {
-        return abcCategory;
-    }
-    public void setManageStatus(Long manageStatus) 
-    {
-        this.manageStatus = manageStatus;
-    }
-
-    public Long getManageStatus() 
-    {
-        return manageStatus;
-    }
-    public void setUserDepartment(String userDepartment) 
-    {
-        this.userDepartment = userDepartment;
-    }
-
-    public String getUserDepartment() 
-    {
-        return userDepartment;
-    }
-    public void setDepartment(String department) 
-    {
-        this.department = department;
-    }
-
-    public String getDepartment() 
-    {
-        return department;
-    }
-    public void setResponsiblePerson(String responsiblePerson) 
-    {
-        this.responsiblePerson = responsiblePerson;
-    }
-
-    public String getResponsiblePerson() 
-    {
-        return responsiblePerson;
-    }
-    public void setLocationNumber(String locationNumber) 
-    {
-        this.locationNumber = locationNumber;
-    }
-
-    public String getLocationNumber() 
-    {
-        return locationNumber;
-    }
-    public void setProperty(String property) 
-    {
-        this.property = property;
-    }
-
-    public String getProperty() 
-    {
-        return property;
-    }
-    public void setPurchaseDate(Date purchaseDate) 
-    {
-        this.purchaseDate = purchaseDate;
-    }
-
-    public Date getPurchaseDate() 
-    {
-        return purchaseDate;
-    }
-    public void setCommissioningDate(Date commissioningDate) 
-    {
-        this.commissioningDate = commissioningDate;
-    }
-
-    public Date getCommissioningDate() 
-    {
-        return commissioningDate;
-    }
-    public void setOriginalValue(String originalValue) 
-    {
-        this.originalValue = originalValue;
-    }
-
-    public String getOriginalValue() 
-    {
-        return originalValue;
-    }
-    public void setDurableYears(Long durableYears) 
-    {
-        this.durableYears = durableYears;
-    }
-
-    public Long getDurableYears() 
-    {
-        return durableYears;
-    }
-    public void setNetValue(String netValue) 
-    {
-        this.netValue = netValue;
-    }
-
-    public String getNetValue() 
-    {
-        return netValue;
-    }
-    public void setResidualValue(String residualValue) 
-    {
-        this.residualValue = residualValue;
-    }
-
-    public String getResidualValue() 
-    {
-        return residualValue;
-    }
-    public void setAccumulatedDepreciation(String accumulatedDepreciation) 
-    {
-        this.accumulatedDepreciation = accumulatedDepreciation;
-    }
-
-    public String getAccumulatedDepreciation() 
-    {
-        return accumulatedDepreciation;
-    }
-    public void setLastDepreciationDate(Date lastDepreciationDate) 
-    {
-        this.lastDepreciationDate = lastDepreciationDate;
-    }
-
-    public Date getLastDepreciationDate() 
-    {
-        return lastDepreciationDate;
-    }
-    public void setDepreciationMethod(Long depreciationMethod) 
-    {
-        this.depreciationMethod = depreciationMethod;
-    }
-
-    public Long getDepreciationMethod() 
-    {
-        return depreciationMethod;
-    }
-    public void setContractNumber(String contractNumber) 
-    {
-        this.contractNumber = contractNumber;
-    }
-
-    public String getContractNumber() 
-    {
-        return contractNumber;
-    }
-    public void setFactoryNumber(String factoryNumber) 
-    {
-        this.factoryNumber = factoryNumber;
-    }
-
-    public String getFactoryNumber() 
-    {
-        return factoryNumber;
-    }
-    public void setManufacturer(String manufacturer) 
-    {
-        this.manufacturer = manufacturer;
-    }
-
-    public String getManufacturer() 
-    {
-        return manufacturer;
-    }
-    public void setSupplier(String supplier) 
-    {
-        this.supplier = supplier;
-    }
-
-    public String getSupplier() 
-    {
-        return supplier;
-    }
-    public void setPurpose(String purpose) 
-    {
-        this.purpose = purpose;
-    }
-
-    public String getPurpose() 
-    {
-        return purpose;
-    }
-    public void setMaintenanceDate(Date maintenanceDate) 
-    {
-        this.maintenanceDate = maintenanceDate;
-    }
-
-    public Date getMaintenanceDate() 
-    {
-        return maintenanceDate;
-    }
-    public void setMaintenanceTel(String maintenanceTel) 
-    {
-        this.maintenanceTel = maintenanceTel;
-    }
-
-    public String getMaintenanceTel() 
-    {
-        return maintenanceTel;
-    }
-    public void setMaintenanceUser(String maintenanceUser) 
-    {
-        this.maintenanceUser = maintenanceUser;
-    }
-
-    public String getMaintenanceUser() 
-    {
-        return maintenanceUser;
-    }
-    public void setCorporation(String corporation) 
-    {
-        this.corporation = corporation;
-    }
-
-    public String getCorporation() 
-    {
-        return corporation;
-    }
-    public void setRecordStatus(Long recordStatus) 
-    {
-        this.recordStatus = recordStatus;
-    }
-
-    public Long getRecordStatus() 
-    {
-        return recordStatus;
-    }
-    public void setReservedColumnA(String reservedColumnA) 
-    {
-        this.reservedColumnA = reservedColumnA;
-    }
-
-    public String getReservedColumnA() 
-    {
-        return reservedColumnA;
-    }
-    public void setReservedColumnB(String reservedColumnB) 
-    {
-        this.reservedColumnB = reservedColumnB;
-    }
-
-    public String getReservedColumnB() 
-    {
-        return reservedColumnB;
-    }
-    public void setReservedColumnC(String reservedColumnC) 
-    {
-        this.reservedColumnC = reservedColumnC;
-    }
-
-    public String getReservedColumnC() 
-    {
-        return reservedColumnC;
-    }
-    public void setReservedColumnD(String reservedColumnD) 
-    {
-        this.reservedColumnD = reservedColumnD;
-    }
-
-    public String getReservedColumnD() 
-    {
-        return reservedColumnD;
-    }
-    public void setReservedColumnE(String reservedColumnE) 
-    {
-        this.reservedColumnE = reservedColumnE;
-    }
-
-    public String getReservedColumnE() 
-    {
-        return reservedColumnE;
-    }
-    public void setReservedColumnF(String reservedColumnF) 
-    {
-        this.reservedColumnF = reservedColumnF;
-    }
-
-    public String getReservedColumnF() 
-    {
-        return reservedColumnF;
-    }
-    public void setReservedColumnG(String reservedColumnG) 
-    {
-        this.reservedColumnG = reservedColumnG;
-    }
-
-    public String getReservedColumnG() 
-    {
-        return reservedColumnG;
-    }
-    public void setReservedColumnH(String reservedColumnH) 
-    {
-        this.reservedColumnH = reservedColumnH;
-    }
-
-    public String getReservedColumnH() 
-    {
-        return reservedColumnH;
-    }
-    public void setReservedColumnI(String reservedColumnI) 
-    {
-        this.reservedColumnI = reservedColumnI;
-    }
-
-    public String getReservedColumnI() 
-    {
-        return reservedColumnI;
-    }
-    public void setReservedColumnJ(String reservedColumnJ) 
-    {
-        this.reservedColumnJ = reservedColumnJ;
-    }
-
-    public String getReservedColumnJ() 
-    {
-        return reservedColumnJ;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("code", getCode())
-            .append("name", getName())
-            .append("number", getNumber())
-            .append("imageUrl", getImageUrl())
-            .append("categoryNumber", getCategoryNumber())
-            .append("specificationsModel", getSpecificationsModel())
-            .append("abcCategory", getAbcCategory())
-            .append("manageStatus", getManageStatus())
-            .append("userDepartment", getUserDepartment())
-            .append("department", getDepartment())
-            .append("responsiblePerson", getResponsiblePerson())
-            .append("locationNumber", getLocationNumber())
-            .append("property", getProperty())
-            .append("purchaseDate", getPurchaseDate())
-            .append("commissioningDate", getCommissioningDate())
-            .append("originalValue", getOriginalValue())
-            .append("durableYears", getDurableYears())
-            .append("netValue", getNetValue())
-            .append("residualValue", getResidualValue())
-            .append("accumulatedDepreciation", getAccumulatedDepreciation())
-            .append("lastDepreciationDate", getLastDepreciationDate())
-            .append("depreciationMethod", getDepreciationMethod())
-            .append("contractNumber", getContractNumber())
-            .append("factoryNumber", getFactoryNumber())
-            .append("manufacturer", getManufacturer())
-            .append("supplier", getSupplier())
-            .append("purpose", getPurpose())
-            .append("maintenanceDate", getMaintenanceDate())
-            .append("maintenanceTel", getMaintenanceTel())
-            .append("maintenanceUser", getMaintenanceUser())
-            .append("corporation", getCorporation())
-            .append("recordStatus", getRecordStatus())
-            .append("remark", getRemark())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("reservedColumnA", getReservedColumnA())
-            .append("reservedColumnB", getReservedColumnB())
-            .append("reservedColumnC", getReservedColumnC())
-            .append("reservedColumnD", getReservedColumnD())
-            .append("reservedColumnE", getReservedColumnE())
-            .append("reservedColumnF", getReservedColumnF())
-            .append("reservedColumnG", getReservedColumnG())
-            .append("reservedColumnH", getReservedColumnH())
-            .append("reservedColumnI", getReservedColumnI())
-            .append("reservedColumnJ", getReservedColumnJ())
-            .toString();
-    }
+
 }

ruoyi-admin/src/main/resources/mapper/asset/TbAssetInformationMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="reservedColumnA"    column="reserved_column_a"    />
+        <result property="isWhitelist"    column="is_whitelist"    />
         <result property="reservedColumnB"    column="reserved_column_b"    />
         <result property="reservedColumnC"    column="reserved_column_c"    />
         <result property="reservedColumnD"    column="reserved_column_d"    />
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTbAssetInformationVo">
-        select id, code, name, number, image_url, category_number, specifications_model, abc_category, manage_status, user_department, department, responsible_person, location_number, property, purchase_date, commissioning_date, original_value, durable_years, net_value, residual_value, accumulated_depreciation, last_depreciation_date, depreciation_method, contract_number, factory_number, manufacturer, supplier, purpose, maintenance_date, maintenance_tel, maintenance_user, corporation, record_status, remark, create_by, create_time, update_by, update_time, reserved_column_a, reserved_column_b, reserved_column_c, reserved_column_d, reserved_column_e, reserved_column_f, reserved_column_g, reserved_column_h, reserved_column_i, reserved_column_j from tb_asset_information
+        select id, code, name, number, image_url, category_number, specifications_model, abc_category, manage_status, user_department, department, responsible_person, location_number, property, purchase_date, commissioning_date, original_value, durable_years, net_value, residual_value, accumulated_depreciation, last_depreciation_date, depreciation_method, contract_number, factory_number, manufacturer, supplier, purpose, maintenance_date, maintenance_tel, maintenance_user, corporation, record_status, remark, create_by, create_time, update_by, update_time, is_whitelist, reserved_column_b, reserved_column_c, reserved_column_d, reserved_column_e, reserved_column_f, reserved_column_g, reserved_column_h, reserved_column_i, reserved_column_j from tb_asset_information
     </sql>
 
     <select id="selectTbAssetInformationList" parameterType="TbAssetInformation" resultMap="TbAssetInformationResult">
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintenanceUser != null  and maintenanceUser != ''"> and maintenance_user = #{maintenanceUser}</if>
             <if test="corporation != null  and corporation != ''"> and corporation = #{corporation}</if>
             <if test="recordStatus != null "> and record_status = #{recordStatus}</if>
-            <if test="reservedColumnA != null  and reservedColumnA != ''"> and reserved_column_a = #{reservedColumnA}</if>
+            <if test="isWhitelist != null  and isWhitelist != ''"> and is_whitelist = #{isWhitelist}</if>
             <if test="reservedColumnB != null  and reservedColumnB != ''"> and reserved_column_b = #{reservedColumnB}</if>
             <if test="reservedColumnC != null  and reservedColumnC != ''"> and reserved_column_c = #{reservedColumnC}</if>
             <if test="reservedColumnD != null  and reservedColumnD != ''"> and reserved_column_d = #{reservedColumnD}</if>
@@ -152,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="reservedColumnA != null">reserved_column_a,</if>
+            <if test="isWhitelist != null">is_whitelist,</if>
             <if test="reservedColumnB != null">reserved_column_b,</if>
             <if test="reservedColumnC != null">reserved_column_c,</if>
             <if test="reservedColumnD != null">reserved_column_d,</if>
@@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="reservedColumnA != null">#{reservedColumnA},</if>
+            <if test="isWhitelist != null">#{isWhitelist},</if>
             <if test="reservedColumnB != null">#{reservedColumnB},</if>
             <if test="reservedColumnC != null">#{reservedColumnC},</if>
             <if test="reservedColumnD != null">#{reservedColumnD},</if>
@@ -254,7 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="reservedColumnA != null">reserved_column_a = #{reservedColumnA},</if>
+            <if test="isWhitelist != null">is_whitelist = #{isWhitelist},</if>
             <if test="reservedColumnB != null">reserved_column_b = #{reservedColumnB},</if>
             <if test="reservedColumnC != null">reserved_column_c = #{reservedColumnC},</if>
             <if test="reservedColumnD != null">reserved_column_d = #{reservedColumnD},</if>

ruoyi-ui/src/views/asset/information/index.vue

@@ -51,7 +51,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="使用部门" prop="userDepartment">
+      <!-- <el-form-item label="使用部门" prop="userDepartment">
         <el-input
           v-model="queryParams.userDepartment"
           placeholder="请输入使用部门"
@@ -66,7 +66,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="责任人" prop="responsiblePerson">
         <el-input
           v-model="queryParams.responsiblePerson"
@@ -221,14 +221,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="所属公司" prop="corporation">
+      <!-- <el-form-item label="所属公司" prop="corporation">
         <el-input
           v-model="queryParams.corporation"
           placeholder="请输入所属公司"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="记录状态" prop="recordStatus">
         <el-select v-model="queryParams.recordStatus" placeholder="请选择记录状态" clearable>
           <el-option
@@ -239,15 +239,17 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="预留字段a" prop="reservedColumnA">
-        <el-input
-          v-model="queryParams.reservedColumnA"
-          placeholder="请输入预留字段a"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="是否白名单" prop="isWhitelist">
+        <el-select v-model="queryParams.isWhitelist" placeholder="请选择是否白名单" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="预留字段b" prop="reservedColumnB">
+      <!--<el-form-item label="预留字段b" prop="reservedColumnB">
         <el-input
           v-model="queryParams.reservedColumnB"
           placeholder="请输入预留字段b"
@@ -451,8 +453,12 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="预留字段a" align="center" prop="reservedColumnA" />
-      <el-table-column label="预留字段b" align="center" prop="reservedColumnB" />
+      <el-table-column label="是否白名单" align="center" prop="isWhitelist" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isWhitelist"/>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="预留字段b" align="center" prop="reservedColumnB" />
       <el-table-column label="预留字段c" align="center" prop="reservedColumnC" />
       <el-table-column label="预留字段d" align="center" prop="reservedColumnD" />
       <el-table-column label="预留字段e" align="center" prop="reservedColumnE" />
@@ -460,7 +466,7 @@
       <el-table-column label="预留字段g" align="center" prop="reservedColumnG" />
       <el-table-column label="预留字段h" align="center" prop="reservedColumnH" />
       <el-table-column label="预留字段i" align="center" prop="reservedColumnI" />
-      <el-table-column label="预留字段j" align="center" prop="reservedColumnJ" />
+      <el-table-column label="预留字段j" align="center" prop="reservedColumnJ" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -644,10 +650,17 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="预留字段a" prop="reservedColumnA">
-          <el-input v-model="form.reservedColumnA" placeholder="请输入预留字段a" />
+        <el-form-item label="是否白名单" prop="isWhitelist">
+          <el-select v-model="form.isWhitelist" placeholder="请输入是否白名单">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="预留字段b" prop="reservedColumnB">
+        <!-- <el-form-item label="预留字段b" prop="reservedColumnB">
           <el-input v-model="form.reservedColumnB" placeholder="请输入预留字段b" />
         </el-form-item>
         <el-form-item label="预留字段c" prop="reservedColumnC">
@@ -673,7 +686,7 @@
         </el-form-item>
         <el-form-item label="预留字段j" prop="reservedColumnJ">
           <el-input v-model="form.reservedColumnJ" placeholder="请输入预留字段j" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -694,7 +707,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Information",
-  dicts: ['asset_record_status'],
+  dicts: ['asset_record_status', 'sys_yes_no'],
   components:{
     ImageUploadTemp,Treeselect
   },
@@ -761,7 +774,7 @@ export default {
         maintenanceUser: null,
         corporation: null,
         recordStatus: null,
-        reservedColumnA: null,
+        isWhitelist: null,
         reservedColumnB: null,
         reservedColumnC: null,
         reservedColumnD: null,
@@ -889,7 +902,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        reservedColumnA: null,
+        isWhitelist: null,
         reservedColumnB: null,
         reservedColumnC: null,
         reservedColumnD: null,

ruoyi-ui/src/views/change/allocation/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
-      <el-form-item label="调拨单号" prop="orderNumber">
+      <!-- <el-form-item label="调拨单号" prop="orderNumber">
         <el-input
           v-model="queryParams.orderNumber"
           placeholder="请输入调拨单号"
@@ -16,7 +16,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="调出经办人" prop="callOutBy">
         <el-input
           v-model="queryParams.callOutBy"
@@ -33,14 +33,14 @@
           placeholder="请选择调出日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="调入部门" prop="callInDepartment">
+      <!-- <el-form-item label="调入部门" prop="callInDepartment">
         <el-input
           v-model="queryParams.callInDepartment"
           placeholder="请输入调入部门"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="调入经办人" prop="callInBy">
         <el-input
           v-model="queryParams.callInBy"
@@ -65,7 +65,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="制单部门" prop="preparedDepartment">
+      <!-- <el-form-item label="制单部门" prop="preparedDepartment">
         <el-input
           v-model="queryParams.preparedDepartment"
           placeholder="请输入制单部门"
@@ -80,7 +80,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="记录状态" prop="recordStatus">
         <el-select v-model="queryParams.recordStatus" placeholder="请选择记录状态" clearable>
           <el-option
@@ -146,15 +146,23 @@
     <el-table v-loading="loading" :data="allocationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="调拨单号" align="center" prop="orderNumber" />
-      <el-table-column label="调出部门" align="center" prop="callOutDepartment" />
+      <!-- <el-table-column label="调拨单号" align="center" prop="orderNumber" /> -->
+      <el-table-column label="调出部门" align="center" prop="callOutDepartment" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.callOutDepartment != null ? companyName(scope.row.callOutDepartment) : ""}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="调出经办人" align="center" prop="callOutBy" />
       <el-table-column label="调出日期" align="center" prop="callOutDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.callOutDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调入部门" align="center" prop="callInDepartment" />
+      <el-table-column label="调入部门" align="center" prop="callInDepartment" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.callInDepartment != null ? companyName(scope.row.callInDepartment) : ""}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="调入经办人" align="center" prop="callInBy" />
       <el-table-column label="调入日期" align="center" prop="callInDate" width="180">
         <template slot-scope="scope">
@@ -165,8 +173,16 @@
       <el-table-column label="资产总净值" align="center" prop="assetTotalNetValue" />
       <el-table-column label="调拨说明" align="center" prop="reason" />
       <el-table-column label="制单人" align="center" prop="preparedBy" />
-      <el-table-column label="制单部门" align="center" prop="preparedDepartment" />
-      <el-table-column label="所属公司" align="center" prop="corporation" />
+      <el-table-column label="制单部门" align="center" prop="preparedDepartment" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.callInDepartment != null ? companyName(scope.row.callInDepartment) : ""}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属公司" align="center" prop="corporation" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.callInDepartment != null ? companyName(scope.row.callInDepartment) : ""}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="记录状态" align="center" prop="recordStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus"/>