diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 2a48d072..55cf7fca 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -147,7 +147,7 @@
-
+
@@ -194,7 +194,6 @@
-
订单 {{ currentRow.billNo }}-发票信息
@@ -253,7 +252,7 @@
prop="remark"
show-overflow-tooltip
>
-
+
+
+
+
+ 单据 {{ currentRow.billNo }}-单据详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
import {
deleteByOrderId,
- getOrderList, rollUnReceivebackOrder, filterInvoice
-} from "../../api/inout/order";
+ getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder
+} from '../../api/inout/order'
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {isBlank} from "@/utils/strUtil";
@@ -354,6 +428,7 @@ import InvoiceRegister from "@/views/inout/InvoiceRegister";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getDeptListByUser} from "@/api/auth/authDept";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import { getCodeDetailList } from '@/api/inout/orderDetailCode'
const formJson = {
@@ -442,6 +517,7 @@ export default {
billNo: ""
},
actDateRange: [],
+ auditDateRange:[],
pickerOptions: {
shortcuts: [
{
@@ -535,6 +611,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();
},
@@ -604,7 +689,12 @@ export default {
// 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() {
this.bizQuery.page = 1;
+ this.codeQuery.page = 1;
+ this.resultQuery.page = 1;
+
this.getBizDetailList();
+ this.getCodeDetailList();
+ this.getResultDetailList();
},
// 清空单据详情数据列表
clearDetailList() {
@@ -624,7 +714,7 @@ export default {
this.currentRow = {billNo: ""};
this.clearDetailList();
this.filterQuery.vueType = "supInvoice";
- filterInvoice(this.filterQuery)
+ filterOrder(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
@@ -704,6 +794,58 @@ export default {
this.deptList = res.data || [];
});
},
+
+ getResultDetailList() {
+ if (isBlank(this.currentRow.billNo)) {
+ this.$message.error("请先选择需要查询的单据！")
+ return;
+ }
+
+ this.resultQuery.orderId = this.currentRow.billNo;
+ this.resultDetailLoading = true;
+ getCodeList(this.resultQuery).then((res) => {
+ this.resultDetailLoading = false;
+ if (res.code === 20000) {
+ this.resultDetailList = res.data.list || [];
+ this.resultTotal = res.data.total || 0;
+ } else {
+ this.$message.error(res.message);
+ this.resultDetailList = [];
+ this.resultTotal = 0;
+ }
+ }).catch((error) => {
+ this.resultDetailLoading = false;
+ this.$message.error(error.message);
+ this.resultDetailList = [];
+ this.resultTotal = 0;
+ });
+ },
+
+ getCodeDetailList() {
+ if (isBlank(this.currentRow.billNo)) {
+ this.$message.error("请先选择需要查询的单据！")
+ return;
+ }
+
+ this.codeQuery.orderIdFk = this.currentRow.billNo;
+ this.codeDetailLoading = true;
+ getCodeDetailList(this.codeQuery).then((res) => {
+ this.codeDetailLoading = false;
+ if (res.code === 20000) {
+ this.codeDetailList = res.data.list || [];
+ this.codeTotal = res.data.total || 0;
+ } else {
+ this.$message.error(res.message);
+ this.codeDetailList = [];
+ this.codeTotal = 0;
+ }
+ }).catch((error) => {
+ this.codeDetailLoading = true;
+ this.$message.error(error.message);
+ this.codeDetailList = [];
+ this.codeTotal = 0;
+ })
+ },
onBizReset() {
this.bizQuery = {
productName: null,