前后:获取注册信息要加审核通过的;includes改造

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

@@ -1166,7 +1166,7 @@ func (this *SelectController) GetAllBusinesList() {
 		nssvc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 		if this.User.IsCompanyUser == 1 {
 			var registerUser register.OilCorporateInfo
-			sql := " UserName='" + this.User.Username + "'"
+			sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 			nssvc.GetEntity(&registerUser, sql)
 			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
 		}
@@ -1202,7 +1202,7 @@ func (this *SelectController) GetAllBusinesList() {
 		bgsvc := infochange.GetInfoChangeService(utils.DBE)
 		if this.User.IsCompanyUser == 1 {
 			var registerUser register.OilCorporateInfo
-			sql := " UserName='" + this.User.Username + "'"
+			sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 			bgsvc.GetEntity(&registerUser, sql)
 			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
 		}
@@ -1255,7 +1255,7 @@ func (this *SelectController) FileList() {
 	var registerUser register.OilCorporateInfo
 	var company supplier.OilSupplier
 
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 	svc.GetEntity(&registerUser, sql)
 	sql1 := " CreateUserId = '" + this.User.Id + "' or CommercialNo='" + registerUser.CommercialNo + "'"
 	svc.GetEntity(&company, sql1)
@@ -1406,7 +1406,7 @@ func (this *SelectController) GetBusinessLicenseById() {
 		var registerUser register.OilCorporateInfo
 		var company supplier.OilSupplier
 
-		sql := " UserName='" + this.User.Username + "'"
+		sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 		svc.GetEntity(&registerUser, sql)
 		sql1 := " CreateUserId = '" + this.User.Id + "' or CommercialNo='" + registerUser.CommercialNo + "'"
 		svc.GetEntity(&company, sql1)

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

@@ -516,7 +516,7 @@ func (this *OilSupplierController) GetJoinCertEntityList() {
 	}*/
 	svc := supplier.GetOilSupplierService(utils.DBE)
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
@@ -1561,7 +1561,7 @@ func (this *OilSupplierController) AddEntity() {
 	json.Unmarshal(jsonBlob, &modelCertVM)
 	serviceCert := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 	serviceCert.GetEntity(&registerUser, sql)
 	canApply := serviceCert.IsCanApplyByExtOrganizeUser(modelCertVM.SupplierTypeCode, registerUser.CommercialNo, this.User.Id, this.User.IsCompanyUser)
 	var errinfo ErrorDataInfo
@@ -2043,7 +2043,7 @@ func (this *OilSupplierController) IsCanApply() {
 
 	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 	svc.GetEntity(&registerUser, sql)
 
 	canApply := svc.IsCanApplyByExtOrganizeUser(Type, registerUser.CommercialNo, this.User.Id, this.User.IsCompanyUser)

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

@@ -115,7 +115,7 @@ func (this *OilSupplierCertAppendController) GetList() {
 	}
 	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
@@ -170,7 +170,7 @@ func (this *OilSupplierCertAppendController) GetSupplier() {
 		where = " WHERE b.Id is NOT NULL AND a.InFlag='1'"
 	}
 	var registerUser register.OilCorporateInfo
-	sql := " UserName='" + this.User.Username + "'"
+	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11"
 	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -1556,7 +1556,7 @@
             })
             return
           }
-          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+          if (this.inStyle !== '2' && this.inStyle !== '4' && this.inStyle !== '6') {
             if (this.userOptions == null || this.userOptions.length === 0) {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -1479,7 +1479,7 @@
             })
             return
           }
-          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+          if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
             if (this.userOptions == null || this.userOptions.length === 0) {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -1463,16 +1463,8 @@
               })
               return
             }
-            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
-              if (this.selectDept === 0 || this.selectDept == '') {
-                this.$message({
-                  type: 'warning',
-                  message: '请选择专业处室！'
-                })
-                return
-              }
-            }
-            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+            // if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+            if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
               if (this.userOptions == null || this.userOptions.length === 0) {
                 this.$message({
                   type: 'warning',

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

@@ -1387,7 +1387,7 @@
             })
             return
           }
-          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+          if (this.inStyle !== '2' && this.inStyle !== '4' && this.inStyle !== '6') {
             if (this.userOptions == null || this.userOptions.length === 0) {
               this.$message({
                 type: 'warning',

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

@@ -1126,7 +1126,7 @@
             })
             return
           }
-          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+          if (this.inStyle !== '2' && this.inStyle !== '4' && this.inStyle !== '6') {
             if (this.userOptions == null || this.userOptions.length === 0) {
               this.$message({
                 type: 'warning',

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

@@ -1084,7 +1084,7 @@
             })
             return
           }
-          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+          if (this.inStyle !== '2' && this.inStyle !== '4' && this.inStyle !== '6') {
             if (this.userOptions == null || this.userOptions.length === 0) {
               this.$message({
                 type: 'warning',