Ammends
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
27e8c99604
commit
c92f444776
|
@ -1,3 +1,3 @@
|
||||||
INSERT INTO salix.defaultViewConfig (tableCode, columns)
|
INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns)
|
||||||
VALUES ('clientsDetail', '{"id":true,"phone":true,"city":true,"socialName":true,"salesPersonFk":true,"email":true,"name":false,"fi":false,"credit":false,"creditInsurance":false,"mobile":false,"street":false,"countryFk":false,"provinceFk":false,"postcode":false,"created":false,"businessTypeFk":false,"payMethodFk":false,"sageTaxTypeFk":false,"sageTransactionTypeFk":false,"isActive":false,"isVies":false,"isTaxDataChecked":false,"isEqualizated":false,"isFreezed":false,"hasToInvoice":false,"hasToInvoiceByAddress":false,"isToBeMailed":false,"hasLcr":false,"hasCoreVnl":false,"hasSepaVnl":false}');
|
VALUES ('clientsDetail', '{"id":true,"phone":true,"city":true,"socialName":true,"salesPersonFk":true,"email":true,"name":false,"fi":false,"credit":false,"creditInsurance":false,"mobile":false,"street":false,"countryFk":false,"provinceFk":false,"postcode":false,"created":false,"businessTypeFk":false,"payMethodFk":false,"sageTaxTypeFk":false,"sageTransactionTypeFk":false,"isActive":false,"isVies":false,"isTaxDataChecked":false,"isEqualizated":false,"isFreezed":false,"hasToInvoice":false,"hasToInvoiceByAddress":false,"isToBeMailed":false,"hasLcr":false,"hasCoreVnl":false,"hasSepaVnl":false}');
|
||||||
|
|
||||||
|
|
|
@ -333,6 +333,15 @@ export default class SmartTable extends Component {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input = this.$compile(`
|
||||||
|
<vn-textfield
|
||||||
|
class="dense"
|
||||||
|
name="${field}"
|
||||||
|
ng-model="searchProps['${field}']"
|
||||||
|
ng-keydown="$ctrl.searchWithEvent($event, '${field}')"
|
||||||
|
clear-disabled="true"
|
||||||
|
/>`)(this.$inputsScope);
|
||||||
|
|
||||||
if (options && options.autocomplete) {
|
if (options && options.autocomplete) {
|
||||||
let props = ``;
|
let props = ``;
|
||||||
|
|
||||||
|
@ -348,7 +357,9 @@ export default class SmartTable extends Component {
|
||||||
on-change="$ctrl.searchByColumn('${field}')"
|
on-change="$ctrl.searchByColumn('${field}')"
|
||||||
clear-disabled="true"
|
clear-disabled="true"
|
||||||
/>`)(this.$inputsScope);
|
/>`)(this.$inputsScope);
|
||||||
} else if (options && options.checkbox) {
|
}
|
||||||
|
|
||||||
|
if (options && options.checkbox) {
|
||||||
input = this.$compile(`
|
input = this.$compile(`
|
||||||
<vn-check
|
<vn-check
|
||||||
class="dense"
|
class="dense"
|
||||||
|
@ -357,7 +368,9 @@ export default class SmartTable extends Component {
|
||||||
on-change="$ctrl.searchByColumn('${field}')"
|
on-change="$ctrl.searchByColumn('${field}')"
|
||||||
triple-state="true"
|
triple-state="true"
|
||||||
/>`)(this.$inputsScope);
|
/>`)(this.$inputsScope);
|
||||||
} else if (options && options.datepicker) {
|
}
|
||||||
|
|
||||||
|
if (options && options.datepicker) {
|
||||||
input = this.$compile(`
|
input = this.$compile(`
|
||||||
<vn-date-picker
|
<vn-date-picker
|
||||||
class="dense"
|
class="dense"
|
||||||
|
@ -365,16 +378,8 @@ export default class SmartTable extends Component {
|
||||||
ng-model="searchProps['${field}']"
|
ng-model="searchProps['${field}']"
|
||||||
on-change="$ctrl.searchByColumn('${field}')"
|
on-change="$ctrl.searchByColumn('${field}')"
|
||||||
/>`)(this.$inputsScope);
|
/>`)(this.$inputsScope);
|
||||||
} else {
|
|
||||||
input = this.$compile(`
|
|
||||||
<vn-textfield
|
|
||||||
class="dense"
|
|
||||||
name="${field}"
|
|
||||||
ng-model="searchProps['${field}']"
|
|
||||||
ng-keydown="$ctrl.searchWithEvent($event, '${field}')"
|
|
||||||
clear-disabled="true"
|
|
||||||
/>`)(this.$inputsScope);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cell.appendChild(input[0]);
|
cell.appendChild(input[0]);
|
||||||
}
|
}
|
||||||
searchRow.appendChild(cell);
|
searchRow.appendChild(cell);
|
||||||
|
|
|
@ -144,7 +144,6 @@ module.exports = Self => {
|
||||||
LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
|
LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
|
||||||
LEFT JOIN sage.TiposIva sti ON sti.CodigoIva = c.taxTypeSageFk
|
LEFT JOIN sage.TiposIva sti ON sti.CodigoIva = c.taxTypeSageFk
|
||||||
LEFT JOIN sage.TiposTransacciones stt ON stt.CodigoTransaccion = c.transactionTypeSageFk
|
LEFT JOIN sage.TiposTransacciones stt ON stt.CodigoTransaccion = c.transactionTypeSageFk
|
||||||
|
|
||||||
`
|
`
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
<vn-crud-model
|
<vn-crud-model
|
||||||
vn-id="model"
|
vn-id="model"
|
||||||
url="Clients/extendedListFilter"
|
url="Clients/extendedListFilter"
|
||||||
limit="20"
|
limit="20">
|
||||||
auto-load="true">
|
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<vn-portal slot="topbar">
|
<vn-portal slot="topbar">
|
||||||
<vn-searchbar
|
<vn-searchbar
|
||||||
|
|
Loading…
Reference in New Issue