diff --git a/src/api/system/allowAdjustment.js b/src/api/system/allowAdjustment.js
new file mode 100644
index 0000000..ae041d7
--- /dev/null
+++ b/src/api/system/allowAdjustment.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询是否允许更改
+export function getAllowAdjustment() {
+  return request({
+    url: '/attendance/param/allow/adjustment',
+    method: 'get',
+  })
+}
diff --git a/src/views/attendance/statistical/index.vue b/src/views/attendance/statistical/index.vue
index 9fe7846..9a076d0 100644
--- a/src/views/attendance/statistical/index.vue
+++ b/src/views/attendance/statistical/index.vue
@@ -126,13 +126,16 @@
       </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['attendance:statistical:edit']"
-          >修改</el-button>
+          <el-tooltip :disabled="!scope.row.allowAdjustment" content="当前月考勤已经生成工资报表, 禁止修改" placement="top" effect="light">
+            <el-button
+              size="mini"
+              type="text"
+              :disabled="scope.row.allowAdjustment"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['attendance:statistical:edit']"
+            >修改</el-button>
+          </el-tooltip>
           <el-button
             size="mini"
             type="text"
@@ -376,7 +379,7 @@
       :size="'60%'"
         direction="rtl">
         <div class="block">
-          <el-timeline >
+          <el-timeline v-if="info.activities.length > 0">
             <el-timeline-item v-for="(activity, index) in info.activities" :key="index" placement="top" :timestamp="activity.operationTime">
               <el-card>
                 <div slot="header" class="clearfix">
@@ -386,6 +389,7 @@
               </el-card>
             </el-timeline-item>
           </el-timeline>
+          <row v-else><el-col :span="24" style="text-align: center;">暂无操作记录</el-col></row>
         </div>
     </el-drawer>
 
diff --git a/src/views/finance/financeStatistics/index.vue b/src/views/finance/financeStatistics/index.vue
index f568246..f3472d1 100644
--- a/src/views/finance/financeStatistics/index.vue
+++ b/src/views/finance/financeStatistics/index.vue
@@ -34,13 +34,13 @@
             @click="handleDetail(scope.row)"
             v-hasPermi="['finance:financeStatistics:detail']"
           >查看详情</el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['finance:financeStatistics:remove']"
-          >删除</el-button>
+          >删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/staff/index.vue b/src/views/system/staff/index.vue
index 55e7d48..0433289 100644
--- a/src/views/system/staff/index.vue
+++ b/src/views/system/staff/index.vue
@@ -78,14 +78,17 @@
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-circle-close"
-          size="mini"
-          @click="handleClearAll"
-          v-hasPermi="['system:staff:cleanSubsidy']"
-        >清除补助</el-button>
+        <el-tooltip :disabled="allowAdjustment" content="当前月考勤计算还未开始或已经结束" placement="top" effect="light">
+          <el-button
+            type="primary"
+            plain
+            :disabled="!allowAdjustment"
+            icon="el-icon-circle-close"
+            size="mini"
+            @click="handleClearAll"
+            v-hasPermi="['system:staff:cleanSubsidy']"
+          >清除补助</el-button>
+        </el-tooltip>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -118,22 +121,28 @@
         >导入信息</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="uploadAccumulationFund"
-          v-hasPermi="['system:staff:importFund']"
-        >上传五险一金</el-button>
+        <el-tooltip :disabled="allowAdjustment" content="当前月考勤计算还未开始或已经结束" placement="top" effect="light">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            :disabled="!allowAdjustment"
+            @click="uploadAccumulationFund"
+            v-hasPermi="['system:staff:importFund']"
+          >上传五险一金</el-button>
+        </el-tooltip>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="importSalesCommissions"
-          v-hasPermi="['system:staff:importSalesCommissions']"
-        >上传销售提成</el-button>
+        <el-tooltip :disabled="allowAdjustment" content="当前月考勤计算还未开始或已经结束" placement="top" effect="light">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            :disabled="!allowAdjustment"
+            @click="importSalesCommissions"
+            v-hasPermi="['system:staff:importSalesCommissions']"
+          >上传销售提成</el-button>
+        </el-tooltip>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -709,67 +718,74 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="其他补助" prop="otherSubsidies">
-              <el-input v-model="infoForm.otherSubsidies" placeholder="其他补助" >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
+            <el-tooltip :disabled="allowAdjustment" content="当前月考勤计算还未开始或已经结束" placement="top" effect="light">
+              <el-form-item label="其他补助" prop="otherSubsidies">
+                <el-input v-model="infoForm.otherSubsidies" :disabled="!allowAdjustment" placeholder="其他补助" >
+                  <template slot="append">元</template>
+                </el-input>
+              </el-form-item>
+            </el-tooltip>
+            
           </el-col>
           <el-col :span="4">
