前后:准入范围

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -178,7 +178,7 @@ func (s *TmpzcgtSession) InsterAnnual() error {
 
 	sql := "INSERT INTO OilAnnualAudit (Status,SupplierTypeName, SupplierName, CreateOn, CreateBy, RecUnitId, ApplyTime, AccessCardNo, OldId) " +
 		"SELECT '11' as Status ,(CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' END ) SupplierTypeName, " +
-		"企业名称 AS SupplierName, STR_TO_DATE(IF(申请日期='', NULL, 申请日期),'%Y-%m-%d') AS CreateOn, 录入员 AS CreateBy, 推荐单位编码 AS RecUnitId, STR_TO_DATE(IF(年审日期='', NULL, 年审日期),'%Y-%m-%d') AS ApplyTime, 准入证号 AS AccessCardNo, id AS oldId " +
+		"企业名称 AS SupplierName, STR_TO_DATE(IF(申请日期='', NULL, 申请日期),'%Y-%m-%d') AS CreateOn, 录入员 AS CreateBy, 推荐单位编码 AS RecUnitId, DATE_ADD(STR_TO_DATE(IF(年审日期='', NULL, 年审日期),'%Y-%m-%d'), INTERVAL 1 year) AS ApplyTime, 准入证号 AS AccessCardNo, id AS oldId " +
 		"FROM T_年审"
 
 	_, err := s.DBE.Query(sql)

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

@@ -2253,22 +2253,19 @@ func (this *OilTechnologyServiceController) DeleteSuspend() {
 func (this *OilTechnologyServiceController) ManualDelete() {
 	var errinfo ErrorInfo
 	var list []supplier.ManualDelete
-	var sub []suppliercertsub.OilSupplierCertSub
-	var class technologyserviceclass.OilTechnologyServiceClass
 	svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
-	delect := this.GetString("delete")
 	where := "1=1"
 	svc.GetEntitysByWhere("TecDifferent", where, &list)
 	for _, value := range list {
 		var sub1 suppliercertsub.OilSupplierCertSub
+		var class technologyserviceclass.OilTechnologyServiceClass
 		if value.Operation == "删除" {
-			if delect != "" {
-				svc.DeleteTable(OilSupplierCertSubName, "SupplierTypeCode='03' and Code = '" + value.Code + "' and Name = '" + value.Name + "'")
-			}
+			svc.DeleteTable(OilSupplierCertSubName, "SupplierTypeCode='03' and Code = '" + value.Code + "' and Name = '" + value.Name + "'")
 		} else if value.Operation == "维持不动" || value.Operation == "" {
 
 		} else if strings.Index(value.Operation, ",") > 0 {
 			//151508,151509
+			var sub []suppliercertsub.OilSupplierCertSub
 			svc.GetEntitysByWhere(OilSupplierCertSubName, "SupplierTypeCode='03' and Code = '" + value.Code + "' and Name = '" + value.Name + "'", &sub)
 			code := strings.Split(value.Operation, ",")
 			for _, c := range code {

src/dashoo.cn/frontend_web/src/api/oilsupplier/basisbuild.js

@@ -134,7 +134,7 @@ export default {
   },
   deleteSuspend (myAxios) {
     return myAxios({
-      url: '/basisbuild/delete-suspend',
+      url: '/basisbuild/deleteUpdate',
       method: 'POST'
     })
   },

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -1026,7 +1026,11 @@
           case '11':
             return '审核完成'
           case '-1':
-            return '初审未通过'
+            if (type == '5') {
+              return '审核未通过'
+            } else {
+              return '初审未通过'
+            }
           case '-2':
             return '复审未通过'
           case '-3':

src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/index.vue

@@ -618,7 +618,7 @@
                 message: res.data.message
               })
               this.initDatas()
-              this.updatasuppiercertsub()
+              this.deleteSuspend()
             } else {
               this.$message({
                 type: 'warning',
@@ -810,6 +810,17 @@
           console.error(err)
         })
       },
+      deleteSuspend () {
+        api.deleteSuspend(this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // this.$message({
+            //   type: 'success',
+            //   message: res.data.message
+            // })
+          }
+        })
+        // })
+      },
 
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {