Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
13167d94
Commit
13167d94
authored
Nov 20, 2019
by
lijingjing
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refs/heads/feature/acr_invoice' into develop
parents
976e3116
d31485bb
Pipeline
#3211
canceled with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
project_modify_entrance_g_project_result_queryfields.js
...g/project_modify_entrance_g_project_result_queryfields.js
+1
-1
prj_project_modify_entrance.lview
...app/modules/prj/PRJ501N/prj_project_modify_entrance.lview
+1
-1
No files found.
src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js
View file @
13167d94
...
@@ -65,7 +65,7 @@ var override_queryfields = [
...
@@ -65,7 +65,7 @@ var override_queryfields = [
//},
//},
{
{
name
:
'project_status'
,
name
:
'project_status'
,
queryexpression
:
"t1.project_status in ('NEW','APPROVING','APPROVED_RETURN','REJECT','APPROVED','CONTRACT_CREATED')"
queryexpression
:
"t1.project_status in ('NEW','APPROVING','APPROVED_RETURN','REJECT','APPROVED','CONTRACT_CREATED'
,'CLOSED'
)"
}
}
...
...
src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview
View file @
13167d94
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id);
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id);
} else if (record.get('document_type') == 'CARLS') {
} else if (record.get('document_type') == 'CARLS') {
if (record.get('project_status') == 'APPROVED' ||record.get('project_status') == 'APPROVING'||record.get('project_status') == 'CONTRACT_CREATED') {
if (record.get('project_status') == 'APPROVED' ||record.get('project_status') == 'APPROVING'||record.get('project_status') == 'CONTRACT_CREATED'
|| record.get('project_status') == 'CLOSED'
) {
maintain_type = 'READONLY';
maintain_type = 'READONLY';
param = record.data;
param = record.data;
param['bp_id_tenant'] = record.get('bp_id_tenant');
param['bp_id_tenant'] = record.get('bp_id_tenant');
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment