年审工作流修改

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

@@ -13,6 +13,7 @@ import (
 	"dashoo.cn/business2/areajson"
 	"dashoo.cn/business2/items"
 	"dashoo.cn/business2/permission"
+	"dashoo.cn/business3/parameter"
 	"reflect"
 
 	"encoding/json"
@@ -939,31 +940,32 @@ func (this *AnnualAuditController) AnnualAudit() {
 		step = 2
 		backstatus = suppliercert.NOPASS_STATUS
 	} else if list.Status == suppliercert.SECOND_TRIAL_STATUS {
-		status = suppliercert.PAYING_AUDIT_STATUS
+		status = suppliercert.CENT_AUDIT_STATUS
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 
-		//svc := organize.GetOrganizeService(utils.DBE)
-		//unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(list.ThirdAudit))
-		//var userlist []userRole.Base_User
-		//var setting auditsetting.Base_OilAuditSetting
-		//usvc := userRole.GetUserService(utils.DBE)
-		//where := "AuditStepCode='" + workflow.PROF_RECE + "'"
-		//svc.GetEntity(&setting, where)
-		//ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
-		//tempstr := strings.Join(ids, ",")
-		//uids := strings.Replace(tempstr, "uid_", "", -1)
-		//uids = strings.Trim(uids, ",")
-		//if uids != "" {
-		//	where := "Id in (" + uids + ")" + " and UnitId=" + unitId
-		//	svc.GetEntities(&userlist, where)
-		//}
-		//
-		//
-		//for _, tmpUser := range userlist {
-		//	userIds += strconv.Itoa(tmpUser.Id) + ","//strconv.FormatInt(tmpUser.Id, 10) + ","
-		//}
-		//userIds = strings.Trim(userIds, ",")
+		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+		topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+
+		var userlist []userRole.Base_User
+		var setting auditsetting.Base_OilAuditSetting
+		usvc := userRole.GetUserService(utils.DBE)
+		where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+		usvc.GetEntity(&setting, where)
+
+		ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+		tempstr := strings.Join(ids, ",")
+		uids := strings.Replace(tempstr, "uid_", "", -1)
+		uids = strings.Trim(uids, ",")
+		if uids != "" {
+			where := "Id in (" + uids + ")" + " and UnitId=" + topid
+			usvc.GetEntities(&userlist, where)
+		}
+		for _, tmpUser := range userlist {
+			userIds += strconv.Itoa(tmpUser.Id) + ","
+		}
+
+		userIds = strings.Trim(userIds, ",")
 	} else if list.Status == suppliercert.THIRD_TRIAL_STATUS {
 		userIds = ProfAudit
 		status = suppliercert.PROF_AUDIT_STATUS
@@ -973,6 +975,10 @@ func (this *AnnualAuditController) AnnualAudit() {
 		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 3
 		backstatus = suppliercert.NO_PROF_AUDIT_STATUS
+	} else if list.Status == suppliercert.CENT_AUDIT_STATUS {
+		status = suppliercert.PAYING_AUDIT_STATUS
+		step = 3
+		backstatus = suppliercert.NO_CENT_AUDIT_STATUS
 	}
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_AUDIT_APPLY
@@ -987,7 +993,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		var auditmodel annualaudit.OilAnnualAudit
 		auditmodel.Status = status
 		oldaplydate := list.ApplyTime
-		if list.Status == suppliercert.SECOND_TRIAL_STATUS {
+		if list.Status == suppliercert.CENT_AUDIT_STATUS {
 
 			if certEntity.InStyle == "1" {
 				var certmodel suppliercert.OilSupplierCert

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -161,7 +161,7 @@ module.exports = {
   },
   ignore: [
     'pages/oilsupplier/addtionaudit/*.*',
-    'pages/oilsupplier/annualaudit/*.*',
+    // 'pages/oilsupplier/annualaudit/*.*',
     'pages/oilsupplier/badrecord/*.*',
     // 'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',

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

@@ -35,6 +35,8 @@
             v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
             v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
+                     v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="fenbanBtn" v-if="auditBtn && AnnualStatus == '10'">
             提交分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
@@ -1412,6 +1414,8 @@
               this.auditstepcode = 'PROF_RECE'
             } else if (this.anndata.Status === '4') {
               this.auditstepcode = 'PROF_AUDIT'
+            } else if (this.anndata.Status === '5') {
+              this.auditstepcode = 'PROF_REGULATION'
             } else if (this.anndata.Status === '10') {
               if (this.anndata.SupplierTypeName === '01') {
                 this.auditstepcode = 'SUB_OFFICE_WZ'
@@ -1997,11 +2001,13 @@
             }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
-            this.$message({
-              type: 'warning',
-              message: '审批意见不能低于20个字符！'
-            })
-            return
+            if (this.AnnualStatus !== '5') {
+              this.$message({
+                type: 'warning',
+                message: '审批意见不能低于20个字符！'
+              })
+              return
+            }
           }
         } else {
           if (this.shenheForm.AuditorRemark.trim().length < 5) {

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

@@ -35,6 +35,8 @@
             v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
             v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
+                     v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="fenbanBtn" v-if="auditBtn && AnnualStatus == '10'">
             提交分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
@@ -392,7 +394,7 @@
                 </el-col>-->
                 <el-col :span="8">
                   <el-form-item label="进津备案通知书">
-                    <el-input v-model="formData.TjinNotify"  :readonly="this.formData.Status > '0'" placeholder="请输入" 
+                    <el-input v-model="formData.TjinNotify"  :readonly="this.formData.Status > '0'" placeholder="请输入"
                       :class="changedForm['TjinNotify'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1341,6 +1343,8 @@
               this.auditstepcode = 'PROF_RECE'
             } else if (this.anndata.Status === '4') {
               this.auditstepcode = 'PROF_AUDIT'
+            } else if (this.anndata.Status === '5') {
+              this.auditstepcode = 'PROF_REGULATION'
             } else if (this.anndata.Status === '10') {
               if (this.anndata.SupplierTypeName === '01') {
                 this.auditstepcode = 'SUB_OFFICE_WZ'
@@ -1929,11 +1933,13 @@
             }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
-            this.$message({
-              type: 'warning',
-              message: '审批意见不能低于20个字符！'
-            })
-            return
+            if (this.AnnualStatus !== '5') {
+              this.$message({
+                type: 'warning',
+                message: '审批意见不能低于20个字符！'
+              })
+              return
+            }
           }
         } else {
           if (this.shenheForm.AuditorRemark.trim().length < 5) {

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

@@ -35,6 +35,8 @@
             v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
             v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
+                     v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="fenbanBtn" v-if="auditBtn && AnnualStatus == '10'">
             提交分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
@@ -1338,6 +1340,8 @@
               this.auditstepcode = 'PROF_RECE'
             } else if (this.anndata.Status === '4') {
               this.auditstepcode = 'PROF_AUDIT'
+            } else if (this.anndata.Status === '5') {
+              this.auditstepcode = 'PROF_REGULATION'
             } else if (this.anndata.Status === '10') {
               if (this.anndata.SupplierTypeName === '01') {
                 this.auditstepcode = 'SUB_OFFICE_WZ'
@@ -1959,11 +1963,13 @@
             }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
-            this.$message({
-              type: 'warning',
-              message: '审批意见不能低于20个字符！'
-            })
-            return
+            if (this.AnnualStatus !== '5') {
+              this.$message({
+                type: 'warning',
+                message: '审批意见不能低于20个字符！'
+              })
+              return
+            }
           }
         } else {
           if (this.shenheForm.AuditorRemark.trim().length < 5) {