登录显示 提交填选限制 信息变更提前 length报错 准入自动填写

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

@@ -328,6 +328,37 @@ func (this *AnnualAuditController) GetSupplier() {
 	this.Data["json"] = &model
 	this.ServeJSON()
 }
+// @Title 获取公司信息（信息变更专用）
+// @Description 根据创建用户Id和增项类别号获取公司信息
+// @Success 200 {object}
+// @router /getsupplierforchange [get]
+func (this *AnnualAuditController) GetSupplierForChange() {
+	SuppTypeCode := this.GetString("SuppTypeCode")
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	where := "1=1 "
+	if SuppTypeCode != "" {
+		where = " WHERE b.Id is NOT NULL AND a.SupplierTypeCode = '" + SuppTypeCode + "' and (a.InFlag='1' or a.InFlag='2' or a.Status='6' or a.Status='7')"
+	}else {
+		where = " WHERE b.Id is NOT NULL AND (a.InFlag='1' or a.InFlag='2' or a.Status='6' or a.Status='7')"
+	}
+	var registerUser register.OilCorporateInfo
+	sql := " UserName='" + this.User.Username + "'"
+	svc.GetEntity(&registerUser,sql)
+	//企业用户必须加创建人条件
+	if this.User.IsCompanyUser == 1 {
+		where = where + " and (b.CreateUserId = '" + this.User.Id + "' or b.CommercialNo='"+registerUser.CommercialNo+"')"
+		//if this.User.IsCompanyUser == 1 {
+		//	where = where + " and b.CreateUserId = '" + this.User.Id + "'"
+	}
+
+	sqlStr := "SELECT b.Id AS SupplierId, a.Id AS SupplierCertId, b.SupplierName AS SupplierName FROM OilSupplierCert a LEFT JOIN OilSupplier b ON a.SupplierId = b.Id "
+	sqlStr = sqlStr + where
+
+	model, _ := svc.DBE.QueryString(sqlStr)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
 
 // @Title 添加
 // @Description 直接新增年审

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

@@ -1946,12 +1946,15 @@ func (this *OilSupplierController) GetFirAuditerByDept() {
 	where := "AuditStepCode='" + auditstepcode + "'"
 	svc.GetEntity(&setting, where)
 
+	svcdepartment := organize.GetOrganizeService(utils.DBE)
+	alldep := svcdepartment.GetAllChildById(Id)
+
 	ids := svc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
 	tempstr := strings.Join(ids, ",")
 	userIds := strings.Replace(tempstr, "uid_", "", -1)
 	userIds = strings.Trim(userIds, ",")
 	if userIds != "" {
-		where := "Id in (" + userIds + ")" + "and UnitId=" + Id
+		where := "Id in (" + userIds + ")" + "and (UnitId=" + Id + " or Departmentid in (" + alldep +")) "
 		svc.GetEntities(&userlist, where)
 	}
 

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

@@ -540,6 +540,10 @@ func (this *OilSupplierCertController) UpdateStorage() {
 			"ModifiedBy",
 		}
 		err = svc.UpdateEntityBytbl(OilSupplierCertName, id, &model, cols)
+		var model2 suppliercertsub.OilSupplierCertSub
+		model2.CertSubStatus = "1"
+		whereid := " SupplierCertId = "+id
+		svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model2, []string{"CertSubStatus"},whereid)
 	}
 
 	if err == nil {

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

@@ -5,6 +5,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierpausereason"
+	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/business2/parameter"
 	"encoding/json"
 
@@ -381,6 +382,11 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 			datamain.IsDelete = 0
 			datamain.CreateBy = this.User.Realname
 			datamain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			unitsvc := organize.GetOrganizeService(utils.DBE)
+			unitid := unitsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
+			if unitid == "100000095" {
+				datamain.CertSubStatus = "1"
+			}
 			svc.InsertEntityBytbl(OilSupplierCertSubName, &datamain)
 
 			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
@@ -490,6 +496,11 @@ func (this *OilSupplierCertSubController) AddTechBus() {
 			datamain.IsDelete = 0
 			datamain.CreateBy = this.User.Realname
 			datamain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			unitsvc := organize.GetOrganizeService(utils.DBE)
+			unitid := unitsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
+			if unitid == "100000095" {
+				datamain.CertSubStatus = "1"
+			}
 			svc.InsertEntityBytbl(OilSupplierCertSubName, &datamain)
 
 			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -283,7 +283,7 @@ func (this *OilCorporateInfoController) AddEntity() {
 	}
 	err = session.Commit()
 	if err == nil {
-		errinfo.Message = "注册成功！"
+		errinfo.Message = "注册成功！已提交审核！"
 		errinfo.Code = 0
 		errinfo.Item = model.Id
 		this.Data["json"] = &errinfo

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -198,7 +198,7 @@
           SupplierCertId: '',
           SupplierTypeCode: '',
           SubClassId: '',
-          CertSubStatus: '1',
+          CertSubStatus: '-1',
           Code: '',
           Name: '',
           Remark: '',

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditor.vue

@@ -171,7 +171,9 @@
         }
       },
       toggleSelection () {
+        if(this.selectedOptions){
         this.$emit('close', this.selectedOptions.Id, this.selectedOptions.Realname)
+        }
       },
       hideChooseAuditer () {
         this.$emit('hideChooseAuditer')

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseorg.vue

@@ -157,7 +157,9 @@
         }
       },
       toggleSelection(val) {
+        if(this.selectedOptions){
         this.$emit('close', this.selectedOptions.id)
+        }
       },
     }
   }

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -1030,6 +1030,10 @@ export default {
     InStyleChange (val) {
       if (val === '2') {
         this.formData.MgrUnit = '中油集团公司'
+        this.formData.Grade = '1'
+      }else{
+        this.formData.Grade = ''
+        this.formData.MgrUnit = ''
       }
     },
     currentSel (event) {

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist.vue

@@ -401,7 +401,7 @@ export default {
         SupplierCertId: parseInt(this.SupplierCertId),
         SupplierTypeCode: '01',
         Type: '1',
-        CertSubStatus: '1',
+        CertSubStatus: '-1',
         Remark: this.Remark1,
         CheckList: this.sectionCert
       }
@@ -441,7 +441,7 @@ export default {
         SupplierCertId: parseInt(_this.SupplierCertId),
         SupplierTypeCode: '01',
         Type: '1',
-        CertSubStatus: '1',
+        CertSubStatus: '-1',
         Remark: _this.Remark
       }
       if (_this.checkList.length > 0) {

src/dashoo.cn/frontend_web/src/components/oilsupplier/techlist.vue

@@ -201,7 +201,7 @@
           SupplierCertId: parseInt(_this.SupplierCertId),
           SupplierTypeCode: '03',
           Type: '1',
-          CertSubStatus: '1',
+          CertSubStatus: '-1',
           Remark: _this.Remark
         }
         if (_this.checkList.length > 0) {

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -478,9 +478,19 @@ export default class Login extends Vue {
         }
       } catch (e) {
         if (e.response.status === 777) {
-          this.$message.warning('您无权限登录本系统')
+          this.$message({
+          showClose: true,
+          message: '您无权限登录本系统',
+          type: 'warning',
+          duration: 5000
+        })
         } else {
-          this.$message.warning('账号或密码错误')
+          this.$message({
+          showClose: true,
+          message: '账号或密码错误',
+          type: 'warning',
+          duration: 5000
+        })
         }
         this.identifyCode = ''
         this.makeCode(this.identifyCodes, 4)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -837,7 +837,7 @@
           Step: 0,
           HseTraining: '0',
           AuditIndex: 0,
-          PACNumber: ""
+          PACNumber: ''
         },
         chooseAuditorVisible: false,
         fushenauditer: '', //复审人员

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/index.vue

@@ -331,7 +331,7 @@
       this.getSupplierList()
     },
     methods: {
-      initDatas() {
+        initDatas() {
         //分页及列表条件
         let params = {
           _currentPage: this.currentPage,
@@ -364,7 +364,7 @@
         let params = {
           SuppTypeCode: '',
         }
-        _this.$axios.get('/annualaudit/getsupplier', {
+        _this.$axios.get('/annualaudit/getsupplierforchange', {
             params
           })
           .then(res => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -1446,7 +1446,8 @@ export default {
       }
 
       /** 2019.05.16 - 16 准入申请中，若选择了“管理单位”，“中石油准入证编号”应自动改为必填项 */
-      if (this.formData.MgrUnit.length > 0 && this.formData.PACNumber.length <= 0) {
+      if(this.formData.MgrUnit != null){
+      if (this.formData.MgrUnit.length > 0 && !this.formData.PACNumber) {
         valid1 = false
         this.$message({
           type: 'warning',
@@ -1454,7 +1455,7 @@ export default {
         })
         return
       }
-
+      }
       if (valid1 && valid2) {
         if (!this.formData.SetupTime) {
           this.formData.SetupTime = null

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -407,7 +407,7 @@
         orgtreelist: [],
         secorgtreelist: [],
         inStyle: '',
-        auditerName: "",
+        auditerName: '',
         fushenauditer: '', //复审人员
         majorDept: [100000000, 100000128, 100000151],
         allorgunitOptions: [],
@@ -965,6 +965,20 @@
             }
           }
           if (this.formData.Status == '10') {
+            if (this.auditerName === '') {
+              this.$message({
+                type: 'warning',
+                message: '请选择初审人！'
+              })
+              return
+            }
+            if (this.fushenauditer === '') {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
             if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
               if (this.userOptions == null || this.userOptions.length === 0) {
                 this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -424,7 +424,7 @@
         secorgtreelist: [],
         userOptions: [],
         auditer: "",
-        auditerName: "",
+        auditerName: '',
         fushenauditer: '', //复审人员
         majorDept: [100000000, 100000001,100000071],
         selectDept: 100000071,
@@ -986,6 +986,20 @@
             }
           }
           if (this.formData.Status == '10') {
+            if (this.auditerName === '') {
+              this.$message({
+                type: 'warning',
+                message: '请选择初审人！'
+              })
+              return
+            }
+            if (this.fushenauditer === '') {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
             if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
               if (this.userOptions == null || this.userOptions.length === 0) {
                 this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -405,7 +405,7 @@
         allorgunitOptions: [],
         selectDept: '',
         auditer: "",
-        auditerName: "",
+        auditerName: '',
         fushenauditer: '', //复审人员
         majorDept: [],
         auditform: {
@@ -963,6 +963,20 @@
             }
           }
           if (this.formData.Status == '10') {
+            if (this.auditerName === '') {
+              this.$message({
+                type: 'warning',
+                message: '请选择初审人！'
+              })
+              return
+            }
+            if (this.fushenauditer === '') {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
             if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
               if (this.userOptions == null || this.userOptions.length === 0) {
                 this.$message({

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -610,7 +610,9 @@
                   if (response.data.code === 0) {
                     _this.$message({
                       type: 'success',
-                      message: response.data.message
+                      message: response.data.message,
+                      showClose: true,
+                      duration: 8000
                     });
                     _this.$router.push('/login') //跳转到登录页
                   } else {