增项申请：基建类服务类代码

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

@@ -1045,11 +1045,20 @@ func (this *OilSupplierCertController) IsAccess() {
 		certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 		var supplierCertEntity suppliercert.OilSupplierCert
 		certSrv.GetEntityById(id, &supplierCertEntity)
+		res1, res2 := false, false
 		if strconv.Itoa(supplierCertEntity.CreateUserId) == this.User.Id {
+			res1 = true
+		}
+		certAppendSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+		var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
+		certAppendSrv.GetEntityById(id, &supplierCertAppendEntity)
+		if strconv.Itoa(supplierCertAppendEntity.CreateUserId) == this.User.Id {
+			res2 = true
+		}
+		if res1 || res2 {
 			res = true
 		}
 	} else {
-		// TODO 单独检查交费用户的按钮权限 当前用户是否和创建人相同
 		//var users []suppliercert.UserList
 		//where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + auditstepcode + "'"
 		//rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -389,7 +389,6 @@ func (this *OilAuditSettingController) DeleteEntity() {
 // @router /isaccess [get]
 func (this *OilAuditSettingController) IsAccess() {
 	auditstepcode := this.GetString("auditstepcode")
-	// TODO 单独检查交费用户的按钮权限 当前用户是否和创建人相同
 	var users []userRole.Base_RoleList
 	var auditWorkflow auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)

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

@@ -76,6 +76,13 @@ export default {
       params: params
     })
   },
+  separateAuditEntity (id, params, myAxios) {
+    return myAxios({
+      url: 'suppliercertappend/separate-audit/' + id,
+      method: 'post',
+      params: params
+    })
+  },
   auditEntityFir (entityId, params, shenheform, myAxios) {
     return myAxios({
       url: '/suppliercertappend/auditEntityFir/' + entityId,

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

@@ -22,11 +22,13 @@
             <!-- <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button> -->
           </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" @click="AuditEntity"
-            v-if="auditBtn && this.formData.Status != '6'&& this.formData.Status != '10'">{{auditTitle}}</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
-            v-if="this.formData.Status == '10'">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick" v-if="auditBtn && this.formData.Status === '3'">提交专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" 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 != '6'">{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="parseInt(this.formData.Status) === 10">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -570,11 +572,29 @@
         <el-button type="primary" size="small" @click="makeSure()" :loading="btnloading">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="分配" :visible.sync="dialogAllocation">
+    <el-dialog title="审核" :visible.sync="dialogCommonAuditMakeSureVisible">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1"  @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2"  @change="radioChange">退回</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogCommonAuditMakeSureVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="commonAuditMakeSure()" :loading="btnloading">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="分配" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审批人">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
-            default-first-option>
+          <el-select ref="selectAuditer" v-model="ProfessionalAudit" 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>
@@ -584,25 +604,25 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
-        <el-button size="small" @click="dialogAllocation = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="makeSure()" :loading="btnloading">确 定</el-button>
+        <el-button size="small" @click="dialogBusinessOfficeSeparateAuditVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="businessOfficeSeparateAuditMakeSure()" :loading="btnloading">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+    <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批状态">
-              <el-radio-group v-model="shenheForm.SuccessStatus">
-                <el-radio :label="1">通过</el-radio>
-                <el-radio :label="0">退回</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+          <!--  <el-form-item label="审批状态">-->
+          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
+          <!--      <el-radio :label="1">通过</el-radio>-->
+          <!--      <el-radio :label="0">退回</el-radio>-->
+          <!--    </el-radio-group>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
-                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
+              <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
               <!--</el-input>-->
               <el-select ref="selectAuditer"
                          v-model="auditer"
@@ -630,7 +650,7 @@
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
               <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
-              <el-select  v-model="selectDept" filterable disabled
+              <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"
                             :value="item.Id">
@@ -653,8 +673,8 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="makeSure()" :loading="btnloading">确定</el-button>
+        <el-button size="mini" @click="dialogSecUnitSeparateVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="secUnitSeparateAuditMakeSure()" :loading="btnloading">确定</el-button>
       </span>
     </el-dialog>
 
@@ -694,20 +714,16 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
-import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
-
- // v-viewer
-  import Vue from 'vue';
+  // v-viewer
+  import Vue from 'vue'
   import Viewer from 'v-viewer'
   import 'viewerjs/dist/viewer.css'
   Vue.use(Viewer)
   Viewer.setDefaults({
     Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
   })
-
-
-
   export default {
     components: {
       WfMultiHistory,
@@ -759,6 +775,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
+        ProfessionalAudit: '',
         majorDept: [100000000, 100000128, 100000151],
         auditbusList: [], // 待审核业务
         allorgunitOptions: [],
@@ -767,6 +784,8 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         dialogMakeSure: false,
         dialogAllocation: false,
         dialogMakeSure2: false,
+        dialogCommonAuditMakeSureVisible: false,
+        dialogBusinessOfficeSeparateAuditVisible: false,
         aduitlabel: '审核人',
         auditer: '',
         auditerName: '',
@@ -807,7 +826,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
           instance: '',
           Status: ''
         },
-        dialogVisible: false, // 增项分办
+        dialogSecUnitSeparateVisible: false, // 增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
@@ -1071,6 +1090,8 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
             this.auditTitle = '集中评审'
             this.auditstepcode = 'PROF_REGULATION'
             this.shenheForm.AuditorRemark = '集中评审通过。'
+          } else if (_this.formData.Status === '6') {
+            this.auditstepcode = 'PAYING_FEE'
           }
           this.inStyle = this.formData.InStyle
           this.getsubfile()
@@ -1102,7 +1123,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.formData.Status === '5') {
             this.textplaceholder = '请填写审批意见'
-          }else{
+          } else {
             this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
           }
         } else {
@@ -1172,12 +1193,312 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         } else if (this.formData.Status === '10') {
           this.getFirAuditerByDept()
           this.changeOrgUnit(this.selectDept)
-          this.dialogVisible = true
+          this.dialogSecUnitSeparateVisible = true
         } else {
           this.dialogMakeSure = true
           this.radioChange()
         }
       },
