Merge remote-tracking branch 'origin/fp_dev' into fp_dev

fp_dev
anthonywj 2 years ago
commit 36dfedeeb1

@ -37,5 +37,14 @@ export function deleteInvoice(data) {
}
export function saveInvoice(query) {
return axios({
url: "/udiwms/inout/invoice/saveInvoice",
method: "post",
data: query
});
}

@ -155,6 +155,15 @@ export function filterOrderList(query) {
});
}
export function filterInvoiceList(query) {
return axios({
url: "/udiwms/inout/order/filterInvoiceList",
method: "get",
params: query
});
}
export function selectNew(query) {
return axios({
url: "/admin/warehouse/inout/order/selectNew",

@ -58,6 +58,25 @@ export function insertInvoice(params) {
});
}
export function uploadInvoice(params) {
return axios({
url: "/udiwms/inout/invoice/uploadInvoice",
method: "post",
data: params
});
}
export function deleteInvoiceByOrderFk(params) {
return axios({
url: "/udiwms/inout/invoice/deleteInvoiceByOrderFk",
method: "post",
data: params
});
}
export function updateorderBiz(params) {
return axios({
url: "/udiwms/inout/biz/updateorderBiz",

@ -39,3 +39,5 @@ export function getAudit(query) {

@ -4,73 +4,27 @@
<el-form :model="invoiceQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="invoiceQuery.billNo" placeholder="单号"
<el-form-item class="query-form-item" label="发票编码:">
<el-input v-model="invoiceQuery.invoiceEncode" placeholder="请输入发票编码"
style="width: 90%"
clearable="true"></el-input>
clearable="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="invoiceQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
<el-form-item class="query-form-item" label="发票代码:">
<el-input v-model="invoiceQuery.invoiceCode" placeholder="请输入发票代码" style="width: 90%" clearable="true" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="invoiceQuery.action" placeholder="请选择单据类型"
style="width: 90%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
<el-form-item class="query-form-item" label="机器编码:">
<el-input v-model="invoiceQuery.machineNo" placeholder="请输入机器编码" style="width: 90%" clearable="true" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" v-if="showSup">
<el-form-item class="query-form-item" label="送货单位:">
<el-select
v-model="invoiceQuery.fromCorp"
filterable
remote
clearable="true"
reserve-keyword
placeholder="送货单位"
:remote-method="findMethod"
size="mini"
:loading="corpLoading"
style="width: 90%"
>
<el-option
v-for="item in fromOptions"
:key="item.name"
:label="item.name"
:value="item.erpId"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-form-item class="query-form-item" label="开票日期:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
@ -85,23 +39,6 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="审核时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="auditDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 90%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
@ -152,12 +89,8 @@
prop="price" width="100"
></el-table-column>
<el-table-column
label="发票文件名"
prop="price" width="100"
></el-table-column>
<el-table-column
label="登记时间" width="100"
prop="productDate"
label="登记时间" width="190"
prop="createTime"
></el-table-column>
<el-table-column
label="备注"
@ -221,8 +154,7 @@
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="发票-关联单据">
<el-table v-loading="orderLoading" :data="orderList" style="width: 100%" highlight-current-row
border
<el-table v-loading="orderLoading" :data="orderList" style="width: 100%" highlight-current-row border
@current-change="handleSelectionChange"
>
<el-table-column label="序号" type="index"></el-table-column>
@ -235,11 +167,13 @@
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
:sort-orders="['ascending', 'descending']"
>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
:sort-orders="['ascending', 'descending']"
>
</el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
@ -274,13 +208,15 @@
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
@click.native.stop="determine(scope.row)">确认
@click.native.stop="determine(scope.row)"
>确认
</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="发票-产品明细">
<el-table v-loading="productDetailLoading" :data="productDetailList" style="width: 100%" border
@ -313,11 +249,7 @@
prop="price"
width="100"
></el-table-column>
<el-table-column
label="金额"
prop="amount"
width="100"
></el-table-column>
<el-table-column label="金额" prop="amout" width="100"></el-table-column>
<el-table-column
label="生产日期"
prop="productDate"
@ -358,6 +290,64 @@
</el-tab-pane>
</el-tabs>
<!--单据业务详情-->
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table :data="codeDetailList" style="width: 100%" border row-key="id" highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="发票编码" prop="invoiceCodes" width="150" show-overflow-tooltip></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="price" width="100"></el-table-column>
<el-table-column label="金额" prop="amount" 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-column label="扫码数量" prop="reCount" width="100"></el-table-column>
</el-table>
<pagination
v-show="codeTotal>0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getCodeDetailList"
/>
</el-tab-pane>
</el-tabs>
<el-dialog
title="发票登记"
:visible.sync="checkInvoice"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="checkInvoice"
>
<invoiceRegCkeck
:curInvoice="curInvoice"
:closeDialog="closeAcceptDialog"
></invoiceRegCkeck>
</el-dialog>
<el-dialog
title="确定"
:visible.sync="determineVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="determineVisible"
>
<InvoiceRegistrationDetermine
:closeDialog="closeDetermineDialog"
:determineData="determineData"
></InvoiceRegistrationDetermine>
</el-dialog>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
@ -365,25 +355,23 @@
</template>
<script>
import {isBlank} from "@/utils/strUtil";
import {deleteInvoice, groupInvoice, orderDetail, productDetail} from "@/api/inout/invoiceOrder";
import DialogInvoice from "@/views/inout/DialogInvoice";
import AcceptOrder from "@/views/inout/DialogReviewOrder";
import InvoiceRegister from "@/views/inout/InvoiceRegister";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDetermine";
import checkInvoice from "@/views/inout/InvoiceCkeck";
import {deleteById} from "@/api/inout/orderDetailBiz";
import {previewFile} from "@/api/purchase/supCompany";
import { isBlank } from '@/utils/strUtil'
import { deleteInvoice, groupInvoice, orderDetail, productDetail } from '@/api/inout/invoiceOrder'
import DialogInvoice from '@/views/inout/DialogInvoice'
import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
import { previewFile } from '@/api/purchase/supCompany'
import invoiceRegCkeck from '@/views/inout/InvoiceRegCkeck'
import InvoiceRegistrationDetermine from '@/views/inout/InvoiceRegistrationDetermine'
import { filterBizOrderList } from '@/api/inout/orderDetailBiz'
export default {
name: "InvoiceRegByFp",
name: 'InvoiceRegByFp',
data() {
return {
BASE_URL: process.env.VUE_APP_BASE_API,
showSearch: true,
checkInvoice: false,
//
curInvoice: {},
invoiceQuery: {
@ -395,44 +383,56 @@ export default {
startTime: null,
endTime: null,
invCode: null,
fromCorp: null,
fromCorp: null
},
codeQuery: {
orderIdFk: null,
page: 1,
limit: 10
},
codeTotal: 0,
invoiceLoading: false,
invoiceList: [],
determineData: null,
codeDetailList: [],
invoicTotal: 0,
currentRow: {
billNo: ''
},
determineVisible: false,
actDateRange: [],
auditDateRange: [],
showSup: false,
pickerOptions: {
shortcuts: [
{
text: "最近一周",
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
picker.$emit('pick', [start, end])
}
},
{
text: "最近一个月",
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
picker.$emit('pick', [start, end])
}
},
{
text: "最近三个月",
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
picker.$emit('pick', [start, end])
}
}
]
},
Upinvoice: false,
@ -443,43 +443,43 @@ export default {
orderLoading: false,
orderList: [],
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI管理系统",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据",
'1': 'UDIMS平台',
'2': '网页新增',
'3': 'pda即时校验',
'4': 'pda未校验',
'5': 'pc端扫码精灵',
'6': '流转自动补单',
'7': 'UDI管理系统',
'8': '平衡补录单据',
'10': '手动补单',
'11': '仓库盘点',
'12': '采购计划',
'13': '领用单据',
'14': '第三方系统单据'
},
statusFilterType(status) {
const statusMap = {
5: "warning",
1: "warning",
6: "danger",
7: "success",
};
return statusMap[status];
5: 'warning',
1: 'warning',
6: 'danger',
7: 'success'
}
return statusMap[status]
},
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "待核对",
6: "校验异常",
7: "已审核",
8: "审核拒绝",
9: "正在处理", 10: "待审核",
1: '草稿',
2: '等待处理',
3: '等待校验',
4: '处理异常',
5: '待核对',
6: '校验异常',
7: '已审核',
8: '审核拒绝',
9: '正在处理', 10: '待审核'
},
checkDateStatus: {
1: "确认",
0: "未确认",
1: '确认',
0: '未确认'
},
//
@ -490,22 +490,21 @@ export default {
invoiceEncode: null,
page: 1,
limit: 10
},
}
}
},
components: {DialogInvoice, ElImageViewer},
components: { DialogInvoice, ElImageViewer, invoiceRegCkeck, InvoiceRegistrationDetermine },
methods: {
onReset() {
this.$router.push({
path: "",
});
path: ''
})
this.invoiceQuery = {
id: "",
id: '',
billNo: null,
mainAction: null,
action: null,
@ -514,153 +513,147 @@ export default {
startTime: null,
endTime: null,
invCode: null,
fromCorp: null,
};
this.actDateRange = [];
this.auditDateRange = [];
this.getInvoiceList();
fromCorp: null
}
this.actDateRange = []
this.auditDateRange = []
this.getInvoiceList()
},
hideSearch() {
this.showSearch = !this.showSearch;
this.showSearch = !this.showSearch
},
//
onSubmit() {
this.loading = true;
this.loading = true
if (this.actDateRange !== null) {
this.invoiceQuery.startTime = this.actDateRange[0];
this.invoiceQuery.endTime = this.actDateRange[1];
} else {
this.invoiceQuery.startTime = null;
this.invoiceQuery.endTime = null;
}
if (this.auditDateRange !== null) {
this.invoiceQuery.startAduditTime = this.auditDateRange[0];
this.invoiceQuery.endAduditTime = this.auditDateRange[1];
this.invoiceQuery.startTime = this.actDateRange[0]
this.invoiceQuery.endTime = this.actDateRange[1]
} else {
this.invoiceQuery.startAduditTime = null;
this.invoiceQuery.endAduditTime = null;
this.invoiceQuery.startTime = null
this.invoiceQuery.endTime = null
}
this.invoiceQuery.page = 1;
this.getInvoiceList();
this.invoiceQuery.page = 1
this.getInvoiceList()
},
getInvoiceList() {
this.invoiceLoading = true;
this.invoiceLoading = true
groupInvoice(this.invoiceQuery).then((res) => {
this.invoiceLoading = false;
this.invoiceLoading = false
if (res.code === 20000) {
this.invoiceList = res.data.list || [];
this.invoicTotal = res.data.total || 0;
this.invoiceList = res.data.list || []
this.invoicTotal = res.data.total || 0
} else {
this.$message.error(res.message);
this.invoiceList = [];
this.invoicTotal = 0;
this.$message.error(res.message)
this.invoiceList = []
this.invoicTotal = 0
}
}).catch((error) => {
this.invoiceLoading = false;
this.$message.error(error.message);
this.invoiceList = [];
this.invoicTotal = 0;
this.invoiceLoading = false
this.$message.error(error.message)
this.invoiceList = []
this.invoicTotal = 0
})
},
invoiceReg() {
this.checkInvoice = true
},
freshen() {
this.Upinvoice = false;
this.Upinvoice = false
},
closeAcceptDialog() {
this.Upinvoice = false;
this.checkInvoice = false
this.Upinvoice = false
this.curInvoice = null
this.getInvoiceList()
},
editInvoice(row) {
this.curInvoice = row;
this.Upinvoice = true;
this.curInvoice = row
this.checkInvoice = true
},
deleteInvoice: function (row) {
this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
deleteInvoice: function(row) {
this.$confirm('此操作将永久删除该发票信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
this.par = row;
this.par.regId = this.regId;
this.par = row
this.par.regId = this.regId
deleteInvoice(row)
.then((response) => {
if (response.code == 20000) {
this.getInvoiceList();
this.getInvoiceList()
this.$message({
type: "success",
message: "删除成功!",
});
type: 'success',
message: '删除成功!'
})
}
})
.catch(() => {
});
})
})
.catch(() => {
});
})
},
showImgViewer(row) {
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name=" + row.licenseUrl;
this.imgList = [];
'/udiwms/image/register/file/getImage?type=image2&name=' + row.licenseUrl
this.imgList = []
this.imgList.push(this.certFileUrl)
let index = row.licenseUrl.lastIndexOf('.');
let index = row.licenseUrl.lastIndexOf('.')
if (index === -1) {
this.$message.error("文件名异常!")
this.$message.error('文件名异常!')
return false
}
if (row.licenseUrl.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
let pdf = 'application/pdf'
let binaryData = []
previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
binaryData.push(res)
let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }))
window.open(URL)
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
this.imgViewerVisible = true
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); //
e.preventDefault()
}
document.body.style.overflow = 'hidden'
document.addEventListener('touchmove', m, false) //
},
closeImgViewer() {
this.imgViewerVisible = false;
this.imgViewerVisible = false
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
}
document.body.style.overflow = 'auto'
document.removeEventListener('touchmove', m, true)
},
//
getOrderList(row) {
this.orderLoading = true;
this.currentRow = {billNo: ""};
let query = {invoiceEncode: row.invoiceEncode};
this.orderLoading = true
this.currentRow = { billNo: '' }
let query = { invoiceEncode: row.invoiceEncode }
orderDetail(query)
.then((response) => {
this.orderLoading = false;
this.orderLoading = false
if (response.code === 20000) {
this.orderList = response.data.list || [];
this.orderList = response.data.list || []
} else {
this.$message.error(response.message);
this.$message.error(response.message)
}
})
.catch((error) => {
this.$message.error(error.message)
this.orderLoading = false;
this.orderList = [];
});
this.orderLoading = false
this.orderList = []
})
},
//
clearDetailList() {
@ -672,44 +665,86 @@ export default {
// this.resultDetailList = [];
},
handleInvoiceChange(val) {
this.getOrderList(val);
this.getProductDetailList(val);
this.getOrderList(val)
this.getProductDetailList(val)
},
//
getProductDetailList(row) {
this.productDetailLoading = true;
this.productDetailList = [];
this.productDetailLoading = true
this.productDetailList = []
if (row == null || isBlank(row.invoiceEncode)) {
this.$message.error("请选择对应发票!")
return;
this.$message.error('请选择对应发票!')
return
}
this.productQuery.invoiceEncode = row.invoiceEncode;
this.productQuery.invoiceEncode = row.invoiceEncode
productDetail(this.productQuery).then((res) => {
this.productDetailLoading = false;
this.productDetailLoading = false
if (res.code === 20000) {
this.productDetailList = res.data.list || [];
this.productTotal = res.data.total || 0;
this.productDetailList = res.data.list || []
this.productTotal = res.data.total || 0
} else {
this.$message.error(res.message);
this.productDetailList = [];
this.productTotal = 0;
this.$message.error(res.message)
this.productDetailList = []
this.productTotal = 0
}
}).catch((error) => {
this.productDetailList = true;
this.$message.error(error.message);
this.codeDetailList = [];
this.productTotal = 0;
this.productDetailList = true
this.$message.error(error.message)
this.codeDetailList = []
this.productTotal = 0
})
},
determine(row) {
this.determineData = row
this.determineVisible = true
},
closeDetermineDialog() {
this.determineVisible = false
this.orderList = []
this.productDetailList = []
this.getInvoiceList()
},
handleSelectionChange(val) {
this.currentRow.billNo = val.billNo
this.getOrderDetails()
},
getOrderDetails() {
this.codeQuery.page = 1
this.getCodeDetailList()
},
getCodeDetailList() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error('请先选择需要查询的单据!')
return
}
this.codeQuery.orderIdFk = this.currentRow.billNo
this.codeDetailLoading = true
this.codeDetailList = []
filterBizOrderList(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
})
},
},
created() {
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;
let supId = this.$store.getters.customerId
if (supId == '110') {
this.showSup = true
}
this.getInvoiceList();
this.getInvoiceList()
}
}
</script>

