Merge branch 'refs/heads/feature/agent' into develop

ed8168ec · lijingjing · d183909b · 1fd9e1b6 · ed8168ec
Commit ed8168ec authored Nov 14, 2019 by lijingjing
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

project_modify_entrance_g_project_result_queryfields.js ...g/project_modify_entrance_g_project_result_queryfields.js +1 -1

No files found.
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js
@@ -65,7 +65,7 @@ var override_queryfields = [
 //},
 {
 	name:'project_status',
-	queryexpression : "t1.project_status in ('NEW','PRE_APPROVING','APPROVED_RETURN')"
+	queryexpression : "t1.project_status in ('NEW','APPROVING','APPROVED_RETURN','REJECT','APPROVED','CONTRACT_CREATED')"
 }