Merge branch 'develop'

master
yixian 4 years ago
commit 587fca45ca

@ -161,7 +161,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
app.controller('settleTasksPriorityListManageCtrl', ['$scope', '$http', '$uibModal', 'commonDialog', app.controller('settleTasksPriorityListManageCtrl', ['$scope', '$http', '$uibModal', 'commonDialog',
function ($scope, $http, $uibModal, commonDialog) { function ($scope, $http, $uibModal, commonDialog) {
$scope.filters = {}; $scope.filters = {client_moniker: null};
$scope.input = {} $scope.input = {}
$scope.loadPriorities = function () { $scope.loadPriorities = function () {
$http.get('/sys/settle_tasks/priority_merchants').then(function (res) { $http.get('/sys/settle_tasks/priority_merchants').then(function (res) {

@ -5,22 +5,22 @@ define(['../app', 'angular'], function (app, angular) {
'use strict'; 'use strict';
app.filter('propsFilter', function () { app.filter('propsFilter', function () {
return function (items, props, strictMode) { return function (items, props, strictMode) {
var out = []; let out = [];
if (angular.isArray(items)) { if (angular.isArray(items)) {
var keys = Object.keys(props); let keys = Object.keys(props);
if (strictMode) { if (strictMode) {
items.forEach(function (item) { items.forEach(function (item) {
var itemMatches = true; let itemMatches = true;
for (var i = 0; i < keys.length; i++) { for (let i = 0; i < keys.length; i++) {
var prop = keys[i]; let prop = keys[i];
if (props[prop] == null) { if (props[prop] == null) {
continue; continue;
} }
var text = props[prop].toString().toLowerCase(); let text = props[prop].toString().toLowerCase();
var propVal = item[prop]; let propVal = item[prop];
if (propVal == null) { if (propVal == null) {
itemMatches = false; itemMatches = false;
break; break;
@ -37,16 +37,16 @@ define(['../app', 'angular'], function (app, angular) {
}); });
} else { } else {
items.forEach(function (item) { items.forEach(function (item) {
var itemMatches = false; let itemMatches = false;
for (var i = 0; i < keys.length; i++) { for (let i = 0; i < keys.length; i++) {
var prop = keys[i]; let prop = keys[i];
if (props[prop] == null) { if (props[prop] == null) {
itemMatches = true; itemMatches = true;
break; break;
} }
var text = props[prop].toString().toLowerCase(); let text = props[prop].toString().toLowerCase();
var propVal = item[prop]; let propVal = item[prop];
if (propVal == null) { if (propVal == null) {
continue; continue;
} }

Loading…
Cancel
Save