Merge branch 'hotfix/v2-1107' into develop

pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js

@@ -31,7 +31,7 @@ export default class SystemSalaryItemModal extends React.Component {
 
   render() {
     const { salaryItemStore } = this.props;
-    const { sysListTableStore } = salaryItemStore;
+    const { sysListTableStore, saveLoading } = salaryItemStore;
     const { searchValue } = this.state;
 
     const handleAdd = () => {
@@ -50,14 +50,19 @@ export default class SystemSalaryItemModal extends React.Component {
         }}
         style={{ width: "60vw" }}
         buttons={[
-          <Button type="primary" onClick={() => {
-            handleAdd();
-          }}>添加</Button>
+          <Button
+            type="primary"
+            loading={saveLoading}
+            onClick={() => {
+              handleAdd();
+            }}
+          >添加</Button>
         ]}
       >
         <div className="headerSearchWrapper">
           <WeaInputSearch
             value={searchValue}
+            placeholder="请输入名称"
             onChange={(value) => {
               this.handleSearchChange(value);
             }}

pc4mobx/hrmSalary/stores/salaryItem.js

@@ -15,6 +15,7 @@ export class SalaryItemStore {
   @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据
   @observable showSearchAd = false; // 高级搜索面板显示
   @observable loading = true; // 数据加载状态
+  @observable saveLoading = false; // 数据保存状态
   @observable systemItemVisible = false;
   @observable deleteTableStore = new TableStore(); // 批量删除
   @observable deleteItemVisible = false;  // 删除Modal
@@ -142,7 +143,9 @@ export class SalaryItemStore {
       message.warning("未选择任何条目");
       return;
     }
+    this.saveLoading = true;
     API.saveSysItem(ids).then(res => {
+      this.saveLoading = false;
       if (res.status) {
         this.setSystemItemVisible(false);
         this.getTableDatas({});