From a247547df86f0fad8f03aebb91de68d3f2bc7918 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 01 五月 2025 10:16:52 +0800
Subject: [PATCH] 修正sugsql导航更新加配置的bug
---
AdminwebPages/adminpageView/src/App.vue | 4
cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs | 107 +++++++++++++++++++++-----
cylsg/cylsg.Model/ECTEModel/OaStaff.cs | 11 ++
AdminwebPages/adminpageView/src/views/cylsgPayrollReport.vue | 36 +++++----
AdminwebPages/adminpageView/src/views/AboutView.vue | 2
AdminwebPages/adminpageView/src/assets/main.css | 5 -
cylsg/cylsg.Application/CyOS/CyOSSettingController.cs | 15 ++-
cylsg/ECTESTOA/OAServices.cs | 2
cylsg/cylsg.Application/CyOS/CyOSSDriver.cs | 10 ++
9 files changed, 136 insertions(+), 56 deletions(-)
diff --git a/AdminwebPages/adminpageView/src/App.vue b/AdminwebPages/adminpageView/src/App.vue
index a0dda38..32d161c 100644
--- a/AdminwebPages/adminpageView/src/App.vue
+++ b/AdminwebPages/adminpageView/src/App.vue
@@ -3,7 +3,7 @@
* @Author: 灏忛渚�
* @Date: 2025-03-17 09:36:48
* @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-18 10:33:24
+ * @LastEditTime: 2025-03-27 13:20:03
* Copyright: 2025 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
-->
@@ -13,7 +13,7 @@
<template>
-<div style="width: 100%; background-color: burlywood; height: 100%;">
+<div style=" background-color: gainsboro;">
<RouterView />
</div>
diff --git a/AdminwebPages/adminpageView/src/assets/main.css b/AdminwebPages/adminpageView/src/assets/main.css
index 9af2a06..51f597f 100644
--- a/AdminwebPages/adminpageView/src/assets/main.css
+++ b/AdminwebPages/adminpageView/src/assets/main.css
@@ -4,11 +4,8 @@
padding: 0;
}
#app {
- width: 100vw;
- height: 100vh;
- margin: 10px 0px 0px 0px ;
- padding: 2px;
+
font-weight: normal;
}
diff --git a/AdminwebPages/adminpageView/src/views/AboutView.vue b/AdminwebPages/adminpageView/src/views/AboutView.vue
index 756ad2a..6e11189 100644
--- a/AdminwebPages/adminpageView/src/views/AboutView.vue
+++ b/AdminwebPages/adminpageView/src/views/AboutView.vue
@@ -7,7 +7,7 @@
<style>
@media (min-width: 1024px) {
.about {
- min-height: 100vh;
+
display: flex;
align-items: center;
}
diff --git a/AdminwebPages/adminpageView/src/views/cylsgPayrollReport.vue b/AdminwebPages/adminpageView/src/views/cylsgPayrollReport.vue
index 3cd37d6..081f7a0 100644
--- a/AdminwebPages/adminpageView/src/views/cylsgPayrollReport.vue
+++ b/AdminwebPages/adminpageView/src/views/cylsgPayrollReport.vue
@@ -3,23 +3,30 @@
* @Author: 灏忛渚�
* @Date: 2025-03-17 09:45:10
* @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-27 13:24:58
+ * Copyright: 2025 MinTinge CO.,LTD. All Rights Reserved.
+ * @Descripttion: 鍐欏叆浣犵殑鎻忚堪
+-->
+<!--
+ * @FilePath: cylsgPayrollReport.vue
+ * @Author: 灏忛渚�
+ * @Date: 2025-03-17 09:45:10
+ * @LastEditors: Please set LastEditors
* @LastEditTime: 2025-03-19 11:33:32
* Copyright: 2025 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
-->
<!-- -->
<template>
- <div>
+ <div style="max-width: 1440px; margin: 0 auto">
<el-card>
<PlusForm v-model="formdata" :columns="FromColumns" :row-props="{ gutter: 100 }" :col-props="{
- span: 4
+ span: 5
}" @submit="mysubmit">
<template #footer="{ handleSubmit }">
<div style="margin: 0 auto">
<el-button type="primary" @click="handleSubmit">鎼滅储</el-button>
-
-
</div>
</template>
</PlusForm>
@@ -32,7 +39,6 @@
<script setup lang='tsx'>
import { GetTransferOrder, OrderByType, type WeChatTransferOrder } from '@/Api/apis';
import moment from 'moment';
-import { valueEquals } from 'element-plus';
import type { PlusColumn, PlusTableInstance, PageInfo } from 'plus-pro-components'
import { useTable } from 'plus-pro-components'
import { h, onMounted, ref, type VNode } from 'vue'
@@ -48,32 +54,30 @@
{
label: '濮撳悕',
prop: 'userName',
- tooltip: '鍚嶇О鏈�澶氭樉绀�6涓瓧绗�'
+ labelWidth: 60,
+
},
{
label: '韬唤璇佸彿鐮�',
- labelWidth: 110,
- width: 200,
- prop: 'userIDCode',
- tooltip: '鍚嶇О鏈�澶氭樉绀�6涓瓧绗�'
+ labelWidth: 100,
+
+ prop: 'userIDCode'
}
,
{
label: '鐢佃瘽鍙风爜',
- labelWidth: 110,
- width: 200,
- prop: 'itCode',
- tooltip: '鍚嶇О鏈�澶氭樉绀�6涓瓧绗�'
+ labelWidth: 100,
+
+ prop: 'itCode'
},
{
label: '鏀粯鏃堕棿',
- labelWidth: 110,
+ labelWidth: 100,
width: 400,
colProps: {
span: 8
},
prop: 'DataTime',
- tooltip: '鏀粯鏃堕棿',
valueType: 'date-picker',
fieldProps: {
type: 'datetimerange',
diff --git a/cylsg/ECTESTOA/OAServices.cs b/cylsg/ECTESTOA/OAServices.cs
index 9cab444..747edf4 100644
--- a/cylsg/ECTESTOA/OAServices.cs
+++ b/cylsg/ECTESTOA/OAServices.cs
@@ -68,7 +68,7 @@
throw Oops.Oh("鐧诲綍淇℃伅閿欒,涓嶆槸鏈夋晥鐢ㄦ埛");
}
//閲嶆柊鑾峰彇鏉冮檺
- ret = await _OAsqlSugarClient.Queryable<OaStaff>().Includes(x => x.Department).Where(x => x.MobieNum == user.ItCode && x.FirmId == firmId).Select(x => new ECTESTOAPermissions
+ ret = await _OAsqlSugarClient.Queryable<OaStaff>().Includes(x => x.Department).Where(x => x.MobieNum == user.ItCode && x.FirmId == firmId&&x.Status=="鍦ㄨ亴").Select(x => new ECTESTOAPermissions
{
DepartmentName = x.Department.Name,
DepartId=x.DepartmentId
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs b/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
index 15c2b80..66543aa 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
@@ -121,11 +121,19 @@
public async Task<int > StartDeliverPlan(Guid KeyId)
{
+
if (!await CheckRols())
{
throw Oops.Oh("娌℃湁鏉冮檺");
}
- var a= await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid == KeyId && x.ShifouDelivery != 2).FirstAsync();
+ DateTime specificDateTime = new DateTime(2025, 4, 9, 23, 59, 59);//2025骞�4鏈�10 鏃ヤ箣鍚庣殑锛屽繀椤讳竴鍗曚竴鍗曠偣鍑诲畬鎴愬悗鎵嶈兘閫佽揣
+ var count = await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid != KeyId && x.ShifouDelivery != 2 && x.Deliveredstatus == DeliveredType.Deliver&&x.DeliverTime> specificDateTime).CountAsync();
+ if(count > 0)
+ {
+ throw Oops.Oh($"浣犺繕鏈墈count}閫佽揣浠诲姟娌℃湁纭瀹屾垚锛屼笉鑳藉紑濮嬫柊鐨勪换鍔�");
+ }
+
+ var a= await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid == KeyId && x.ShifouDelivery != 2).FirstAsync();
if(a==null)
throw Oops.Oh("娌℃湁鏉冮檺");
if(a.Deliveredstatus!= DeliveredType.Undeliver)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
index 538fbb9..87256d7 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
@@ -49,7 +49,7 @@
/// </summary>
/// <returns></returns>
[HttpGet]
-
+ [AllowAnonymous]
public async Task<List<OaSubjectSet>> getKeMuList()
{
return await _client.Queryable<OaSubjectSet>().Where(x => x.Status == true && x.FirmId == _oAServices.firmId && x.SubjectType == "璐�").Select(x => new OaSubjectSet
@@ -74,7 +74,7 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [AllowAnonymous]
+ //[AllowAnonymous]
public async Task<object> GeCorporateClients()
{
return await _client.Queryable<OA_CorporateClients>()
@@ -95,15 +95,17 @@
/// </summary>
/// <returns></returns>
[HttpGet]
+ [AllowAnonymous]
public async Task<List<OaStaff>> Getdrivers()
{
- return await _client.Queryable<OaStaff>().Where(x => x.Status == "鍦ㄨ亴" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
+ return await _client.Queryable<OaStaff>().Includes(x=>x.Car).Where(x => x.Status == "鍦ㄨ亴" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
{
Name = x.Name,
MemberId = x.MemberId,
Keyid = x.Keyid,
+ Car=x.Car
- }).WithCache(60).ToListAsync();
+ }).ToListAsync();
}
@@ -117,13 +119,14 @@
{
var list = await _client.Queryable<OA_DeliverPlanPaiche>().Where(x =>( x.DeliverTime.Value.Date < DateTime.Now.AddDays(8).Date) && (x.DeliverTime.Value.Date >= DateTime.Now.Date)).Select(x => x.DriverId).ToListAsync();
- return await _client.Queryable<OaStaff>().Where(x=>list.Contains(x.Keyid)).Where(x => x.Status == "鍦ㄨ亴" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
+ return await _client.Queryable<OaStaff>().Includes(x=>x.Car).Where(x=>list.Contains(x.Keyid)).Where(x => x.Status == "鍦ㄨ亴" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
{
Name = x.Name,
MemberId = x.MemberId,
Keyid = x.Keyid,
+ Car=x.Car
- }).WithCache(60).ToListAsync();
+ })/*.WithCache(30)*/.ToListAsync(); //Includes(x => x.Car)鍔犵紦瀛樹細鎶ラ敊
//// return await _client.Queryable<OA_DeliverPlan>()
////.LeftJoin<OaStaff>((dp, os) => dp.DriverId == os.Keyid)
////.Where((dp, os) => SqlFunc.ToDate(dp.DeliverTime) < DateTime.Now.AddDays(8).Date
diff --git a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs b/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
index 768bf43..deda07e 100644
--- a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
@@ -13,6 +13,7 @@
using System.Text;
using System.Threading.Tasks;
using TencentCloud.Iecp.V20210914.Models;
+using TencentCloud.Monitor.V20180724.Models;
namespace cylsg.Application.CyOS
{
@@ -34,32 +35,92 @@
_oAServices = oAServices;
_eZCoreNetRedisService = netRedisService;
}
- [HttpGet]
- [AllowAnonymous]
- public async Task<OA_DriverRecord> testc()
- {
- OA_DriverRecord data = null;
+ //[HttpGet]
+ //[AllowAnonymous]
+ //public async Task<bool > TestCreat()
+ //{
+ // OaWorkPlan pram = new OaWorkPlan()
+ // {
- data = await _client.Queryable<OA_DriverRecord>().Where(x =>
- x.Id == new Guid("BE15D584-DFE3-438D-863B-705DB1AB14ED")
- ).Includes(x=>x.Attachments).FirstAsync();
-
- data.Attachments?.Add(new OA_attachment
- {
- PlanAttachment = "1111",
- AttachmentType = 4,
- Operator= "sdasd"
- });
- data.CarConditionAttachments = null;
- await _client.UpdateNav(data).Include(x => x.CarConditionAttachments,new UpdateNavOptions
- {
- OneToManyInsertOrUpdate=true,
-
- }).ExecuteCommandAsync();
+ // EvaluationContent = "",
+ // PlanDataType = 17,
+ // PlanType = 3,
+ // MemberId = _oAServices.firmId,
+ // SentStaffId = Guid.Empty,
+ // ReciveStaffId = Guid.Empty,
+ // DepartId = 0,
+ // PlanStartTime = DateTime.Now,
+ // RewardContent = "",
+ // LastUpdateTime = DateTime.Now,
+ // Operator = "",
+ // PlanTitle = "",
+ // PlanRunTime = DateTime.Now,
+ // PlanRemark = "",
+ // PlanPeople = "娴嬭瘯娴嬭瘯",
+ // PlanComplany = "",
+ // PlanStatus = PlanStatusType.unApproval,
+ // ApprovalStaffId = Guid.Empty,
+ // ApprovalStatus = PlanStatusType.unApproval,
+ // EvaluationStatus = BaoxiaoStausType.Unknown,
+ // FirmAccountId = 0,
+ // HoubufapiaoStatus = HoubufapiaoStatusType.Unknown,
+ // PlanMoney = 200,
+ // PlanContent = "娴嬭瘯鎵归噺",
+ // RewardResult = "10",
- return await _client.Queryable<OA_DriverRecord>().Where(x => x.Id == new Guid("BE15D584-DFE3-438D-863B-705DB1AB14ED")).Includes(x => x.Attachments).Includes(x => x.CarConditionAttachments).FirstAsync();
+ // ApprovalTime = DateTime.Now,
+ // ApprovalContent = "",
+ // EvaluationStaffId = Guid.Empty,
+ // EvaluationTime = DateTime.Now,
+ // RewardMoney = 0,
+ // RewardType = 1,
+ // Keyid = null,
+ // WorkPlanAttachments = new List<OaWorkPlanAttachment>()
+ // {
+ // new OaWorkPlanAttachment
+ // {
+ // AttachmentType=1,
+ // CreateTime=DateTime.Now,
+ // Operator="123213",
+ // PlanAttachment="hhttp://1.jpg"
+ // },
+ // new OaWorkPlanAttachment
+ // {
+ // AttachmentType=1,
+ // CreateTime=DateTime.Now,
+ // Operator="123213",
+ // PlanAttachment="hhttp://2.jpg"
+ // }
+ // ,
+ // new OaWorkPlanAttachment
+ // {
+ // AttachmentType=4,
+ // CreateTime=DateTime.Now,
+ // Operator="123213",
+ // PlanAttachment="hhttp://2.jpg"
+ // }
+ // }
+
- }
+ // };
+ // return await _client.InsertNav(pram).Include(x => x.WorkPlanAttachments).ExecuteCommandAsync();
+
+
+
+ //}
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <returns></returns>
+ //[HttpGet]
+ //[AllowAnonymous]
+ //public async Task<OA_DriverRecord> TestUpdata()
+ //{
+
+
+
+ //}
/// <summary>
/// 鑾峰彇棰勭害閰嶉�佷俊鎭�
diff --git a/cylsg/cylsg.Model/ECTEModel/OaStaff.cs b/cylsg/cylsg.Model/ECTEModel/OaStaff.cs
index 27ba2d4..61b41a2 100644
--- a/cylsg/cylsg.Model/ECTEModel/OaStaff.cs
+++ b/cylsg/cylsg.Model/ECTEModel/OaStaff.cs
@@ -1,4 +1,5 @@
-锘縰sing SqlSugar;
+锘縰sing Models;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -377,7 +378,13 @@
[SugarColumn(ColumnName = "BF_Isbaoxiaojingli")]
public bool BF_Isbaoxiaojingli { get; set; }
-
+ /// <summary>
+ /// 杞﹁締
+ /// </summary>
+ [Navigate(NavigateType.OneToOne, nameof(Keyid), nameof(OA_CarManage.StaffID))]
+ public OA_CarManage? Car { get; set; }
+
+
}
--
Gitblit v1.9.1