+      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
+      commonAuditClick () {
+        console.log('审批公共会话框')
+        this.dialogCommonAuditMakeSureVisible = true
+        this.radioChange()
+      },
+      commonAuditMakeSure () {
+        let checkRes = this.commonAuditParamsCheck()
+        console.log('审批结果公共提交，参数检查结果', checkRes)
+        if (!checkRes) {
+          return false
+        }
+        this.btnloading = true
+        let params = {
+          result: this.shenheForm.SuccessStatus,
+          AuditRemark: this.shenheForm.AuditorRemark
+        }
+        console.log('审批结果提交参数：', params)
+        api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            // this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.$router.push('/')
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogCommonAuditMakeSureVisible = false
+          this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      commonAuditParamsCheck () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if ((!this.auditer || this.auditer === 0) && (this.formData.Status == '0' || this.formData.Status == '10' || this.formData.Status == '3')) {
+            this.$message({
+              type: 'warning',
+              message: '请选择审核人！'
+            })
+            return
+          }
+          if (this.formData.Status == '10') {
+            if (!this.fushenauditer || this.fushenauditer === 0) {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
+            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+              if (this.selectDept === 0 || this.selectDept == '') {
+                this.$message({
+                  type: 'warning',
+                  message: '请选择专业处室！'
+                })
+                return
+              }
+            }
+            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
+            }
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return false
+          }
+        } else {
+          if (this.formData.Status === '10') {
+            this.shenheForm.AuditorRemark = this.backRemark
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
+            .Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return false
+          }
+        }
+        return true
+      },
+      // 二级单位分办审批会话框 ⬇
+      secUnitSeparateAuditClick (val) {
+        console.log('二级单位分办审批会话框')
+        this.auditOrgChange()
+        this.btnstatus = val
+        this.getFirAuditerByDept()
+        this.changeOrgUnit(this.selectDept)
+        this.dialogSecUnitSeparateVisible = true
+      },
+      // 二级单位分办审批结果确认 ⬇
+      secUnitSeparateAuditMakeSure () {
+        console.log('二级单位分办审批结果确认')
+        this.shenheForm.SuccessStatus = 1
+        let checkRes = this.secUnitSeparateAuditParamsCheck()
+        if (!checkRes) {
+          return false
+        }
+        this.btnloading = true
+        let params = {
+          FirstAudit: this.auditer,
+          SecondAudit: this.fushenauditer,
+          ThirdAudit: this.selectDept,
+          AuditRemark: this.auditform.AuditRemark
+        }
+        console.log('二级单位分办审批结果提交参数：', params)
+        api2.separateAuditEntity(this.certId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogSecUnitSeparateVisible = false
+          this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      // 二级单位分办审批参数检查 ⬇
+      secUnitSeparateAuditParamsCheck () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.auditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择初审人！'
+            })
+            return
+          }
+          if (this.fushenauditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择复审人！'
+            })
+            return
+          }
+          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+            if (this.userOptions == null || this.userOptions.length === 0) {
+              this.$message({
+                type: 'warning',
+                message: '该专业科室未配置接收人！'
+              })
+              return
+            }
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+        } else {
+          this.shenheForm.AuditorRemark = this.backRemark
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return false
+          }
+        }
+        return false
+      },
+      // 专业处室分办审批
+      businessOfficeSeparateAuditClick () {
+        console.log('专业处室分办审批提交按钮')
+        this.auditOrgChange()
+        console.log('请求部门结束')
+        this.dialogBusinessOfficeSeparateAuditVisible = true
+      },
+      businessOfficeSeparateAuditMakeSure () {
+        if (this.ProfessionalAudit === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择审批人！'
+          })
+          return
+        }
+        let params = {
+          ProfessionalAudit: this.ProfessionalAudit,
+          AuditRemark: this.shenheForm.AuditorRemark
+        }
+        this.btnloading = true
+        console.log('业务处室专业审批, 提交参数: ', params)
+        api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            // this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.$router.push('/')
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogBusinessOfficeSeparateAuditVisible = false
+          this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      paySureClick () {
+        console.log('交费按钮')
+        this.$confirm('是否确认交费', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.payMakeSure()
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          })
+        })
+      },
+      payMakeSure () {
+        console.log('交费结果确认')
+        this.loading = true
+        let params = {
+          payStatus: this.payStatus
+        }
+        console.log('交费结果确认提交参数：', this.certId)
+        api2.updatePayStatus(this.certId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('交费成功')
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogSecUnitSeparateVisible = false
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 获取资质文件
       // getFileList () {
       //   this.SupplierId = this.formData.SupplierId
@@ -1583,7 +1904,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
       },
       auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
-      suppapi
+        suppapi
           .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
@@ -1712,7 +2033,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
             // this.dialogMakeSure = false
             // this.dialogAllocation = false
             // this.dialogMakeSure2 = false
-            // this.dialogVisible = false
+            // this.dialogSecUnitSeparateVisible = false
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -29,6 +29,8 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '4'">专业审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="concentrateAuditClick" 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 != '6'">1{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="parseInt(this.formData.Status) === 10">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -656,24 +658,6 @@
         <el-button type="primary" size="small" @click="commonAuditMakeSure()" :loading="btnloading">确 定</el-button>
       </div>
     </el-dialog>
-    <!--<el-dialog title="分配" :visible.sync="dialogAllocation">-->
-    <!--  <el-form :model="shenheForm" label-width="100px" ref="shenheForm">-->
-    <!--    <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-option>-->
-    <!--      </el-select>-->
-    <!--    </el-form-item>-->
-    <!--    <el-form-item label="意见">-->
-    <!--      <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>-->
-    <!--    </el-form-item>-->
-    <!--  </el-form>-->
-    <!--  <div slot="footer" class="dialog-footer" style="margin-top: -25px">-->
-    <!--    <el-button size="small" @click="dialogAllocation = false">取 消</el-button>-->
-    <!--    <el-button type="primary" size="small" @click="makeSure()" :loading="btnloading">确 定</el-button>-->
-    <!--  </div>-->
-    <!--</el-dialog>-->
     <el-dialog title="分配" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审批人">
@@ -711,17 +695,17 @@
         <el-button type="primary" size="small" @click="concentrateAuditEntityMakeSure()" :loading="btnloading">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+    <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批状态">
-              <el-radio-group v-model="shenheForm.SuccessStatus">
-                <el-radio :label="1">通过</el-radio>
-                <el-radio :label="0">退回</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+          <!--  <el-form-item label="审批状态">-->
+          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
+          <!--      <el-radio :label="1">通过</el-radio>-->
+          <!--      <el-radio :label="0">退回</el-radio>-->
+          <!--    </el-radio-group>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -776,8 +760,8 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="makeSure()" :loading="btnloading">确定</el-button>
+        <el-button size="mini" @click="dialogSecUnitSeparateVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="secUnitSeparateAuditMakeSure()" :loading="btnloading">确定</el-button>
       </span>
     </el-dialog>
 
@@ -930,7 +914,7 @@
           Remark: '' // 备注
         },
         subfileList1: [],
-        dialogVisible: false, // 增项分办
+        dialogSecUnitSeparateVisible: false, // 增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
@@ -1194,6 +1178,9 @@
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
             this.shenheForm.AuditorRemark = '集中评审通过。'
+          } else if (this.formData.Status === '6') {
+            this.auditTitle = '确认交费'
+            this.auditstepcode = 'PAYING_FEE'
           }
           this.inStyle = this.formData.InStyle
           this.getsubfile()
