增项准入项

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierSession.go

@@ -164,6 +164,7 @@ func (s *OilSupplierSession) GetUpdateCols(oilSupplierCertTableName string, supp
 		"CredentialFlag",
 		"SupplierCertificate",
 		"PACNumber",
+		"BusinessScope",
 	}
 
 	if !canEdit {

src/dashoo.cn/backend/api/conf/app.conf

@@ -83,9 +83,9 @@ callbackHost=http://36dcae10.ngrok.io
 # AposeUrl=http://localhost:8080/acti-api/api/apose
 # BaseUrl=http://localhost:8080/acti-api/api/acti
 
-goodsModuleHost=http://weed1.labsop.cn:9390/5,2c059c70a088
-basisModuleHost=http://weed1.labsop.cn:9390/1,2bf8a91091f3
-techModuleHost=http://weed1.labsop.cn:9390/4,2c04a1b12531
+goodsModuleHost=http://weed1.labsop.cn:9390/1,2c23a61ef2ef
+basisModuleHost=http://weed1.labsop.cn:9390/2,2c25b72356e5
+techModuleHost=http://weed1.labsop.cn:9390/5,2c242309037d
 goodsPdfHost=http://weed1.labsop.cn:9390/4,272c38746f9a
 basisPdfHost=http://weed1.labsop.cn:9390/6,272dc8ca68d1
 techPdfHost=http://weed1.labsop.cn:9390/1,272e1bdabf62

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

@@ -7,6 +7,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/oilcostmanage"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/paymentinfo"
 	"dashoo.cn/backend/api/business/register"
@@ -851,12 +852,42 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 						msgService.HandleMsg(toMobile,msg,"4-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId))
 					}
 
+					//var model suppliercertsub.OilSupplierCertSub
+					//model.Type = "3"
+					//model.ModifiedOn = time.Now()
+					//model.ModifiedBy = this.User.Realname
+					//model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+					//colssup := []string{
+					//	"Type",
+					//	"ModifiedOn",
+					//	"ModifiedUserId",
+					//	"ModifiedBy",
+					//}
+   					//svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &model, colssup, wheresup)
 
 					//paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
 				} else {
 					status = suppliercert.ALL_PASE_STATUS
 				}
 			}
+			if status == suppliercert.ALL_PASE_STATUS {
+				appsvc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+				//更新准入项表
+				appendwhere := " SupplierId = " + utils.ToStr(supplierCertAppendEntity.SupplierId) + " and SupplierCertId = " + utils.ToStr(supplierCertAppendEntity.SupplierCertId) + " and Type = '2'"
+				var appendsubmodel suppliercertsub.OilSupplierCertSub
+				appendsubmodel.Type = "3"
+				appsvc.UpdateEntityBywheretbl(OilSupplierCertSubName, &appendsubmodel, []string{"Type"}, appendwhere)
+				//更新资质表
+				appendfilewhere := " SupplierId = " + utils.ToStr(supplierCertAppendEntity.SupplierId) + " and SupType = 2"
+				var appendsubfilemodel supplierfile.OilSupplierFile
+				appendsubfilemodel.SupType = 3
+				appsvc.UpdateEntityBywheretbl(OilSupplierCertSubName, &appendsubfilemodel, []string{"SupType"}, appendfilewhere)
+				//更新增项表
+				appdwhere := " SupplierId = " + utils.ToStr(supplierCertAppendEntity.SupplierId) + " and SupplierCertId = " + utils.ToStr(supplierCertAppendEntity.SupplierCertId) + " and Status = '6'"
+				var appendmodel suppliercertappend.OilSupplierCertAppend
+				appendmodel.Status = suppliercert.ALL_PASE_STATUS
+				appsvc.UpdateEntityBywheretbl(OilSupplierCertAppendName, &appendmodel, []string{"Status"}, appdwhere)
+			}
 			supplierCertAppendEntity.Status = status
 			supplierCertAppendEntity.Step = step
 			supplierCertAppendEntity.AuditDate = time.Now()

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

@@ -363,7 +363,11 @@ func (this *SupplierDataEntryController) PdfExport() {
 	datamap["QualifCertLevel"] = model1.QualifCertLevel
 	datamap["SpecIndustryCert"] = model1.SpecIndustryCert
 	datamap["MaunLicense"] = model1.MaunLicense
-	datamap["HseTraining"] = model1.HseTraining
+	if model1.HseTraining == "1" {
+		datamap["HseTraining"] = "是"
+	} else {
+		datamap["HseTraining"] = "否"
+	}
 	datamap["Fax"] = model1.Fax
 	datamap["CompanyTel"] = model1.CompanyTel
 	datamap["SupplierName"] = model1.SupplierName

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

@@ -183,7 +183,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
+            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
                 style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
               </el-cascader>
@@ -257,6 +257,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         }
       }
       return {
+        inStyle: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible: false,
         audithistoryshow: false,
@@ -406,6 +407,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
             this.auditTitle = '集中评审'
             this.auditstepcode = 'PROF_REGULATION'
           }
+          this.inStyle = this.formData.InStyle
           this.getFileList()
           this.getSortList()
           this.getDictOptions()

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

@@ -188,7 +188,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
+            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
                 style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
               </el-cascader>
@@ -261,6 +261,7 @@
         }
       }
       return {
+        inStyle: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible: false,
         audithistoryshow: false,
@@ -392,7 +393,7 @@
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = _this.AppendId
           this.entrydetail.instance = this.formData.WorkFlowId
-        this.entrydetail.status = this.formData.Status
+          this.entrydetail.status = this.formData.Status
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -410,6 +411,7 @@
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
           }
+          this.inStyle = this.formData.InStyle
           this.getFileList()
           this.getSortList()
           this.getDictOptions()

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

@@ -184,7 +184,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
+            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
                 style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
               </el-cascader>
@@ -255,6 +255,7 @@
         }
       }
       return {
+        inStyle: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible: false,
         subfileList: [],
@@ -426,6 +427,7 @@
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
           }
+          this.inStyle = this.formData.InStyle
           this.getSortList()
           this.getFileList()
           this.getDictOptions()