前后:增项添加准入范围;size=mini

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitudeService.go

@@ -641,4 +641,10 @@ func (s *OilGoodsAptitudeService) GetEntityJoin(tableName string, tableName2 str
 	sql := "SELECT a.GoodsLevel, class.Id, class.Code, class.Name FROM " + tableName + " a LEFT JOIN " + tableName2 + " class ON a.ClassId = class.Id "
 	s.DBE.SQL(sql).Find(entityPtr)
 	return
+}
+
+func (s *OilGoodsAptitudeService) GetEntityJoin2(tableName string, tableName2 string,entityPtr interface{},where string) (has bool) {
+	sql := "SELECT a.GoodsLevel, class.Id, class.Code, class.Name FROM " + tableName + " a LEFT JOIN " + tableName2 + " class ON a.ClassId = class.Id where " + where
+	s.DBE.SQL(sql).Get(entityPtr)
+	return
 }

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitude"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
@@ -371,20 +372,24 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
 	svcSupplier.GetEntityById(datamain.SupplierId, &supplierModel)
 
+	var goods goodsaptitude.GoodsBusiness1
+	svcGoods := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+
 	for n := 0; n < len(dataother.CheckList); n++ {
+		svcGoods.GetEntityJoin2(OilGoodsAptitudeName, OilGoodsAptitudeClassName, &goods, "Code = '" + dataother.CheckList[n].Code + "'")
 		where_sub := "SupplierTypeCode = 01 and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
 		where_sub += " and SupplierCertId = '" + strconv.Itoa(dataother.SupplierCertId) + "'"
-		where_sub += " and SubClassId = '" + dataother.CheckList[n].Id + "'"
+		where_sub += " and SubClassId = '" + strconv.Itoa(goods.Id) + "'"
 		var model suppliercertsub.OilSupplierCertSub
 		svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
 		has := svc.GetEntityByWhere(OilSupplierCertSubName, where_sub, &model)
 
 		if !has {
 			// TODO: 不存在的准入范围直接就新增了，因为前台已经调用了checkLost检查过是否缺少资质，有时间可以在些方法补充验证
-			datamain.SubClassId, _ = utils.StrTo(dataother.CheckList[n].Id).Int()
+			datamain.SubClassId = goods.Id
 			datamain.Code = dataother.CheckList[n].Code
 			datamain.Name = dataother.CheckList[n].Name
-			datamain.GoodsLevel = dataother.CheckList[n].GoodsLevel
+			datamain.GoodsLevel = goods.GoodsLevel
 			datamain.CertSubStatus = "-1"
 			datamain.Remark = dataother.Remark
 			datamain.IsDelete = 0

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -479,70 +479,70 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数">
-                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同化用工数量">
-                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="大学及以上学历人员数量">
-                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术、管理人员数量">
-                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="高级及以上职称人员数量">
-                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="中级职称人员数量">
-                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格人员数量">
-                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格证书总数">
-                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="设计人员总数">
-                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术工人总数">
-                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -582,70 +582,70 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数" prop="WorkerTotal">
-                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同化用工数量">
-                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="大学及以上学历人员数量">
-                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术、管理人员数量" prop="TechnicalNum">
-                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="高级及以上职称人员数量">
-                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="中级职称人员数量">
-                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格人员数量">
-                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格证书总数">
-                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="设计人员总数">
-                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术工人总数" prop="SkillerTotal">
-                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -391,70 +391,70 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数">
-                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同化用工数量">
-                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="大学及以上学历人员数量">
-                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术、管理人员数量">
-                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="高级及以上职称人员数量">
-                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="中级职称人员数量">
-                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格人员数量">
-                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格证书总数">
-                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="设计人员总数">
-                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术工人总数">
-                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
+                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" size="mini" :min="0"
                       style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>