From 7fbc0cb176d0d6d552fff7747df57cb6b0de2fef Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 03 Mar 2021 23:49:16 +0800
Subject: [PATCH] 修改数据库
---
zq-erp/pom.xml | 18 ++++----
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 61 +++++++++++++++++++++++-------
2 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index ca46822..56ae289 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -385,17 +385,17 @@
<filtering>true</filtering>
<excludes>
- <exclude>config/dev/*</exclude>
- <exclude>config/prd/*</exclude>
- <exclude>config/test/*</exclude>
- <exclude>config/xcx/*</exclude>
+ <exclude>config/dev/*</exclude>
+ <exclude>config/prd/*</exclude>
+ <exclude>config/test/*</exclude>
+ <exclude>config/xcx/*</exclude>
- <!---->
- <exclude>config/config.json</exclude>
- <exclude>config/application.properties</exclude>
- <exclude>config/system.properties</exclude>
+ <!--
+ <exclude>config/config.json</exclude>
+ <exclude>config/application.properties</exclude>
+ <exclude>config/system.properties</exclude>
-
+ -->
<exclude>**/*.woff</exclude>
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 5d91b37..27c9eba 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
@@ -416,14 +416,27 @@
</el-table-column>
<el-table-column
+ label="岗位业绩" width="150">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.t3" placeholder="请选择岗位业绩">
+ <el-option
+ v-for="item in achievePostList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
label="业绩类型" width="150">
<template slot-scope="scope">
- <el-select v-model="scope.row.t3" placeholder="请选择业绩类型">
+ <el-select v-model="scope.row.t4" placeholder="请选择业绩类型">
<el-option
v-for="item in achieveTypeList"
- :key="item.key"
+ :key="item.value"
:label="item.value"
- :value="item.key">
+ :value="item.value">
</el-option>
</el-select>
</template>
@@ -611,14 +624,11 @@
type: '欠款'
},],
achieveList: [],
+ //业绩岗位
+ achievePostList : [
+ ],
+ //业绩类型
achieveTypeList : [
- {
- "key" : "现金业绩",
- "value" : "现金业绩"
- },{
- "key" : "划扣业绩",
- "value" : "划扣业绩"
- },
],
//会员可用的充值卡
moneyCards: [],
@@ -660,12 +670,30 @@
if (vipId) {
_this.changeVip(vipId);
}
- //获取用户列表
+ //获取业绩用户列表
AjaxProxy.requst({
app: _this,
url: basePath + '/admin/shopAll',
callback: function (data) {
_this.userList = data.rows;
+ }
+ });
+
+ //岗位业绩
+ AjaxProxy.requst({
+ app: _this,
+ url: basePath + '/admin/customerDictionary/getListByParentCode/GWYJ',
+ callback: function (data) {
+ _this.achievePostList = data.rows;
+ }
+ });
+
+ // 业绩类型
+ AjaxProxy.requst({
+ app: _this,
+ url: basePath + '/admin/customerDictionary/getListByParentCode/YJLX',
+ callback: function (data) {
+ _this.achieveTypeList = data.rows;
}
});
@@ -716,7 +744,8 @@
saleId: _this.staffUser.suId,
achieveMoney: item.payMoney,
commission : 0,
- t3 : '现金业绩',
+ t3 : _this.achievePostList[0].value,
+ t4 : _this.achieveTypeList[0].value,
isShare: false,
});
});
@@ -801,7 +830,7 @@
* @param{type} 1 = 购买 2=赠送
* */
pushToSelectGoods(goods, type) {
-
+ let _this=this;
//判断是否被选中
let selected = false;
this.order.items.forEach(item => {
@@ -842,7 +871,8 @@
staff: this.staffUser,
saleId: this.staffUser.suId,
achieveMoney: item.payMoney,
- t3: '现金业绩',
+ t3 : _this.achievePostList[0].value,
+ t4 : _this.achieveTypeList[0].value,
commission: 0,
isShare: false,
});
@@ -853,7 +883,8 @@
staff: this.loginUser,
saleId: this.loginUser.suId,
achieveMoney: item.payMoney,
- t3: '现金业绩',
+ t3 : _this.achievePostList[0].value,
+ t4 : _this.achieveTypeList[0].value,
commission: 0,
isShare: false,
});
--
Gitblit v1.9.1