升级.net8暂存

This commit is contained in:
dell
2024-11-14 09:01:37 +08:00
parent 08a59bd2a3
commit 48e9e27fa0
110 changed files with 11291 additions and 4541 deletions

View File

@ -23,7 +23,7 @@
</fieldset>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" name="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新通知</button>
<button id="NF-add" name="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</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>
</div>
</script>

View File

@ -64,6 +64,9 @@
},
{
field: 'F_ActualTime', title: '实际时间', minWidth: 160, sort: true, event: 'actualTime', config: { type: 'date', dateType: 'date' }
, templet: function (d) {
return new Date(d.F_ActualTime).Format("yyyy-MM-dd");
}
},
{ field: 'F_ProductName', title: '产品名称', minWidth: 145, sort: true, event: 'productName', config: { type: 'input', verify: { type: "required" } } },
{ field: 'F_ProductDescription', title: '产品规格', minWidth: 145, event: 'productDescription', config: { type: 'input'} },

View File

@ -3,12 +3,12 @@
Layout = "~/Views/Shared/_Index.cshtml";
}
<script>
layui.use(['jquery', 'form', 'table', 'common', 'treeTable', "layer"], function () {
layui.use(['jquery', 'form', 'table', 'common', 'treeTablelay', "layer"], function () {
var $ = layui.jquery,
form = layui.form,
table = layui.table,
layer=layui.layer,
treeTable = layui.treeTable,
treeTablelay = layui.treeTablelay,
common = layui.common;
//加载数据
//var loading = layer.load(0, { shade: false });
@ -79,7 +79,7 @@
/**
* toolbar监听事件
*/
treeTable.on('toolbar(currentTableId)', function (obj) {
treeTablelay.on('toolbar(currentTableId)', function (obj) {
var data = rendertree.checkStatus();
if (obj.event === 'add') { // 监听操作
var keyValue = data.length==1 ? data[0].F_Id : null;
@ -140,7 +140,7 @@
return false;
});
//toolbar监听事件
treeTable.on('tool(currentTableId)', function (obj) {
treeTablelay.on('tool(currentTableId)', function (obj) {
if (obj.event === 'delete') {
common.deleteForm({
url: "/SystemManage/Area/DeleteForm",

View File

@ -736,7 +736,7 @@
</form>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="edit"><i class="layui-icon">&#xe642;</i>编辑</button>
<button class="layui-btn layui-btn-sm" lay-event="sort"><i class="layui-icon">&#xe61a;</i>设为排序</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete"> <i class="layui-icon">&#xe640;</i>删除</button> </div>

View File

@ -54,11 +54,11 @@
</div>
</div>
<script>
layui.use(['form', 'table', 'treeTable', 'common', 'commonTable'], function () {
layui.use(['form', 'table', 'treeTablelay', 'common', 'commonTable'], function () {
var form = layui.form,
table = layui.table,
commonTable = layui.commonTable,
treeTable = layui.treeTable,
treeTablelay = layui.treeTablelay,
common = layui.common;
var entity;
var ItemId;

View File

@ -54,11 +54,11 @@
</div>
</div>
<script>
layui.use(['form', 'table','treeTable', 'common', 'commonTable'], function () {
layui.use(['form', 'table', 'treeTablelay', 'common', 'commonTable'], function () {
var form = layui.form,
table = layui.table,
commonTable = layui.commonTable,
treeTable = layui.treeTable,
treeTablelay = layui.treeTablelay,
common = layui.common;
var ItemId;
//权限控制(js是值传递)

View File

@ -321,7 +321,7 @@
</fieldset>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-edit"name="NF-edit" authorize="yes" class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="clone"><i class="fa fa-paste"></i>复制</button>
<button id="NF-edit" name="NF-edit" authorize="yes" 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="yes" class="layui-btn layui-btn-sm layui-btn-danger layui-hide" lay-event="delete"> <i class="layui-icon">&#xe640;</i>删除</button>

View File

@ -279,7 +279,7 @@
</fieldset>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-edit" name="NF-edit" authorize="yes" 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="yes" class="layui-btn layui-btn-sm layui-btn-danger layui-hide" lay-event="delete"> <i class="layui-icon">&#xe640;</i>删除</button>
</div>

View File

@ -23,7 +23,7 @@
</fieldset>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-edit" name="NF-edit" authorize="yes" 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="yes" class="layui-btn layui-btn-sm layui-btn-danger layui-hide" lay-event="delete"> <i class="layui-icon">&#xe640;</i>删除</button>
</div>

View File

@ -192,7 +192,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-edit" name="NF-edit" authorize="yes" 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="yes" 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="yes" class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon">&#xe60b;</i>查看</button>

View File

@ -180,7 +180,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-edit" name="NF-edit" authorize="yes" 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="yes" 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="yes" class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon">&#xe60b;</i>查看</button>

View File

@ -186,7 +186,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-edit" name="NF-edit" authorize="yes" 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="yes" 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="yes" class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon">&#xe60b;</i>查看</button>

View File

@ -265,7 +265,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbar">
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-add" authorize="yes" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe654;</i>新</button>
<button id="NF-edit" name="NF-edit" authorize="yes" 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="yes" 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="yes" class="layui-btn layui-btn-sm layui-btn-normal layui-hide" lay-event="details"> <i class="layui-icon">&#xe60b;</i>查看</button>