gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎代码优化

Browse Source
This commit is contained in:
zuohuaijun 2024-08-15 14:49:31 +08:00
parent e614e11b76
commit aa800074b8
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs
View File

@ -17,13 +17,13 @@ public partial class SysWechatPay : EntityBase
/// <summary>
/// 关联的商户订单号
/// </summary>
[SugarColumn(ColumnDescription = "OrderId")]
[SugarColumn(ColumnDescription = "关联商户订单号")]
public virtual string OrderId { get; set; }
/// <summary>
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
/// </summary>
[SugarColumn(ColumnDescription = "OrderStatus")]
[SugarColumn(ColumnDescription = "关联商户订单状态")]
public virtual string OrderStatus { get; set; }
/// <summary>

2
Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs
View File

@ -299,7 +299,7 @@ public class SysFileService : IDynamicApiController, ITransient
if (file == null) throw Oops.Oh(ErrorCodeEnum.D8000);
// 判断是否重复上传的文件
var sizeKb = (long)(file.Length / 1024.0); // 大小KB
var sizeKb = file.Length / 1024; // 大小KB
var fileMd5 = string.Empty;
if (_uploadOptions.EnableMd5)
{

2
Web/src/views/system/region/component/genOrgLevel.vue
View File

@ -29,7 +29,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-loading="state.loading" @click="submit">确 定</el-button>
<el-button type="primary" :loading="state.loading" @click="submit">确 定</el-button>
</span>
</template>
</el-dialog>

2
Web/src/views/system/region/component/syncMcaParam.vue
View File

@ -20,7 +20,7 @@
<span class="dialog-footer">
<a href="https://www.stats.gov.cn/sj/tjbz/tjyqhdmhcxhfdm/2023/index.html" target="_blank" style="float: left">查看区划代码：国家统计局</a>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-loading="state.loading" @click="submit">确 定</el-button>
<el-button type="primary" :loading="state.loading" @click="submit">确 定</el-button>
</span>
</template>
</el-dialog>

4
Web/src/views/system/region/component/syncStatsParam.vue
View File

@ -29,7 +29,7 @@
<span class="dialog-footer">
<a href="https://www.stats.gov.cn/sj/tjbz/tjyqhdmhcxhfdm/2023/index.html" target="_blank" style="float: left">查看区划名称：国家统计局</a>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-loading="state.loading" @click="submit">确 定</el-button>
<el-button type="primary" :loading="state.loading" @click="submit">确 定</el-button>
</span>
</template>
</el-dialog>
@ -76,7 +76,7 @@ const submit = () => {
ruleFormRef.value.validate(async (valid: boolean) => {
if (!valid) return;
if (!state.ruleForm.city || !state.ruleForm.province) {
if (state.ruleForm.city && !state.ruleForm.province) {
ElMessage.error('不能单独指定市级！');
return;
}