diff --git a/pc4mobx/hrmSalary/components/FormInfo/index.js b/pc4mobx/hrmSalary/components/FormInfo/index.js
new file mode 100644
index 00000000..d6940489
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/FormInfo/index.js
@@ -0,0 +1,98 @@
+import React, { Component } from "react";
+import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import { observer } from "mobx-react";
+import { WeaSwitch } from "comsMobx";
+
+const getLabel = WeaLocaleProvider.getLabel;
+@observer
+export default class FormInfo extends Component {
+  renderForm = () => {
+    const {
+      formFields, form, colCount, itemRender, onSelectedChangeHandle, showLabel, multiColumn, custLabelCol,
+      childrenComponents
+    } = this.props;
+
+    let groupArr = [];
+    const formParams = form.getFormParams();
+    const labelVisible = showLabel == null || showLabel == true;
+    const col = colCount ? colCount : 1;
+    const labelCol = labelVisible ? (custLabelCol || 6) : 0;
+    const itemProps = {
+      // ratio1to2: labelVisible && custLabelCol == null,
+      style: { marginLeft: 0 },
+      tipPosition: "bottom",
+      labelCol: { span: labelCol },
+      wrapperCol: { span: 22 - labelCol }
+    };
+    const textAreaProps = { minRows: 4, maxRows: 4 };
+
+    formFields.map((fields, i) => {
+      let formItems = [];
+      fields.items.map((field, j) => {
+        const customerRender = itemRender != null ? itemRender[field.domkey[0]] : null;
+        const showCheckbox = field.checkbox || false;
+        let label = getLabel(field.lanId, field.label);
+        if (showCheckbox)
+          label = <WeaCheckbox content={label} value={field.checkboxValue} onChange={(v) => {
+            field.checkboxValue = v === "1";
+            onSelectedChangeHandle && onSelectedChangeHandle(field, v);
+          }}/>;
+        let coms;
+        if (customerRender == null) {
+          coms = <WeaSwitch fieldConfig={{
+            ...field, helpfulTip: getLabel(field.helpfulTipLanId || "", field.helpfulTip || ""), ...textAreaProps,
+            hasBorder: false
+          }} form={form} formParams={formParams}/>;
+        } else {
+          coms = customerRender({
+            ...field, helpfulTip: getLabel(field.helpfulTipLanId || "", field.helpfulTip || "")
+          }, textAreaProps, form, formParams);
+        }
+        Object.assign(itemProps, { label, error: form.getError(field) });
+        let col = colCount ? colCount : 1;
+        if (multiColumn != null) {//检查有哪些字段需要一行显示多个
+          const idx = _.findIndex(multiColumn, item => item.key === field.domkey[0]);
+          if (idx > -1) {
+            col = field.colSpan || 1;
+            if (multiColumn[idx].labelCol != null)//检查字段是否有配置标题宽度
+              Object.assign(itemProps, {
+                labelCol: { span: multiColumn[idx].labelCol },
+                wrapperCol: { span: 24 - multiColumn[idx].labelCol }
+              });
+          } else {
+            Object.assign(itemProps, {
+              labelCol: { span: labelCol },
+              wrapperCol: { span: 24 - labelCol }
+            });
+          }
+        }
+        coms != null && formItems.push({
+          com: (<WeaFormItem {...itemProps}>{coms}</WeaFormItem>),
+          col
+        });
+
+        if (childrenComponents && childrenComponents[field.domkey[0]]) {
+          childrenComponents[field.domkey[0]]().map(child => formItems.push(child));
+        }
+      });
+
+      groupArr.push(<WeaSearchGroup
+        center={this.props.center != null ? this.props.center : true}
+        needTigger={true}
+        title={formFields.length < 2 ? null : fields.title}
+        showGroup={true}
+        items={formItems}
+        col={col}
+        fontSize={14}/>);
+    });
+    return groupArr;
+  };
+
+  render() {
+    const { formFields, className, form } = this.props;
+    if (formFields == null || !form.isFormInit) return (<div></div>);
+    return (
+      <div className={className}>{this.renderForm()}</div>
+    );
+  }
+}
diff --git a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
index 935e1e00..f4c62718 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
@@ -53,7 +53,7 @@ class PersonalScopeModal extends Component {
       if (!_.isEmpty(nextProps.record)) {
         this.setState({
           targetType: nextProps.record.targetType,
-          targetTypeIds: String(nextProps.record.targetId),
+          targetTypeIds: nextProps.record.targetType !== "SQL" ? String(nextProps.record.targetId) : nextProps.record.target,
           targetTypeIdsNames: nextProps.record.targetName,
           status: nextProps.record.status,
           statusAll: ""
diff --git a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
index 5faaf8a9..d8824c8b 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
@@ -41,7 +41,7 @@ class PersonalScopeTable extends Component {
   }
 
   getPersonalScopeList = (tabActive = this.props.tabActive) => {
-    const { searchValue, searchKeyVal, APIFox } = this.props;
+    const { searchValue, searchKeyVal, APIFox, showOperateBtn } = this.props;
     const { pageInfo, loading } = this.state;
     const payload = {
       [searchKeyVal["key"]]: searchKeyVal["value"],
@@ -60,7 +60,7 @@ class PersonalScopeTable extends Component {
             return {
               ...item,
               render: (text, record) => {
-                if (item.dataIndex === "targetName") {
+                if (item.dataIndex === "targetName" && showOperateBtn) {
                   return <a href="javascript:void(0);" onClick={() => this.props.onEditScope(record)}>{text}</a>;
                 }
                 return <span className="tdEllipsis" title={text}>{text}</span>;
diff --git a/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js
index e70c6967..32a5e5b0 100644
--- a/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js
+++ b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js
@@ -18,8 +18,10 @@ CodeMirror.extendMode("javascript", {
     if (this.jsonMode) {
       return /^[\[,{]$/.test(content) || /^}/.test(textAfter) || /^]/.test(textAfter);
     } else {
-      if (content == ";" && state.lexical && state.lexical.type == ")") return false;
-      return /^[;{}]$/.test(content) && !/^;/.test(textAfter);
+      if (content == ";" && state.lexical && state.lexical.type == "}") return false;
+      // if (content == ";" && state.lexical && state.lexical.type == ")") return false;
+      return /[=,]/.test(content) || /.*\)/.test(textAfter);
+      // return /^[;{}]$/.test(content) && !/^;/.test(textAfter);
     }
   }
 });
@@ -94,7 +96,8 @@ CodeMirror.defineExtension("autoFormatRange", function (from, to) {
         atSol = false;
       }
       if (!atSol && inner.mode.newlineAfterToken &&
-        inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state))
+        // inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state))
+        inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos, stream.pos + 2) || text[i + 1] || "", inner.state))
         newline();
     }
     if (!stream.pos && outer.blankLine) outer.blankLine(state);
diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.less b/pc4mobx/hrmSalary/components/pcTemplate/index.less
index e57fe5e5..4f834426 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/index.less
+++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less
@@ -82,6 +82,8 @@
       }
 
       .data-detail {
+        padding-bottom: 16px;
+
         .salary-group {
           background: #FFF;
 
diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
index d1fd2bb9..a58245c7 100644
--- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
+++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
@@ -46,8 +46,8 @@ class Index extends Component {
     const payload = {
       ...pageInfo, ...extra,
       departmentIds: departmentIds ? departmentIds.split(",") : [],
-      positionIds: departmentIds ? departmentIds.split(",") : [],
-      operatorIds: departmentIds ? departmentIds.split(",") : [],
+      positionIds: positionIds ? positionIds.split(",") : [],
+      operatorIds: operatorIds ? operatorIds.split(",") : [],
       effectiveTime: effectiveTime1 ? [effectiveTime1, effectiveTime2] : [],
       operateTime: operateTime1 ? [operateTime1, operateTime2] : []
     };
diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
index cdfe5a73..91a1a88f 100644
--- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
+++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
@@ -1,27 +1,24 @@
 import React from "react";
-import CustomTab from "../../components/customTab";
 import { inject, observer } from "mobx-react";
+import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom";
 import { getQueryString } from "../../util/url";
 import * as API from "../../apis/declare";
 import { Button } from "antd";
-import UnifiedTable from "../../components/UnifiedTable";
 import "./index.less";
 
+const { getLabel } = WeaLocaleProvider;
 @inject("taxAgentStore")
 @observer
 export default class GenerateDeclarationDetail extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      loading: false,
-      dataSource: [],
-      columns: [],
-      pageInfo: { current: 1, pageSize: 10, total: 0 },
-      declareInfo: {}
+      loading: false, dataSource: [], columns: [], declareInfo: {},
+      pageInfo: { current: 1, pageSize: 10, total: 0 }
     };
   }
 
-  componentWillMount() {
+  componentDidMount() {
     this.getDetailList();
     this.getDeclareInfo();
   }
@@ -37,31 +34,19 @@ export default class GenerateDeclarationDetail extends React.Component {
       if (status) {
         const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
         this.setState({
-          dataSource,
-          pageInfo: {
-            ...pageInfo,
-            current, pageSize, total
-          },
+          dataSource, pageInfo: { ...pageInfo, current, pageSize, total },
           columns: _.map(_.filter(columns, it => it.dataIndex !== "jobNum"), item => {
             if (item.dataIndex === "username") {
               return {
-                ...item,
-                render: (text, record) => {
-                  return <a className="ellipsis"
-                            href={`javaScript:openhrm(${record.employeeId});`}
-                            onClick={e => window.pointerXY(e)}
-                            title={text}
-                  >
-                    {text}
-                  </a>;
-                }
+                ...item, width: 180,
+                render: (text, record) => (<a className="ellipsis" href={`javaScript:openhrm(${record.employeeId});`}
+                                              onClick={e => window.pointerXY(e)}
+                                              title={text}>{text}</a>)
               };
             }
             return {
-              ...item,
-              render: (text) => {
-                return <span className="ellipsis" title={text}>{text}</span>;
-              }
+              ...item, width: (item.dataIndex === "cardType" || item.dataIndex === "cardNum") ? 180 : 100,
+              render: (text) => (<span className="ellipsis" title={text}>{text}</span>)
             };
           })
         });
@@ -78,26 +63,19 @@ export default class GenerateDeclarationDetail extends React.Component {
     const url = `${window.location.origin}/api/bs/hrmsalary/taxdeclaration/export?taxDeclarationId=${getQueryString("id")}`;
     window.open(url, "_self");
   };
+  renderTitle = () => {
+    const { declareInfo } = this.state;
+    return (<React.Fragment>
+      <span>{getLabel(111, "薪资所属月")}：{declareInfo.salaryMonth}</span>
+      <span style={{ marginLeft: "10px" }}>{getLabel(111, "个税扣缴义务人")}：{declareInfo.taxAgentName}</span>
+    </React.Fragment>);
+  };
 
   render() {
-    const { declareInfo, loading, pageInfo, columns, dataSource } = this.state;
+    const { loading, pageInfo, columns, dataSource } = this.state;
     const { taxAgentStore: { showOperateBtn } } = this.props;
-
-    const renderRightOperation = () => {
-      return (
-        <div style={{ display: "inline-block" }}>
-          <Button type="primary" onClick={this.handleExport}>导出</Button>
-        </div>
-      );
-    };
-    const renderLeftOperation = () => {
-      return (
-        <div style={{ display: "inline-block", lineHeight: "47px" }}>
-          <span>薪资所属月：{declareInfo.salaryMonth}</span>
-          <span style={{ marginLeft: "10px" }}>个税扣缴义务人：{declareInfo.taxAgentName}</span>
-        </div>
-      );
-    };
+    const buttons = showOperateBtn ? [<Button type="primary"
+                                              onClick={this.handleExport}>{getLabel(111, "导出全部")}</Button>] : [];
     const pagination = {
       ...pageInfo,
       showTotal: (total) => `共 ${total} 条`,
@@ -115,23 +93,12 @@ export default class GenerateDeclarationDetail extends React.Component {
         }, () => this.getDetailList());
       }
     };
-    return (
-      <div className="generateDeclarationDetail">
-        <CustomTab
-          searchOperationItem={showOperateBtn && renderRightOperation()}
-          leftOperation={renderLeftOperation()}
-        />
-        <div className="tableWrapper">
-          <UnifiedTable
-            rowKey="id"
-            columns={columns}
-            dataSource={dataSource}
-            pagination={pagination}
-            loading={loading}
-            xWidth={columns.length * 120}
-          />
-        </div>
+    return (<WeaTop title={this.renderTitle()} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
+                    buttons={buttons}>
+      <div className="declare-detail-table-container">
+        <WeaTable columns={columns} dataSource={dataSource} pagination={pagination} loading={loading}
+                  scroll={{ x: 1200, y: `calc(100vh - 186px)` }}/>
       </div>
-    );
+    </WeaTop>);
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/declare/index.less b/pc4mobx/hrmSalary/pages/declare/index.less
index 9e4ced1a..01b8fd58 100644
--- a/pc4mobx/hrmSalary/pages/declare/index.less
+++ b/pc4mobx/hrmSalary/pages/declare/index.less
@@ -1,11 +1,10 @@
-.generateDeclarationDetail {
-  .tabWrapper {
-    padding-left: 10px
-  }
+.declare-detail-table-container {
+  height: 100%;
+  background: #f6f6f6;
+  padding: 8px 16px;
 
-  .tableWrapper {
-    height: calc(100vh - 48px);
-    overflow: auto;
+  .wea-new-table {
+    background: #FFF;
   }
 }
 
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
index 0b71af53..905c2f3b 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
@@ -289,6 +289,7 @@ class LedgerAssociatedPersonnel extends Component {
           APIFox={APIFox}
           tabActive={selectedKey}
           searchValue={searchValue}
+          showOperateBtn={showOperateBtn}
           onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
           onEditScope={this.handleAddPersonal}
         />
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js
index af75ac82..8a333ea5 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js
@@ -18,10 +18,8 @@ class LedgerMovoTo extends Component {
     ];
     return (
       <WeaDialog
-        {...extraProps} style={{ width: 440, height: 232 }}
-        buttons={buttons} hasScroll initLoadCss
-        className="moveModalWrapper"
-      >
+        {...extraProps} buttons={buttons} hasScroll initLoadCss className="moveModalWrapper"
+        style={{ width: 440, height: Math.ceil((dataList.length - 1) / 3) * 25 + 41 }}>
         <WeaSearchGroup showGroup needTigger={false}>
           <WeaSelect
             options={_.filter(dataList, item => item.showname === "未分类")}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
index 934b777e..65912404 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
@@ -318,7 +318,7 @@ class LedgerSalaryItem extends Component {
             items: [...it.items, {
               ...extraItems,
               salaryItemGroupId: moveToItemId,
-              key: moveId,
+              key: moveId ? moveId : items.key,
               sortedIndex: !_.isEmpty(it.items) ? it.items[it.items.length - 1].sortedIndex + 1 : 0
             }]
           };
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
index 82cbdfbf..4b9b42ec 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
@@ -182,7 +182,7 @@ class LedgerSalaryItemNormal extends Component {
               >
                 <LedgerSalaryItemTable
                   tableData={items}
-                  dataSource={_.find(dataSource, childItem => childItem.id === id || childItem.uuid === uuid).items}
+                  dataSource={_.find(newDateSource, childItem => childItem.uuid === uuid).items}
                   salarySobId={editId || saveSalarySobId}
                   selectedRowKeys={field.selectedRowKeys || []}
                   onDropCategoryItem={(data) => onDropCategoryItem(field, data)}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 73540fea..4f126ef9 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -128,8 +128,10 @@ class LedgerSalaryItemTable extends Component {
             formulaContent, formulaId, name,
             hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
             valueType, roundingMode, pattern,
-            originFormulaContent, originSqlContent,
-            useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0"
+            useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0",
+            //不能改成其他空值
+            originFormulaContent: _.isNil(originFormulaContent) ? formulaContent : originFormulaContent,
+            originSqlContent: _.isNil(originSqlContent) ? formulaContent : originSqlContent
           },
           record,
           userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
@@ -288,7 +290,9 @@ class LedgerSalaryItemTable extends Component {
         width: 80,
         render: (text, record) => <WeaCheckbox
           value={text ? String(text) : !text ? "0" : "1"}
-          onChange={value => this.handleChangeItem(value, record.id || record.key)}
+          onChange={value => {
+            this.handleChangeItem(value, record.id || record.key);
+          }}
         />
       },
       {
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 8cde7da5..f140ab79 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -599,6 +599,7 @@ export default class PayrollGrant extends React.Component {
         <WeaTab
           datas={topTab} keyParam="viewcondition" selectedKey={selectedKey} searchType={["base", "advanced"]}
           onChange={v => this.setState({ selectedKey: v }, () => {
+            this.pageInfo = { current: 1, pageSize: 10 };
             getInfoList({ salarySendId: currentId, isGranted: v !== "0" });
           })}
           searchsBasePlaceHolder="请输入姓名" showSearchAd={grantListShowSearchAd} buttonsAd={adBtn}
@@ -652,7 +653,7 @@ export default class PayrollGrant extends React.Component {
                   this.pageInfo = { current, pageSize };
                   this.handleShowSizeChange(this.pageInfo);
                 }}
-                scroll={{ y: `calc(100vh - 236px)` }}
+                scroll={{ y: `calc(100vh - 255px)` }}
               /> : renderLoading()
           }
         </div>
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
index b004e177..5e7f1398 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
@@ -41,7 +41,7 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange =
                 />
             }
             {
-              getKey(fields) === "theme" && c.viewAttr === 3 &&
+              getKey(fields) === "theme" && fields.viewAttr === 3 &&
               <div className="sft-variables">
                 <span className="sftv-tip">{getLabel(500143, "插入变量")}：</span>
                 <a className="sftv-item"
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
index c5701013..5813e659 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
@@ -188,6 +188,15 @@ export const conditions = [
         lanId: 111,
         labelcol: 8,
         viewAttr: 2
+      },
+      {
+        conditionType: "SWITCH",
+        domkey: ["SHOT_EMP_BTN"],
+        fieldcol: 10,
+        label: "启用组织快照",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
       }
     ],
     title: "薪资核算",
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
index 573bc864..ab502d5c 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
@@ -154,6 +154,7 @@ class RuleConfig extends Component {
           case "APPROVAL_CAN_RE_CALC_STATUS":
           case "APPROVAL_CAN_EDIT_RESULT_STATUS":
           case "ATTENDANCE_SERIAL_COLLECTION_BTN":
+          case "SHOT_EMP_BTN":
             if (!this.handleDebounce) {
               this.handleDebounce = _.debounce(() => {
                 const confTitle = {
@@ -171,7 +172,8 @@ class RuleConfig extends Component {
                   APPROVAL_CAN_MANUAL_FILE_STATUS: getLabel(111, "开启审批的核算记录允许手动归档"),
                   APPROVAL_CAN_RE_CALC_STATUS: getLabel(111, "开启审批的核算记录允许重新核算"),
                   APPROVAL_CAN_EDIT_RESULT_STATUS: getLabel(111, "审批流程发起后允许修改核算数据"),
-                  ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据")
+                  ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据"),
+                  SHOT_EMP_BTN: getLabel(111, "启用组织快照")
                 };
                 this.unifiedSettings(key, confTitle[key]);
                 this.handleDebounce = null;
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index cdac76ff..474eb08c 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -64,7 +64,7 @@ export default class CustomSalaryItemSlide extends React.Component {
               case "taxAgentIds":
                 fields = {
                   ...fields, options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content })),
-                  hide: String(salaryItemForm["sharedType"]) === "0" || !_.isNil(salaryItemForm["sharedType"])
+                  hide: String(salaryItemForm["sharedType"]) === "0" || _.isNil(salaryItemForm["sharedType"])
                 };
                 break;
               case "dataType":
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
index f97ef453..d7d11617 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
@@ -78,14 +78,12 @@ class SyncToSalaryAccountSetDialog extends Component {
     const { conditions } = this.state;
     return (
       <WeaDialog
-        {...this.props} className="salarySetDialog" initLoadCss
-        style={{ width: 480 }} title={getLabel(111, "请选择薪资账套")}
+        {...this.props} className="salarySetDialog" initLoadCss title={getLabel(111, "请选择薪资账套")}
+        style={{ width: 480, height: _.reduce(conditions, (pre, cur) => (pre += cur.items.length), 0) * 47 + 33 }}
         buttons={[<Button type="primary" onClick={this.save}
                           loading={this.state.loading}>{getLabel(537558, "确定")}</Button>]}
       >
-        <div className="salarySetDialogContent">
-          {getSearchs(salarySetform, conditions, 1)}
-        </div>
+        <div className="salarySetDialogContent"> {getSearchs(salarySetform, conditions, 1, false)} </div>
       </WeaDialog>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
index 235eba25..c7117046 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
@@ -4,12 +4,16 @@
   height: 100%;
   background: #f6f6f6;
 
+  .wea-tab {
+    border-bottom: none !important;
+  }
+
   .wea-new-top-req-wapper .wea-new-top-req {
     z-index: 0 !important;
   }
 
   .wea-search-tab, .wea-input-focus {
-    background: #f6f6f6;
+    background: #f1f1f1;
   }
 
   .normalWapper {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
index e2342e93..e00b4f83 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
@@ -116,7 +116,7 @@ class Index extends Component {
                   } else if (getKey(g).indexOf("StartTime") !== -1) {
                     return {
                       ...g, label: getLabel(g.lanId, g.label),
-                      viewAttr: (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr
+                      viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr
                     };
                   }
                   return {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
index 10751d50..aa3942b0 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
@@ -84,7 +84,7 @@ class PlanSetTable extends Component {
         com: [{
           type: "custom",
           key: "custom",
-          render: text => (<span>{text}</span>)
+          render: text => (<span className="text-td-elli" title={text}>{text}</span>)
         }]
       },
       {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
index 5566cc8e..0c19ca25 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
@@ -232,6 +232,14 @@
         text-overflow: ellipsis;
         overflow: hidden;
       }
+
+      .text-td-elli {
+        display: inline-block;
+        width: 120px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
   }
 }
diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index 02955b0b..eedbf38d 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -39,6 +39,10 @@
 .form-dialog-layout {
   background: #f6f6f6;
 
+  .wea-form-item-wrapper {
+    display: block !important;
+  }
+
   .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
     line-height: 28px;
   }
@@ -128,3 +132,10 @@
   }
 }
 
+//公共表格操作按钮间距
+.space_div {
+  a:not(:last-child) {
+    margin-right: 8px;
+  }
+}
+