diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue index f55c06a386..2d6033291a 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -347,6 +353,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue index 49f2d79051..396afb824e 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -339,6 +345,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue index 54a0fb00ef..dc63110b7b 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue @@ -15,6 +15,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -386,6 +392,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue index 147698ffe8..77e159ad7d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue @@ -15,6 +15,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -409,6 +415,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue index b2d15bccc2..921adb2963 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue @@ -15,6 +15,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -386,6 +392,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue index 12c7c34123..e749f600c8 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -339,6 +345,7 @@ export default { busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], concatNo: '', + companyInvoicingName: '', createDate: '', customerName: '', customerSid: '', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue index 091014503a..2efbc0d166 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -339,6 +345,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue b/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue index ccdc62c5c4..3817044a35 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -339,6 +345,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue index 77c51064e3..4af1402bd6 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue @@ -179,7 +179,7 @@ export default { visibleDisabled: false, printSid: '', print: '', - printSource: '', + printSource: false, btndisabled: false, isSearchShow: false, searchxianshitit: '隐藏查询条件', @@ -357,13 +357,13 @@ export default { }, handleDownLoad(row) { this.printSid = row.sid - this.printSource = row.source + this.printSource = row.loan this.print = '' this.dialogVisible = true }, handleConfirm() { this.visibleDisabled = true - if (this.printSource === '01') { + if (!this.printSource) { createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => { if (resp.success && resp.data.pdfPath !== '') { var xhr = new XMLHttpRequest() @@ -388,7 +388,7 @@ export default { xhr.send() this.dialogVisible = false this.printSid = '' - this.printSource = '' + this.printSource = false this.visibleDisabled = false this.getList() } else { @@ -397,7 +397,7 @@ export default { }).catch(() => { this.visibleDisabled = false }) - } else if (this.printSource === '02') { + } else if (this.printSource) { createPdfRsk({ skdSid: this.printSid, printerType: this.print }).then((resp) => { if (resp.success && resp.data.pdfPath !== '') { var xhr = new XMLHttpRequest() @@ -422,7 +422,7 @@ export default { xhr.send() this.dialogVisible = false this.printSid = '' - this.printSource = '' + this.printSource = false this.visibleDisabled = false this.getList() } else { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue index 0c8407889d..1bc4a6ad3d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -339,6 +345,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue b/anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue index bd1cdbb82a..19a522f20e 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -339,6 +345,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue b/anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue index ce3551762e..39f34bea68 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue @@ -11,6 +11,12 @@
销售订单
+ +
开票单位
+ {{ formobj.companyInvoicingName }} +
+
+
订单编号
{{ formobj.billNo }} @@ -339,6 +345,7 @@ export default { busSalesOrderVehicleList: [], busSalesOrderotherMessageDetailsVo: [], busSalesVehicleOrderList: [], + companyInvoicingName: '', concatNo: '', createDate: '', customerName: '', diff --git a/yxt-as-ui/src/api/purchase/purchasereturn.js b/yxt-as-ui/src/api/purchase/purchasereturn.js new file mode 100644 index 0000000000..e2956f49a3 --- /dev/null +++ b/yxt-as-ui/src/api/purchase/purchasereturn.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/pms/pmspurchasebackbill/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 供应商 + supplierListPage: function(params) { + return request({ + url: '/base/basesupplierinfo/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 初始化 + fetchDetailsBySid: function(data) { + return request({ + url: '/pms/pmspurchasebackbill/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/pms/pmspurchasebillsettle/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + settlement: function(data) { + return request({ + url: '/pms/pmspurchasebillsettle/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + deleteBySids: function(data) { + return request({ + url: '/pms/pmspurchasebackbill/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 导出 + exportExcel: function(data) { + return request({ + url: '/pms/pmspurchasebackbill/exportExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } +} diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index ab2d71a5a5..1c397e65d0 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -132,6 +132,12 @@ export const constantRoutes = [ component: () => import('@/views/purchase/procurement/procurement.vue'), name: 'Procurement', meta: { title: '采购开单', noCache: true } + }, + { + path: '/purchasereturn/purchasereturn', + component: () => import('@/views/purchase/purchasereturn/purchasereturn.vue'), + name: 'PurchaseReturn', + meta: { title: '采购退货', noCache: true } } ] }, diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue new file mode 100644 index 0000000000..0821658c73 --- /dev/null +++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue @@ -0,0 +1,337 @@ + + + + diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue new file mode 100644 index 0000000000..d128df2195 --- /dev/null +++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue @@ -0,0 +1,332 @@ + + + + diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue new file mode 100644 index 0000000000..042b708434 --- /dev/null +++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue @@ -0,0 +1,81 @@ + + + + +