From b401e5a937fad6eaa31aeaa16725ab8d19f84227 Mon Sep 17 00:00:00 2001 From: chenshaowei Date: Thu, 9 Apr 2026 14:38:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20index=E4=B8=8D?= =?UTF-8?q?=E7=BC=93=E5=AD=98=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=8E=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=BC=93=E5=AD=98=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=A1=B5=E9=9D=A2=E4=B8=80=E7=9B=B4=E7=99=BD=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/web.config | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 public/web.config diff --git a/public/web.config b/public/web.config new file mode 100644 index 0000000..f2fd51b --- /dev/null +++ b/public/web.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 28fd0d1e771c223136a9b4ef23bcbc4450718762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 9 Apr 2026 14:57:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/files/edit/FO055.js | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/files/edit/FO055.js diff --git a/src/files/edit/FO055.js b/src/files/edit/FO055.js new file mode 100644 index 0000000..88f4c34 --- /dev/null +++ b/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); + } + } + }); + } + }, +} From 91c9be1abef218cedd6cf57cedec8ffa8244bf8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 9 Apr 2026 15:22:17 +0800 Subject: [PATCH 3/5] 1 --- src/components/CustomPages/SK/SK022ShowPrint.js | 4 ++-- src/files/edit/SK022.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index 3ac12ae..f92c8ee 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -155,7 +155,7 @@ class SK022ShowPrint extends React.Component { {data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''} {data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''} { - 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 : ''} @@ -176,7 +176,7 @@ class SK022ShowPrint extends React.Component { {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} {data.ACCEPT_OPINION} { - 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 : '' } diff --git a/src/files/edit/SK022.js b/src/files/edit/SK022.js index cd875ec..8858c74 100644 --- a/src/files/edit/SK022.js +++ b/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 { From 471963a1e8af75bb64f3d9bd215e0fd6e3880e17 Mon Sep 17 00:00:00 2001 From: chenshaowei Date: Thu, 9 Apr 2026 15:54:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0log=20=20=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/baseComponents/TableBaseComponent/index.js | 2 ++ src/components/Table/ListPage.js | 2 ++ src/feui/search/AdvanceSearch.js | 3 ++- src/feui/search/index.js | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/baseComponents/TableBaseComponent/index.js b/src/baseComponents/TableBaseComponent/index.js index 475c3a9..59d85bf 100644 --- a/src/baseComponents/TableBaseComponent/index.js +++ b/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', diff --git a/src/components/Table/ListPage.js b/src/components/Table/ListPage.js index fb09a2e..3924250 100644 --- a/src/components/Table/ListPage.js +++ b/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() } }) diff --git a/src/feui/search/AdvanceSearch.js b/src/feui/search/AdvanceSearch.js index 33660f8..a7b93f8 100644 --- a/src/feui/search/AdvanceSearch.js +++ b/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() } diff --git a/src/feui/search/index.js b/src/feui/search/index.js index f1e9ce2..53e51ab 100644 --- a/src/feui/search/index.js +++ b/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 } From 74fec213e5746cbc33b7e5eb85f5f66a99f1ffc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 9 Apr 2026 16:15:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E4=BA=BA=E7=AD=BE?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/SK/SK022ShowPrint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index f92c8ee..e9db354 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -182,7 +182,7 @@ class SK022ShowPrint extends React.Component { } { (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 : '' }