浏览代码

【修改】生成报到二维码:增加默认教室;修改带Learun的提示文字;

中职版本
dyy 4 年前
父节点
当前提交
0b0e2323c8
共有 49 个文件被更改,包括 111 次插入81 次删除
  1. +8
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/BookBorrow/BookBorrow.js
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js
  7. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/form/form.js
  8. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/form/form.js
  9. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessage.js
  10. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/SchoolCalendar.js
  11. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/form/form.js
  12. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js
  13. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.js
  14. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/StuConsumption.js
  15. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/form/form.js
  16. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/form/form.js
  17. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js
  18. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js
  19. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html
  20. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/StuMail.js
  21. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/form/form.js
  22. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js
  23. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js
  24. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js
  25. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js
  26. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js
  27. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js
  28. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js
  29. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js
  30. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js
  31. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js
  32. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js
  33. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js
  34. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js
  35. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js
  36. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js
  37. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js
  38. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js
  39. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js
  40. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js
  41. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js
  42. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js
  43. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js
  44. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js
  45. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js
  46. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js
  47. +27
    -11
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
  48. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config
  49. +10
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

+ 8
- 8
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js 查看文件

@@ -1,15 +1,15 @@
//var config = {
// webapi: 'http://localhost:8088/',
// web: "http://localhost:8087/"//web地址,用于配置logo
//};
var config = {
webapi: 'http://localhost:8088/',
web: "http://localhost:8087/"//web地址,用于配置logo
};
//var config = {
// webapi: 'http://112.230.201.53:31173/',
// web:"http://112.230.201.53/:8081/"//web地址,用于配置logo
//};
var config = {
webapi: 'http://localhost:31173/',
web: "http://localhost:20472/"//web地址,用于配置logo
};
//var config = {
// webapi: 'http://localhost:31173/',
// web: "http://localhost:20472/"//web地址,用于配置logo
//};


//var config = {


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js 查看文件

@@ -201,7 +201,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js 查看文件

@@ -72,7 +72,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js 查看文件

@@ -82,7 +82,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/BookBorrow/BookBorrow.js 查看文件

@@ -105,7 +105,7 @@
// learun.layer.loading(false);
// });
// }
// }, 'Learun智慧校园提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
//},
//rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js 查看文件

@@ -32,7 +32,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessage.js 查看文件

@@ -98,7 +98,7 @@
learun.layer.loading(false);
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/SchoolCalendar.js 查看文件

@@ -103,7 +103,7 @@
learun.layer.loading(false);
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js 查看文件

@@ -102,7 +102,7 @@
learun.layer.loading(false);
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.js 查看文件

@@ -70,7 +70,7 @@
// }
// });
// }
// }, 'Learun敏捷框架提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
// }
// }
// ],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/StuConsumption.js 查看文件

@@ -130,7 +130,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/form/form.js 查看文件

@@ -85,7 +85,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js 查看文件

@@ -126,7 +126,7 @@
// learun.layer.loading(false);
// });
// }
// }, 'Learun智慧校园提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
//},
//rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js 查看文件

@@ -37,7 +37,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -69,7 +69,7 @@
// }
// });
// }
// }, 'Learun智慧校园提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
// }
// }
// ],


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html 查看文件

@@ -40,6 +40,10 @@
班级
<span id="ClassNo"></span>
</div>
<div class="welText">
默认教室
<span id="DefaultClassRoomName"></span>
</div>
<div class="welText">
班主任编号
<span id="ClassDiredctorNo"></span>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/StuMail.js 查看文件

@@ -97,7 +97,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js 查看文件

@@ -124,7 +124,7 @@
learun.layer.loading(false);
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js 查看文件

@@ -118,7 +118,7 @@
learun.layer.loading(false);
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun敏捷框架提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js 查看文件

@@ -167,7 +167,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
//rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
// }
// });
// }
// }, 'Learun智慧校园提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
// }
//}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js 查看文件

@@ -94,7 +94,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js 查看文件

@@ -113,7 +113,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js 查看文件

@@ -100,7 +100,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js 查看文件

@@ -109,7 +109,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js 查看文件

