From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html | 217 ++++++++++++++++++++++++++++-------------------------
1 files changed, 114 insertions(+), 103 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
index 229b1df..14f58ff 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
@@ -221,68 +221,75 @@
"id": "u:8224ab367da8"
},
{
- "type": "input-image",
- "id": "u:53e0d6a37b69",
- "label": "",
- "name": "image1",
- "autoUpload": true,
- "proxy": true,
- "uploadType": "fileReceptor",
- "imageClassName": "r w-full",
- "receiver": {
- "url": "/mgr/uploadImg",
- "method": "post"
- },
- "accept": ".jpeg, .jpg, .png, .gif",
- "multiple": false,
- "hideUploadButton": false,
- "fixedSize": false,
- "mode": "inline",
- "value":`${pic1!}`,
- "disabled": true,
+ "type": "images",
+ "id": "u:76216a114f2c",
+ "name": "images",
+ "value":`${images!}`,
+ "delimiter":";"
},
- {
- "type": "input-image",
- "id": "u:53e0d6a37b69",
- "label": "",
- "name": "image2",
- "autoUpload": true,
- "proxy": true,
- "uploadType": "fileReceptor",
- "imageClassName": "r w-full",
- "receiver": {
- "url": "/mgr/uploadImg",
- "method": "post"
- },
- "accept": ".jpeg, .jpg, .png, .gif",
- "multiple": false,
- "hideUploadButton": false,
- "fixedSize": false,
- "mode": "inline",
- "value":`${pic2!}`,
- "disabled": true,
- },
- {
- "type": "input-image",
- "id": "u:53e0d6a37b69",
- "label": "",
- "name": "image3",
- "autoUpload": true,
- "proxy": true,
- "uploadType": "fileReceptor",
- "imageClassName": "r w-full",
- "receiver": {
- "url": "/mgr/uploadImg",
- "method": "post"
- },
- "accept": ".jpeg, .jpg, .png, .gif",
- "multiple": false,
- "hideUploadButton": false,
- "fixedSize": false,
- "mode": "inline",
- "value":`${pic3!}`,
- "disabled": true,
- },
+ // {
+ // "type": "input-image",
+ // "id": "u:53e0d6a37b69",
+ // "label": "",
+ // "name": "image1",
+ // "autoUpload": true,
+ // "proxy": true,
+ // "uploadType": "fileReceptor",
+ // "imageClassName": "r w-full",
+ // "receiver": {
+ // "url": "/mgr/uploadImgAmis",
+ // "method": "post"
+ // },
+ // "accept": ".jpeg, .jpg, .png, .gif",
+ // "multiple": false,
+ // "hideUploadButton": false,
+ // "fixedSize": false,
+ // "mode": "inline",
+ // "value":`${pic1!}`,
+ // "disabled": true,
+ // },
+ // {
+ // "type": "input-image",
+ // "id": "u:53e0d6a37b69",
+ // "label": "",
+ // "name": "image2",
+ // "autoUpload": true,
+ // "proxy": true,
+ // "uploadType": "fileReceptor",
+ // "imageClassName": "r w-full",
+ // "receiver": {
+ // "url": "/mgr/uploadImg",
+ // "method": "post"
+ // },
+ // "accept": ".jpeg, .jpg, .png, .gif",
+ // "multiple": false,
+ // "hideUploadButton": false,
+ // "fixedSize": false,
+ // "mode": "inline",
+ // "value":`${pic2!}`,
+ // "disabled": true,
+ // },
+ // {
+ // "type": "input-image",
+ // "id": "u:53e0d6a37b69",
+ // "label": "",
+ // "name": "image3",
+ // "autoUpload": true,
+ // "proxy": true,
+ // "uploadType": "fileReceptor",
+ // "imageClassName": "r w-full",
+ // "receiver": {
+ // "url": "/mgr/uploadImg",
+ // "method": "post"
+ // },
+ // "accept": ".jpeg, .jpg, .png, .gif",
+ // "multiple": false,
+ // "hideUploadButton": false,
+ // "fixedSize": false,
+ // "mode": "inline",
+ // "value":`${pic3!}`,
+ // "disabled": true,
+ // },
{
"type": "divider",
"id": "u:c8ddd15c688d"
@@ -298,11 +305,10 @@
"type": "input-date",
"id": "u:9fe564fc31fc",
"label": "        入学时间:",
- "name": "birthday",
"embed": false,
"mode": "inline",
"size": "md",
- "value":`${studentClassInfo.inDate}`,
+ "value":`${item.time}`,
"disabled": true,
},
{
@@ -766,6 +772,7 @@
"id": "u:e6a3e106fac0",
"tpl": "退费申请：",
"inline": true,
+
"wrapperComponent": "",
"style": {
"paddingBottom": "100",
@@ -838,7 +845,7 @@
"url": "/tStudent/backmoney",
"params": {
"ids": "$ids",
- "id": "$id"
+ "id": "$studentId"
}
}
}
@@ -849,7 +856,9 @@
"id": "u:38a6f5402e72",
"level": "link"
},
- {
+ @if(shiro.hasPermission("/backpass")){
+
+ {
"type": "button",
"label": "同意",
"onEvent": {
@@ -887,6 +896,8 @@
},
"reload": "pay,crud"
}
+ @}
+
],
"placeholder": "-",
"label": "操作"
@@ -986,7 +997,6 @@
"label": "已上课时数",
"name": "hasClassHours",
"id": "u:b55a5ac7f49d",
- "value": "$totalClassHours-$totalClassHours"
},
{
"type": "text",
@@ -1158,7 +1168,8 @@
},
"id": "u:fcd7f36c5f88",
"level": "link",
- "disabledOn": "this.laveClassHours === 0"
+ "disabledOn": "this.laveClassHours === 0 || this.classType===2",
+ "hiddenOn": "this.classType===2"
},
{
"type": "button",
@@ -1228,16 +1239,14 @@
"valueField": "id"
}
],
- "messages": {
- },
+ "messages": {},
"loadingConfig": {
- "show": true
+ "show": false
},
"api": {
"url": "/tStudent/giftSelect",
"method": "post",
- "messages": {
- },
+ "messages": {},
"requestAdaptor": "",
"adaptor": "",
"dataType": "form-data",
@@ -1246,7 +1255,8 @@
"phone": "$phone",
"id": "$id"
}
- }
+ },
+ "initFetch": false
},
{
"type": "input-text",
@@ -1316,12 +1326,10 @@
"method": "post",
"requestAdaptor": "",
"adaptor": "",
- "messages": {
- },
+ "messages": {},
"dataType": "form-data"
},
- "actions": [
- ],
+ "actions": [],
"onEvent": {
"submitSucc": {
"weight": 0,
@@ -1341,8 +1349,7 @@
{
"id": "u:59d68a32f7fd",
"type": "container",
- "body": [
- ],
+ "body": [],
"style": {
"position": "static",
"display": "block"
@@ -1354,8 +1361,7 @@
"showLoading": true,
"className": "app-popover",
"id": "u:552bd1b3464d",
- "actions": [
- ],
+ "actions": [],
"canAccessSuperData": false
}
}
@@ -1364,7 +1370,8 @@
},
"id": "u:ae1e6e73beb9",
"level": "link",
- "disabledOn": "this.laveClassHours === 0"
+ "disabledOn": "this.laveClassHours === 0 || this.classType===2",
+ "hiddenOn": "this.classType===2"
},
{
"type": "button",
@@ -1376,7 +1383,7 @@
"actionType": "dialog",
"dialog": {
"type": "dialog",
- "title": "弹框标题",
+ "title": "课时变更记录",
"body": [
{
"type": "form",
@@ -1389,8 +1396,7 @@
"api": {
"url": "/tStudent/changelist/$id",
"method": "post",
- "messages": {
- },
+ "messages": {},
"requestAdaptor": "",
"adaptor": "",
"dataType": "form"
@@ -1408,7 +1414,11 @@
"name": "changeType",
"label": "变更类型",
"type": "mapping",
- "id": "u:e2b292dd63d0"
+ "id": "u:e2b292dd63d0",
+ "map": {
+ "0": "减少",
+ "1": "增加"
+ }
},
{
"type": "text",
@@ -1423,10 +1433,8 @@
"id": "u:8ba95bfd5e56"
}
],
- "bulkActions": [
- ],
- "itemActions": [
- ],
+ "bulkActions": [],
+ "itemActions": [],
"features": [
"filter"
],
@@ -1437,7 +1445,7 @@
{
"type": "input-date-range",
"name": "start",
- "label": "上传时间",
+ "label": "时间",
"id": "u:b2fb064aa9ac",
"inputFormat": "YYYY-MM-DD HH:mm",
"format": "YYYY-MM-DD HH:mm",
@@ -1446,7 +1454,7 @@
},
{
"type": "select",
- "label": "是否启用",
+ "label": "变更类型",
"name": "changeType",
"options": [
{
@@ -1532,8 +1540,7 @@
"perPageAvailable": [
10
],
- "messages": {
- },
+ "messages": {},
"perPageField": "size"
},
{
@@ -1588,12 +1595,10 @@
"method": "post",
"requestAdaptor": "",
"adaptor": "",
- "messages": {
- },
+ "messages": {},
"dataType": "form-data"
},
- "actions": [
- ]
+ "actions": []
}
],
"showCloseButton": true,
@@ -1601,8 +1606,7 @@
"showLoading": true,
"className": "",
"id": "u:f66fa4de8251",
- "actions": [
- ],
+ "actions": [],
"canAccessSuperData": false,
"wrapWithPanel": false,
"size": "xl",
@@ -1613,7 +1617,9 @@
}
},
"id": "u:dd3110deaf9d",
- "level": "link"
+ "level": "link",
+ "disabledOn": "this.classType===2",
+ "hiddenOn": "this.classType===2"
}
]
}
@@ -1626,9 +1632,12 @@
"tpl": "        已报名课程：",
"wrapperComponent": ""
},
- {
+ @if(shiro.hasPermission("/bback")){
+
+ {
"type": "button",
"label": "退费",
+ "visible": true,
"actionType": "ajax",
"id": "u:38a6f5402e72",
"onEvent": {
@@ -1649,7 +1658,9 @@
}
}
}
- ],
+ @}
+
+ ],
"itemActions": [
],
"features": [
--
Gitblit v1.7.1