From 02bb4ca48fc1117f831530a6dd81ce938b23d789 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 6 May 2023 11:01:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 631 ++++++++++++++++++ src/views/inout/InvoiceRegistration.vue | 158 +++-- .../inout/InvoiceRegistrationDetermine.vue | 31 +- 3 files changed, 753 insertions(+), 67 deletions(-) create mode 100644 src/views/inout/InvoiceCkeck.vue diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue new file mode 100644 index 0000000..df5f949 --- /dev/null +++ b/src/views/inout/InvoiceCkeck.vue @@ -0,0 +1,631 @@ + + + + + + diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index bd4df61..b185d3e 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -140,6 +140,19 @@ border @row-click="handleSelectionChange"> + + + @@ -179,22 +192,16 @@ - - - @@ -216,6 +223,22 @@ row-key="id" highlight-current-row > + + + + - - - + + - - - + + + + + + + + + + + + + + + + + { - insertInvoice(row) - .then(response => { - if (response.code === 20000) { - this.closeInvoice(row); - } else { - this.$message.error(response.message); - } - }) - .catch((response) => { - this.$message.error(response.message); - }); - }).catch(() => { - }); - // 加状态 - updateorderBiz(row).then(res =>{ - - }) + InvoiceRegister1(row){ + this.inputInv=row; + this.checkInvoice=true; + }, + closecheckInvoice(){ + this.checkInvoice=false; + this.getCodeDetailList(); }, onSubmit() { @@ -793,6 +821,7 @@ export default { type: "success", message: "删除成功！", }); + this.getCodeDetailList(); } }) .catch(() => { @@ -806,6 +835,7 @@ export default { handleSelectionChange(val) { this.currentRow.billNo = val.billNo; this.getOrderDetails(); + this.getBizDetailListInv(); }, // 获取单据 业务详情、扫码详情、扫码明细 getOrderDetails() { @@ -945,10 +975,10 @@ export default { this.$message.error("请先选择需要查询的单据！") return; } - this.codeQuery.orderIdFk = this.currentRow.billNo; this.codeDetailLoading = true; - getBizDetailListInv(this.codeQuery).then((res) => { + + filterBizOrderList(this.codeQuery).then((res) => { this.codeDetailLoading = false; if (res.code === 20000) { this.codeDetailList = res.data.list || []; @@ -988,6 +1018,7 @@ export default { if(row != null) { this.bizQuery.batchNo = row.batchNo; this.bizQuery.relId = row.bindRlFk; + this.bizQuery.bizIdFk = row.id; } filterListInvoice(this.bizQuery).then((res) => { this.bizDetailLoading = false; @@ -1044,7 +1075,8 @@ export default { closeAcceptDialog() { this.Upinvoice = false; this.getBizDetailListInv(); - }, + this.getOrderDetails(); + }, closeInvoice(row) { this.InvoiceRegisterv = false; diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue index c5eb8a2..7c8b72d 100644 --- a/src/views/inout/InvoiceRegistrationDetermine.vue +++ b/src/views/inout/InvoiceRegistrationDetermine.vue @@ -46,6 +46,16 @@ row-key="id" highlight-current-row > + + + { - this.closeDialog(); - }).catch((error) => { + let index = this.codeDetailList.findIndex(item=>item.regStatus==false) + if(index!=-1){ + this.$confirm("还有未登记的发票, 是否继续提交?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then( ()=>{ + updateOrder(data).then((res) => { + this.closeDialog(); + }).catch((error) => { + }) + }).catch( ()=>{ + + }) + + } + - }) }, showImgViewer(row) { this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; From ca332514662b1dbd0e4e36c64c03afaff4012e22 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 6 May 2023 11:12:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index df5f949..ba1d827 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -9,6 +9,19 @@ + + + + + + + + From e02c1328d5ab349e89eab52162d5a6e22478f118 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Sat, 6 May 2023 11:42:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 555 +++++++++++++++++-------------- 1 file changed, 301 insertions(+), 254 deletions(-) diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index ba1d827..85dc98c 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -1,16 +1,22 @@ @@ -215,78 +256,78 @@ import { insertInvoice, updateOrder, filterBizOrderList, - updateorderBiz -} from '@/api/inout/orderDetailBiz' -import AcceptOrder from '@/views/inout/DialogReviewOrder' -import DialogInvoice from '@/views/inout/DialogInvoice' -import InvoiceRegister from '@/views/inout/InvoiceRegister' + updateorderBiz, +} from "@/api/inout/orderDetailBiz"; +import AcceptOrder from "@/views/inout/DialogReviewOrder"; +import DialogInvoice from "@/views/inout/DialogInvoice"; +import InvoiceRegister from "@/views/inout/InvoiceRegister"; -import { previewImage } from '@/api/purchase/supCompany' -import ElImageViewer from 'element-ui/packages/image/src/image-viewer' -import store from '@/store' +import { previewImage } from "@/api/purchase/supCompany"; +import ElImageViewer from "element-ui/packages/image/src/image-viewer"; +import store from "@/store"; const formJson = { - site_id: '', - site_name: '', - describe: '', - ads: [] -} + site_id: "", + site_name: "", + describe: "", + ads: [], +}; export default { - name: 'checkInvoice', + name: "checkInvoice", props: { - closeDialog:{ - type:Function, - required: true + closeDialog: { + type: Function, + required: true, }, input: { type: Object, - required: true + required: true, }, - getOrderDetails :{ + getOrderDetails: { type: Object, - required: true + required: true, }, - invoiceRow:{ + invoiceRow: { type: Array, - required: true - } + required: true, + }, }, data() { return { - idList:[], - invoiceRow:[], - statusCode:null, + 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 + 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: '', + id: "", billNo: null, mainAction: null, action: null, page: 1, - supInoivceSearch: 'supInvoice', + supInoivceSearch: "supInvoice", limit: 10, startTime: null, endTime: null, - invCode: this.$store.getters.locInvCode + invCode: this.$store.getters.locInvCode, }, corpLoading: false, @@ -294,39 +335,36 @@ export default { formName: 1, formMap: { - 1: '发票登记' + 1: "发票登记", }, formRules: { machineNo: [ - {required: true, message: "请输入机械编码", trigger: "blur"} + { required: true, message: "请输入机械编码", trigger: "blur" }, ], invoiceCode: [ - {required: true, message: "请输入发票代码", trigger: "blur"} + { required: true, message: "请输入发票代码", trigger: "blur" }, ], invoiceEncode: [ - {required: true, message: "请输入发票编码", trigger: "blur"} - ], - price: [ - {required : true, message: "请输入发票价格", trigger:"blur"} - ], - remark: [ - {required : true, message: "请输入备注", trigger:"blur"} + { required: true, message: "请输入发票编码", trigger: "blur" }, ], + price: [{ required: true, message: "请输入发票价格", trigger: "blur" }], + remark: [{ required: true, message: "请输入备注", trigger: "blur" }], }, - certFileUrl: '', + certFileUrl: "", Upinvoice: false, currentManufacturer: {}, InvoiceRegisterv: false, checkStatus: { - 1: '草稿', - 2: '等待处理', - 3: '等待校验', - 4: '处理异常', - 5: '待核对', - 6: '校验异常', - 7: '已审核', - 8: '审核拒绝', - 9: '正在处理', 10: '待审核' + 1: "草稿", + 2: "等待处理", + 3: "等待校验", + 4: "处理异常", + 5: "待核对", + 6: "校验异常", + 7: "已审核", + 8: "审核拒绝", + 9: "正在处理", + 10: "待审核", }, storageList: [], invList: [], @@ -339,23 +377,23 @@ export default { showSup: false, 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: "第三方系统单据", }, deleteData: { - id: '', - status: 10 + id: "", + status: 10, }, dialogTableVisible: false, formLoading: false, @@ -364,46 +402,46 @@ export default { deleteLoading: false, busTypes: [], currentRow: { - billNo: '' + billNo: "", }, actDateRange: [], auditDateRange: [], 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]); + }, + }, + ], }, bizQuery: { productName: null, orderIdFk: null, page: 1, - limit: 10 + limit: 10, }, bizTotal: 0, invTotal: 0, @@ -412,7 +450,7 @@ export default { codeQuery: { orderIdFk: null, page: 1, - limit: 10 + limit: 10, }, codeTotal: 0, codeDetailLoading: false, @@ -421,70 +459,65 @@ export default { orderId: null, code: null, page: 1, - limit: 10 + limit: 10, }, resultTotal: 0, resultDetailLoading: false, resultDetailList: [], acceptQuery: null, acceptOrderVisible: false, - subRow: null - } + subRow: null, + }; }, components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer }, methods: { onSubmit() { - if(this.invoiceRow.length==0) { - this.$message.error("请选择要登记的物资! "); - return false; - } - if (this.$isBlank(this.inputQuery.machineNo)) { - this.$message.error("机械编码不能为空！"); - return; - } - if (this.$isBlank(this.inputQuery.invoiceCode)) { - this.$message.error("发票代码不能为空！"); - return; - } - 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.remark)) { - this.$message.error("备注不能为空！"); - return; - } - this.inputQuery.list=this.invoiceRow; - insertInvoice(this.inputQuery) - .then(response => { - if (response.code === 20000) { - this.statusCode=response.code; - } else { - this.$message.error(response.message); - } - }) - .catch((response) => { + if (this.invoiceRow.length == 0) { + this.$message.error("请选择要登记的物资! "); + return false; + } + if (this.$isBlank(this.inputQuery.machineNo)) { + this.$message.error("机械编码不能为空！"); + return; + } + if (this.$isBlank(this.inputQuery.invoiceCode)) { + this.$message.error("发票代码不能为空！"); + return; + } + 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.remark)) { + this.$message.error("备注不能为空！"); + return; + } + this.inputQuery.list = this.invoiceRow; + insertInvoice(this.inputQuery) + .then((response) => { + if (response.code === 20000) { + this.statusCode = response.code; + } else { this.$message.error(response.message); - }); + } + }) + .catch((response) => { + this.$message.error(response.message); + }); // 加状态 - updateorderBiz(this.inputQuery.list).then(res =>{ + updateorderBiz(this.inputQuery.list).then((res) => { this.closeDialog(); - }) - - - + }); }, - uploadHandleError() { - - }, + uploadHandleError() {}, uploadHandleSuccess(response, file, fileList) { - debugger + debugger; if (response.code === 20000) { this.inputQuery.licenseUrl = response.data.name; // this.onSubmit(); @@ -494,14 +527,20 @@ export default { }, uploadOnchange(file, fileList) { let fileName = file.name; - let uid = file.uid + 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") { + 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删除 + for (let i = 0; i < fileList.length; i++) { + //从list删除 if (fileList[i].uid === uid) { - fileList.splice(i, 1) + fileList.splice(i, 1); } } return; @@ -512,21 +551,25 @@ export default { this.$message.error("上传文件大小不能超过 30MB"); for (let i = 0; i < fileList.length; i++) { if (fileList[i].uid === uid) { - fileList.splice(i, 1) + fileList.splice(i, 1); } } } return isLt; }, uploadHandleExceed(files, fileList) { - this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); + 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; + this.inputQuery.licenseUrl = null; console.log(file, fileList); }, getOrderDetail() { @@ -538,91 +581,99 @@ export default { getCodeDetailLists() { this.codeQuery.orderIdFk = this.input.billNo; this.codeDetailLoading = true; - 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); + 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; - } - }).catch((error) => { - this.codeDetailLoading = true; - this.$message.error(error.message); - this.codeDetailList = []; - this.codeTotal = 0; - }) + }); }, BizDetailInv(row) { this.bizQuery.page = 1; this.getBizDetailList(row); - }, - handleSelectionUdiChange(val){ - this.invoiceRow=val; - // this.$emit("upData",this.invoiceRow); + handleSelectionUdiChange(val) { + this.invoiceRow = val; + // this.$emit("upData",this.invoiceRow); }, getBizDetailList(row) { this.bizQuery.orderIdFk = this.input.billNo; - if(row != null) { + 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); + 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; - } - }).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) => { - - }) + 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.certFileUrl = + this.BASE_URL + + "/udiwms/image/register/file/getImage?type=image2&name="; this.imgList = []; - previewImage({imageUrl: this.inputQuery.licenseUrl, certFileUrl: this.certFileUrl}).then(response => { + previewImage({ + imageUrl: this.inputQuery.licenseUrl, + certFileUrl: this.certFileUrl, + }).then((response) => { if (response.code === 20000) { this.imgList = response.data; } - console.log(this.imgList) + console.log(this.imgList); this.imgViewerVisible = true; }); const m = (e) => { - e.preventDefault() + e.preventDefault(); }; - document.body.style.overflow = 'hidden'; + document.body.style.overflow = "hidden"; document.addEventListener("touchmove", m, false); // 禁止页面滑动 }, closeImgViewer() { this.imgViewerVisible = false; const m = (e) => { - e.preventDefault() + e.preventDefault(); }; - document.body.style.overflow = 'auto'; + document.body.style.overflow = "auto"; document.removeEventListener("touchmove", m, true); }, }, @@ -633,12 +684,8 @@ export default { ADMIN_TOKEN: store.getters.token, }; this.getOrderDetail(); - } - -} - + }, +}; - - + From 72f3eb55142418ca97f07b558c41c3e9f0bd236b Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Sat, 6 May 2023 11:52:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=99=BB=E8=AE=B0=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=A4=A7=E5=B0=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index 85dc98c..aef041a 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -1,7 +1,8 @@