From 509d10498313921fd795f73b8e7ae9ee43b0a81a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 14:24:29 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 2 +
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html | 28 ++++++++++---
zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html | 19 +++++++--
zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html | 1
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html | 29 ++++++++++----
5 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index 058970f..e57a138 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -879,6 +879,8 @@
if (skipServiceOrderStep(Dictionary.SERVICE_OVER_BEGIN_END)) {
projServices.setStartTime(new Date());
projServices.setState(Dictionary.SERVICE_STATU_FWWC);
+ } else {
+ projServices.setState(Dictionary.SERVICE_STATU_PLWC);
}
// 释放床位资源
// SysBedState checkBedState = sysBedStateDao.selectBySerIdAndBedId(projServices.getBedId(), projServices.getId());
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
index 2b3de69..60f715e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
@@ -75,6 +75,9 @@
padding-left: 10px;
margin-left:10px ;
}
+ .openOrClose {
+ cursor:pointer
+ }
</style>
</head>
<body>
@@ -124,14 +127,17 @@
</el-tab-pane>
<el-tab-pane label="套餐" name="tab2">
- <template v-for="(item,index) in taocanList" v-if="index > 3 ? tcIsOpen : true">
- <p class="el-big-title">{{index}}【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
+ <template v-for="(item,index) in taocanList">
+ <p class="el-big-title">
+ <span class="openOrClose" v-if="!item.openOrClose" @click="openOrCloseTc(item, index, 1)"><i class="el-icon-arrow-down"></i></span>
+ <span class="openOrClose" v-if="item.openOrClose" @click="openOrCloseTc(item, index, 2)"><i class="el-icon-arrow-up"></i></span>
+ 【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
<span style="float: right" v-if="item.failTime != null">有效期:{{item.failTime}}</span>
<code v-if="item.projInfo.isCourse=='Y'" > 剩余次数：<span v-if="item.projInfo.isInfinite == 'Y'">无限次</span><span v-else>{{item.surplusCount}}</span> </code>
</p>
<el-table
:data="item.taocanProjUse"
- style="width: 98%">
+ style="width: 98%" v-show="item.openOrClose">
<el-table-column
prop="projName"
label="项目">
@@ -165,10 +171,10 @@
</el-table-column>
</el-table>
</template>
- <el-row style="text-align: center; margin-top: 5px;">
- <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>
- <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>
- </el-row>
+<!-- <el-row style="text-align: center; margin-top: 5px;">-->
+<!-- <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>-->
+<!-- <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>-->
+<!-- </el-row>-->
</el-tab-pane>
</el-tabs>
@@ -370,6 +376,14 @@
closeFram: function () {
parent.layer.close(parent.layer.getFrameIndex(window.name));
},
+ openOrCloseTc : function (item, index, value) {
+ if (value == 1) {
+ item.openOrClose = true;
+ } else {
+ item.openOrClose = false;
+ }
+ Vue.set(this.taocanList, index, item);
+ }
}
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html
index 6720171..d01ee11 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html
@@ -75,6 +75,9 @@
padding-left: 10px;
margin-left:10px ;
}
+ .openOrClose {
+ cursor:pointer
+ }
</style>
</head>
<body>
@@ -124,14 +127,17 @@
</el-tab-pane>
<el-tab-pane label="套餐" name="tab2">
- <template v-for="(item,index) in taocanList" v-if="index > 3 ? tcIsOpen : true">
- <p class="el-big-title">【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
+ <template v-for="(item,index) in taocanList">
+ <p class="el-big-title">
+ <span class="openOrClose" v-if="!item.openOrClose" @click="openOrCloseTc(item, index, 1)"><i class="el-icon-arrow-down"></i></span>
+ <span class="openOrClose" v-if="item.openOrClose" @click="openOrCloseTc(item, index, 2)"><i class="el-icon-arrow-up"></i></span>
+ 【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
<span style="float: right" v-if="item.failTime != null">有效期:{{item.failTime}}</span>
<code v-if="item.projInfo.isCourse=='Y'" > 剩余次数：<span v-if="item.projInfo.isInfinite == 'Y'">无限次</span><span v-else>{{item.surplusCount}}</span> </code>
</p>
<el-table
:data="item.taocanProjUse"
- style="width: 98%">
+ style="width: 98%" v-show="item.openOrClose">
<el-table-column
prop="projName"
label="项目">
@@ -165,10 +171,10 @@
</el-table-column>
</el-table>
</template>
- <el-row style="text-align: center; margin-top: 5px;">
- <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>
- <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>
- </el-row>
+<!-- <el-row style="text-align: center; margin-top: 5px;">-->
+<!-- <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>-->
+<!-- <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>-->
+<!-- </el-row>-->
</el-tab-pane>
</el-tabs>
@@ -336,7 +342,14 @@
closeFram: function () {
parent.layer.close(parent.layer.getFrameIndex(window.name));
},
-
+ openOrCloseTc : function (item, index, value) {
+ if (value == 1) {
+ item.openOrClose = true;
+ } else {
+ item.openOrClose = false;
+ }
+ Vue.set(this.taocanList, index, item);
+ }
}
})
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html
index 1324d76..99e8c74 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html
@@ -161,7 +161,6 @@
alarmNum = row.alarmNum;
}
var storeNum = parseInt(value);
- console.log(alarmNum,storeNum);
if (alarmNum > storeNum) {
html = '<span class="label-danger" > ' + value
+ ' </span>';
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html
index 62cf9f0..71c4cae 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html
@@ -81,6 +81,10 @@
var projIndex = 0;
var myForm=MForm.initForm({
invokeUrl:basePath+"/admin/projService/endPl",
+ beforeSubmit : function() {
+ var fieldArray = $("#dataform").serializeArray();
+ console.log(fieldArray);
+ },
afterSubmit:function(){
if (parent.myGrid) {
parent.myGrid.serchData();
@@ -119,20 +123,27 @@
if (rows) {
var projInfo = plList[projIndex];
var idSelect = "#"+projIndex;
+ var allGroup = $(".group").length;
+ console.log(idSelect);
var groupLength = $(idSelect + " .group").length;
for(var i = 0; i < rows.length; i++) {
var row = rows[i];
var nextIndex = groupLength + i + 1;
+ var outItemIndex = allGroup + i;
var html = '<tr class="group">'
+ '<td>'+ nextIndex +'</td>'
+ '<td>'+ row.goods.name +'</td>'
+ '<td><span></span></td>'
- + '<td ><input autocomplete="off" class="form-control" style="width: 200px;float: left;" type="text" name="amount" placeholder="实际用量" >'
+ + '<td ><input autocomplete="off" class="form-control" style="width: 200px;float: left;" type="text" name="outStoreItem['+ outItemIndex +'].amount" placeholder="实际用量" >'
+ '<span style="line-height: 30px;margin-left: 10px;">'+ row.goods.measure +'</span></td>'
- + '<td><input autocomplete="off" type="hidden" name="skuId" value="'+ row.goods.id +'">'
- + '<input autocomplete="off" type="text" name="remark" class="form-control" placeholder="配料备注"></td></tr>';
+ + '<td><input autocomplete="off" type="hidden" name="outStoreItem['+ outItemIndex +'].skuId" value="'+ row.goods.id +'">'
+ + '<input autocomplete="off" type="text" name="outStoreItem['+ outItemIndex +'].remark" class="form-control" placeholder="配料备注"></td></tr>';
- $(idSelect).children(':last').after(html);
+ if ($(idSelect).children(':last').length <= 0) {
+ $(idSelect).html(html);
+ } else {
+ $(idSelect).children(':last').after(html);
+ }
}
}
}
--
Gitblit v1.9.1