-            <el-form-item label="固定补助" prop="fixedAllowance">
-              <el-input v-model="infoForm.fixedAllowance" placeholder="固定补助" >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
+            <el-tooltip :disabled="allowAdjustment" content="当前月考勤计算还未开始或已经结束" placement="top" effect="light">
+              <el-form-item label="固定补助" prop="fixedAllowance">
+                <el-input v-model="infoForm.fixedAllowance" :disabled="!allowAdjustment" placeholder="固定补助" >
+                  <template slot="append">元</template>
+                </el-input>
+              </el-form-item>
+            </el-tooltip>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="其他扣款" prop="deductions">
-              <el-input v-model="infoForm.deductions" placeholder="其他扣款" >
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
+            <el-tooltip :disabled="allowAdjustment" content="当前月考勤计算还未开始或已经结束" placement="top" effect="light">
+              <el-form-item label="其他扣款" prop="deductions">
+                <el-input v-model="infoForm.deductions" :disabled="!allowAdjustment" placeholder="其他扣款" >
+                  <template slot="append">元</template>
+                </el-input>
+              </el-form-item>
+            </el-tooltip>
           </el-col>
         </el-row>
         <el-divider content-position="left">个税抵扣详情</el-divider>
         <el-row>
           <el-col :span="4">
             <el-form-item label="子女教育" prop="childrenEducation">
-              <el-input v-model="infoForm.childrenEducation" placeholder="子女教育" >
+              <el-input v-model="infoForm.childrenEducation" :disabled="!allowAdjustment" placeholder="子女教育" >
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="继续教育" prop="adultEducation">
-              <el-input v-model="infoForm.adultEducation" placeholder="继续教育" >
+              <el-input v-model="infoForm.adultEducation" :disabled="!allowAdjustment" placeholder="继续教育" >
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="住房贷款" prop="housingLoans">
-              <el-input v-model="infoForm.housingLoans" placeholder="住房贷款">
+              <el-input v-model="infoForm.housingLoans" :disabled="!allowAdjustment" placeholder="住房贷款">
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="住房租金" prop="housingRents">
-              <el-input v-model="infoForm.housingRents" placeholder="住房租金" >
+              <el-input v-model="infoForm.housingRents" :disabled="!allowAdjustment" placeholder="住房租金" >
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="赡养老人" prop="supportTheOld">
-              <el-input v-model="infoForm.supportTheOld" placeholder="赡养老人" >
+              <el-input v-model="infoForm.supportTheOld" :disabled="!allowAdjustment" placeholder="赡养老人" >
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="大病医疗" prop="treatmentForSeriousDisease">
-              <el-input v-model="infoForm.treatmentForSeriousDisease" placeholder="大病医疗" >
+              <el-input v-model="infoForm.treatmentForSeriousDisease" :disabled="!allowAdjustment" placeholder="大病医疗" >
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
@@ -915,6 +931,7 @@ import { listAllDepts } from '@/api/system/dept';
 import { listAllOptions } from '@/api/personnelMatters/subsidyInformation';
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
+import {  getAllowAdjustment } from "@/api/system/allowAdjustment";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
@@ -946,6 +963,8 @@ export default {
       openWorker: false,
       //全额,离职，转正显示标识
       disPlayFlag: "0",
+      //是否允许调整
+      allowAdjustment: true,
       // 员工信息导入
       upload: {
         // 是否显示弹出层（员工导入）
@@ -1076,6 +1095,7 @@ export default {
     };
   },
   created() {
+    this.getAllowAdjustment();
     this.getList();
     this.getDeptList();
     this.getSubsidyList();
@@ -1113,6 +1133,12 @@ export default {
         this.deptOptions = response;
       });
     },
+
+    getAllowAdjustment(){
+      getAllowAdjustment().then(response => {
+        this.allowAdjustment = response.data;
+      });
+    },
     /** 查询员工管理列表 */
     getList() {
       this.loading = true;