Commit f38dbba5f3080485c76c60fcb1480d6dcdd38771

Authored by pengye
1 parent f9bbf493

no message

@@ -1796,6 +1796,7 @@ class Seller extends Common @@ -1796,6 +1796,7 @@ class Seller extends Common
1796 r.ddate_solt, 1796 r.ddate_solt,
1797 r.room_demand, 1797 r.room_demand,
1798 r.operator_openid, 1798 r.operator_openid,
  1799 + r.note_name,
1799 s.sellername, 1800 s.sellername,
1800 s.is_tele, 1801 s.is_tele,
1801 s.seller_tel, 1802 s.seller_tel,
@@ -1847,6 +1848,7 @@ class Seller extends Common @@ -1847,6 +1848,7 @@ class Seller extends Common
1847 r.ddate_solt, 1848 r.ddate_solt,
1848 r.room_demand, 1849 r.room_demand,
1849 r.operator_openid, 1850 r.operator_openid,
  1851 + r.note_name,
1850 s.sellername, 1852 s.sellername,
1851 s.is_tele, 1853 s.is_tele,
1852 s.seller_tel, 1854 s.seller_tel,
@@ -123,7 +123,8 @@ @@ -123,7 +123,8 @@
123 {field: 'card_title',title: '卡券'}, 123 {field: 'card_title',title: '卡券'},
124 {field: 'should_price',title: '应收金额'}, 124 {field: 'should_price',title: '应收金额'},
125 {field: 'actual_price', title: '实收金额'}, 125 {field: 'actual_price', title: '实收金额'},
126 - {align: 'center',title: '操作', toolbar: '#action'} 126 + {align: 'center',title: '操作', toolbar: '#action'},
  127 + {align: 'note_name',title: '记录人'}
127 ]], 128 ]],
128 done: function(res, curr, count){ 129 done: function(res, curr, count){
129 } 130 }