一级物资类供方审批流程中无业务处室审批环节，其他地区公司管理二级物资供方审批流程不需要集中评审

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -67,8 +67,12 @@ type MultiOrgAuditVM struct {
 const (
 	//供方准入流程图
 	OIL_SUPPLIER_APPLY string = "oil_supplier_apply_1"
-	//增项业务
-	OIL_SUPPLIER_APPEND string = "oil_supplier_append"
+
+	//一级物资供方准入流程图
+	OIL_FIRST_SUPPLIER_APPLY string = "oil_first_supplier_apply"
+	//二级物资供方准入流程图
+	OIL_SECOND_SUPPLIER_APPLY string = "oil_second_supplier_apply"
+
 	//业务步骤编码 初审
 	FIRST_TRIAL string = "FIRST_TRIAL"
 	// 复审

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -1288,7 +1289,19 @@ func (this *OilSupplierController) GetMyTaskEntityList() {
 
 	//找出待办任务
 	actisvc := workflow.GetActivitiService(utils.DBE)
-	certIdList := actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+	var certIdList string
+	if actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id) != ""{
+		certIdList = actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+		certIdList = certIdList + ","
+	}
+	if actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id) != ""{
+		certIdList = fmt.Sprintf("%s %s",certIdList,actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id))
+		certIdList = certIdList + ","
+	}
+	if actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id) != ""{
+		certIdList = fmt.Sprintf("%s %s",certIdList,actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id))
+	}
+	certIdList = strings.Trim(certIdList, ",")
 	certIdarr := strings.Split(certIdList, ",")
 	for i, item := range certIdarr {
 		idx := strings.Index(item, "-")

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

@@ -605,7 +605,14 @@ func (this *OilSupplierCertController) AuditEntity() {
 	if supplierCertEntity.WorkflowId == "0" || len(supplierCertEntity.WorkflowId) <= 0 {
 		//启动工作流
 		businessKey = certId + "-" +  strconv.Itoa(supplierCertEntity.AuditIndex)
-		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, businessKey, this.User.Id)
+		if supplierCertEntity.InStyle == "2" {
+			processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
+		}else if  supplierCertEntity.InStyle == "3" {
+			processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_SUPPLIER_APPLY, businessKey, this.User.Id)
+		}else {
+			processInstanceId = svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, businessKey, this.User.Id)
+		}
+
 	} else {
 		processInstanceId = supplierCertEntity.WorkflowId
 	}
