删除了装置区域管理和单位用户管理的导入按钮

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceContractor.java

@@ -42,11 +42,16 @@ public class TInvoiceContractor extends BaseEntity
     @Excel(name = "登录账户")
     private String username;
 
+    @TableField(exist = false)
+    @Excel(name = "登录密码")
+    private String password;
+
     /** 状态 0 ：正常 ；-1：删除 */
     private Long delFlag;
 
     /** 创建人 */
     @Excel(name = "创建人")
+    private String createrName;
     private String createrCode;
 
     /** 创建时间 */
@@ -55,24 +60,29 @@ public class TInvoiceContractor extends BaseEntity
     private Date createdate;
 
     /** 修改人 */
-    @Excel(name = "修改人")
+//    @Excel(name = "修改人")
     private Long updaterCode;
 
     /** 修改时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
     /** 部门编号 */
-    @Excel(name = "部门编号")
+    //@Excel(name = "部门编号")
     private Long deptId;
 
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
-    @TableField(exist = false)
-    private String password;
+    public String getCreaterName() {
+        return createrName;
+    }
+
+    public void setCreaterName(String createrName) {
+        this.createrName = createrName;
+    }
 
     public void setId(Long id)
     {

master/src/main/resources/mybatis/invoice/TInvoiceContractorMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
         <result property="deptName" column="dept_name" />
+        <result property="createrName" column="creater_name" />
     </resultMap>
 
     <sql id="selectTInvoiceContractorVo">
@@ -27,8 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTInvoiceContractorList" parameterType="TInvoiceContractor" resultMap="TInvoiceContractorResult">
-        select d.id, d.contractor_name, d.contact, d.phonenumber, d.address, d.username, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,u.password from t_invoice_contractor d
-        left join sys_user u on d.username=u.user_name and u.del_flag=0
+        select d.id, d.contractor_name, d.contact, d.phonenumber, d.address, d.username, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,u.password,su.nick_name creater_name from t_invoice_contractor d
+        left join sys_user u on d.username=u.user_name
+        left join sys_user su on su.user_id=to_number(d.creater_code) and u.del_flag=0
         <where>
             <if test="contractorName != null  and contractorName != ''"> and contractor_name like concat(concat('%', #{contractorName}), '%')</if>
             <if test="contact != null  and contact != ''"> and contact = #{contact}</if>

ui/src/views/invoice/contractor/index.vue

@@ -85,16 +85,16 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['invoice:contractor:edit']"
-        >导入
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="info"-->
+<!--          icon="el-icon-upload2"-->
+<!--          size="mini"-->
+<!--          @click="handleImport"-->
+<!--          v-hasPermi="['invoice:contractor:edit']"-->
+<!--        >导入-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/invoice/device/index.vue

@@ -64,15 +64,6 @@
           v-hasPermi="['invoice:device:remove']"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['invoice:device:edit']"
-            >导入</el-button>
-        </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/invoice/unit/index.vue

@@ -58,16 +58,6 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['invoice:unit:edit']"
-        >导入
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"