audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

search range 初始化

Browse Source 
todo: pivot
This commit is contained in:
ivan deng
2017-11-15 23:49:09 +08:00
parent 4f47945278
commit 314ca5ceb9
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app_search_range/static/src/js/tree.js
View File

@@ -68,17 +68,17 @@ ListView.include({
self.$buttons.find('.app-search').remove(); self.$buttons.find('.app-search').remove();
var app_fields = []; var date_fields = [];
// 增加参数控制app_show_search_date // 增加参数控制app_show_search_date
new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_show_search_date']], ['value']]).then(function (show) { new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_show_search_date']], ['value']]).then(function (show) {
if (show.length >= 1 && (show[0]['value'] == "True")) { if (show.length >= 1 && (show[0]['value'] == "True")) {
_.each(self.columns, function (value, key, list) { _.each(self.columns, function (value, key, list) {
if (value.store && value.type === "datetime" || value.type === "date") { if (value.store && value.type === "datetime" || value.type === "date") {
app_fields.push([value.name, value.string]); date_fields.push([value.name, value.string]);
} }
}); });
if (app_fields.length > 0) { if (date_fields.length > 0) {
self.$search_button = $(QWeb.render('odooApp.buttons', {'app_fields': app_fields})) self.$search_button = $(QWeb.render('odooApp.buttons', {'date_fields': date_fields}))
self.$search_button.find('.app_start_date').datetimepicker(datepickers_options); self.$search_button.find('.app_start_date').datetimepicker(datepickers_options);
self.$search_button.find('.app_end_date').datetimepicker(datepickers_options); self.$search_button.find('.app_end_date').datetimepicker(datepickers_options);
// self.$search_button.find('.app_search_date_rate').click(function() { // self.$search_button.find('.app_search_date_rate').click(function() {
@@ -99,24 +99,24 @@ ListView.include({
}); });
app_fields = []; var number_fields = [];
_.each(self.columns, function(value, key, list){
if (value.string && value.string.length > 1 && value.store && (value.type === "integer" || value.type === "float" || value.type === "monetary")) {
app_fields.push([value.name, value.string]);
}
});
if (app_fields.length == 0) {
if (self.fields_range) {
app_fields = self.fields_range;
}
}
// 增加参数控制app_show_search_number // 增加参数控制app_show_search_number
new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_show_search_number']], ['value']]).then(function (show) { new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_show_search_number']], ['value']]).then(function (show) {
if (show.length >= 1 && (show[0]['value'] == "True")) { if (show.length >= 1 && (show[0]['value'] == "True")) {
if (app_fields.length > 0) { _.each(self.columns, function (value, key, list) {
self.$search_range = $(QWeb.render('odooApp.SearchRange', {'app_fields': app_fields})) if (value.string && value.string.length > 1 && value.store && (value.type === "integer" || value.type === "float" || value.type === "monetary")) {
number_fields.push([value.name, value.string]);
}
});
if (number_fields.length == 0) {
if (self.fields_range) {
number_fields = self.fields_range;
}
}
if (number_fields.length > 0) {
self.$search_range = $(QWeb.render('odooApp.SearchRange', {'number_fields': number_fields}))
// self.$search_range.find('.app_search_date_range').click(function() { // self.$search_range.find('.app_search_date_range').click(function() {
// self.tgl_search(); // self.tgl_search();
// }); // });
@@ -170,11 +170,7 @@ ListView.include({
}); });
} }
}); });
// {'tree_search': [{'string': 'Địa điểm', 'name': 'location_id', 'domain': [('usage', '=', 'internal')]}, {'string': 'Nhóm sản phẩm', 'name': 'categ_id', 'domain': []}]}
// {'search_default_sales': 1, 'tree_search': [{'string': 'Địa điểm', 'name': 'location_id', 'domain': [('usage', '=', 'internal')]}, {'string': 'NV bán hàng', 'name': 'user_id', 'domain': []}]}
// {'tree_search': [{'string': 'Địa điểm', 'name': 'location_id', 'domain': [('usage', '=', 'internal')]}]}
// var a = $(QWeb.render('odooApp.selection', {'class_name': 'abc','fields': [['1', '1'], ['2', '2']]}));
// a.appendTo(self.$buttons);
}, },

4
app_search_range/static/src/xml/pivot_view.xml
View File

@@ -8,7 +8,7 @@
<span style="float: left;"> <span style="float: left;">
<select class="app_select_field form-control" style="height: 30px;" > <select class="app_select_field form-control" style="height: 30px;" >
<option t-foreach="app_fields" t-as="field" t-att-value="field[0]"> <option t-foreach="date_fields" t-as="field" t-att-value="field[0]">
<t t-esc="field[1]"/> <t t-esc="field[1]"/>
</option> </option>
</select> </select>
@@ -35,7 +35,7 @@
<span style="float: left;"> <span style="float: left;">
<select class="app_select_range_field form-control" style="height: 30px;" > <select class="app_select_range_field form-control" style="height: 30px;" >
<option t-foreach="app_fields" t-as="field" t-att-value="field[0]"> <option t-foreach="number_fields" t-as="field" t-att-value="field[0]">
<t t-esc="field[1]"/> <t t-esc="field[1]"/>
</option> </option>
</select> </select>