用户添加二级单位

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	"dashoo.cn/backend/api/business/accountinfo"
 	"dashoo.cn/backend/api/business/company"
@@ -141,6 +142,7 @@ func (this *UserController) List() {
 	keyword := this.GetString("keyword")
 	username := this.GetString("username")
 	departmentname := this.GetString("departmentname")
+	unit := this.GetString("Unit")
 	IsCompanyUser := this.GetString("IsCompanyUser")
 	svc := permission.GetPermissionService(utils.DBE)
 	organsvc := organize.GetOrganizeService(utils.DBE)
@@ -170,6 +172,9 @@ func (this *UserController) List() {
 	if departmentname != "" {
 		where = where + " and DepartmentName like '%" + departmentname + "%'"
 	}
+	if unit != "" {
+		where = where + " and Unit like '%" + unit + "%'"
+	}
 	total := svc.GetPagingEntitiesWithOrder(page.CurrentPage, page.Size, "Id", false, &users, where)
 
 	var datainfo DataInfo
@@ -242,10 +247,17 @@ func (this *UserController) AddUser() {
 	//获取组织上级组织
 	//var orginizeentity organize.Base_Organize
 	//svcorg.GetEntityById(model.DepartmentId, &orginizeentity)
+	unitId := svcorg.GetMyUnitDepartmentId(model.DepartmentId)
+	var org organize.Base_Organize
+	svcorg.GetEntityById(unitId, &org)
+
+
 	var userentity userRole.Base_User
 	userentity.Companyid = "0"
 	userentity.Superior = model.Superior
 	userentity.Roleid, _ = utils.StrTo(model.Role).Int()
+	userentity.UnitId = org.Id
+	userentity.Unit = org.Fullname
 	if userentity.Roleid == 0 {
 		//userentity.Roleid = 10000123 //普通用户
 	}
@@ -571,3 +583,35 @@ func (this *UserController) Registerput() {
 	}
 
 }
+
+// @Title 跟新用户二级单位
+// @Description 跟新用户二级单位
+// @Success 200 {object} organize.Base_Organize
+// @router /updatauser2Org [get]
+func (this *UserController) UpdataUser2Org() {
+	t := time.Now()
+	var userlist []userRole.Base_User
+	var user1 userRole.Base_User
+	svc := userRole.GetUserService(utils.DBE)
+	svc.GetEntities(&userlist, "DepartmentId != ''")
+	unitIdcopy := ""
+	fullname := ""
+	unitsvc := organize.GetOrganizeService(utils.DBE)
+	for i,user := range userlist {
+		unitId := unitsvc.GetMyUnitDepartmentId(user.Departmentid)
+		var org organize.Base_Organize
+		if unitIdcopy != unitId {
+			unitsvc.GetEntityById(unitId, &org)
+			fullname = org.Fullname
+		}
+		user1.UnitId,_ = strconv.Atoi(unitId)
+		user1.Unit = fullname
+		cols := []string{"UnitId", "Unit"}
+		unitsvc.UpdateEntityByIdCols(user.Id, &user1, cols)
+		unitIdcopy = unitId
+		fmt.Println(i)
+	}
+
+	elapsed := time.Since(t)
+	fmt.Println(elapsed)
+}

src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -277,10 +277,10 @@ func (this *SelectController) GetProcessAuditList() {
 	supplierName := this.GetString("SupplierName")
 
 	if supplierTypeCode != "" {
-		where = where + " and SupplierTypeCode like '%" + supplierTypeCode + "%'"
+		where = where + " and b.SupplierTypeCode like '%" + supplierTypeCode + "%'"
 	}
 	if supplierName != "" {
-		where = where + " and SupplierName like '%" + supplierName + "%'"
+		where = where + " and a.SupplierName like '%" + supplierName + "%'"
 	}
 
 	var total int64 = 0

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/_opera/operation.vue

@@ -31,7 +31,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="缴费金额">
-              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="true" ></el-input>
+              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay != '1'" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -11,6 +11,7 @@
         </el-breadcrumb>
         <span style="float: right;">
           <el-button size="mini" type="primary" style="margin-left:10px; margin-top: -4px;" @click="opendatadialog(1,null,-1);resetForm('organizeform')">新增用户</el-button>
+          <!--<el-button size="mini" type="primary" style="margin-left:10px; margin-top: -4px;" @click="setorg2">添加二级单位</el-button>-->
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="账号">
@@ -22,6 +23,9 @@
           <el-form-item label="所属部门">
             <el-input size="mini" style="width: 165px;" v-model="searchForm.DepartmentName" placeholder="请输入账号"></el-input>
           </el-form-item>
+          <el-form-item label="单位">
+            <el-input size="mini" style="width: 165px;" v-model="searchForm.Unit" placeholder="请输入账号"></el-input>
+          </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="seachdata" @command="searchCommand">
               查询
@@ -50,7 +54,8 @@
           </el-table-column>
           <el-table-column prop="Username" align="center" label="账号" show-overflow-tooltip></el-table-column>
           <el-table-column prop="Realname" align="center" label="用户名"></el-table-column>
-          <el-table-column prop="Departmentname" align="center" label="所属组织"></el-table-column>
+          <el-table-column prop="Departmentname" align="center" label="部门"></el-table-column>
+          <el-table-column prop="Unit" align="center" label="单位"></el-table-column>
           <!-- <el-table-column prop="RealnameRole" align="center" label="角色"></el-table-column> -->
           <el-table-column prop="Telephone" align="center" label="手机" show-overflow-tooltip></el-table-column>
           <el-table-column label="座机" align="center" prop="Mobile" show-overflow-tooltip></el-table-column>
@@ -251,7 +256,8 @@
         searchForm: {
           keyword: '',
           UserName: '',
-          DepartmentName: ''
+          DepartmentName: '',
+          Unit: ''
         }
       }
     },
@@ -268,6 +274,11 @@
       this.selectedorg = [parseInt(this.authUser.Profile.DepartmentId)]
     },
     methods: {
+      setorg2 () {
+        this.$axios.get('users/updatauser2Org')
+          .then(res => {
+          })
+      },
       initData() {
         let _this = this
         // paginate
@@ -278,6 +289,7 @@
           username: this.searchForm.UserName,
           departmentname: this.searchForm.DepartmentName
         }
+        Object.assign(params, this.searchForm)
         // request
         this.$axios.get('users/list', {
             params