This commit is contained in:
parent
973eff4520
commit
01d3c23cf0
|
@ -1,6 +1,6 @@
|
||||||
INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
|
INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
|
||||||
VALUES
|
VALUES
|
||||||
('CplusRectificationType', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
('CplusRectificationType', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
||||||
('CplusInvoiceType477', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
('SiiTypeInvoiceOut', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
||||||
('InvoiceCorrectionType', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
('InvoiceCorrectionType', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
|
||||||
('InvoiceOut', 'transferInvoice', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
|
('InvoiceOut', 'transferInvoice', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
|
||||||
|
|
|
@ -27,7 +27,7 @@ module.exports = Self => {
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'cplusInvoiceType477Id',
|
arg: 'siiTypeInvoiceOutId',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
@ -93,7 +93,7 @@ module.exports = Self => {
|
||||||
correctingFk: invoiceId,
|
correctingFk: invoiceId,
|
||||||
correctedFk: args.id,
|
correctedFk: args.id,
|
||||||
cplusRectificationTypeFk: args.cplusRectificationId,
|
cplusRectificationTypeFk: args.cplusRectificationId,
|
||||||
cplusInvoiceType477Fk: args.cplusInvoiceType477Id,
|
siiTypeInvoiceOutFk: args.siiTypeInvoiceOutId,
|
||||||
invoiceCorrectionTypeFk: args.invoiceCorrectionTypeId
|
invoiceCorrectionTypeFk: args.invoiceCorrectionTypeId
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
"InvoiceCorrection": {
|
"InvoiceCorrection": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"CplusInvoiceType477": {
|
"SiiTypeInvoiceOut": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"name": "CplusInvoiceType477",
|
"name": "SiiTypeInvoiceOut",
|
||||||
"base": "VnModel",
|
"base": "VnModel",
|
||||||
"options": {
|
"options": {
|
||||||
"mysql": {
|
"mysql": {
|
||||||
"table": "cplusInvoiceType477"
|
"table": "siiTypeInvoiceOut"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"properties": {
|
"properties": {
|
||||||
|
@ -12,6 +12,9 @@
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"description": "Identifier"
|
"description": "Identifier"
|
||||||
},
|
},
|
||||||
|
"code": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
|
@ -6,8 +6,8 @@
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<vn-crud-model
|
<vn-crud-model
|
||||||
auto-load="true"
|
auto-load="true"
|
||||||
url="CplusInvoiceType477s"
|
url="SiiTypeInvoiceOuts"
|
||||||
data="cplusInvoiceType477">
|
data="siiTypeInvoiceOuts">
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<vn-crud-model
|
<vn-crud-model
|
||||||
auto-load="true"
|
auto-load="true"
|
||||||
|
@ -223,11 +223,11 @@
|
||||||
<vn-autocomplete
|
<vn-autocomplete
|
||||||
vn-one
|
vn-one
|
||||||
vn-id="cplusInvoiceType"
|
vn-id="cplusInvoiceType"
|
||||||
data="cplusInvoiceType477"
|
data="siiTypeInvoiceOuts"
|
||||||
show-field="description"
|
show-field="description"
|
||||||
value-field="id"
|
value-field="id"
|
||||||
required="true"
|
required="true"
|
||||||
ng-model="$ctrl.cplusInvoiceType477"
|
ng-model="$ctrl.siiTypeInvoiceOut"
|
||||||
search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
|
search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
|
||||||
label="Class">
|
label="Class">
|
||||||
</vn-autocomplete>
|
</vn-autocomplete>
|
||||||
|
|
|
@ -132,7 +132,7 @@ class Controller extends Section {
|
||||||
ref: this.invoiceOut.ref,
|
ref: this.invoiceOut.ref,
|
||||||
newClientFk: this.invoiceOut.client.id,
|
newClientFk: this.invoiceOut.client.id,
|
||||||
cplusRectificationId: this.cplusRectificationType,
|
cplusRectificationId: this.cplusRectificationType,
|
||||||
cplusInvoiceType477Id: this.cplusInvoiceType477,
|
siiTypeInvoiceOutId: this.siiTypeInvoiceOut,
|
||||||
invoiceCorrectionTypeId: this.invoiceCorrectionType
|
invoiceCorrectionTypeId: this.invoiceCorrectionType
|
||||||
};
|
};
|
||||||
this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
|
this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
|
||||||
|
|
Loading…
Reference in New Issue