2
3
Quellcode durchsuchen

注册界面修改

ljm vor 6 Jahren
Ursprung
Commit
532bbf7f54

+ 9 - 31
src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -1,11 +1,12 @@
 package register
 
 import (
-	"dashoo.cn/business2/parameter"
 	"encoding/json"
 	"strconv"
 	"time"
 
+	"dashoo.cn/business2/parameter"
+
 	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
@@ -112,7 +113,6 @@ func (this *OilCorporateInfoController) AddEntity() {
 	json.Unmarshal(jsonBlob, &model)
 
 	model.CreateOn = time.Now()
-	//	model.CheckUserId = 284
 
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	_, err2 := svc.InsertEntityBytbl("OilCorporateInfo", &model)
@@ -176,14 +176,14 @@ func (this *OilCorporateInfoController) AddUser() {
 	userentity.Username = model.UserName
 	userentity.Realname = model.UserRealName
 	userentity.Telephone = model.UserTelephone
-	userentity.Roleid,_ =  strconv.Atoi(roleid)//企业用户
-	userentity.Companyid = "0"
+	userentity.Roleid, _ = strconv.Atoi(roleid) //企业用户
+	//	userentity.Companyid = "0"
 	userentity.IsCompanyUser = 1
-	userentity.Departmentid = "100000171"
-	userentity.Departmentname = "供方企业"
+	//	userentity.Departmentid = "100000171"
+	//	userentity.Departmentname = "供方企业"
 	userentity.Createon = time.Now()
 	//	userentity.CreateBy = this.User.Realname
-	userentity.Createuserid = 284
+	//	userentity.Createuserid = 284
 
 	//处理密码
 	pwd, key, errrk := utils.TripleDesEncrypt(model.UserPass)
@@ -214,11 +214,11 @@ func (this *OilCorporateInfoController) AddUser() {
 		model.CreateBy = userentity.Realname
 		model.CreateUserId = userentity.Id
 		svcRegister := register.GetOilCorporateInfoService(utils.DBE)
-		//删除
+		//删除原有数据(由于采用 svcRegister.UpdateEntityById() 一直报错,所以采用先删除再添加的方式达到更新数据的目的!)
 		where := " Id = " + strconv.Itoa(model.Id)
 		err2 := svcRegister.DeleteEntityBytbl("OilCorporateInfo", where)
 		if err2 == nil {
-			//插入数据
+			//插入更新数据
 			_, err3 := svcRegister.InsertEntityBytbl("OilCorporateInfo", &model)
 			if err3 == nil {
 				errinfo.Message = "审核通过!"
@@ -238,28 +238,6 @@ func (this *OilCorporateInfoController) AddUser() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
-
-		//		var model2 register.UpdateOilCorporateInfo
-		//		model2.UserId = userentity.Id
-		//		model2.CheckStatus = 1 //通过审核
-		//		model2.CreateBy = userentity.Realname
-		//		model2.CreateUserId = userentity.Id
-		//		svcRegister := register.GetOilCorporateInfoService(utils.DBE)
-		//		Id := strconv.Itoa(model.Id)
-		//		var cols []string = []string{"UserId", "CheckStatus", "CreateBy", "CreateUserId"}
-		//		err2 := svcRegister.UpdateEntityBytbl("OilCorporateInfo", Id, &model2, cols)
-		//		if err2 == nil {
-		//			errinfo.Message = "审核通过!"
-		//			errinfo.Code = 0
-		//			errinfo.Item = model.Id
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		} else {
-		//			errinfo.Message = "操作失败!"
-		//			errinfo.Code = -1
-		//			this.Data["json"] = &errinfo
-		//			this.ServeJSON()
-		//		}
 	} else {
 		errinfo.Message = "操作失败!"
 		errinfo.Code = -1

+ 0 - 7
src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditor2.vue

@@ -88,10 +88,6 @@
           })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
-
-            console.log("**res.data.items**",res.data.items)
-            console.log("**_this.orgtreelist**",_this.orgtreelist)
-
             _this.handleNodeClick(_this.orgtreelist[0].children[0])
           })
           .catch(err => {
@@ -106,9 +102,6 @@
         }
         supapi.getAuditerByDeptAndNoLogin(params, this.$axios).then(res => {
           this.userOptions = res.data.item
-
-          console.log("**this.userOptions**",this.userOptions)
-
           if (res.data.item != null && res.data.item.length > 0) {
             this.AuditorForm.UserId = res.data.item[0].id
           }