jiangbiao 3 лет назад
Родитель
Сommit
9c0198797c

+ 14 - 1
master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceDevice.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.invoice.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * 装置区域管理对象 t_invoice_device
  *
@@ -61,6 +63,17 @@ public class TInvoiceDevice extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    @TableField(exist = false)
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

+ 14 - 1
master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceUserUnit.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.invoice.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * 用户单位管理对象 t_invoice_user_unit
  *
@@ -57,6 +59,17 @@ public class TInvoiceUserUnit extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    @TableField(exist = false)
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

+ 3 - 0
ui/src/views/invoice/device/index.vue

@@ -144,6 +144,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="归属部门" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>

+ 3 - 0
ui/src/views/invoice/unit/index.vue

@@ -141,6 +141,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="归属部门" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>