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

第三方单据上传过滤，单据上传新增起始时间

Browse Source
dev
anthonywj 2 years ago
parent 9ff096566c
commit e713afdd3a
3 changed files with 103 additions and 38 deletions
Show Stats Download Patch File Download Diff File

50
src/views/inout/IoAuditedOrder.vue
Unescape Escape View File

@ -110,7 +110,7 @@
:default-sort="defaultSort"
@sort-change="handleSortChange">
<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="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">
</el-table-column>
@ -133,11 +133,11 @@
</el-table-column>
<el-table-column label="采购仓库" prop="deptName" width="120">
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="审核人" prop="reviewUserName" width="120">
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
<el-table-column label="审核人" prop="reviewUserName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
@ -169,14 +169,14 @@
<!-- >报表打印-->
<!-- </el-button-->
<!-- >-->
<!-- 暂时隐藏-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<!-- 暂时隐藏-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"
@ -465,7 +465,7 @@ import DialogcChangeNewOrder from "@/views/inout/DialogcChangeNewOrder";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import DialogCheck from "@/views/inout/DialogCheck";
import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {previewImage,previewFile} from "@/api/purchase/supCompany";
import {previewImage, previewFile} from "@/api/purchase/supCompany";
import {
inspectionStockQRCodeTextPDFFromTemplateStatementFile,
stockQRCodeTextPDFFromTemplateStatementFile
@ -654,23 +654,23 @@ export default {
this.getList();
},
showImgViewer(row) {
if(row.filePath.substr(-1) == ','){
row.filePath=row.filePath.slice(0, row.filePath.length-1);
if (row.filePath.substr(-1) == ',') {
row.filePath = row.filePath.slice(0, row.filePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
"/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
if(index===-1){
if (index === -1) {
this.$message.error("文件名异常!")
return false
}
if(row.filePath.substr(index+1)==='pdf'){
if (row.filePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@ -696,23 +696,23 @@ export default {
showImgViewerCold(row) {
if(row.coldFilePath.substr(-1) == ','){
row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
if (row.coldFilePath.substr(-1) == ',') {
row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
"/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
if(index===-1){
if (index === -1) {
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
if (row.coldFilePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);

71
src/views/inout/uploadManage/uploadOrder.vue
Unescape Escape View File

@ -99,25 +99,49 @@
@current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType">
<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">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromCorpName" width="220">
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.auditTime }}</span>
</template>
</el-table-column>
<el-table-column label="当前部门" prop="deptName" width="120">
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120">
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
<el-table-column label="审核人" prop="reviewUserName" width="120">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusAuditFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="提交状态" prop="exportStatus" width="100">
@ -345,6 +369,7 @@ export default {
endTime: null,
billNo: null,
submitStatus: null,
vueType: "thirdUpload",
page: 1,
limit: 10
},
@ -436,6 +461,17 @@ export default {
1: "已提交",
2: "提交失败"
},
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "待核对",
6: "校验异常",
7: "已审核",
8: "审核拒绝",
9: "正在处理", 10: "待审核", 11: "待配货",
},
loading: false,
list: [],
total: 0,
@ -472,13 +508,14 @@ export default {
corpName: null,
invCode: this.$store.getters.locInvCode,
startTime: null,
vueType: "thirdUpload",
endTime: null,
billNo: null,
submitStatus: null,
page: 1,
limit: 10
};
this.actDateRange= [];
this.actDateRange = [];
this.getList();
},
onSubmit() {
@ -633,6 +670,7 @@ export default {
getBusType() {
let params = {
code: this.filterQuery.invCode,
vueType: "thirdUpload",
enabled: true
};
getLocalJoinByUser(params).then((res) => {
@ -640,6 +678,15 @@ export default {
this.onSubmit();
});
},
statusAuditFilterType(status) {
const statusMap = {
5: "warning",
1: "warning",
6: "danger",
7: "success",
};
return statusMap[status];
},
},
filters: {
statusFilterType(status) {

20
src/views/inout/uploadManage/uploadSetting.vue
Unescape Escape View File

@ -30,7 +30,6 @@
<template slot="label">
参数设置
</template>
<el-row :gutter="20" class="el-row">
<el-col :span="20" class="el-col">
<div>
@ -43,7 +42,26 @@
:disabled="configQuery.autoUpload"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
参数设置
</template>
<el-row :gutter="20" class="el-row">
<el-col :span="20" class="el-col">
<div>
<span>单据上传起始时间:&nbsp;</span>
<el-date-picker
v-model="configQuery.orderStartTime"
type="date"
value-format="yyyy-MM-dd"
:disabled="configQuery.autoUpload"
placeholder="单据上传起始时间">
</el-date-picker>
</div>
</el-col>
</el-row>

Write Preview
Loading…
Cancel
Save