diff --git a/.env.development b/.env.development index 14e382e..5539ad6 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理平台 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://127.0.0.1:9993' +VUE_APP_BASE_API = 'http://192.168.0.166:9993' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/src/api/inout/invoiceOrder.js b/src/api/inout/invoiceOrder.js new file mode 100644 index 0000000..b80a91c --- /dev/null +++ b/src/api/inout/invoiceOrder.js @@ -0,0 +1,50 @@ +import axios from "@/utils/request"; + +//获取发票列表 +export function groupInvoice(params) { + return axios({ + url: "/udiwms/inout/order/group/invoice", + method: "get", + params: params + }); +} + +//获取发票对应产品明细 +export function productDetail(params) { + return axios({ + url: "/udiwms/inout/invoice/product/detail", + method: "get", + params: params + }); +} + +//获取发票对应单据 +export function orderDetail(params) { + return axios({ + url: "/udiwms/inout/invoice/order/detail", + method: "get", + params: params + }); +} + + +export function deleteInvoice(data) { + return axios({ + url: "/udiwms/inout/invoice/delete", + method: "post", + data: data + }); +} + + +export function saveInvoice(query) { + return axios({ + url: "/udiwms/inout/invoice/saveInvoice", + method: "post", + data: query + }); +} + + + + diff --git a/src/api/inout/order.js b/src/api/inout/order.js index e74e9ae..34e015e 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -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", diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js index bf93635..15f5274 100644 --- a/src/api/inout/orderDetailBiz.js +++ b/src/api/inout/orderDetailBiz.js @@ -58,6 +58,30 @@ 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 checkInvoiceCode(params) { + return axios({ + url: "/udiwms/inout/invoice/checkInvoiceCode", + method: "post", + data: params + }); +} + export function updateorderBiz(params) { return axios({ url: "/udiwms/inout/biz/updateorderBiz", @@ -113,3 +137,7 @@ export function parseInvoice(params) { + + + + diff --git a/src/api/inout/receiveOrder.js b/src/api/inout/receiveOrder.js index d9f2c07..8954f80 100644 --- a/src/api/inout/receiveOrder.js +++ b/src/api/inout/receiveOrder.js @@ -39,3 +39,5 @@ export function getAudit(query) { + + diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 7f376c6..8aac932 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -161,7 +161,7 @@ - + diff --git a/src/views/basic/locUdi/UdiInfoDb.vue b/src/views/basic/locUdi/UdiInfoDb.vue index b803483..5e02106 100644 --- a/src/views/basic/locUdi/UdiInfoDb.vue +++ b/src/views/basic/locUdi/UdiInfoDb.vue @@ -9,7 +9,6 @@ diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue index 76df4f0..f27d932 100644 --- a/src/views/basic/product/productUdiType.vue +++ b/src/views/basic/product/productUdiType.vue @@ -219,7 +219,6 @@ export default { }); }, handleSubForm(data, formName) { //新增，编辑 - debugger this.formName = formName; if (formName === "edit") { this.subData = JSON.parse(JSON.stringify(data)); diff --git a/src/views/inout/DialogInvoiceOrder.vue b/src/views/inout/DialogInvoiceOrder.vue new file mode 100644 index 0000000..d2c29dc --- /dev/null +++ b/src/views/inout/DialogInvoiceOrder.vue @@ -0,0 +1,741 @@ + + + + + diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue index bc144f9..5856c65 100644 --- a/src/views/inout/DialogSelectProduct.vue +++ b/src/views/inout/DialogSelectProduct.vue @@ -140,7 +140,10 @@ - {{ item }} + {{ + item + }} + @@ -282,7 +285,7 @@ export default { return; } let str = this.currentRow.zczbhhzbapzbh; - if (str.search(",") != -1) { + if (this.$isNotBlank(str) && str.search(",") != -1) { this.currentCert = null; this.certList = str.split(','); this.dialogFormVisible = true; diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue index 98e7563..19d0387 100644 --- a/src/views/inout/DialogThrReviewOrder.vue +++ b/src/views/inout/DialogThrReviewOrder.vue @@ -96,6 +96,11 @@ :cell-style="{padding:6+'px'}" style="width: 100%"> + diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue new file mode 100644 index 0000000..69103b4 --- /dev/null +++ b/src/views/inout/InvoiceRegByFp.vue @@ -0,0 +1,769 @@ + + + + + diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue new file mode 100644 index 0000000..e2691ed --- /dev/null +++ b/src/views/inout/InvoiceRegByOrder.vue @@ -0,0 +1,1192 @@ + + + + + + diff --git a/src/views/inout/InvoiceRegCkeck.vue b/src/views/inout/InvoiceRegCkeck.vue new file mode 100644 index 0000000..87415b9 --- /dev/null +++ b/src/views/inout/InvoiceRegCkeck.vue @@ -0,0 +1,796 @@ + + + + + diff --git a/src/views/inout/InvoiceRegister.vue b/src/views/inout/InvoiceRegister.vue index cf2a6f1..9a1acdb 100644 --- a/src/views/inout/InvoiceRegister.vue +++ b/src/views/inout/InvoiceRegister.vue @@ -1,8 +1,5 @@