@@ -616,7 +623,14 @@ func (this *OilSupplierCertController) AuditEntity() {
 	//}
 	//userIds = strings.Trim(userIds, ",")
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
+	if supplierCertEntity.InStyle == "2" {
+		ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
+	}else if  supplierCertEntity.InStyle == "3" {
+		ActiComplete.ProcessKey = workflow.OIL_SECOND_SUPPLIER_APPLY
+	}else{
+		ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
+	}
+
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
@@ -748,6 +762,11 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	status := ""
 	backstatus := "0"
 	var userIds string
+	if supplierCertEntity.InStyle == "2" {
+		if supplierCertEntity.Status == suppliercert.SECOND_TRIAL_STATUS{
+			supplierCertEntity.Status = "4"
+		}
+	}
 	if supplierCertEntity.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = auditer
 		status = suppliercert.SECOND_TRIAL_STATUS
@@ -814,7 +833,13 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
+	if supplierCertEntity.InStyle == "2" {
+		ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
+	}else if  supplierCertEntity.InStyle == "3" {
+		ActiComplete.ProcessKey = workflow.OIL_SECOND_SUPPLIER_APPLY
+	}else{
+		ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
+	}
 	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id

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

@@ -13,11 +13,16 @@
         <span style="float: right;">
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '3'">提交专业审批</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '4'">专业审批</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '5'">集中审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '3' && this.formData.InStyle != '2'">提交专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '4' && this.formData.InStyle != '2'">专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '5' && this.formData.InStyle != '3'">集中审批</el-button>
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -30,8 +35,8 @@
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
             </div>
-            <goods-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData"
-                        :disabled="true"></goods-info>
+            <goods-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true">
+            </goods-info>
           </el-card>
         </el-tab-pane>
 
@@ -46,70 +51,70 @@
                 <el-col :span="8">
                   <el-form-item label="企业员工总数">
                     <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同化用工数量">
                     <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="大学及以上学历人员数量">
                     <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术、管理人员数量">
                     <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="高级及以上职称人员数量">
                     <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="中级职称人员数量">
                     <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格人员数量">
                     <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格证书总数">
                     <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="设计人员总数">
                     <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术工人总数">
                     <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
-                                     style="width: 100%"></el-input-number>
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -121,7 +126,7 @@
               <span>企业主要装备情况</span>
             </div>
             <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId+''" height="360px"
-                            style="margin-top: 20px"></equipment-list>
+              style="margin-top: 20px"></equipment-list>
           </el-card>
 
           <el-card class="box-card" style="margin-top: 10px;">
@@ -129,7 +134,7 @@
               <span>近三年主要工程业绩</span>
             </div>
             <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" height="360px"
-                              style="margin-top: 20px"></performance-list>
+              style="margin-top: 20px"></performance-list>
           </el-card>
 
           <el-card class="box-card" style="margin-top: 10px;">
@@ -137,7 +142,7 @@
               <span>拥有专利、专有技术及工法</span>
             </div>
             <patent-list ref="patentList" :data="patentList" :SupplierCertId="certId" height="360px"
-                         style="margin-top: 20px">
+              style="margin-top: 20px">
             </patent-list>
           </el-card>
 
@@ -146,7 +151,7 @@
               <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
             </div>
             <winning-list ref="winningList" :data="winningList" :SupplierCertId="certId" height="360px"
-                          style="margin-top: 20px">
+              style="margin-top: 20px">
             </winning-list>
           </el-card>
         </el-tab-pane>
@@ -158,7 +163,8 @@
 
         <el-tab-pane label="企业资质">
           <auditbus-list ref="auditbusList" :data="auditbusList" :SupplierCertId="certId" :SupplierId="serviceId+''"
-                         :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px"></auditbus-list>
+            :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px">
+          </auditbus-list>
         </el-tab-pane>
 
         <el-tab-pane label="流程查看">
@@ -185,27 +191,23 @@
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
           <!--<el-select ref="selectauditOrg" v-model="majorDept" placeholder="请选择"-->
-                     <!--style="width: 90%" filterable allow-create default-first-option>-->
-            <!--<el-option-->
-              <!--v-for="item in organizeOption"-->
-              <!--:key="item.Id"-->
-              <!--:label="item.Fullname"-->
-              <!--:value="item.Id">-->
-            <!--</el-option>-->
+          <!--style="width: 90%" filterable allow-create default-first-option>-->
+          <!--<el-option-->
+          <!--v-for="item in organizeOption"-->
+          <!--:key="item.Id"-->
+          <!--:label="item.Fullname"-->
+          <!--:value="item.Id">-->
+          <!--</el-option>-->
           <!--</el-select>-->
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                       filterable style="width: 100%" v-model="majorDept"
-                       placeholder="请选择组织">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
         </el-form-item>
-        <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                     style="width: 100%" filterable allow-create default-first-option>
-            <el-option
-              v-for="item in auditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
+        <el-form-item :label="aduitlabel"
+          v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
+            default-first-option>
+            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -215,8 +217,10 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item porp="AuditorRemark" label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）" minlength="20"></el-input>
+        <el-form-item porp="AuditorRemark" label="意见"
+          :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）"
+            minlength="20"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -233,10 +237,10 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item prop="AuditorRemark" label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+        <el-form-item prop="AuditorRemark" label="意见"
+          :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
           <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）"
-                    minlength="20"
-          ></el-input>
+            minlength="20"></el-input>
         </el-form-item>
 
         <el-divider></el-divider>
@@ -250,7 +254,7 @@
           </el-select>
         </el-form-item>
         <el-divider></el-divider>
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1' && this.formData.InStyle != '2'">
           <!-- <el-select ref="selectAuditer" v-model="majorDept" placeholder="请选择" style="width: 90%" filterable allow-create
             default-first-option>
             <el-option v-for="item in orgtreelist" :key="item.id" :label="item.name" :value="item.id">
@@ -276,13 +280,9 @@
           </el-cascader>
         </el-form-item> -->
         <el-form-item label="审批人">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                     style="width: 100%" filterable allow-create default-first-option>
-            <el-option
-              v-for="item in secauditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
+            default-first-option>
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -297,7 +297,7 @@
     </el-dialog>
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
-                    :visible="chooseAuditorVisible"></choose-auditor>
+      :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -344,7 +344,7 @@
     },
     name: 'oilsupplierEdit',
 
