Merge branch 'refs/heads/baojia_detail' into develop

b748f031 · lijingjing · cc32165c · 5bb281aa · b748f031
Commit b748f031 authored Nov 12, 2019 by lijingjing
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

contract_incept_entrance_g_contract_result_queryfields.js ...contract_incept_entrance_g_contract_result_queryfields.js +1 -1

No files found.
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/contract_incept_entrance_g_contract_result_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/contract_incept_entrance_g_contract_result_queryfields.js
@@ -2,7 +2,7 @@ var add_datafilters = [
 	{
 		name:'contract_status',
-		expression:"t1.contract_status not  in ('SIGNING','SIGN','INCEPTING','INCEPT_RETURN')"
+		expression:"t1.contract_status  in ('SIGNING','SIGN','INCEPTING','INCEPT','INCEPT_RETURN')"
 	},
    {
        name : 'authority',