状态动态变化判断, 是否有专业处室审批不再根据准入方式判断，全部专业审核

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

@@ -125,18 +125,20 @@ func (this *OilSupplierCertListenerController) PreThirdTrialStatus() {
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(supplierCertId, &supplierCertEntity)
-	cols := []string{
-		"Id",
-		"Status",
-	}
-	//进入此步骤，记录在数据库中
-	supplierCertEntity.Status = suppliercert.THIRD_TRIAL_STATUS ////专业处接收
-	certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
 
 	//查出业务处室接收分办的人员
 	stepCode := workflow.PROF_RECE //专业处室接收
 	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
 	approverIds := auditSettingService.GetApproverIdsByStepCodeAndUnitId(stepCode, strconv.Itoa(supplierCertEntity.ThirdAudit))
+	if approverIds != "" {
+		cols := []string{
+			"Id",
+			"Status",
+		}
+		//进入此步骤，记录在数据库中
+		supplierCertEntity.Status = suppliercert.THIRD_TRIAL_STATUS ////专业处接收
+		certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
+	}
 	var approveInfo ListenerApproveInfo
 	approveInfo.Users = approverIds
 	this.Data["json"] = &approveInfo

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

@@ -22,8 +22,8 @@
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="itemsshow">查看变更项</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
           <!--<el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0"> 提交审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(Status) === 6">交费</el-button>
           <router-link :to="'/oilsupplier/annualaudit/basicindex'">
@@ -739,7 +739,7 @@
         <el-button type="primary"
                    size="mini"
                    @click="comSubmitToSeparateUnitClick()"
-                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 && Number() <= 0">
+                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 && Status <= 0">
           提交
         </el-button>
       </div>

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

@@ -22,8 +22,8 @@
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="itemsshow">查看变更项</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
           <!--<el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">提交审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(Status) === 6">交费</el-button>
           <router-link :to="'/oilsupplier/annualaudit/goodsindex'">
@@ -827,7 +827,7 @@
         <el-button type="primary"
                    size="mini"
                    @click="comSubmitToSeparateUnitClick()"
-                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 && Number(Status) <= 0">
+                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 && Status <= 0">
           提交
         </el-button>
       </div>

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

@@ -22,8 +22,8 @@
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="itemsshow">查看变更项</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
           <!--<el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0"> 提交审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(Status) === 6">交费</el-button>
           <router-link :to="'/oilsupplier/annualaudit/techindex'">
@@ -656,7 +656,7 @@
         <el-button type="primary"
                    size="mini"
                    @click="comSubmitToSeparateUnitClick()"
-                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 && Number(Status) <= 0">
+                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 && Status <= 0">
           提交
         </el-button>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -14,14 +14,14 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
-            v-if="(InfoStatus == '' || Number(InfoStatus) <= 0) && !butnab" @click="saveinfochange">保存
+            v-if="(InfoStatus == '' || InfoStatus <= 0) && !butnab" @click="saveinfochange">保存
           </el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-button type="primary" size="mini" @click="companySubmitApplyBtn"
-            v-if="(InfoStatus == '' || Number(InfoStatus) <= 0) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
+            v-if="(InfoStatus == '' || InfoStatus <= 0) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
           </el-button>
           <el-button type="primary" size="mini" @click="separateUnitSubmitApplyBtn"
-                     v-if="(InfoStatus == '' || Number(InfoStatus) <= 0) && authUser.Profile.IsCompanyUser == 0 ">提交申请
+                     v-if="(InfoStatus == '' || InfoStatus <= 0) && authUser.Profile.IsCompanyUser == 0 ">提交申请
           </el-button>
           <router-link :to="'/oilsupplier/infochangech'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -53,10 +53,10 @@
           <el-button type="primary"
                      size="mini"
                      @click="commitAudit()"
-                     v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >= 3 && Number(this.formData.Status) <= 0">
+                     v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >= 3 && formData.Status <= 0">
             提交
           </el-button>
-          <el-button v-if="parseInt(IsCompanyUser) !== 1 && Number(this.formData.Status) <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+          <el-button v-if="parseInt(IsCompanyUser) !== 1 && formData.Status <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
         </span>
@@ -357,7 +357,7 @@
         <el-button type="primary"
                    size="mini"
                    @click="commitAudit()"
-                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >=3 && Number(this.formData.Status) <= 0">
+                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >=3 && formData.Status <= 0">
           提交
         </el-button>
       </div>

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

@@ -52,10 +52,10 @@
           <el-button type="primary"
                      size="mini"
                      @click="commitAudit()"
-                     v-if="parseInt(IsCompanyUser) === 1 && parseInt(totalTab) >= 3 || Number(this.formData.Status) <= 0">
+                     v-if="parseInt(IsCompanyUser) === 1 && parseInt(totalTab) >= 3 && formData.Status <= 0">
             提交
           </el-button>
-          <el-button v-if="parseInt(IsCompanyUser) !== 1 && parseInt(totalTab) >= 3 || Number(this.formData.Status) <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+          <el-button v-if="parseInt(IsCompanyUser) !== 1 && parseInt(totalTab) >= 3 && formData.Status <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
           <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->
@@ -388,7 +388,7 @@
         <el-button type="primary"
                    size="mini"
                    @click="commitAudit()"
-                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >=3 && Number(this.formData.Status) <= 0">
+                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >=3 && formData.Status <= 0">
           提交
         </el-button>
       </div>
@@ -1571,7 +1571,7 @@ export default {
         // }
       } else if (this.formData.OperType === '代理商') {
         let countM = this.getCurrentManufactureCount1()
-        if (Number(countM) <= 0 && this.certId) {
+        if (countM <= 0 && this.certId) {
           valid1 = false
           this.$message({
             type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -42,10 +42,10 @@
           <el-button type="primary"
                      size="mini"
                      @click="commitAudit()"
-                     v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >= 3 || Number(this.formData.Status) <= 0">
+                     v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >= 3 && formData.Status <= 0">
             提交
           </el-button>
-          <el-button v-if="parseInt(IsCompanyUser) !== 1 && Number(this.formData.Status) <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+          <el-button v-if="parseInt(IsCompanyUser) !== 1 && formData.Status <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
         </span>
@@ -72,7 +72,7 @@
                 <el-button type="primary"
                            size="mini"
                            @click="saveEntity"
-                           v-if="Number(formDataCert.Status) <= 0">保存基本信息
+                           v-if="formDataCert.Status <= 0">保存基本信息
                 </el-button>
               </span>
             </div>
@@ -350,7 +350,7 @@
         <el-button type="primary"
                    size="mini"
                    @click="commitAudit()"
-                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >=3 && Number(this.formData.Status) <= 0">
+                   v-if="parseInt(IsCompanyUser) === 1 && parseInt(activeName) >=3 && formData.Status <= 0">
           提交
         </el-button>
       </div>
@@ -1817,15 +1817,16 @@ export default {
       this.auditform.CertId = this.certId
       this.loading = true
       console.log('企业用户提交参数', this.auditform)
+      let _this = this
       apiCert.companyAuditEntity(this.certId, this.auditform, this.$axios)
         .then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
-            this.initDatas()
-            if (this.$refs['WfHistory']) {
-                this.$refs['WfHistory'].getHistoryTask()
-              }
-            this.dialogVisibleCom = false
+            _this.initDatas()
+            if (_this.$refs['WfHistory']) {
+              _this.$refs['WfHistory'].getHistoryTask()
+            }
+            _this.dialogVisibleCom = false
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -25,13 +25,13 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
-                     v-if="formData.Id !='' && Number(formData.Status) <= 0" @click="saveinfochange">保存
+                     v-if="formData.Id != '' && formData.Status <= 0" @click="saveinfochange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && Number(formData.Status) <= 0 && parseInt(IsCompanyUser) === 0">提交审核
+            v-if="formData.Id != '' && formData.Status <= 0 && parseInt(IsCompanyUser) === 0">提交审核
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-            v-if="formData.Id !='' && Number(formData.Status) <= 0 && parseInt(IsCompanyUser) === 1">提交
+            v-if="formData.Id != '' && formData.Status <= 0 && parseInt(IsCompanyUser) === 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -24,13 +24,13 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && Number(formData.Status) <= 0" @click="saveinfochange">保存
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && formData.Status <= 0" @click="saveinfochange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 0">提交审核
+            v-if="formData.Id !='' && formData.Status <= 0 && IsCompanyUser == 0">提交审核
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 1">提交
+            v-if="formData.Id !='' && formData.Status <= 0 && IsCompanyUser == 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -25,13 +25,13 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
-                     v-if="formData.Id !='' && Number(formData.Status) <= 0" @click="saveinfochange">保存
+                     v-if="formData.Id !='' && formData.Status <= 0" @click="saveinfochange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 0">提交审核
+            v-if="formData.Id !='' && formData.Status <= 0 && IsCompanyUser == 0">提交审核
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 1">提交
+            v-if="formData.Id !='' && formData.Status <= 0 && IsCompanyUser == 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -331,7 +331,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' && inStyle != '3' ">
+            <el-form-item label="专业处室">
               <el-select  v-model="selectDept" filterable disabled
                           placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
                 <el-option  v-for="item in allorgunitOptions" :key="item.Id" :label="item.Fullname"

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

@@ -349,7 +349,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' && inStyle != '3' ">
+            <el-form-item label="专业处室">
               <el-select  v-model="selectDept" filterable
                           placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
                 <el-option  v-for="item in allorgunitOptions" :key="item.Id" :label="item.Fullname"