panhui 5 роки тому
батько
коміт
cfb3c17da4

+ 4 - 4
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;
                 }
             });

+ 4 - 4
src/main/vue/src/views/Operation/RoomStatus.vue

@@ -1687,14 +1687,14 @@ export default {
             var list1 = [...this.storeItemList];
             if (this.chooseBedInfo.checkinInfo) {
                 var list2 = [...this.chooseBedInfo.checkinInfo.checkinItemList];
-                list2=list2.filter(item=>{
-                    return item.status != 'REVERT'
-                })
+                list2 = list2.filter(item => {
+                    return item.status != 'REVERT';
+                });
                 var idList = list2.map(item => {
                     return item.storeItemId;
                 });
                 list1.forEach(item => {
-                    if (idList.indexOf(item.id) != -1 ) {
+                    if (idList.indexOf(item.id) != -1) {
                         list.push({
                             ...item,
                             choose: true,