-    data () {
+    data() {
       return {
         auditer: '',
         auditerName: '',
@@ -490,7 +490,7 @@
         }
       }
     },
-    created () {
+    created() {
       this.companyid = this.authUser.Profile.Superior
       this.serviceId = this.$route.params.opera + ''
       this.certId = this.$route.query.certid + ''
@@ -506,7 +506,7 @@
       // this.getorgtreelistbydeptid()
     },
     methods: {
-      orgtreeChange (val) {
+      orgtreeChange(val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
         let auditstepcode = 'PROF_RECE'
@@ -516,16 +516,16 @@
           console.error(err)
         })
       },
-      equipmentdialog () {
+      equipmentdialog() {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog () {
+      performancedialog() {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog () {
+      patentdialog() {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog () {
+      winningdialog() {
         this.$refs['winningList'].showDialog()
       },
 
@@ -540,7 +540,7 @@
         this.chooseAuditorVisible = false
       },
 
-      initDatas () {
+      initDatas() {
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
@@ -556,7 +556,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-
+            console.log("---", this.formData.Status,this.formData.InStyle)
             this.entrydetail.business = this.formData.BusinessKey
             this.entrydetail.instance = this.formDataCert.WorkflowId
             this.entrydetail.status = this.formData.Status
@@ -592,7 +592,7 @@
           })
         }
       },
-      isAccess () {
+      isAccess() {
         apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {
@@ -600,7 +600,7 @@
         })
       },
 
-      getDictOptions () {
+      getDictOptions() {
         let params = {
           status: this.formData.Status,
           majorAduit: this.formData.ThirdAudit
@@ -614,14 +614,14 @@
           console.error(err)
         })
       },
-      getorgtreelist () {
+      getorgtreelist() {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/orgalllist', {
-          params
-        })
+            params
+          })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -629,14 +629,14 @@
             console.error(err)
           })
       },
-      getorgtreelistbydeptid () {
+      getorgtreelistbydeptid() {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/listbydeptid', {
-          params
-        })
+            params
+          })
           .then(res => {
             _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -644,7 +644,7 @@
             console.error(err)
           })
       },
-      auditOrgChange () {
+      auditOrgChange() {
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
@@ -667,7 +667,7 @@
         })
       },
       // 保存信息
-      saveEntity () {
+      saveEntity() {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
@@ -683,11 +683,11 @@
       },
 
       // 保存信息
-      saveCertEntity () {
+      saveCertEntity() {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity () {
+      addEntity() {
         this.formData.SupplierTypeCode = '02'
         this.formData.SupplierTypeName = '物资类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -711,7 +711,7 @@
         })
       },
 
-      updateEntity () {
+      updateEntity() {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -731,7 +731,7 @@
         })
       },
 
-      CheckCompanyBase () {
+      CheckCompanyBase() {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -749,7 +749,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity () {
+      updateNumberEntity() {
         if (!this.CheckCompanyBase()) {
           return false
         }
@@ -772,7 +772,7 @@
         })
       },
 
-      AuditEntity () {
+      AuditEntity() {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
@@ -782,11 +782,11 @@
           this.dialogMakeSure = true
         }
       },
-      allocationBtn () {
+      allocationBtn() {
         this.dialogAllocation = true
       },
       // 审核通过
-      makeSure () {
+      makeSure() {
         if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
           this.$message({
             type: 'warning',
@@ -809,7 +809,8 @@
             })
             return
           }
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '2' && this.formData.Status !== '4' && this.formData.Status !== '5') {
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '2' && this.formData.Status !== '4' &&
+            this.formData.Status !== '5') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
@@ -820,7 +821,7 @@
         this.checkstatus()
       },
 
-      checkstatus () {
+      checkstatus() {
         let params = this.shenheForm
         let audit = {
           auditer: this.auditer,
@@ -848,7 +849,7 @@
         })
       },
 
-      jstimehandle (val) {
+      jstimehandle(val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -861,7 +862,7 @@
         }
       },
 
-      formatDateTime (date) {
+      formatDateTime(date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -874,6 +875,7 @@
       }
     }
   }
+
 </script>
 
 <style lang="scss">