UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
prod
郑明梁 2 years ago
parent 287e69fd12 ff91b5f8d0
commit 7cea46c47e
1 changed files with 148 additions and 6 deletions
Show Stats Download Patch File Download Diff File

154
src/views/inout/InvoiceRegistration.vue
Unescape Escape View File

@ -147,7 +147,7 @@
</el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
</el-table-column>
<el-table-column label="创建时间" prop="createTimem" width="150" show-overflow-tooltip>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip>
</el-table-column>
@ -194,7 +194,6 @@
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">订单 {{ currentRow.billNo }}-发票信息</span>
<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
@ -253,7 +252,7 @@
prop="remark"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<el-table-column label="操作" width="160">
<template slot-scope="scope">
<el-button
@ -289,6 +288,81 @@
@pagination="getBizDetailList"
/>
</el-tab-pane>
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
width="150"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
width="150"
prop="spec"
></el-table-column>
<el-table-column
label="批次号"
width="100"
prop="batchNo"
></el-table-column>
<el-table-column
label="数量"
prop="count"
width="100"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
<el-table-column
label="价格"
prop="price"
width="100"
></el-table-column>
<el-table-column
label="生产日期"
prop="productDate"
width="100"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="100"
></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column
label="生产企业"
prop="manufacturer"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
width="160"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="bizTotal>0"
:total="bizTotal"
:page.sync="bizQuery.page"
:limit.sync="bizQuery.limit"
@pagination="getBizDetailList"
/>
</el-tab-pane>
</el-tabs>
<el-dialog
title="发票编辑"
@ -339,8 +413,8 @@
<script>
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,

Write Preview
Loading…
Cancel
Save