Merge remote-tracking branch 'origin/master'

src/main/vue/src/views/CheckinInfoEdit.vue

@@ -57,13 +57,13 @@
                 <el-input v-model="formData.orderId" disabled></el-input>
             </el-form-item>
             <el-form-item prop="depositAmount" label="押金金额">
-                <el-input-number type="number" :disabled="!checkAdmin && formData.id" v-model="formData.depositAmount">
+                <el-input-number type="number" :disabled="!checkRole && formData.id" v-model="formData.depositAmount">
                 </el-input-number>
             </el-form-item>
             <el-form-item prop="depositStatus" label="押金状态">
                 <el-select
                     v-model="formData.depositStatus"
-                    :disabled="!checkAdmin && formData.id"
+                    :disabled="!checkRole && formData.id"
                     clearable
                     filterable
                     placeholder="请选择"
@@ -216,11 +216,11 @@ export default {
         authorities() {
             return this.userInfo.authorities || [];
         },
-        checkAdmin() {
+        checkRole() {
             var val = false;
             var authorities = [...this.authorities];
             authorities.forEach(item => {
-                if (item.name === 'ROLE_ADMIN') {
+                if (item.name === 'ROLE_ADMIN' || item.name === 'ROLE_FINANCIAL_DIRECTOR') {
                     val = true;
                 }
             });