@ -0,0 +1,782 @@
<template>
<div style="display: flex; flex-direction: column">
<el-button size="small" style="margin-left: auto; margin-right: 15px" type="primary" icon="el-icon-bottom-right" @click="onSubmit"></el-button>
<el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="150px" style="padding-top: 40px">
<el-card style="margin-top: -30px">
<el-row>
<el-col :span="20">
<el-form-item prop="code" label="请扫入发票二维码:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref="inputRef"
style="ime-mode: disabled"
type="password"
v-model="inputQuery.code"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="机器编码:" prop="machineNo">
<el-input
v-model="inputQuery.machineNo"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="发票代码:" prop="invoiceCode">
<el-input
v-model="inputQuery.invoiceCode"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="发票编码:" prop="invoiceEncode">
<el-input
v-model="inputQuery.invoiceEncode"
:disabled="this.list.length>0"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="发票价格:" prop="price">
<el-input
v-model="inputQuery.price"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="开票日期:" prop="invoiceDate">
<el-date-picker
v-model="inputQuery.invoiceDate"
type="datetime"
placeholder="请选择日期"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
style="width: 100%"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="备注:" prop="remark">
<el-input
v-model="inputQuery.remark"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="文件:">
<el-upload
:disabled="formData.auditStatus == 1"
class="upload-demo"
ref="upload"
:action="this.uploadUrl"
:on-preview="uploadHandlePreview"
:on-remove="uploadHandleRemove"
:limit="1"
:headers="headers"
:on-exceed="uploadHandleExceed"
accept=".jpg,.png,.pdf,.doc"
:on-change="uploadOnchange"
:on-success="uploadHandleSuccess"
:on-error="uploadHandleError"
:file-list="fileList"
:data="{ type: 'image2' }"
:auto-upload="true"
>
<el-button
slot="trigger"
size="small"
type="primary"
:disabled="formData.auditStatus == 1"
>
{{ choiceFile }}
</el-button>
<div>只能上传 jpg,png,pdf,doc 文件且不超过 10 MB</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item
label="文件预览:"
v-if="this.inputQuery.licenseUrl != null"
>
<el-button
type="success"
size="mini"
icon="search"
v-if="this.inputQuery.licenseUrl != null"
style="text-align: right"
@click="showImgViewer"
>
文件预览
</el-button>
</el-form-item>
<el-image-viewer
v-if="imgViewerVisible"
style="z-index: 9999"
:on-close="closeImgViewer"
:url-list="imgList"
/>
</el-col>
</el-row>
</el-card>
</el-form>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-button-group style="display: flex">
<el-button type="primary" size="small" @click.native.stop="selectOrderFunction()"
style="margin: 0px 0px 10px auto; height: 35px" :loading="loading"
>选择单据
</el-button>
</el-button-group>
<el-table v-loading="loading" @current-change="handleSelectionChange" :data="list" style="width: 100%" highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltipsortable="custom"
:sort-orders="['ascending', 'descending']"
></el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip sortable="custom"
:sort-orders="['ascending', 'descending']"
></el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept"></el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120"></el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="总金额" prop="allAmount" width="120"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="delectSub(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="codeTotal > 0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getCodeDetailLists"
/>
</el-tabs>
<!--单据业务详情-->
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table :data="codeDetailList" style="width: 100%" border row-key="id" highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="发票编码" prop="invoiceCodes" width="150" show-overflow-tooltip></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="price" width="100"></el-table-column>
<el-table-column label="金额" prop="amount" 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-column label="扫码数量" prop="reCount" width="100"></el-table-column>
</el-table>
<pagination
v-show="codeTotal>0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getCodeDetailList"
/>
</el-tab-pane>
</el-tabs>
<el-image-viewer
v-if="imgViewerVisible"
style="z-index: 9999"
:on-close="closeImgViewer"
:url-list="imgList"
/>
<el-dialog
title="选入单据"
:visible.sync="invoiceSelectRegByOrderVisible"
width="80%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="invoiceSelectRegByOrderVisible"
>
<invoiceSelectRegByOrder
:closeDialog="closeAcceptDialog"
:inputQuery="inputQuery"
></invoiceSelectRegByOrder>
</el-dialog>
</div>
</template>
<script>
import {
filterListInvoice,
getBizDetailList,
deleteById,
insertInvoice,
uploadInvoice,
updateOrder,
filterBizOrderList,
updateorderBiz, parseInvoice, deleteInvoiceByOrderFk
} from '@/api/inout/orderDetailBiz'
import AcceptOrder from '@/views/inout/DialogReviewOrder'
import DialogInvoice from '@/views/inout/DialogInvoice'
import InvoiceRegister from '@/views/inout/InvoiceRegister'
import { previewImage, previewFile } from '@/api/purchase/supCompany'
import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
import store from '@/store'
import invoiceSelectRegByOrder from '@/views/inout/InvoiceSelectRegByOrder'
import { filterInvoiceList } from '@/api/inout/order'
import { isBlank } from '@/utils/strUtil'
const formJson = {
site_id: '',
site_name: '',
describe: '',
ads: []
}
export default {
name: 'checkInvoice',
props: {
closeDialog: {
type: Function,
required: true
},
curInvoice: {
type: Object,
required: true
},
},
data() {
return {
invoiceSelectRegByOrderVisible: false,
idList: [],
invoiceRow: [],
statusCode: null,
choiceFile: '选取文件',
fileList: [],
headers: {},
uploadUrl: '',
inputQuery: {
ggxh: null,
cpmctymc: null,
machineNo: null,
invoiceCode: null,
invoiceEncode: null,
price: null,
invoiceDate: null,
remark: null,
licenseUrl: null
},
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
showSearch: true,
filterQuery: {
id: '',
billNo: null,
mainAction: null,
action: null,
page: 1,
supInoivceSearch: 'supInvoice',
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode
},
corpLoading: false,
fromOptions: [],
invoiceLoading: false,
formName: 1,
formMap: {
1: '发票登记'
},
formRules: {
// machineNo: [
// { required: true, message: "", trigger: "blur" },
// ],
// invoiceCode: [
// { required: true, message: "", trigger: "blur" },
// ],
invoiceEncode: [
{ required: true, message: '请输入发票编码', trigger: 'blur' }
],
price: [{ required: true, message: '请输入发票价格', trigger: 'blur' }],
invoiceDate: [{ required: true, message: '请输入备注', trigger: 'blur' }]
},
certFileUrl: '',
Upinvoice: false,
currentManufacturer: {},
InvoiceRegisterv: false,
checkStatus: {
1: '草稿',
2: '等待处理',
3: '等待校验',
4: '处理异常',
5: '待核对',
6: '校验异常',
7: '已审核',
8: '审核拒绝',
9: '正在处理',
10: '待审核'
},
storageList: [],
invList: [],
deptList: [],
list: [],
total: 0,
loading: false,
index: null,
enableDept: false,
showSup: false,
fromTypeMap: {
1: 'UDIMS平台',
2: '网页新增',
3: 'pda即时校验',
4: 'pda未校验',
5: 'pc端扫码精灵',
6: '流转自动补单',
7: 'UDI管理系统',
8: '平衡补录单据',
10: '手动补单',
11: '仓库盘点',
12: '采购计划',
13: '领用单据',
14: '第三方系统单据'
},
deleteData: {
id: '',
status: 10
},
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
formData: formJson,
deleteLoading: false,
busTypes: [],
currentRow: {
billNo: ''
},
actDateRange: [],
auditDateRange: [],
pickerOptions: {
shortcuts: [
{
text: '最近一周',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
picker.$emit('pick', [start, end])
}
},
{
text: '最近一个月',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
picker.$emit('pick', [start, end])
}
},
{
text: '最近三个月',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
picker.$emit('pick', [start, end])
}
}
]
},
bizQuery: {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
},
bizTotal: 0,
invTotal: 0,
bizDetailLoading: false,
bizDetailList: [],
codeQuery: {
orderIdFk: null,
page: 1,
limit: 10
},
codeTotal: 0,
codeDetailLoading: false,
codeDetailList: [],
resultQuery: {
orderId: null,
code: null,
page: 1,
limit: 10
},
resultTotal: 0,
resultDetailLoading: false,
resultDetailList: [],
acceptQuery: null,
acceptOrderVisible: false,
subRow: null
}
},
components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, invoiceSelectRegByOrder },
methods: {
onSubmit() {
if (this.list == null || this.list.length==0) {
this.$message.error('请选择要登记的物资! ')
return false
}
if (this.$isBlank(this.inputQuery.invoiceEncode)) {
this.$message.error('发票编码不能为空!')
return
}
if (this.$isBlank(this.inputQuery.price)) {
this.$message.error('发票价格不能为空!')
return
}
if (this.$isBlank(this.inputQuery.invoiceDate)) {
this.$message.error('日期不能为空!')
return
}
let mount = 0
for (var i = 0; i < this.list.length; i++) {
mount += this.list[i].allAmount
}
if (mount != this.inputQuery.price) {
this.$confirm('价格不匹配,是否确定提交?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
this.postInvoice()
})
.catch(() => {
})
return
} else {
this.postInvoice()
}
},
postInvoice() {
uploadInvoice(this.inputQuery)
.then((response) => {
if (response.code === 20000) {
this.statusCode = response.code
this.closeDialog()
} else {
this.$message.error(response.message)
}
})
.catch((response) => {
this.$message.error(response.message)
})
//
updateorderBiz(this.inputQuery.list).then((res) => {
this.closeDialog()
})
},
getInputFocus(event) {
event.currentTarget.select()
},
enterKey() {
let param = {
code: this.inputQuery.code
}
parseInvoice(param)
.then((res) => {
if (res.code == 20000) {
this.inputQuery = res.data
}
})
},
uploadHandleError() {
},
uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) {
this.inputQuery.licenseUrl = response.data.name
// this.onSubmit();
} else {
this.$message.error('文件上传失败:' + response.message)
}
},
uploadOnchange(file, fileList) {
let fileName = file.name
let uid = file.uid
let pos = fileName.lastIndexOf('.')
let lastName = fileName.substring(pos, fileName.length)
if (
lastName.toLowerCase() !== '.jpg' &&
lastName.toLowerCase() !== '.png' &&
lastName.toLowerCase() !== '.doc' &&
lastName.toLowerCase() !== '.pdf'
) {
this.$message.error('上传文件只能是 jpg,png,doc,pdf 格式')
for (let i = 0; i < fileList.length; i++) {
//list
if (fileList[i].uid === uid) {
fileList.splice(i, 1)
}
}
return
}
//
const isLt = file.size / 1024 / 1024 / 30 <= 1
if (!isLt) {
this.$message.error('上传文件大小不能超过 30MB')
for (let i = 0; i < fileList.length; i++) {
if (fileList[i].uid === uid) {
fileList.splice(i, 1)
}
}
}
return isLt
},
uploadHandleExceed(files, fileList) {
this.$message.warning(
`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
files.length + fileList.length
} 个文件`
)
},
uploadHandlePreview(file) {
console.log(file)
console.log(this.fileList)
},
uploadHandleRemove(file, fileList) {
this.inputQuery.licenseUrl = null
console.log(file, fileList)
},
getOrderDetail() {
this.codeQuery.page = 1
this.getCodeDetailLists()
//this.getResultDetailList();
},
getCodeDetailLists() {
this.filterQuery.invoiceEncode = this.inputQuery.invoiceEncode
this.filterQuery.vueType = 'supInvoice'
this.codeDetailLoading = true
filterInvoiceList(this.filterQuery)
.then((response) => {
this.loading = false
if (response.code === 20000) {
this.list = response.data.list || []
this.total = response.data.total || 0
} else {
this.$message.error(response.message)
}
})
.catch((error) => {
this.$message.error(error.message)
this.loading = false
this.list = []
this.total = 0
})
},
BizDetailInv(row) {
this.bizQuery.page = 1
this.getBizDetailList(row)
},
handleSelectionUdiChange(val) {
this.invoiceRow = val
// this.$emit("upData",this.invoiceRow);
},
getBizDetailList(row) {
this.bizQuery.orderIdFk = this.input.billNo
if (row != null) {
this.bizQuery.batchNo = row.batchNo
this.bizQuery.relId = row.bindRlFk
}
filterListInvoice(this.bizQuery)
.then((res) => {
this.bizDetailLoading = false
if (res.code === 20000) {
this.bizDetailList = res.data.list || []
this.invTotal = res.data.total || 0
} else {
this.$message.error(res.message)
this.bizDetailList = []
this.invTotal = 0
}
})
.catch((error) => {
this.bizDetailLoading = false
this.$message.error(error.message)
this.bizDetailList = []
this.invTotal = 0
})
},
determineBtn() {
var data = {
billNo: this.input.billNo,
checkStatus: 1
}
updateOrder(data)
.then((res) => {
this.closeDialog()
})
.catch((error) => {
})
},
showImgViewer(row) {
this.certFileUrl =
this.BASE_URL +
'/udiwms/image/register/file/getImage?type=image2&name=' + this.inputQuery.licenseUrl
this.imgList = []
this.imgList.push(this.certFileUrl)
let index = this.inputQuery.licenseUrl.lastIndexOf('.')
if (index === -1) {
this.$message.error('文件名异常!')
return false
}
if (this.inputQuery.licenseUrl.substr(index + 1) === 'pdf') {
let pdf = 'application/pdf'
let binaryData = []
previewFile(this.certFileUrl).then(res => {
binaryData.push(res)
let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }))
window.open(URL)
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true
const m = (e) => {
e.preventDefault()
}
document.body.style.overflow = 'hidden'
document.addEventListener('touchmove', m, false) //
},
closeImgViewer() {
this.imgViewerVisible = false
const m = (e) => {
e.preventDefault()
}
document.body.style.overflow = 'auto'
document.removeEventListener('touchmove', m, true)
},
/** -------------------------------------------------后续加的js------------------------------------------------------------- */
/** * 选入单据页面 */
selectOrderFunction() {
if (this.$isBlank(this.inputQuery.invoiceEncode)) {
this.$message.error('发票编码不能为空!')
return
}
this.invoiceSelectRegByOrderVisible = true
},
closeAcceptDialog(){
this.invoiceSelectRegByOrderVisible = false
this.getCodeDetailLists()
},
delectSub(row){
deleteInvoiceByOrderFk({billNo:row.billNo,invoiceEncode:this.inputQuery.invoiceEncode})
.then((response) => {
if (response.code === 20000) {
this.getOrderDetail();
} else {
this.$message.error(response.message)
}
})
.catch((response) => {
this.$message.error(response.message)
})
},
handleSelectionChange(val) {
this.currentRow.billNo = val.billNo
this.getOrderDetails()
},
getOrderDetails() {
this.codeQuery.page = 1
this.getCodeDetailList()
},
getCodeDetailList() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error('请先选择需要查询的单据!')
return
}
this.codeQuery.orderIdFk = this.currentRow.billNo
this.codeDetailLoading = true
this.codeDetailList = []
filterBizOrderList(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
})
},
},
created() {
this.uploadUrl = this.BASE_URL + '/udiwms/upload/register/file'
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token
}
if(this.curInvoice.id!=null){
this.inputQuery=this.curInvoice
this.getOrderDetail();
}
}
}
</script>
<style type="text/scss" lang="scss"></style>

File diff suppressed because it is too large Load Diff

@ -76,7 +76,7 @@
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row borderv @selection-change="handleCheckedChange">
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row borderv @selection-change="handleCheckedChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="fromCorpName" width="160" v-if="showSup"></el-table-column>

Loading…
Cancel
Save