From 85dce973eb29eb2372c76d5b95b30354da9c41c8 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:08:51 +0800
Subject: [PATCH] fead:新增收银员字段

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 bcd29c4..c5a2247 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;

--
Gitblit v1.9.1