From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 6483229..fb3829a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -175,6 +175,15 @@
</el-col>
</el-row>
<el-row class="vertical ">
+ <el-select v-model="goodsType" placeholder="商品类型" style="width: 120px" >
+ <el-option
+ v-for="item in goodsTypeList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
<el-input class="searchInput" @input="searchGoods()" v-model="queryKey"
placeholder="搜索添加产品"></el-input>
<el-button @click="searchGoods()" type="primary">搜索</el-button>
@@ -582,7 +591,8 @@
var app = new Vue({
el: '#app',
data: {
-
+ goodsType:"",
+ goodsTypeList:[{value:"",label:"全部"},{value:"套餐",label:"套餐"},{value:"项目",label:"项目"},{value:"充值卡",label:"充值卡"}],
//业绩设置框
drawer: false,
direction: 'rtl',
@@ -901,7 +911,7 @@
this.achieveList.push({
orderItem: item,
staff: this.loginUser,
- saleId: this.loginUser.suId,
+ saleId: _this.loginUser.suUserType === 'admin' ? '' : this.loginUser.suId,
goodsCash: item.payMoney,
achieveType : _this.achieveTypeList[0].value,
commission: 0,
@@ -1093,6 +1103,7 @@
//结算打印提示
if (submitType == 1) {
if (_this.printPaper) {
+ _this.$message.success(data.info);
_this.print();
} else {
_this.$message.success({
@@ -1219,7 +1230,7 @@
app: _this,
contentType: 'application/x-www-form-urlencoded',
//TODO 优化下拉加载
- data: {name: _this.queryKey, limit: pageSize, offset : offset},
+ data: {name: _this.queryKey,goodType:_this.goodsType , limit: pageSize, offset : offset},
url: basePath + "/admin/shoppinggoods/showList",
callback: function (data) {
_this.searchTableData = data.rows;
@@ -1350,7 +1361,7 @@
title: "打印订单",
area: ['250px', '550px'],
maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + this.order.id],
+ content: [basePath + '/admin/order/printOrder?id=' + this.order.id],
cancel: function (index, layero) {
_this.closeFram();
}
--
Gitblit v1.9.1