Zel/WaterCloudForJt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1111111

Browse Source
This commit is contained in:
zel
2025-03-12 19:50:47 +08:00
parent bf14c5c621
commit 9fbd66bf76
3 changed files with 287 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs
View File

@@ -105,7 +105,7 @@ public class CustomerOrderEntity : IEntity<CustomerOrderEntity>, ICreationAudite
/// <summary> /// <summary>
/// 附件 /// 附件
/// </summary> /// </summary>
[SugarColumn(IsNullable = true, ColumnName = "F_Attachment", ColumnDescription = "模板文件", [SugarColumn(IsNullable = true, ColumnName = "F_Attachment", ColumnDescription = "附件",
ColumnDataType = "nvarchar(200)")] ColumnDataType = "nvarchar(200)")]
public string F_Attachment { get; set; } public string F_Attachment { get; set; }

95
WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Form.cshtml
View File

@@ -1,4 +1,97 @@
@{ @{
ViewBag.Title = "Form"; ViewBag.Title = "Form";
Layout = "~/Views/Shared/_Form.cshtml"; Layout = "~/Views/Shared/_Form.cshtml";
} }
<script>
</script>
<body>
<div class="layuimini-container">
<div class="layuimini-main">
<div class="layui-form layuimini-form" lay-filter="adminform">
<div class="layui-form-item layui-hide">
<label class="layui-form-label required">客户名称</label>
<div class="layui-input-block">
<input type="text" id="F_Name" name="F_Name" autocomplete="off" lay-verify="required" placeholder="请输入客户名称" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-hide">
<div class="layui-col-md6 layui-col-sm6 layui-hide">
<label class="layui-form-label required">开始合作时间</label>
<div class="layui-input-block">
<input type="text" id="F_CooperationTime" name="F_CooperationTime" autocomplete="off" lay-verify="required" class="layui-input">
</div>
</div>
<div class="layui-col-md6 layui-col-sm6 layui-hide">
<label class="layui-form-label required">发帖时间</label>
<div class="layui-input-block">
<input type="text" id="F_PostTime" name="F_PostTime" autocomplete="off" lay-verify="required" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item layui-hide">
<div class="layui-col-md6 layui-col-sm6 layui-hide">
<label class="layui-form-label required">合作进展</label>
<div class="layui-input-block">
<select id="F_OrderState" name="F_OrderState" lay-verify="required">
<option value="">===请选择===</option>
<option value="0">断续</option>
<option value="1">持续合作</option>
</select>
</div>
</div>
<div class="layui-col-md6 layui-col-sm6 layui-hide">
<label class="layui-form-label">联系方式</label>
<div class="layui-input-block">
<input type="text" id="F_Contact" name="F_Contact" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item layui-hide">
<div class="layui-col-md6 layui-col-sm6 layui-hide">
<label class="layui-form-label required">对接人</label>
<div class="layui-input-block">
<input type="text" id="F_ContactPerson" name="F_ContactPerson" autocomplete="off" lay-verify="required" class="layui-input">
</div>
</div>
<div class="layui-col-md6 layui-col-sm6 layui-hide">
<label class="layui-form-label required">对接情况</label>
<div class="layui-input-block">
<input type="text" id="F_Docking" name="F_Docking" autocomplete="off" lay-verify="required" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item layui-hide">
<label class="layui-form-label">附件</label>
<div class="layui-input-block" style="padding-right: 70px;">
<input type="text" id="F_Attachment" name="F_Attachment" readonly disabled class="layui-input">
<button class="layui-btn" style="position: absolute;top: 0;right: 6px;cursor: pointer;" id="test1">上传</button>
</div>
</div>
<div class="layui-form-item layui-hide">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea id="F_Remark" name="F_Remark" value="" autocomplete="off" class="layui-textarea"></textarea>
</div>
</div>
<div class="layui-form-item layui-hide">
<button class="layui-btn site-demo-active" lay-submit id="submit" lay-filter="saveBtn">确认保存</button>
</div>
</div>
</div>
</div>
</body>

384
WaterCloud.Web/Areas/OrderManagement/Views/Order/Index.cshtml
View File

