前后:中石油准入证号;资质检查根据准入范围制造商非制造判断

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertService.go

@@ -195,7 +195,9 @@ func (s *OilSupplierCertService) IsSupplierCertCanSubmit(supplierId, supplierCer
 	mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
 
 	var ids suppliercertsub.Ids
-	certsubService.GetIds(supplierCertId, supplierTypeCode, &ids)
+	certsubService.GetIds(supplierCertId, supplierTypeCode, &ids, 1)
+	var ids1 suppliercertsub.Ids
+	certsubService.GetIds(supplierCertId, supplierTypeCode, &ids1, 2)
 
 	gradeTotal := certsubService.GetCountGrade(supplierCertId)
 	if supplierEntity.Grade == "2" && gradeTotal > 0 {
@@ -214,7 +216,13 @@ func (s *OilSupplierCertService) IsSupplierCertCanSubmit(supplierId, supplierCer
 			}
 		}
 		//需要的资质
-		needList = filesvc.GetGoodsNeedFileListNew(ids.Id, strconv.Itoa(IsManufacturer))
+		//needList = filesvc.GetGoodsNeedFileListNew(ids.Id, strconv.Itoa(IsManufacturer))
+		needList = filesvc.GetGoodsNeedFileListNew(ids.Id, "1")
+		var needList1 []supplierfile.FileList
+		needList1 = filesvc.GetGoodsNeedFileListNew(ids1.Id, "2")
+		for _, need := range needList1 {
+			needList = append(needList, need)
+		}
 	} else if supplierTypeCode == "02" {
 		needList = filesvc.GetBasicNeedFileListNew(ids.Id)
 	} else if supplierTypeCode == "03" {

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertsub/oilsuppliercertsubService.go

@@ -97,8 +97,14 @@ func (s *OilSupplierCertSubService) GetListByAppendId (appendId string, supplier
 	s.GetEntitysByWhere("OilSupplierCertSub", queryWhere, supplierCertSubs)
 }
 
-func (s *OilSupplierCertSubService) GetIds (certId string, typeCode string, entitiesPtr interface{}) {
+func (s *OilSupplierCertSubService) GetIds (certId string, typeCode string, entitiesPtr interface{}, isManufacturer int) {
 	sql := "SELECT GROUP_CONCAT(SubClassId) as Id FROM OilSupplierCertSub WHERE SupplierCertId = " + certId + " AND SupplierTypeCode = '" + typeCode + "'"
+	if isManufacturer == 1 {
+		// 0 和 1
+		sql += " and IsManufacturer != 2"
+	} else {
+		sql += " and IsManufacturer = 2"
+	}
 	s.DBE.SQL(sql).Get(entitiesPtr)
 }
 

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

@@ -2621,12 +2621,19 @@ func (this *OilSupplierController) CheckSupplierFile() {
 		mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
 
 		var ids suppliercertsub.Ids
-		certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids)
+		var ids1 suppliercertsub.Ids
+		certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 1)
+		certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids1, 2)
 		var needList []supplierfile.FileList
+		var needList1 []supplierfile.FileList
 
 		if cert.SupplierTypeCode == "01" {
 			//需要的资质
-			needList = filesvc.GetGoodsNeedFileListNew(ids.Id, strconv.Itoa(file.Type))
+			needList = filesvc.GetGoodsNeedFileListNew(ids.Id, "1")
+			needList1 = filesvc.GetGoodsNeedFileListNew(ids1.Id, "2")
+			for _, need := range needList1 {
+				needList = append(needList, need)
+			}
 			if file.Type == 1 { //制造商
 				var needFile supplierfile.FileList
 				// 质量管理体系认证证书
@@ -2725,12 +2732,20 @@ func (this *OilSupplierController) CheckSupplierFileNew(){
 
 	var ids suppliercertsub.Ids
 	certsubService := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
-	certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids)
+	certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 1)
+	var ids1 suppliercertsub.Ids
+	certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids1, 2)
 	var needList []supplierfile.FileList
+	var needList1 []supplierfile.FileList
 
 	if cert.SupplierTypeCode == "01" {
 		//需要的资质
-		needList = filesvc.GetGoodsNeedFileListNew(ids.Id, strconv.Itoa(file.Type))
+		//needList = filesvc.GetGoodsNeedFileListNew(ids.Id, strconv.Itoa(file.Type))
+		needList = filesvc.GetGoodsNeedFileListNew(ids.Id, "1")
+		needList1 = filesvc.GetGoodsNeedFileListNew(ids1.Id, "2")
+		for _, need := range needList1 {
+			needList = append(needList, need)
+		}
 		total := certsubService.GetCountIsManufacturer(strconv.Itoa(cert.Id))
 		if file.Type == 2 && total > 0 {
 			errinfo.Message = "非制造商准入范围不能为制造商,请手动修改！"

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

@@ -132,7 +132,7 @@
           <el-form-item label="中石油准入证编号">
             <el-input v-model="formData.PACNumber"
                       maxlength="255"
-                      :readonly="(this.formData.Status != '7'&&!appendStatus)&&this.formData.Grade==2"
+                      :readonly="(this.formData.Status != '7'&&!appendStatus)&&this.formData.Grade==2 && (this.formData.InStyle != '3' || this.formData.MgrUnit != '大庆油田有限责任公司')"
                       style="width: 100%">
             </el-input>
           </el-form-item>

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

@@ -103,7 +103,7 @@
                     <el-form-item label="准入方式">
                       <el-select ref="SpecType" v-model="InStyle" :disabled="true"
                                  placeholder="请选择" style="width: 100%">
-                        <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
+                        <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key"
                                    :value="item.Value">
                         </el-option>
                       </el-select>
@@ -2720,6 +2720,7 @@
           this.getCountryList(res.data.items['CountryList'])
           this.getCityList(res.data.items['GaodeMapChinaAreas'])
           this.InOptions = res.data.items['InOptions']
+          console.log(this.InOptions, 'this.InOptions')
           this.ManagementUnitOptions = res.data.items['ManagementUnit']
           this.orgunitChange(this.UnitOrg)
         }).catch(err => {
@@ -2918,6 +2919,13 @@
             this.saveLoading = false
             resolve(false)
           }
+          if (this.formData.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
+            this.$message({
+              type: 'warning',
+              message: '中石油准入证编号不能为空！'
+            })
+            return
+          }
           if (this.formData.InStyle === '3' && this.formData.MgrUnit === '大港油田分公司') {
             this.$message({
               type: 'warning',

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

@@ -1596,6 +1596,20 @@ export default {
         })
         return
       }
+      if (this.formData.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
+        this.$message({
+          type: 'warning',
+          message: '中石油准入证编号不能为空！'
+        })
+        return
+      }
+      if (this.formData.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
+        this.$message({
+          type: 'warning',
+          message: '中石油准入证编号不能为空！'
+        })
+        return
+      }
       if (this.formData.InStyle === '3' && this.formData.MgrUnit === '大港油田分公司') {
         this.$message({
           type: 'warning',