@@ -99,7 +99,7 @@
// learun.layer.loading(false);
// });
// }
// }, 'Learun智慧校园提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
//},
btnJoinClick: function (item, $item, $page) {// 左滑按钮点击事件
learun.layer.confirm('确定要申请加入该社团吗?', function (_index) {
@@ -112,7 +112,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
//rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
rowBtns: ['<a class="lr-btn-join">申请加入</a>'] // 列表行左滑按钮


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js 查看文件

@@ -105,7 +105,7 @@
// learun.layer.loading(false);
// });
// }
// }, 'Learun智慧校园提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
//},
//rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js 查看文件

@@ -119,7 +119,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js 查看文件

@@ -39,7 +39,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -71,7 +71,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js 查看文件

@@ -102,7 +102,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js 查看文件

@@ -141,7 +141,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js 查看文件

@@ -155,7 +155,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js 查看文件

@@ -105,7 +105,7 @@
learun.layer.loading(false);
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
},
rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js 查看文件

@@ -38,7 +38,7 @@
learun.nav.closeCurrent();
}
}
}, 'learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
});
// 编辑
$header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
}
});
}
}, 'Learun智慧校园提示', ['取消', '确定']);
}, '智慧校园提示', ['取消', '确定']);
}
}
],


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js 查看文件

@@ -71,7 +71,7 @@
// }
// });
// }
// }, 'Learun敏捷框架提示', ['取消', '确定']);
// }, '智慧校园提示', ['取消', '确定']);
// }
// }
// ],


+ 27
- 11
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs 查看文件

@@ -37,6 +37,7 @@ namespace Learun.Application.WebApi.Modules
private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
private AccommodationIBLL accdormitoryIBLL = new AccommodationBLL();
private FinaChargesStandardIBLL finaChargesStandardIBLL = new FinaChargesStandardBLL();
private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL();

/// <summary>
/// 获取个人信息
@@ -60,19 +61,34 @@ namespace Learun.Application.WebApi.Modules
if (classInfoEntity != null)
{
StuInfoFreshEntity.ClassNo = classInfoEntity.ClassName;
StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo;
StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo;
var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
if (empInfoEntity != null)
if (classInfoEntity.ClassTutorNo != null)
{
StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName;
StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile;
StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo;
var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
if (empInfoEntity != null)
{
StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName;
StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile;
}
}
var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
if (empInfoEntity2 != null)
if (classInfoEntity.ClassDiredctorNo != null)
{
StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName;
StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile;
StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo;
var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassDiredctorNo);
if (empInfoEntity2 != null)
{
StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName;
StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile;
}
}
if (classInfoEntity.SerialNum != null)
{
StuInfoFreshEntity.DefaultClassRoomNo = classInfoEntity.SerialNum;
var classroomEntity = classroomInfoIBLL.GetClassroomInfoEntityByNo(classInfoEntity.SerialNum);
if (classroomEntity != null)
{
StuInfoFreshEntity.DefaultClassRoomName = classroomEntity.ClassroomName;
}
}
}

@@ -142,7 +158,7 @@ namespace Learun.Application.WebApi.Modules

return Success(result);
}
/// <summary>
/// 保存完善个人信息
/// </summary>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config 查看文件

@@ -97,7 +97,7 @@
<add key="ACIp" value="192.168.90.2"/>
<add key="ACIp2" value="192.168.200.252"/>
<!-- 是否强制验证强密码 -->
<add key="verifypwd" value="true"/>
<add key="verifypwd" value="false"/>
<!--疫情防控组角色Id-->
<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
</appSettings>

+ 10
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs 查看文件

@@ -663,6 +663,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[NotMapped]
public string ClassDiredctorMobile { get; set; }
/// <summary>
/// 默认教室
/// </summary>
[NotMapped]
public string DefaultClassRoomNo { get; set; }
/// <summary>
/// 默认教室
/// </summary>
[NotMapped]
public string DefaultClassRoomName { get; set; }
/// <summary>
/// 是否完善信息
/// </summary>
[NotMapped]


正在加载...
取消
保存