From 1d7f34fd295b3197de7cba4cccf147f1e77ce066 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 02 Feb 2021 06:32:43 +0800
Subject: [PATCH] 1、新增个人中心产品编号展示 2、修改项目添加单次划扣金额修改
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 10 +++++++---
zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html | 8 ++++++++
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 3 ++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 0053d74..3ba6f8c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -334,7 +334,8 @@
a.*,
d.id as orderId,
b.TIME_LENGTH,
- b.img
+ b.img,
+ b.code
from sys_proj_use a
left join shopping_goods b on a.proj_id=b.id
left join sys_order_item c on a.ORDER_ITEM_ID=c.id
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
index 2be1c8b..5311542 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
@@ -226,9 +226,11 @@
<el-table id="proj" v-show="projTab.projType=='proj'" :data="projTab.projTableData"
style="width: 100%">
<el-table-column
- prop="projName"
label="项目名称"
width="180">
+ <template slot-scope="scope">
+ <span >{{scope.row.projName}}({{scope.row.projInfo.code}})</span>
+ </template>
</el-table-column>
<el-table-column
prop="source"
@@ -267,9 +269,11 @@
style="width: 100%;"
row-key="id" :tree-props="{children: 'taocanProjUse', hasChildren: 'hasChildren'}">
<el-table-column
- prop="projName"
label="名称"
- width="240">
+ width="280">
+ <template slot-scope="scope">
+ <span >{{scope.row.projName}}({{scope.row.projInfo.code}})</span>
+ </template>
</el-table-column>
<el-table-column
prop="status"
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html
index e7360e3..936a6ae 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html
@@ -38,6 +38,14 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-2 control-label">单次划扣<span class="text-danger">*</span></label>
+ <div class="col-sm-4">
+ <input autocomplete="off" type="text" class="form-control" name="price"
+ th:value="${obj?.price}" datatype="*1-20" nullmsg="单次划扣余额不能为空">
+ <div class="Validform_checktip"></div>
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-2 control-label">到期时间</label>
<div class="col-sm-4">
<input autocomplete="off" name="failTime" type="text" datatype="*"
--
Gitblit v1.9.1