From 6adb97dd4625c0007a66ccaa99677d1f8b4dac81 Mon Sep 17 00:00:00 2001 From: beyond <931414026@qq.com> Date: Wed, 5 Feb 2020 18:27:09 +0800 Subject: [PATCH] =?UTF-8?q?beyond=202.5=20=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/SaleOut.js | 3 +- src/lang/zh.js | 3 +- src/views/Receipt/AddReceipt.vue | 58 ++++++++- src/views/Receipt/components/DetailList.vue | 10 ++ src/views/Receipt/components/MyDialog.vue | 83 +++++++++++- src/views/SaleOut/AddSaleOut.vue | 11 ++ src/views/SaleOut/NewAccessoriesOut.vue | 76 +++++++++-- src/views/SaleOut/components/MyDialog.vue | 132 ++++++++++++++++++-- 8 files changed, 349 insertions(+), 27 deletions(-) diff --git a/src/api/SaleOut.js b/src/api/SaleOut.js index 20228b31..07cd6286 100644 --- a/src/api/SaleOut.js +++ b/src/api/SaleOut.js @@ -90,11 +90,12 @@ export function searchsaleOut(query) { } // 修改销售出库单 -export function updatesaleOut(query, query2, query3) { +export function updatesaleOut(query, query2, query3, query4) { var params = new URLSearchParams() params.append('Json', query) // 你要传给后台的参数值 key/value params.append('detailJson', query2) // 你要传给后台的参数值 key/value params.append('giftJson', query3) // 你要传给后台的参数值 key/value + params.append('receivableMoney2', query4) // 你要传给后台的参数值 key/value return request({ url: '/saleOut/update', method: 'post', diff --git a/src/lang/zh.js b/src/lang/zh.js index 7e9c7bde..cc716814 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -3980,7 +3980,8 @@ export default { leftMoney: '剩余金额', number2: '数量', ffxx: '发放信息', - couponNumbers: '优惠券码' + couponNumbers: '优惠券码', + couponSupport2: '优惠劵抵用金额' }, collectAndPayDetail: { name: '名称', diff --git a/src/views/Receipt/AddReceipt.vue b/src/views/Receipt/AddReceipt.vue index 37a15bb8..c841a271 100644 --- a/src/views/Receipt/AddReceipt.vue +++ b/src/views/Receipt/AddReceipt.vue @@ -64,9 +64,15 @@ + + + + + + - - + + @@ -190,6 +196,7 @@