diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index c7e0019..66e4a94 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 58e87af..596c900 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -386,7 +386,7 @@ export default { getBusTypeByInv() { let query = { code: this.orderFormData.invCode, - busType: 2,//默认只能选择送货单 + vueType: "supDelivery", }; findByInvUser(query) .then((response) => { diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 658893d..e52572f 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -442,6 +442,7 @@ export default { billNo: "" }, actDateRange: [], + auditDateRange:[], pickerOptions: { shortcuts: [ { @@ -535,6 +536,15 @@ export default { this.filterQuery.startTime = null; this.filterQuery.endTime = null; } + + if (this.auditDateRange !== null) { + this.filterQuery.startAduditTime = this.auditDateRange[0]; + this.filterQuery.endAduditTime = this.auditDateRange[1]; + } else { + this.filterQuery.startAduditTime = null; + this.filterQuery.endAduditTime = null; + } + this.filterQuery.page = 1; this.getList(); }, diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue index 96420e9..5b5279d 100644 --- a/src/views/purchase/product/supProductAuditDialog.vue +++ b/src/views/purchase/product/supProductAuditDialog.vue @@ -723,7 +723,6 @@ export default { this.confirmStatus = this.currentAudit.auditStatus; }, revoke(inputQuery) { - this.$confirm("是否确定撤回证书状态至未确认?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消",