@@ -1325,13 +1312,117 @@
           console.log('33')
           this.getFirAuditerByDept()
           this.changeOrgUnit(this.selectDept)
-          this.dialogVisible = true
+          this.dialogSecUnitSeparateVisible = true
         } else {
           console.log('44')
           this.dialogMakeSure = true
           this.radioChange()
         }
       },
+      // 二级单位分办审批会话框 ⬇
+      secUnitSeparateAuditClick (val) {
+        console.log('二级单位分办审批会话框')
+        this.auditOrgChange()
+        this.btnstatus = val
+        this.getFirAuditerByDept()
+        this.changeOrgUnit(this.selectDept)
+        this.dialogSecUnitSeparateVisible = true
+      },
+      // 二级单位分办审批结果确认 ⬇
+      secUnitSeparateAuditMakeSure () {
+        console.log('二级单位分办审批结果确认')
+        this.shenheForm.SuccessStatus = 1
+        let checkRes = this.secUnitSeparateAuditParamsCheck()
+        if (!checkRes) {
+          return false
+        }
+        this.btnloading = true
+        let params = {
+          FirstAudit: this.auditer,
+          SecondAudit: this.fushenauditer,
+          ThirdAudit: this.selectDept,
+          AuditRemark: this.auditform.AuditRemark
+        }
+        console.log('二级单位分办审批结果提交参数：', params)
+        api2.separateAuditEntity(this.certId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogSecUnitSeparateVisible = false
+          this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      // 二级单位分办审批参数检查 ⬇
+      secUnitSeparateAuditParamsCheck () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.auditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择初审人！'
+            })
+            return
+          }
+          if (this.fushenauditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择复审人！'
+            })
+            return
+          }
+          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+            if (this.userOptions == null || this.userOptions.length === 0) {
+              this.$message({
+                type: 'warning',
+                message: '该专业科室未配置接收人！'
+              })
+              return
+            }
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+        } else {
+          this.shenheForm.AuditorRemark = this.backRemark
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return false
+          }
+        }
+        return true
+      },
       // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
       commonAuditClick () {
         console.log('审批公共会话框')
@@ -1545,6 +1636,48 @@
         }
         return true
       },