@@ -1,209 +1,209 @@
@{ @{
ViewBag.Title = "Index"; ViewBag.Title = "Index";
Layout = "~/Views/Shared/_Index.cshtml"; Layout = "~/Views/Shared/_Index.cshtml";
} }
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<fieldset class="table-search-fieldset layui-hide" id="searchField"> <fieldset class="table-search-fieldset layui-hide" id="searchField">
<div> <div>
<form class="layui-form layui-form-pane" > <form class="layui-form layui-form-pane">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">关键字:</label> <label class="layui-form-label">关键字:</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="txt_keyword" name="txt_keyword" autocomplete="off" class="layui-input" > <input type="text" id="txt_keyword" name="txt_keyword" autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn"><i class="layui-icon">&#xe615;</i> 搜 索</button> <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn"><i class="layui-icon">&#xe615;</i> 搜 索</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</fieldset> </fieldset>
<script type="text/html" id="toolbarDemo"> <script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar"> <div class="layui-btn-container" id="toolbar">
<button id="NF-add" name="NF-add" authorize class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新增</button> <button id="NF-add" name="NF-add" authorize class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新增</button>
<button id="NF-edit" name="NF-edit" authorize class="layui-btn layui-btn-sm layui-btn-warm layui-hide" lay-event="edit"><i class="layui-icon">&#xe642;</i>修改</button> <button id="NF-edit" name="NF-edit" authorize class="layui-btn layui-btn-sm layui-btn-warm layui-hide" lay-event="edit"><i class="layui-icon">&#xe642;</i>修改</button>
<button id="NF-delete" name="NF-delete" authorize class="layui-btn layui-btn-sm layui-btn-danger layui-hide" lay-event="delete"> <i class="layui-icon">&#xe640;</i>删除</button> <button id="NF-delete" name="NF-delete" authorize class="layui-btn layui-btn-sm layui-btn-danger layui-hide" lay-event="delete"> <i class="layui-icon">&#xe640;</i>删除</button>
<button id="NF-details" name="NF-details" authorize class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon">&#xe60b;</i>查看</button> <button id="NF-details" name="NF-details" authorize class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon">&#xe60b;</i>查看</button>
</div> </div>
</script> </script>
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table> <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
<script type="text/html" id="currentTableBar"> <script type="text/html" id="currentTableBar">
<a id="NF-edit" authorize class="layui-btn layui-btn-xs layui-btn-warm" lay-event="edit">修改</a> <a id="NF-edit" authorize class="layui-btn layui-btn-xs layui-btn-warm" lay-event="edit">修改</a>
<a id="NF-delete" authorize class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete">删除</a> <a id="NF-delete" authorize class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete">删除</a>
<a id="NF-details" authorize class="layui-btn layui-btn-xs layui-btn-normal" lay-event="details">查看</a> <a id="NF-details" authorize class="layui-btn layui-btn-xs layui-btn-normal" lay-event="details">查看</a>
</script> </script>
</div> </div>
</div> </div>
<script> <script>
layui.use(['jquery', 'form','table','commonTable', 'common','optimizeSelectOption'], function () { layui.use(['jquery', 'form','table','commonTable', 'common','optimizeSelectOption'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
table = layui.table,commonTable = layui.commonTable table = layui.table,commonTable = layui.commonTable
common = layui.common; common = layui.common;
//权限控制(js是值传递) //权限控制(js是值传递)
currentTableBar.innerHTML = common.authorizeButtonNew(currentTableBar.innerHTML); currentTableBar.innerHTML = common.authorizeButtonNew(currentTableBar.innerHTML);
toolbarDemo.innerHTML = common.authorizeButtonNew(toolbarDemo.innerHTML); toolbarDemo.innerHTML = common.authorizeButtonNew(toolbarDemo.innerHTML);
commonTable.rendertable({ commonTable.rendertable({
elem: '#currentTableId', elem: '#currentTableId',
id: 'currentTableId', id: 'currentTableId',
url: '/OrderManagement/Order/GetGridJson', url: '/OrderManagement/Order/GetGridJson',
cols: [[ cols: [[
//此处需修改 //此处需修改
{ type: "checkbox", width: 50, fixed: 'left' }, { type: "checkbox", width: 50, fixed: 'left' },
{ field: 'F_OrderCode', title: '订单编号', width: 180,sort: true,filter: true }, { field: 'F_OrderCode', title: '订单编号', width: 180,sort: true,filter: true },
{ {
field: 'F_OrderState', title: '订单状态', width: 120, sort: true, filter: true, field: 'F_OrderState', title: '订单状态', width: 120, sort: true, filter: true,
templet: function (d) { templet: function (d) {
if (d.F_OrderState == 1) { if (d.F_OrderState == 1) {
return "<span class='layui-btn layui-btn-normal layui-btn-xs'>已完成</span>"; return "<span class='layui-btn layui-btn-normal layui-btn-xs'>已完成</span>";
} else { } else {
return "<span class='layui-btn layui-btn-warm layui-btn-xs'>未完成</span>"; return "<span class='layui-btn layui-btn-warm layui-btn-xs'>未完成</span>";
} }
} }
}, },
{ {
field: 'F_NeedTime', title: '需求时间', minWidth: 160, sort: true, filter: { type: 'date[yyyy/MM/dd HH:mm:ss]' } field: 'F_NeedTime', title: '需求时间', minWidth: 160, sort: true, filter: { type: 'date[yyyy/MM/dd HH:mm:ss]' }
}, },
{ {
field: 'F_ActualTime', title: '实际时间', minWidth: 160, sort: true, filter: { type: 'date[yyyy/MM/dd HH:mm:ss]' } field: 'F_ActualTime', title: '实际时间', minWidth: 160, sort: true, filter: { type: 'date[yyyy/MM/dd HH:mm:ss]' }
}, },
{ field: 'F_NeedNum', title: '需求数量', width: 120, sort: true, filter: true }, { field: 'F_NeedNum', title: '需求数量', width: 120, sort: true, filter: true },
{ field: 'F_ActualNum', title: '实际数量', width: 120, sort: true, filter: true }, { field: 'F_ActualNum', title: '实际数量', width: 120, sort: true, filter: true },
{ {
field: 'F_EnabledMark', title: '状态', width: 80, sort: true, filter: true, field: 'F_EnabledMark', title: '状态', width: 80, sort: true, filter: true,
templet: function (d) { templet: function (d) {
if (d.F_EnabledMark == true) { if (d.F_EnabledMark == true) {
return "<span class='layui-btn layui-btn-normal layui-btn-xs'>有效</span>"; return "<span class='layui-btn layui-btn-normal layui-btn-xs'>有效</span>";
} else { } else {
return "<span class='layui-btn layui-btn-warm layui-btn-xs'>无效</span>"; return "<span class='layui-btn layui-btn-warm layui-btn-xs'>无效</span>";
} }
} }
}, },
{ {
field: 'F_CreatorUserName', title: '创建人', Width: 100, sort: true, filter: true, field: 'F_CreatorUserName', title: '创建人', Width: 100, sort: true, filter: true,
}, },
{ {
field: 'F_CreatorTime', title: '创建时间', minWidth: 160, sort: true, filter: { type: 'date[yyyy/MM/dd HH:mm:ss]' } field: 'F_CreatorTime', title: '创建时间', minWidth: 160, sort: true, filter: { type: 'date[yyyy/MM/dd HH:mm:ss]' }
}, },
{ title: '操作', width: 160, toolbar: '#currentTableBar', align: "center", fixed: 'right' } { title: '操作', width: 160, toolbar: '#currentTableBar', align: "center", fixed: 'right' }
]] ]]
}); });
// 监听搜索操作 // 监听搜索操作
form.on('submit(data-search-btn)', function (data) { form.on('submit(data-search-btn)', function (data) {
//执行搜索重载 //执行搜索重载
commonTable.reloadtable({ commonTable.reloadtable({
elem: 'currentTableId', elem: 'currentTableId',
curr: 1, curr: 1,
where: { keyword: data.field.txt_keyword} where: { keyword: data.field.txt_keyword}
}); });
return false; return false;
}); });
wcLoading.close(); wcLoading.close();
//行点击事件监听，控制按钮显示 //行点击事件监听，控制按钮显示
var oneList = ["NF-edit", "NF-details"];//选择1条显示 var oneList = ["NF-edit", "NF-details"];//选择1条显示
var morerList = ["NF-delete"];//选中1条以上显示 var morerList = ["NF-delete"];//选中1条以上显示
commonTable.tableRowClick("checkbox", "currentTableFilter", "currentTableId", oneList, morerList); commonTable.tableRowClick("checkbox", "currentTableFilter", "currentTableId", oneList, morerList);
//toolbar监听事件 //toolbar监听事件
table.on('toolbar(currentTableFilter)', function (obj) { table.on('toolbar(currentTableFilter)', function (obj) {
var data = table.checkStatus('currentTableId').data; var data = table.checkStatus('currentTableId').data;
var id = data.length > 0 ? data[0].F_Id : null; var id = data.length > 0 ? data[0].F_Id : null;
if (obj.event === 'add') { // 监听添加操作 if (obj.event === 'add') { // 监听添加操作
common.modalOpen({ common.modalOpen({
title: "添加订单", title: "添加订单",
url: "/OrderManagement/Order/Form", url: "/OrderManagement/Order/Form",
width: "850px", width: "850px",
height: "700px", height: "700px",
}); });
} }
else if (obj.event === 'delete') { else if (obj.event === 'delete') {
if (data.length == 0) { if (data.length == 0) {
common.modalMsg("未选中数据", "warning"); common.modalMsg("未选中数据", "warning");
return false; return false;
}
var ids = [];
for (var i = 0; i < data.length; i++) {
ids.push(data[i].F_Id);
} }
var ids = []; common.deleteForm({
for (var i = 0; i < data.length; i++) { url: "/OrderManagement/Order/DeleteForm",
ids.push(data[i].F_Id); param: { keyValue: ids.join(',') },
} success: function () {
common.deleteForm({ common.reload('data-search-btn');
url: "/OrderManagement/Order/DeleteForm", }
param: { keyValue: ids.join(',') }, });
success: function () {
common.reload('data-search-btn');
}
});
}
else if (obj.event === 'edit') {
if (data.length == 0) {
common.modalMsg("未选中数据", "warning");
return false;
}
common.modalOpen({
title: "编辑订单",
url: "/OrderManagement/Order/Form?keyValue=" + id,
width: "850px",
height: "700px",
});
}
else if (obj.event === 'details') {
if (data.length == 0) {
common.modalMsg("未选中数据", "warning");
return false;
}
common.modalOpen({
title: "查看订单",
url: "/OrderManagement/Order/Details?keyValue=" + id,
width: "850px",
height: "700px",
btn: []
});
}
else if (obj.event === 'TABLE_SEARCH') {
var _that = $("#searchField");
if (_that.hasClass("layui-hide")) {
_that.removeClass('layui-hide');
} else {
_that.addClass('layui-hide');
}
table.resize();
}
return false;
});
//toolrow监听事件
table.on('tool(currentTableFilter)', function (obj) {
var id = obj.data.F_Id;
if (obj.event === 'delete') {
common.deleteForm({
url: "/OrderManagement/Order/DeleteForm",
param: { keyValue: obj.data.F_Id },
success: function () {
obj.del();
}
});
} }
else if (obj.event === 'edit') { else if (obj.event === 'edit') {
common.modalOpen({ if (data.length == 0) {
title: "编辑订单", common.modalMsg("未选中数据", "warning");
url: "/OrderManagement/Order/Form?keyValue=" + id, return false;
width: "850px", }
height: "700px", common.modalOpen({
}); title: "编辑订单",
url: "/OrderManagement/Order/Form?keyValue=" + id,
width: "850px",
height: "700px",
});
} }
else if (obj.event === 'details') { else if (obj.event === 'details') {
common.modalOpen({ if (data.length == 0) {
title: "查看订单", common.modalMsg("未选中数据", "warning");
url: "/OrderManagement/Order/Details?keyValue=" +id, return false;
width: "850px", }
height: "700px", common.modalOpen({
btn: [] title: "查看订单",
}); url: "/OrderManagement/Order/Details?keyValue=" + id,
width: "850px",
height: "700px",
btn: []
});
}
else if (obj.event === 'TABLE_SEARCH') {
var _that = $("#searchField");
if (_that.hasClass("layui-hide")) {
_that.removeClass('layui-hide');
} else {
_that.addClass('layui-hide');
}
table.resize();
} }
return false; return false;
}); });
}); //toolrow监听事件
table.on('tool(currentTableFilter)', function (obj) {
var id = obj.data.F_Id;
if (obj.event === 'delete') {
common.deleteForm({
url: "/OrderManagement/Order/DeleteForm",
param: { keyValue: obj.data.F_Id },
success: function () {
obj.del();
}
});
}
else if (obj.event === 'edit') {
common.modalOpen({
title: "编辑订单",
url: "/OrderManagement/Order/Form?keyValue=" + id,
width: "850px",
height: "700px",
});
}
else if (obj.event === 'details') {
common.modalOpen({
title: "查看订单",
url: "/OrderManagement/Order/Details?keyValue=" +id,
width: "850px",
height: "700px",
btn: []
});
}
return false;
});
});
</script> </script>