Browse Source

update 服务管理修改显示报错问题和随访SOP表字段列表调整

wangshuangpan 1 month ago
parent
commit
5e28ef6f0a

+ 1 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopList.html

@@ -161,7 +161,7 @@
                     { field: 'templateName', title: '模板名称', align: 'center' },
                     { field: 'templateName', title: '模板名称', align: 'center' },
                     { field: 'templateId', title: '模版ID', align: 'center' },
                     { field: 'templateId', title: '模版ID', align: 'center' },
                     { field: 'createdBy', title: '创建人', align: 'center' },
                     { field: 'createdBy', title: '创建人', align: 'center' },
-                    { field: 'status', title: '状态:启用,禁用', align: 'center' },
+                    { field: 'status', title: '状态', align: 'center' },
                     { field: 'createdTime', title: '创建时间', align: 'center' },
                     { field: 'createdTime', title: '创建时间', align: 'center' },
                     { field: 'updatedTime', title: '更新时间', align: 'center' },
                     { field: 'updatedTime', title: '更新时间', align: 'center' },
                     { field: 'updatedBy', title: '更新人', align: 'center' },
                     { field: 'updatedBy', title: '更新人', align: 'center' },
@@ -174,10 +174,6 @@
                             var actions = [];
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
                             return actions.join('');
                             return actions.join('');
                         } else {
                         } else {
                             return "";
                             return "";

+ 1 - 0
health-admin/src/main/resources/templates/server/serv/serv.html

@@ -107,6 +107,7 @@
 		        columns: [{
 		        columns: [{
 		            checkbox: true
 		            checkbox: true
 		        },
 		        },
+				{ field: 'id', title: '主键', align: 'center' ,visible:false},
 		        {
 		        {
 		            field: 'serviceTypeNumber',
 		            field: 'serviceTypeNumber',
 		            title: '服务类型编号'
 		            title: '服务类型编号'