mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-06-12 10:00:56 +08:00
Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb
This commit is contained in:
commit
8a674a25b3
@ -96,8 +96,7 @@
|
|||||||
return vc.validate.validate({
|
return vc.validate.validate({
|
||||||
reviewApplyRoomDiscountInfo: vc.component.reviewApplyRoomDiscountInfo
|
reviewApplyRoomDiscountInfo: vc.component.reviewApplyRoomDiscountInfo
|
||||||
}, {
|
}, {
|
||||||
'reviewApplyRoomDiscountInfo.discountId': [
|
'reviewApplyRoomDiscountInfo.discountId': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "折扣名称不能为空"
|
errInfo: "折扣名称不能为空"
|
||||||
@ -108,8 +107,7 @@
|
|||||||
errInfo: "折扣错误"
|
errInfo: "折扣错误"
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
'reviewApplyRoomDiscountInfo.discountType': [
|
'reviewApplyRoomDiscountInfo.discountType': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "折扣类型不能为空"
|
errInfo: "折扣类型不能为空"
|
||||||
@ -120,8 +118,7 @@
|
|||||||
errInfo: "折扣错误"
|
errInfo: "折扣错误"
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
'reviewApplyRoomDiscountInfo.returnWay': [
|
'reviewApplyRoomDiscountInfo.returnWay': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "返还方式不能为空"
|
errInfo: "返还方式不能为空"
|
||||||
@ -132,8 +129,7 @@
|
|||||||
errInfo: "折扣错误"
|
errInfo: "折扣错误"
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
'reviewApplyRoomDiscountInfo.startTime': [
|
'reviewApplyRoomDiscountInfo.startTime': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "开始时间不能为空"
|
errInfo: "开始时间不能为空"
|
||||||
@ -144,8 +140,7 @@
|
|||||||
errInfo: "开始时间错误"
|
errInfo: "开始时间错误"
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
'reviewApplyRoomDiscountInfo.endTime': [
|
'reviewApplyRoomDiscountInfo.endTime': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "结束时间不能为空"
|
errInfo: "结束时间不能为空"
|
||||||
@ -156,8 +151,7 @@
|
|||||||
errInfo: "结束时间错误"
|
errInfo: "结束时间错误"
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
'reviewApplyRoomDiscountInfo.reviewRemark': [
|
'reviewApplyRoomDiscountInfo.reviewRemark': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "审批说明不能为空"
|
errInfo: "审批说明不能为空"
|
||||||
@ -168,14 +162,12 @@
|
|||||||
errInfo: "申请申请说明"
|
errInfo: "申请申请说明"
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
'reviewApplyRoomDiscountInfo.ardId': [
|
'reviewApplyRoomDiscountInfo.ardId': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "申请ID不能为空"
|
errInfo: "申请ID不能为空"
|
||||||
}],
|
}],
|
||||||
'reviewApplyRoomDiscountInfo.state': [
|
'reviewApplyRoomDiscountInfo.state': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "审批状态不能为空"
|
errInfo: "审批状态不能为空"
|
||||||
@ -186,8 +178,7 @@
|
|||||||
return vc.validate.validate({
|
return vc.validate.validate({
|
||||||
reviewApplyRoomDiscountInfo: vc.component.reviewApplyRoomDiscountInfo
|
reviewApplyRoomDiscountInfo: vc.component.reviewApplyRoomDiscountInfo
|
||||||
}, {
|
}, {
|
||||||
'reviewApplyRoomDiscountInfo.reviewRemark': [
|
'reviewApplyRoomDiscountInfo.reviewRemark': [{
|
||||||
{
|
|
||||||
limit: "required",
|
limit: "required",
|
||||||
param: "",
|
param: "",
|
||||||
errInfo: "审批说明不能为空"
|
errInfo: "审批说明不能为空"
|
||||||
@ -215,8 +206,7 @@
|
|||||||
}
|
}
|
||||||
vc.http.apiPost(
|
vc.http.apiPost(
|
||||||
'/applyRoomDiscount/updateReviewApplyRoomDiscount',
|
'/applyRoomDiscount/updateReviewApplyRoomDiscount',
|
||||||
JSON.stringify(vc.component.reviewApplyRoomDiscountInfo),
|
JSON.stringify(vc.component.reviewApplyRoomDiscountInfo), {
|
||||||
{
|
|
||||||
emulateJSON: true
|
emulateJSON: true
|
||||||
},
|
},
|
||||||
function(json, res) {
|
function(json, res) {
|
||||||
@ -277,7 +267,8 @@
|
|||||||
function(json, res) {
|
function(json, res) {
|
||||||
let _feeDiscountManageInfo = JSON.parse(json);
|
let _feeDiscountManageInfo = JSON.parse(json);
|
||||||
$that.reviewApplyRoomDiscountInfo.discounts = _feeDiscountManageInfo.data;
|
$that.reviewApplyRoomDiscountInfo.discounts = _feeDiscountManageInfo.data;
|
||||||
}, function (errInfo, error) {
|
},
|
||||||
|
function(errInfo, error) {
|
||||||
console.log('请求失败处理');
|
console.log('请求失败处理');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -340,6 +331,7 @@
|
|||||||
row: 50,
|
row: 50,
|
||||||
communityId: vc.getCurrentCommunity().communityId,
|
communityId: vc.getCurrentCommunity().communityId,
|
||||||
feeId: vc.component.reviewApplyRoomDiscountInfo.feeId,
|
feeId: vc.component.reviewApplyRoomDiscountInfo.feeId,
|
||||||
|
state: '1400'
|
||||||
// startTime: vc.component.reviewApplyRoomDiscountInfo.startTime,
|
// startTime: vc.component.reviewApplyRoomDiscountInfo.startTime,
|
||||||
// endTime: vc.component.reviewApplyRoomDiscountInfo.endTime
|
// endTime: vc.component.reviewApplyRoomDiscountInfo.endTime
|
||||||
}
|
}
|
||||||
@ -351,7 +343,8 @@
|
|||||||
function(json, res) {
|
function(json, res) {
|
||||||
var listFeeDetailData = JSON.parse(json);
|
var listFeeDetailData = JSON.parse(json);
|
||||||
vc.component.reviewApplyRoomDiscountInfo.fees = listFeeDetailData.feeDetails;
|
vc.component.reviewApplyRoomDiscountInfo.fees = listFeeDetailData.feeDetails;
|
||||||
}, function (errInfo, error) {
|
},
|
||||||
|
function(errInfo, error) {
|
||||||
console.log('请求失败处理');
|
console.log('请求失败处理');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user