前后:增项和信息变更审核通过后修改资质状态

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

@@ -2148,7 +2148,8 @@ func (this *InfoChangeController) updateChangeInfo(supplierId int, infoId string
 			supFileModel.FileName = qualDetail[i].FileName
 			supFileModel.FileUrl = qualDetail[i].FileUrl
 			supFileModel.EffectDate = qualDetail[i].EffectDate
-			svc.UpdateEntityBytbl(OilSupplierFileName, qualDetail[i].FileId, &supFileModel, []string{"FileName", "FileUrl", "EffectDate"})
+			supFileModel.SupType = 5
+			svc.UpdateEntityBytbl(OilSupplierFileName, qualDetail[i].FileId, &supFileModel, []string{"FileName", "FileUrl", "EffectDate", "SupType"})
 		}
 	}
 }

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

@@ -979,6 +979,10 @@ func (this *OilSupplierCertAppendController) AppendCommonAuditEntity() {
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	certSrv.GetEntityById(certAppendId, &supplierCertAppendEntity)
 
+	cols := []string{"AuditDate"}
+	supplierCertAppendEntity.AuditDate = time.Now()
+	certSrv.UpdateEntityBywheretbl(OilSupplierCertAppendName, &supplierCertAppendEntity, cols, "Id = " + certAppendId)
+
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
@@ -1162,6 +1166,11 @@ func (this *OilSupplierCertAppendController) UpdateIsStorage() {
 		AuditRemark = "入库退回。"
 	}
 
+	// 审核日期
+	cols := []string{"AuditDate"}
+	supplierCertAppendEntity.AuditDate = time.Now()
+	certAppendSrv.UpdateEntityBywheretbl(OilSupplierCertAppendName, &supplierCertAppendEntity, cols, "Id = " + id)
+
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
@@ -1175,6 +1184,14 @@ func (this *OilSupplierCertAppendController) UpdateIsStorage() {
 		log.Println("工作流异常, 业务ID："+supplierCertAppendEntity.BusinessKey+"， 流程ID："+supplierCertAppendEntity.WorkFlowId, " 工作流传参: ", ActiComplete, receiveVal)
 		panic("任务已审批，请刷新！")
 	}
+	if status == "1" && receiveVal == "true" {
+		// 资质文件改状态
+		var file supplierfile.OilSupplierFile
+		svc := supplierfile.GetSupplierfileService(utils.DBE)
+		cols := []string{"SupType"}
+		file.SupType = 3
+		svc.UpdateEntityBywheretbl(OilSupplierFileName, &file, cols, "SupType = 2 and SupplierId = " + strconv.Itoa(supplierCertAppendEntity.SupplierId))
+	}
 
 }
 

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

@@ -96,7 +96,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label-width="150px" label="统一社会信用代码" prop="CommercialNo">
+                  <el-form-item label="统一社会信用代码" prop="CommercialNo">
                     <el-input v-model="supplierData.CommercialNo" maxlength="50" :readonly="true"
                               :class="changedForm['CommercialNo'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">

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

@@ -164,7 +164,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label-width="150px" label="统一社会信用代码" prop="CommercialNo">
+                  <el-form-item label="统一社会信用代码" prop="CommercialNo">
                     <el-input v-model="supplierData.CommercialNo" maxlength="50" :readonly="true"
                               :class="changedForm['CommercialNo'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">

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

@@ -97,7 +97,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label-width="150px" label="统一社会信用代码" prop="CommercialNo">
+                  <el-form-item label="统一社会信用代码" prop="CommercialNo">
                     <el-input v-model="supplierData.CommercialNo" maxlength="50" :readonly="true"
                               :class="changedForm['CommercialNo'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">

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

@@ -2468,7 +2468,13 @@
                   message: '该银行账号与其他公司重复'
                 })
               } else {
-                this.addInfoChangeItemCh(val)
+                this.$refs['EntityFormCert'].validate((valid) => {
+                  if (valid) {
+                    this.addInfoChangeItemCh(val)
+                  }
+                }).catch(err => {
+                  console.error(err)
+                })
               }
             }).catch(err => {
               console.error(err)

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

@@ -2245,7 +2245,13 @@
                   message: '该银行账号与其他公司重复'
                 })
               } else {
-                this.addInfoChangeItemCh(val)
+                this.$refs['EntityFormCert'].validate((valid) => {
+                  if (valid) {
+                    this.addInfoChangeItemCh(val)
+                  }
+                }).catch(err => {
+                  console.error(err)
+                })
               }
             }).catch(err => {
               console.error(err)

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

@@ -2001,7 +2001,13 @@
                   message: '该银行账号与其他公司重复'
                 })
               } else {
-                this.addInfoChangeItemCh(val)
+                this.$refs['EntityFormCert'].validate((valid) => {
+                  if (valid) {
+                    this.addInfoChangeItemCh(val)
+                  }
+                }).catch(err => {
+                  console.error(err)
+                })
               }
             }).catch(err => {
               console.error(err)