年审----交费按钮

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

@@ -32,6 +32,7 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="profAudit()" v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button> &lt;!&ndash; 未用到 &ndash;&gt;-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()" v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>&lt;!&ndash; 未用到 &ndash;&gt;-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button><!-- 企业法规处 -->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '7'">入库审批</el-button><!-- 企业法规处 -->
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
@@ -1550,9 +1551,15 @@ export default {
       // this.getorgtreelistbydeptid()
       // this.orgtreeChange(this.majorDept)
       this.getsubfile()
+      this.setStorageRemark()
     },
     methods: {
-
+      setStorageRemark () {
+        console.log('不锐深状态', this.AnnualStatus)
+        if (this.AnnualStatus === '7') {
+          this.shenheForm.AuditorRemark = '入库审批已通过。'
+        }
+      },
       imgFormat (val, index) {
         if (val != null && val != undefined && val != '') {
           let fileurlall = val.split('$')[index]
@@ -1875,6 +1882,10 @@ export default {
               this.auditstepcode = 'PROF_AUDIT'
             } else if (this.anndata.Status === '5') {
               this.auditstepcode = 'PROF_REGULATION'
+            } else if (this.anndata.Status === '6') {
+              this.auditstepcode = 'PAYING_FEE'
+            } else if (this.anndata.Status === '7') {
+              this.auditstepcode = 'PROF_REGULATION_STORAGE'
             } else if (this.anndata.Status === '10') {
               if (this.anndata.SupplierTypeName === '01') {
                 this.auditstepcode = 'SUB_OFFICE_WZ'
@@ -1913,6 +1924,11 @@ export default {
         } else {
           this.textplaceholder = '退回意见不能少于5个字'
         }
+        if (this.AnnualStatus === '7' && this.shenheForm.SuccessStatus === 1) {
+          this.shenheForm.AuditorRemark = '入库审批已通过。'
+        } else {
+          this.shenheForm.AuditorRemark = ''
+        }
       },
       SetFormData (fdata) {
         this.isCanUpdateSupplier(fdata.Id)
@@ -2507,7 +2523,7 @@ export default {
       commonAuditParamsCheck () {
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
-            if (this.AnnualStatus !== '5') {
+            if (this.AnnualStatus !== '5' && this.AnnualStatus !== '7') {
               this.$message({
                 type: 'warning',
                 message: '审批意见不能低于20个字符！'

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

@@ -25,6 +25,7 @@
           <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(this.formData.Status) === 6">交费</el-button>
           <router-link :to="'/oilsupplier/annualaudit/goodsindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
           </router-link>
@@ -1249,6 +1250,7 @@
       return {
         firOptions: [],
         newVisible: false,
+        auditBtn: false,
         newSubfileForm: {
           Id: '',
           SupplierId: '',
@@ -1756,8 +1758,42 @@
       this.orgtreeChange(this.majorDept)
       this.getsubfile()
       this.initTableHeader()
+      this.isAccess()
     },
     methods: {
+      isAccess () {
+        this.getAuditStepCodeByStatus()
+        let params = {
+          id: this.formData.Id,
+          auditstepcode: this.auditstepcode,
+          processkey: 'oil_audit_apply'
+        }
+        apiCert.isAccess(params, this.$axios).then(res => {
+          this.auditBtn = res.data
+        }).catch(err => {
+          console.log(err)
+        })
+      },
+      getAuditStepCodeByStatus () {
+        if (this.Status === '1') {
+          this.auditstepcode = 'FIRST_TRIAL'
+        } else if (this.Status === '2') {
+          this.auditstepcode = 'SECOND_TRIAL'
+        } else if (this.Status === '3') {
+          this.auditstepcode = 'PROF_RECE'
+        } else if (this.Status === '4') {
+          this.auditstepcode = 'PROF_AUDIT'
+        } else if (this.Status === '5') {
+          this.auditstepcode = 'PROF_REGULATION'
+          this.shenheForm.AuditorRemark = '集中评审通过。'
+        } else if (this.Status === '6') {
+          this.auditstepcode = 'PAYING_FEE'
+        } else if (this.Status === '7') {
+          this.auditstepcode = 'PROF_REGULATION_STORAGE'
+        } else if (this.Status === '10') {
+          this.auditstepcode = 'SUB_OFFICE_JS'
+        }
+      },
       getFirAuditerByDept () {
         let deptid = this.authUser.Profile.DepartmentId
         this.userOptions = []

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -76,6 +76,7 @@
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
+              <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>