Merge branch 'refs/heads/baojia_detail' into develop

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 ('NEW','SIGN_RETURN')"
+		expression:"t1.contract_status not  in ('SIGNING','SIGN','INCEPTING','INCEPT_RETURN')"
 	},
     {
         name : 'authority',

src/main/webapp/WEB-INF/server-script/layoutconfig/contract_print_entrance_g_contract_result_queryfields.js

@@ -4,6 +4,10 @@ var add_datafilters = [
         name: 'document_type',
         expression: "t1.document_type = 'CARCON'"
     },
+    {
+        name: 'contract_status',
+        expression: "t1.contract_status in ('NEW','SIGNING','SIGNING','SIGN_RETURN')"
+    },
     {
         name : 'authority',
         expression : "(exists (select 1 from aut_trx_user_authorize a1, aut_owner_user_authorize a2  where a1.trx_category = 'CONTRACT' and a1.trx_id = t1.contract_id and trunc(sysdate) between a1.start_date and nvl(a1.end_date, trunc(sysdate)) and a1.user_id = a2.owner_user_id and a1.trx_category = a2.trx_category and a2.authorized_user_id = ${/session/@user_id} and trunc(sysdate) between a2.start_date and nvl(a2.end_date, trunc(sysdate))))"