Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

DSWeb/Areas/OA/Viewsjs/Jiekuan/JiekuanModel.js

@@ -18,8 +18,9 @@
                 , { name: 'JKSTATUS', type: 'string' }
                 , { name: 'JKSTATUS_REF', type: 'string' }
                 , { name: 'REMAIN', type: 'string' }
-                , { name: 'REMARK', type: 'string' }
-            ]
+        , { name: 'REMARK', type: 'string' }
+        , { name: 'REMARKALL', type: 'string' }
+    ]
 });
 
 Ext.define('Tradermb', {

DSWeb/Areas/OA/Viewsjs/Jiekuan2/JiekuanIndex.js

@@ -283,6 +283,12 @@ Ext.extend(DsTruck.Chfee_managementIndex, Ext.Panel, {
                 header: '借款理由',
                 width: 200
             },
+            {
+                sortable: true,
+                dataIndex: 'REMARKALL',
+                header: '借款理由(含明细)',
+                width: 300
+            },
             {
                 sortable: true,
                 dataIndex: 'EXREPAYDATE',

DSWeb/Areas/OA/Viewsjs/Jiekuan2/JiekuanModel.js

@@ -22,7 +22,8 @@
         , { name: 'JKTYPE', type: 'string' }
         , { name: 'JKTYPE_REF', type: 'string' }
                 , { name: 'REMAIN', type: 'string' }
-                , { name: 'REMARK', type: 'string' }
+        , { name: 'REMARK', type: 'string' }
+        , { name: 'REMARKALL', type: 'string' }
                 , { name: 'RMBAMOUNT', type: 'number' }
                 , { name: 'USDAMOUNT', type: 'number' }
                 , { name: 'OTHERAMOUNT', type: 'number' }

DSWeb/Areas/OA/Viewsjs/Jiekuan2/JiekuanNewIndex.js

@@ -389,6 +389,12 @@ Ext.extend(DsTruck.Chfee_managementIndex, Ext.Panel, {
                 header: '借款理由',
                 width: 200
             },
+            {
+                sortable: true,
+                dataIndex: 'REMARKALL',
+                header: '借款理由(含明细)',
+                width: 300
+            },
             {
                 sortable: true,
                 dataIndex: 'EXREPAYDATE',