王智 / spare · 提交

转到一个项目

作者 王智
提交 ae49c93ea4f9688be4a130b0eb3a6790856f76cc 1 个父辈 64ab4820

222

内嵌 并排对比
正在显示 1 个修改的文件 包含 13 行增加 和 13 行删除
@@ -27,29 +27,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -27,29 +27,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
27 {field: 'id', title: __('Id')}, 27 {field: 'id', title: __('Id')},
28 {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image}, 28 {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image},
29 {field: 'name', title: __('Name')}, 29 {field: 'name', title: __('Name')},
30 - {field: 'class_id', title: __('Class_id')},  
31 - {field: 'class_con_id', title: __('Class_con_id')},  
32 - {field: 'logo_id', title: __('Logo_id')}, 30 + // {field: 'class_id', title: __('Class_id')},
  31 + // {field: 'class_con_id', title: __('Class_con_id')},
  32 + // {field: 'logo_id', title: __('Logo_id')},
  33 + {field: 'classa.class', title: __('Classa.class')},
  34 + {field: 'classcon.class_con', title: __('Classcon.class_con')},
  35 + {field: 'logo.logo', title: __('Logo.logo')},
33 {field: 'fengzhuang', title: __('Fengzhuang')}, 36 {field: 'fengzhuang', title: __('Fengzhuang')},
34 {field: 'con', title: __('Con')}, 37 {field: 'con', title: __('Con')},
35 {field: 'stock', title: __('Stock')}, 38 {field: 'stock', title: __('Stock')},
36 {field: 'book_avatar', title: __('Book_avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image}, 39 {field: 'book_avatar', title: __('Book_avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image},
  40 + {field: 'price', title: __('Price'), operate:'BETWEEN'},
37 {field: 'tidu1', title: __('Tidu1')}, 41 {field: 'tidu1', title: __('Tidu1')},
  42 + {field: 'price1', title: __('Price1'), operate:'BETWEEN'},
38 {field: 'tidu2', title: __('Tidu2')}, 43 {field: 'tidu2', title: __('Tidu2')},
39 - {field: 'tidu3', title: __('Tidu3')},  
40 - {field: 'tidu4', title: __('Tidu4')},  
41 {field: 'price2', title: __('Price2'), operate:'BETWEEN'}, 44 {field: 'price2', title: __('Price2'), operate:'BETWEEN'},
42 - {field: 'price1', title: __('Price1'), operate:'BETWEEN'},  
43 - {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},  
44 - {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 45 + {field: 'tidu3', title: __('Tidu3')},
45 {field: 'price3', title: __('Price3'), operate:'BETWEEN'}, 46 {field: 'price3', title: __('Price3'), operate:'BETWEEN'},
  47 + {field: 'tidu4', title: __('Tidu4')},
46 {field: 'price4', title: __('Price4'), operate:'BETWEEN'}, 48 {field: 'price4', title: __('Price4'), operate:'BETWEEN'},
47 - {field: 'price5', title: __('Price5'), operate:'BETWEEN'},  
48 {field: 'tidu5', title: __('Tidu5')}, 49 {field: 'tidu5', title: __('Tidu5')},
49 - {field: 'price', title: __('Price'), operate:'BETWEEN'},  
50 - {field: 'classa.class', title: __('Classa.class')},  
51 - {field: 'classcon.class_con', title: __('Classcon.class_con')},  
52 - {field: 'logo.logo', title: __('Logo.logo')}, 50 + {field: 'price5', title: __('Price5'), operate:'BETWEEN'},
  51 + {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  52 + {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
53 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 53 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
54 ] 54 ]
55 ] 55 ]