Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

public/web.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <location path="index.html">
+        <system.webServer>
+            <httpProtocol>
+                <customHeaders>
+                    <add name="Cache-Control" value="no-cache, no-store, must-revalidate" />
+                </customHeaders>
+            </httpProtocol>
+        </system.webServer>
+    </location>
+</configuration>

src/baseComponents/TableBaseComponent/index.js

@@ -422,6 +422,7 @@ class TableBaseComponent extends ComponentBase {
   实际加载表数据
    */
   doLoadTableData = (loadParamJson, tableCode, onComplete, onLoadData) => {
+    console.log('调用查询实际过程', 6)
     const payloadJson = this.getLoadTableDataParams(loadParamJson, tableCode)
     if (!payloadJson) return
 
@@ -430,6 +431,7 @@ class TableBaseComponent extends ComponentBase {
     }
     const tableConfig = this.getTableConfig({ tableCode });
     const { api } = tableConfig ? tableConfig : {};
+    console.log('调用查询实际过程', 7, api)
 
     this.props.dispatch({
       type: 'listPage/getTableData',

src/components/CustomPages/SK/SK022ShowPrint.js

@@ -155,7 +155,7 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item label="整改部门">{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改落实人">{
-                                    data.STATUS == 21 &&
+                                      (data.STATUS == 21 ||data.STATUS == 20 || data.STATUS == 10|| data.STATUS == 30)&&
                                         data.Nav_ImplementUser && data.Nav_ImplementUser.FILE_PATH ?
                                         showUserSign(data.Nav_ImplementUser, config.picServerHost)
                                         : data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''}</Descriptions.Item>
@@ -176,13 +176,13 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item style={{ display: (data.STATUS == 20 || data.STATUS == 30) ? "inline" : "none" }} label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
                                 <Descriptions.Item style={{ display: (data.STATUS == 20 || data.STATUS == 30) ? "inline" : "none" }} label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人签名">{
-                                    data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
+                                    (data.STATUS == 20 || data.STATUS == 10|| data.STATUS == 30) && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
                                         showUserSign(data.Nav_RecitifyUser, config.picServerHost)
                                         : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="验收人签名">{
                                     (data.STATUS == 20 || data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
-                                        showUserSign(data.Nav_RecitifyUser, config.picServerHost)
+                                        showUserSign(data.Nav_AcceptUser, config.picServerHost)
                                         : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
                                 }</Descriptions.Item>
                             </Descriptions>

src/components/Table/ListPage.js

@@ -60,6 +60,7 @@ class ListPage extends React.Component {
 
   loadData = (params) => {
     if (this.state.loadDataFunc) {
+       console.log('调用查询中间过程', 5)
       if (!this.state.loadDataFunc.length) {
         this.directSearchStop = true
         this.directSearchParams = params
@@ -87,6 +88,7 @@ class ListPage extends React.Component {
       loadDataFunc: data
     }, () => {
       if (!this.props.preventDefaultSearch || this.directSearchStop) {
+        console.log('调用查询中间过程', 4)
         this.refOfSearch && this.refOfSearch.handleSearch()
       }
     })

src/feui/search/AdvanceSearch.js

@@ -79,6 +79,7 @@ class AdvanceSearch extends Component {
     const { search, dispatch } = this.props
     let stopSelfChangeSearch = false
     let stopSelfExtraSearch = false
+    console.log('共享搜索条件', this.shareKey)
     if (this.shareKey) {
       const instances = search.shareIns[this.shareKey] || []
       // 同一 filterList 组里面的 Search 组件不共享搜索条件
@@ -297,7 +298,7 @@ class AdvanceSearch extends Component {
    */
   handleSearch = (self = true) => {
     if (this.setShareIns(self)) return
-
+    console.log('调用查询开始', 1)
     const { onSearch } = this.props
     onSearch instanceof Function && onSearch()
   }

src/feui/search/index.js

@@ -161,6 +161,7 @@ class Search extends React.Component {
     if (errorLabel) return
 
     const { onSearch } = this.props
+    console.log('调用查询中间过程', 2)
     onSearch instanceof Function && onSearch(rule)
     return rule
   }

src/files/edit/FO055.js

@@ -0,0 +1,32 @@
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import moment from 'moment';
+/**
+ * @return {string}
+ */
+// 编辑
+export default {
+  onBeforeSaveHandleRecord(params) {
+    params.record.TaskID = params.data.TaskID    //TaskID传递消息表ID
+    params.record.PUBLISH = params.customParams;
+  },
+  onBeforeEdit: ({ isNew,login,record, dispatch,stateData,setRowFieldVisible, setFieldEditable,setFieldVisible,setFieldValue,setFieldValueByBatch }) => {
+    if (isNew) {
+        let json = initFilter(login.OrgId);
+        extendRule(json, "PARENT_ID", 1, null);
+        extendRule(json, "DEPARTMENT_TYPE", 1, 5);
+        dispatch({
+            type: 'app/getDataByPost',
+            url: 'FM/Department/Get',
+            payload: json,
+          onComplete: (ret) => {
+            if (ret) {
+                let temps = [];
+              temps.push({ field: 'COMPANY_NAME', value: ret.NAME })
+              setFieldValueByBatch(temps);
+            }
+          }
+        });
+      }
+  },
+}

src/files/edit/SK022.js

@@ -37,6 +37,12 @@ export default {
         setFieldVisible('ACCEPT_DATE', false);
         setFieldVisible('ACCEPT_RESULTE', false);
         setFieldVisible('ACCEPT_OPINION', false);
+      }else if(stateData.STATUS === 10)
+      {
+        setFieldVisible("CONTEXT", false);
+            setFieldVisible('ACCEPT_DATE', false);
+            setFieldVisible('ACCEPT_RESULTE', true);
+            setFieldVisible('ACCEPT_OPINION', true);
       }
         else
         {