付费申请 系统管理员在审核通过情况下允许撤销

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -18,8 +18,8 @@
                     :loading="saveLoading" @click="submit('申请')">提交申请
                 </el-button>
                 <el-button size="small" type="warning" plain style="margin-right: 8px" :disabled="!form.id || editPower"
-                    v-if="form.status == '1' || form.status == '4'" :loading="saveLoading"
-                    @click="revokeSettlementApprovefun">撤销申请
+                    v-if="form.status == '1' || form.status == '4' || (form.status == '3' && roleName.indexOf('admin') != -1)"
+                    :loading="saveLoading" @click="revokeSettlementApprovefun">撤销申请
                 </el-button>
                 <span v-if="form.status == '3'" style="font-size: 12px;padding-right: 10px;">审核通过</span>
                 <el-button type="success" size="small" :disabled="!form.id" plain @click="newbillFun">新建账单
@@ -565,7 +565,7 @@ export default {
     },
     methods: {
         importData(list) {
-            this.tableData=this.tableData.concat(list)
+            this.tableData = this.tableData.concat(list)
         },
         dicChange(name, row) {
             if (name == 'branchName') {
@@ -839,8 +839,7 @@ export default {
                 this.form.billNoFormat = 'FFSQ'
                 this.form.businessTypeCode = 'FFSQ'
                 this.form.businessType = 'FFSQ' // 结算单
-                this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(',') :
-                    '' // 业务类型
+                this.form.businessTypes = Array.isArray(this.form.businessTypes) ? this.form.businessTypes.join(',') : '' // 业务类型
                 this.form.feeCnName = Array.isArray(this.form.feeCnName) ? this.form.feeCnName.join(',') : this.form.feeCnName
                 this.saveLoading = true // 打开按钮动画
                 if (this.form.id) {
@@ -1001,7 +1000,7 @@ export default {
             })
 
         },
-        quickSearch(){
+        quickSearch() {
             this.$refs.form.validate((valid) => {
                 if (!valid) return
                 // 判断是否有对账单位
@@ -1195,6 +1194,8 @@ export default {
             this.form.estimatedTime = this.form.estimatedTime ? this.form.estimatedTime.slice(0, 10) + ' 00:00:00' :
                 null
             this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + ' 00:00:00' : null
+            this.form.auditDateTo = this.form.auditDateTo ? this.form.auditDateTo.slice(0, 10) +
+                ' 00:00:00' : null
             this.form.url = '/iosBasicData/PaymentApplication/index',
                 this.form.pageStatus = "this.$store.getters.paidapplication"
             this.form.pageLabel = "付费申请(F)"