From 2b177eea6ca44785a6116e91dbadbf7cf5ed2e15 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 24 一月 2022 12:22:31 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Printhetong.cshtml | 10 +++++++---
zhengcaioa/Services/WfHistoryService.cs | 4 +++-
zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml | 10 +++++-----
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/Services/WfHistoryService.cs b/zhengcaioa/Services/WfHistoryService.cs
index a19cbc3..fe2dc40 100644
--- a/zhengcaioa/Services/WfHistoryService.cs
+++ b/zhengcaioa/Services/WfHistoryService.cs
@@ -350,6 +350,8 @@
join a in _context.WfHistories
on k.Id equals a.RunProcessId
+ into asssss
+ from aaa in asssss.DefaultIfEmpty()
join e in listCode.Where(x => x.CodeTable == "wf_run_process" && x.CodeField == "shenpi_status")
on k.ShenpiStatus equals e.CodeSn
@@ -396,7 +398,7 @@
Content = k.Content,
ShenpiStatusName = eee.Comments,
- Deelurl = a.Deelurl,
+ Deelurl = aaa.Deelurl,
Creater = k.Creater,
Createtime = k.Createtime,
Step = k.Step,
diff --git a/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml b/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml
index 10d3b40..1178fec 100644
--- a/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml
@@ -10,13 +10,13 @@
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
- label: '鏉ョ數鏃堕棿', name: 'InTime', labtype: 'txt', width: 100, hidden: false,
+ label: '鏉ョ數鏃堕棿', name: 'InTime', labtype: 'txt', width: 80, hidden: false,
formatter: function (cellvalue, options, rowObject) {
return '<a href="javascript: void (0)" onclick="edit(\'' + rowObject.Id + '\');">' + new Date(cellvalue).Format("yyyy-MM-dd hh:mm") + '</a>';
}
},
{
- label: '鐢佃瘽绫诲瀷', name: 'LineType', labtype: 'txt', width: 100, hidden: false,
+ label: '鐢佃瘽绫诲瀷', name: 'LineType', labtype: 'txt', width: 50, hidden: false,
formatter: function (cellvalue, options, rowObject) {
let LType = JSON.parse(LineType);
let value = '';
@@ -30,10 +30,10 @@
}
},
{ label: '鏉ョ數鍗曚綅', name: 'OrderId', labtype: 'txt', hidden: false, width: 200 },
- { label: '鐢佃瘽鍙风爜', name: 'Phone', labtype: 'txt', hidden: false, width: 100},
+ { label: '鐢佃瘽鍙风爜', name: 'Phone', labtype: 'txt', hidden: false, width: 50},
{ label: '鐢佃瘽鍐呭', name: 'Context', labtype: 'txt', hidden: false, width: 200},
{
- label: '鍚堜綔鎰忓悜', name: 'Intention', labtype: 'txt', width: 100, hidden: false,
+ label: '鍚堜綔鎰忓悜', name: 'Intention', labtype: 'txt', width: 50, hidden: false,
formatter: function (cellvalue, options, rowObject) {
let it = JSON.parse(Intention);
let value = '';
@@ -46,7 +46,7 @@
return value;
}
},
- { label: '鎺ョ數璇濅汉', name: 'UserId', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鎺ョ數璇濅汉', name: 'UserId', labtype: 'txt', hidden: false, width: 50 },
{
label: '鎿嶄綔', name: 'RecStatus', align: "center", align: "center", sortable: false, width: 100, labtype: 'txt',
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Printhetong.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Printhetong.cshtml
index 35a6112..6eceaa8 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Printhetong.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Printhetong.cshtml
@@ -152,9 +152,13 @@
<tr>
<td colspan="2" style="height:15px"></td>
</tr>
-
<tr>
- <td colspan="2" align="right">绛捐鏃堕棿锛欯(Model.Baomingtime.ToString("yyyy骞碝M鏈坉d鏃�"))</td>
+ <td align="left">鐢叉柟锛�</td>
+ <td align="left">涔欐柟锛�</td>
+ </tr>
+ <tr>
+ <td >绛捐鏃堕棿锛欯(Model.Baomingtime.ToString("yyyy骞碝M鏈坉d鏃�"))</td>
+ <td >绛捐鏃堕棿锛欯(Model.Baomingtime.ToString("yyyy骞碝M鏈坉d鏃�"))</td>
</tr>
</table>
</div>
@@ -166,7 +170,7 @@
font-size: 16pt;
font-family: 'FangSong';
background: #fff;
- line-height: 2.0;
+ line-height: 1.2;
}
span {
--
Gitblit v1.9.1