+      paySureClick () {
+        console.log('交费按钮')
+        this.$confirm('是否确认交费', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.payMakeSure()
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          })
+        })
+      },
+      payMakeSure () {
+        console.log('交费结果确认')
+        this.loading = true
+        let params = {
+          payStatus: this.payStatus
+        }
+        console.log('交费结果确认提交参数：', this.certId)
+        api2.updatePayStatus(this.certId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('交费成功')
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogSecUnitSeparateVisible = false
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       getDictOptions () {
         let params = {
           status: this.formData.Status,
@@ -2047,7 +2180,7 @@
             // this.dialogMakeSure = false
             // this.dialogAllocation = false
             // this.dialogMakeSure2 = false
-            // this.dialogVisible = false
+            // this.dialogSecUnitSeparateVisible = false
             this.$message({
               type: 'success',
               message: res.data.message

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

@@ -23,10 +23,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" @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="this.formData.Status == '10'">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick" v-if="auditBtn && this.formData.Status === '3'">提交专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" 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 != '6'">{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="parseInt(this.formData.Status) === 10">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -555,10 +558,28 @@
         <el-button type="primary" size="small" @click="makeSure()" :loading="btnloading">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="分配" :visible.sync="dialogAllocation">
+    <el-dialog title="审核" :visible.sync="dialogCommonAuditMakeSureVisible">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1"  @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2"  @change="radioChange">退回</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogCommonAuditMakeSureVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="commonAuditMakeSure()" :loading="btnloading">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="分配" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审批人">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
+          <el-select ref="selectAuditer" v-model="ProfessionalAudit" 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>
@@ -569,21 +590,21 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
-        <el-button size="small" @click="dialogAllocation = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="makeSure()" :loading="btnloading">确 定</el-button>
+        <el-button size="small" @click="dialogBusinessOfficeSeparateAuditVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="businessOfficeSeparateAuditMakeSure()" :loading="btnloading">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+    <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批状态">
-              <el-radio-group v-model="shenheForm.SuccessStatus">
-                <el-radio :label="1">通过</el-radio>
-                <el-radio :label="0">退回</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+          <!--  <el-form-item label="审批状态">-->
+          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
+          <!--      <el-radio :label="1">通过</el-radio>-->
+          <!--      <el-radio :label="0">退回</el-radio>-->
+          <!--    </el-radio-group>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -638,8 +659,8 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="makeSure()" :loading="btnloading">确定</el-button>
+        <el-button size="mini" @click="dialogSecUnitSeparateVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="secUnitSeparateAuditMakeSure()" :loading="btnloading">确定</el-button>
       </span>
     </el-dialog>
 
@@ -678,17 +699,14 @@
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue';
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
-   // v-viewer
-  import Vue from 'vue';
+  // v-viewer
+  import Vue from 'vue'
   import Viewer from 'v-viewer'
   import 'viewerjs/dist/viewer.css'
   Vue.use(Viewer)
   Viewer.setDefaults({
     Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
   })
-
-
-
   export default {
     components: {
       WfMultiHistory,
@@ -743,6 +761,7 @@
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
         secorgtreelist: [],
+        ProfessionalAudit: '',
         majorDept: [100000000, 100000001, 100000071],
         auditbusList: [], // 待审核业务
         allorgunitOptions: [],
@@ -751,6 +770,8 @@
         dialogMakeSure: false,
         dialogAllocation: false,
         dialogMakeSure2: false,
+        dialogCommonAuditMakeSureVisible: false,
+        dialogBusinessOfficeSeparateAuditVisible: false,
         aduitlabel: '审核人',
         auditer: '',
         auditerName: '',
@@ -810,7 +831,7 @@
           AppendType: '', // 增项类别(01 物资类，02 基建类，03 服务类)
           Remark: '' // 备注
         },
-        dialogVisible: false, // 增项分办
+        dialogSecUnitSeparateVisible: false, // 增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
@@ -1074,6 +1095,8 @@
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
             this.shenheForm.AuditorRemark = '集中评审通过。'
+          } else if (_this.formData.Status === '6') {
+            this.auditstepcode = 'PAYING_FEE'
           }
           this.inStyle = this.formData.InStyle
           this.getSortList()
@@ -1120,7 +1143,7 @@
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.formData.Status === '5') {
             this.textplaceholder = '请填写审批意见'
-          }else{
+          } else {
             this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
           }
         } else {
@@ -1176,9 +1199,8 @@
           SupCertId: this.formData.SupplierCertId,
           SupTypeCode: '03'
         }
-
-      //访问接口
-      api.getListAppend(params, this.$axios).then(res => {
+        // 访问接口
+        api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -1203,12 +1225,312 @@
           this.dialogMakeSure2 = true
         } else if (this.formData.Status === '10') {
           this.getFirAuditerByDept()
-          this.dialogVisible = true
+          this.dialogSecUnitSeparateVisible = true
         } else {
           this.dialogMakeSure = true
           this.radioChange()
         }
       },
+      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
+      commonAuditClick () {
+        console.log('审批公共会话框')
+        this.dialogCommonAuditMakeSureVisible = true
+        this.radioChange()
+      },
+      commonAuditMakeSure () {
+        let checkRes = this.commonAuditParamsCheck()
+        console.log('审批结果公共提交，参数检查结果', checkRes)
+        if (!checkRes) {
+          return false
+        }
+        this.btnloading = true
+        let params = {
+          result: this.shenheForm.SuccessStatus,
+          AuditRemark: this.shenheForm.AuditorRemark
+        }
+        console.log('审批结果提交参数：', params)
+        api2.commonAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            // this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.$router.push('/')
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogCommonAuditMakeSureVisible = false
+          this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      commonAuditParamsCheck () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if ((!this.auditer || this.auditer === 0) && (this.formData.Status == '0' || this.formData.Status == '10' || this.formData.Status == '3')) {
+            this.$message({
+              type: 'warning',
+              message: '请选择审核人！'
+            })
+            return
+          }
+          if (this.formData.Status == '10') {
+            if (!this.fushenauditer || this.fushenauditer === 0) {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
+            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+              if (this.selectDept === 0 || this.selectDept == '') {
+                this.$message({
+                  type: 'warning',
+                  message: '请选择专业处室！'
+                })
+                return
+              }
+            }
+            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
+            }
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return false
+          }
+        } else {
+          if (this.formData.Status === '10') {
+            this.shenheForm.AuditorRemark = this.backRemark
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
+            .Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return false
+          }
+        }
+        return true
+      },
+      // 二级单位分办审批会话框 ⬇
+      secUnitSeparateAuditClick (val) {
+        console.log('二级单位分办审批会话框')
+        this.auditOrgChange()
+        this.btnstatus = val
+        this.getFirAuditerByDept()
+        this.changeOrgUnit(this.selectDept)
+        this.dialogSecUnitSeparateVisible = true
+      },
+      // 二级单位分办审批结果确认 ⬇
+      secUnitSeparateAuditMakeSure () {
+        console.log('二级单位分办审批结果确认')
+        this.shenheForm.SuccessStatus = 1
+        let checkRes = this.secUnitSeparateAuditParamsCheck()
+        if (!checkRes) {
+          return false
+        }
+        this.btnloading = true
+        let params = {
+          FirstAudit: this.auditer,
+          SecondAudit: this.fushenauditer,
+          ThirdAudit: this.selectDept,
+          AuditRemark: this.auditform.AuditRemark
+        }
+        console.log('二级单位分办审批结果提交参数：', params)
+        api2.separateAuditEntity(this.certId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogSecUnitSeparateVisible = false
+          this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      // 二级单位分办审批参数检查 ⬇
+      secUnitSeparateAuditParamsCheck () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.auditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择初审人！'
+            })
+            return
+          }
+          if (this.fushenauditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择复审人！'
+            })
+            return
+          }
+          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
+            if (this.userOptions == null || this.userOptions.length === 0) {
+              this.$message({
+                type: 'warning',
+                message: '该专业科室未配置接收人！'
+              })
+              return
+            }
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+        } else {
+          this.shenheForm.AuditorRemark = this.backRemark
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return false
+          }
+        }
+        return false
+      },
+      // 专业处室分办审批
+      businessOfficeSeparateAuditClick () {
+        console.log('专业处室分办审批提交按钮')
+        this.auditOrgChange()
+        console.log('请求部门结束')
+        this.dialogBusinessOfficeSeparateAuditVisible = true
+      },
+      businessOfficeSeparateAuditMakeSure () {
+        if (this.ProfessionalAudit === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择审批人！'
+          })
+          return
+        }
+        let params = {
+          ProfessionalAudit: this.ProfessionalAudit,
+          AuditRemark: this.shenheForm.AuditorRemark
+        }
+        this.btnloading = true
+        console.log('业务处室专业审批, 提交参数: ', params)
+        api2.businessOfficeSeparateAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            // this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.$router.push('/')
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogBusinessOfficeSeparateAuditVisible = false
+          this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      paySureClick () {
+        console.log('交费按钮')
+        this.$confirm('是否确认交费', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.payMakeSure()
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          })
+        })
+      },
+      payMakeSure () {
+        console.log('交费结果确认')
+        this.loading = true
+        let params = {
+          payStatus: this.payStatus
+        }
+        console.log('交费结果确认提交参数：', this.certId)
+        api2.updatePayStatus(this.certId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('交费成功')
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.dialogSecUnitSeparateVisible = false
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       getDictOptions () {
         let params = {
           status: this.formData.Status,
@@ -1712,7 +2034,7 @@
             // this.dialogMakeSure = false
             // this.dialogAllocation = false
             // this.dialogMakeSure2 = false
-            // this.dialogVisible = false
+            // this.dialogSecUnitSeparateVisible = false
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1729,21 +2051,20 @@
           console.error(err)
         })
       },
-       imgFormat(val,index){
-         console.log(val)
-        if(val !=null && val != undefined && val !=''){
+      imgFormat (val, index) {
+        if (val != null && val != undefined && val != '') {
           let fileurlall = val.split('$')[index]
           let fileurl = fileurlall.split('|')
-          if(fileurl[1] != null && fileurl[1] !='' && fileurl[1] != undefined){
-            let Format  = fileurl[1].split(".")
-            if(Format[1]!=null && Format[1] !='' && Format[1] != undefined){
-               let pictureFormat = Format[1];
-              if("jpg"== pictureFormat || "bmp" ==pictureFormat || "png" ==pictureFormat || "gif" ==pictureFormat|| "jpeg" ==pictureFormat){
-                return false;
+          if (fileurl[1] != null && fileurl[1] != '' && fileurl[1] != undefined) {
+            let Format = fileurl[1].split('.')
+            if (Format[1] != null && Format[1] != '' && Format[1] != undefined) {
+              let pictureFormat = Format[1]
+              if (pictureFormat == 'jpg' || pictureFormat == 'bmp' || pictureFormat == 'png' || pictureFormat == 'gif' || pictureFormat == 'jpeg') {
+                return false
               }
             }
           }
-          return true;
+          return true
         }
       },
       fileurlcut (val, index) {

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

@@ -712,7 +712,7 @@
               <!--<el-cascader :options="preorgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable disabled-->
                 <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">-->
               <!--</el-cascader>-->
-              <el-select  v-model="selectDept" filterable
+              <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"
                             :value="item.Id">

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

@@ -8,7 +8,7 @@
     <el-card class="box-card">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 审批-{{auditBtn}}
+          <i class="icon icon-table2"></i> 审批
         </span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 1">初审</el-button>

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

@@ -8,7 +8,7 @@
     <el-card class="box-card">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 审批-{{auditBtn}}
+          <i class="icon icon-table2"></i> 审批
         </span>
         <span style="float: right;">
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->