diff --git a/src/api/table.js b/src/api/table.js index 1a691c3..4e7cb83 100644 --- a/src/api/table.js +++ b/src/api/table.js @@ -461,3 +461,14 @@ export function $returnTableDetail(data) { } }); } +//获取订单可用优惠券 +export function $activateByOrderId(data) { + return request({ + url: '/api/tbShopCoupon/activateByOrderId', + method: "get", + params:{ + shopId: localStorage.getItem("shopId"), + ...data + } + }); +} \ No newline at end of file diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue index d253601..825e2b0 100644 --- a/src/views/coupon_manage/add_coupon.vue +++ b/src/views/coupon_manage/add_coupon.vue @@ -7,7 +7,7 @@
- + @@ -82,7 +82,7 @@
- + diff --git a/src/views/devices/details.vue b/src/views/devices/details.vue index 8571bba..75d7ef8 100644 --- a/src/views/devices/details.vue +++ b/src/views/devices/details.vue @@ -46,10 +46,10 @@ 打印所有 - 部分分类 + 部分分类(仅打印制作单[厨房]) -
仅打印制作单[厨房]
+
- - 全部 - 今天 - 昨天 - 最近7天 - 最近30天 - 本周 - 本月 - 自定义 - - - + + 全部 + 今天 + 昨天 + 最近7天 + 最近30天 + 本周 + 本月 + 自定义 + + + 查询 重置 @@ -39,19 +38,17 @@
- {{ item.payAmount }} -
-
{{ item.payType }}
-
-
-
-
--> +{{ item.payAmount }} +
+
{{ item.payType }}
+ + + + -->
- - + + @@ -67,7 +64,7 @@ - + - + @@ -482,13 +482,15 @@ - + @@ -240,7 +261,7 @@ import { tbConsInfoGet, tbProductlist } from "@/api/invoicing"; import { tbShopPurveyorGet, tbProductStockOperateOutAndOn, stockInOut } from '@/api/invoicing' import { formatDecimal } from '@/utils' export default { - name:'operation_in', + name: 'operation_in', components: { shopList, ConsumableList @@ -380,7 +401,11 @@ export default { }) } else { this.tableData.list.forEach(ele => { - zong += ele.price * ele.stockNumber + let p = 1 + if (ele.unit && ele.conUnitTwo == ele.unit) { + p = ele.conUnitTwoConvert + } + zong += ele.price * ele.stockNumber * p }) } this.queryForm.totalAmount = formatDecimal(zong) @@ -404,7 +429,6 @@ export default { }, // 切换入库内容 tabChange(value, type) { - console.log(value, type) this.shopTypesActive = type == 'in' ? 0 : 1 this.inTabValue = value this.resetHandle() @@ -413,7 +437,7 @@ export default { }, // 切换类型 changeTypeEnum(index) { - let filterd= this.purveyorList.filter(ele=>ele.id == index) + let filterd = this.purveyorList.filter(ele => ele.id == index) this.queryForm.waitAmount = filterd[0].waitAmount this.inTabs.forEach((i) => { @@ -445,7 +469,6 @@ export default { }, 10) } else { row[key1] = cvalue - let zong = 0 this.tableData.list.forEach(ele => { let p = 1 diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue index 3096136..29de460 100644 --- a/src/views/invoicing/operation_out.vue +++ b/src/views/invoicing/operation_out.vue @@ -43,6 +43,7 @@ + {{ queryForm.waitAmount }} @@ -83,11 +84,6 @@ - - - - - @@ -122,18 +118,32 @@ @@ -141,7 +151,21 @@ -
出库前：{{ scope.row.number }}{{ scope.row.conUnit }}
+ + +
出库前： + {{ !scope.row.unit ? + (scope.row.defaultUnit ? + scope.row.defaultUnit== scope.row.conUnitTwo? + (scope.row.number/scope.row.conUnitTwoConvert): scope.row.number:scope.row.number) + : scope.row.unit== scope.row.conUnitTwo? + (scope.row.number/scope.row.conUnitTwoConvert): scope.row.number}} + + {{ !scope.row.unit ? (scope.row.defaultUnit ? scope.row.defaultUnit : + scope.row.conUnit) : scope.row.unit }} +
+ + @@ -184,7 +208,7 @@ @@ -385,7 +409,11 @@ export default { }) } else { this.tableData.list.forEach(ele => { - zong += ele.price * ele.stockNumber + let p = 1 + if (ele.unit && ele.conUnitTwo == ele.unit) { + p = ele.conUnitTwoConvert + } + zong += ele.price * ele.stockNumber * p }) } this.queryForm.totalAmount = formatDecimal(zong) diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue index bb5d714..aa6bdd8 100644 --- a/src/views/order_manage/order_list.vue +++ b/src/views/order_manage/order_list.vue @@ -234,6 +234,10 @@ export default { if (this.$route.query.tableName) { this.query.tableName = this.$route.query.tableName } + if (this.$route.query.timeValue) { + this.timeValue = this.$route.query.timeValue + this.timeChange(this.timeValue); + } if (this.$route.query.orderNo) { this.query.orderNo = this.$route.query.orderNo } diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index e219e29..e11e399 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -825,7 +825,7 @@
- +
@@ -1287,6 +1287,7 @@ import { tbShopTableGet, $changeUseType, $returnTableDetail, + $activateByOrderId } from "@/api/table"; import { tbShopCategoryGet } from "@/api/shop"; import { @@ -1745,6 +1746,7 @@ export default { tableId: this.table.tableId, masterId: this.masterId, vipUserId: val, + orderId:this.createOrder.data.id||'', type: val === "" ? 1 : 0, }); }, @@ -3407,9 +3409,17 @@ export default { this.table = params.tableId ? item : ""; }, async getOrderData(params) { + const orderId= params ? params.orderId : this.createOrder.data.id + const res = await tbOrderInfoDetail( params ? params.orderId : this.createOrder.data.id ); + if(res.memberId){ + $activateByOrderId({ + orderId,memberId:res.memberId + }) + } + if (res.status != "unpaid") { return res; }