Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower
This commit is contained in:
Kai
commit
a8ca32f96c
@ -99,11 +99,11 @@ namespace SolarPower.Models
|
||||
public string UpdatedAt { get { return Convert.ToDateTime(updatedAt).ToString("yyyy-MM-dd HH:mm:ss"); } set { updatedAt = value; } } //修改時間
|
||||
private string lastCreateTime;
|
||||
public string LastCreateTime { get { return Convert.ToDateTime(lastCreateTime).ToString("yyyy-MM-dd HH:mm:ss"); } set { lastCreateTime = value; } }
|
||||
public string PowerStationName { get; set; }
|
||||
}
|
||||
public class OperationPlanTable : OperationCreatePlan
|
||||
{
|
||||
public string TypeName { get; set; }
|
||||
public string PowerStationName { get; set; }
|
||||
public string Schedule { get; set; }
|
||||
public string EmailTypeName { get; set; }
|
||||
public string CreatedPerson { get; set; }
|
||||
|
||||
@ -158,7 +158,7 @@ namespace SolarPower.Quartz.Jobs
|
||||
{
|
||||
//Get所有運維人員
|
||||
var personal = await operationRepository.GetOperationPersonnel(a.PowerStationId);
|
||||
var Title = $@"編號:{a.PlanId} - {WorkType}單 - 作業紀錄建立通知";
|
||||
var Title = $@"電站:{a.PowerStationName} - {WorkType}單 - 編號:{a.PlanId}";
|
||||
var content = $@" {noticeName} {Environment.NewLine} 內容描述:{a.Description}";
|
||||
await operationRepository.InsertNoticeSchedule(personal, Title, content);
|
||||
|
||||
|
||||
@ -604,7 +604,8 @@ namespace SolarPower.Repository.Implement
|
||||
{
|
||||
try
|
||||
{
|
||||
var sql = @$"SELECT * FROM operation_plan_create opc
|
||||
var sql = @$"SELECT opc.*,ps.Name AS PowerStationName FROM operation_plan_create opc
|
||||
LEFT JOIN power_station ps ON opc.PowerStationId = ps.Id
|
||||
WHERE opc.Deleted = 0";
|
||||
result = (await conn.QueryAsync<OperationCreatePlan>(sql)).ToList();
|
||||
}
|
||||
|
||||
@ -148,15 +148,16 @@
|
||||
<div class="row mb-3">
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="power_station_select_modal">電站</label>
|
||||
<label class="form-label" for="power_station_select_modal"><span class="text-danger">*</span>電站</label>
|
||||
<select class="form-control" id="power_station_select_modal">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="work_time_modal">作業日期</label>
|
||||
<label class="form-label" for="work_time_modal"><span class="text-danger">*</span>作業日期</label>
|
||||
<input class="form-control" id="work_time_modal" type="date" name="work_time_modal" />
|
||||
<label id="work_time_modal-error" class="" style="z-index:1;color:red;display:none">此為必填欄位</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -164,7 +165,7 @@
|
||||
<div class="row mb-3">
|
||||
<div class="col-lg-6">
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="example-select">狀態</label>
|
||||
<label class="form-label" for="example-select"><span class="text-danger">*</span>狀態</label>
|
||||
<div>
|
||||
<div class="custom-control custom-radio custom-control-inline">
|
||||
<input type="radio" class="custom-control-input ml-auto" id="status_none_complete" name="status_modal" value="0" />
|
||||
@ -179,9 +180,10 @@
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="">
|
||||
<label class="form-label" for="work_person_select_modal">執行人員</label>
|
||||
<label class="form-label" for="work_person_select_modal"><span class="text-danger">*</span>執行人員</label>
|
||||
<select class="form-control" id="work_person_select_modal" multiple="multiple">
|
||||
</select>
|
||||
<label id="work_person_select_modal-error" class="" style="z-index:1;color:red;display:none">此為必填欄位</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -291,6 +293,7 @@
|
||||
|
||||
$(function () {
|
||||
//#region Date-Picker
|
||||
|
||||
datepicker = $('#date-range').daterangepicker({
|
||||
autoUpdateInput: false,
|
||||
locale: { format: 'YYYY/MM/DD' },
|
||||
@ -597,6 +600,20 @@
|
||||
//#endregion
|
||||
});
|
||||
|
||||
$('#work_person_select_modal').change(function () {
|
||||
if ($('#work_person_select_modal').val().length == 0) {
|
||||
$('#work_person_select_modal-error').show();
|
||||
} else {
|
||||
$('#work_person_select_modal-error').hide();
|
||||
}
|
||||
});
|
||||
|
||||
$('#work_time_modal').change(function () {
|
||||
$("#work_time_modal-error").hide();
|
||||
});
|
||||
|
||||
|
||||
|
||||
function getPowerStationCheckBox() {
|
||||
var send_data = {
|
||||
cityIds: ids
|
||||
@ -686,7 +703,8 @@
|
||||
$("input[name=status_modal][value='" + 0 + "']").prop('checked', true); //狀態
|
||||
$("#record_files_div > .row").empty();
|
||||
|
||||
|
||||
$('#work_person_select_modal-error').hide();
|
||||
$("#work_time_modal-error").hide();
|
||||
|
||||
|
||||
|
||||
@ -1029,7 +1047,7 @@
|
||||
//#region 表單驗證
|
||||
$("#record-form").validate({
|
||||
rules: {
|
||||
work_person_select_modal: {
|
||||
work_time_modal: {
|
||||
required: true
|
||||
}
|
||||
},
|
||||
@ -1038,6 +1056,7 @@
|
||||
|
||||
//#region 儲存表單資料
|
||||
function SaveRecord() {
|
||||
if ($('#work_person_select_modal').val().length > 0 && $("#work_time_modal").val() != "") {
|
||||
Swal.fire(
|
||||
{
|
||||
title: "儲存",
|
||||
@ -1126,12 +1145,19 @@
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($('#work_person_select_modal').val().length == 0)
|
||||
{
|
||||
$('#work_person_select_modal-error').show();
|
||||
}
|
||||
if ($("#work_time_modal").val() == "")
|
||||
{
|
||||
$("#work_time_modal-error").show();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
//#endregion
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user