monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit fc6e13da69f4d3b5ca44d25452443e178914a117 2 parents 07f69028 1b054b66 wangfeng-mj ... master-500-dev master-500-dev-0327 master-500-dev-joke master-500-dev-lzc master-500-dev-ztq1 master-mj master-mj-610 master-mj-joke master-mj-yuanjinpeng master-mj-ztq wangfeng-500-dev

Merge branch 'master-500-dev-joke' into 'master-500-dev' 

测试bug问题处理(禅道1169~1179)

测试bug问题处理(禅道1169~1179)

See merge request !1070
Inline Side-by-side
Showing 15 changed files with 138 additions and 107 deletions
... ... @@ -66,14 +66,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
time: 1000,
}, function () {
layer.closeAll()
table.reload('table-repair-view', {
where: {
access_token: accessToken,
createtime: "today",
viewMode: 'true',
dateLimit: ""
},
});
var evt = $.Event('keydown', {keyCode: 13});
$('#monitor_keyword').trigger(evt);
// table.reload('table-repair-view', {
// where: {
// access_token: accessToken,
// createtime: "today",
// viewMode: 'true',
// dateLimit: ""
// },
// });
})
} else {
layer.msg(res.msg, {
... ... @@ -292,7 +294,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//写入标签内容
function writeTagsInfo(id, name) {
var tags = '<span id="tags_span_' + id + '" data-id="' + id + '"><em>' + name + '</em>' +
'<button type="button" value="' + id + '" class="tags close">×</button></span>';
'<button type="button" value="' + id + '" class="tagsclose">×</button></span>';
if ($("#tags_span_" + id).length == 0) {
//拼接标签
$("#selecte_content_id").append(tags);
... ... @@ -304,7 +306,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//删除标签事件
function bindTagesDelEvent() {
//删除已选主体的页签
$("button.tagsclose").on("click", function () {
$("button.tagsclose").unbind('click').on("click", function () {
var attachId = $(this).attr("value");
//确认提示框
layer.confirm('附件删除后将无法恢复，您确定要删除吗？', {
... ...
... ... @@ -175,7 +175,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var title = '附件'
common.openWin('assets/repairlist', title, {id: id, type: type}, ['确定', '取消'])
common.openWin('assets/repairlist', title, {id: id, type: type})
}
//监听单元格事件
... ...
... ... @@ -63,7 +63,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
form.on('select(slt-actionType)', function (data) {
if (data.value == "3") {
$("#lastPlace").removeAttribute("readOnly");
//当迁移时，设置readOnly为false joke modify 20221121
// $("#lastPlace").removeAttribute("readOnly");
$("#lastPlace").attr("readOnly", false);
} else {
$("#lastPlace").attr("readOnly", "readOnly");
}
... ... @@ -103,22 +105,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
time: 1000,
}, function () {
layer.closeAll()
table.reload('enterdevice_table_id', {
where: {
access_token: accessToken,
createtime: "month",
viewMode: 'true',
dateLimit: ""
},
});
table.reload('fitting-table', {
where: {
access_token: accessToken,
createtime: "month",
viewMode: 'true',
dateLimit: ""
},
});
//模拟申请人回车事件，刷新父页面
var evt = $.Event('keydown', {keyCode: 13});
$('#applyUserDevice').trigger(evt);
// table.reload('enterdevice_table_id', {
// where: {
// access_token: accessToken,
// createtime: "month",
// viewMode: 'true',
// dateLimit: ""
// },
// });
// table.reload('fitting-table', {
// where: {
// access_token: accessToken,
// createtime: "month",
// viewMode: 'true',
// dateLimit: ""
// },
// });
})
} else {
... ... @@ -278,7 +283,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-staffadd-group').html(options);
form.render();
});
... ...
... ... @@ -77,14 +77,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
});
// 回车搜索
$('[lay-filter="form-enterStaff-condition"] input').keydown(function (e) {
$('[lay-filter="form-enterDevice-condition"] input').keydown(function (e) {
if (e.keyCode === 13) {
reloadAllChange();
}
});
// 下拉框改变搜索
form.on('select(slt-staff-group)', reloadAllChange);
form.on('select(slt-device-group)', reloadAllChange);
// tab页切换事件
element.on('tab(enterdevice-tab)', function (data) {
... ... @@ -104,7 +104,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载配件更换表格
function renderEnterDeviceListTable() {
var conditions = form.val('form-enterStaff-condition');
var conditions = form.val('form-enterDevice-condition');
Object.assign(conditions, {
access_token: accessToken,
... ... @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载设备出入表格
function renderFittingFixListTable() {
var conditions = form.val('form-enterStaff-condition');
var conditions = form.val('form-enterDevice-condition');
Object.assign(conditions, {
access_token: accessToken,
... ... @@ -304,7 +304,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var title = '更换配件列表'
common.openWin('machineroom/fittingList', title, {id: id}, ['确定', '取消'])
common.openWin('machineroom/fittingList', title, {id: id})
}
//查看进出设备列表
... ... @@ -312,7 +312,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var title = '出入设备列表'
common.openWin('machineroom/deviceList', title, {id: id}, ['确定', '取消'])
common.openWin('machineroom/deviceList', title, {id: id})
}
// 加载查询条件下拉框
... ... @@ -324,8 +324,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-staff-group').html(options);
$('#slt-device-group').html(options);
form.render();
});
}
... ...
... ... @@ -86,7 +86,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
// 加载工作汇报表格
function loadWorkReportTable() {
var conditions = form.val('form-enterStaff-condition');
Object.assign(conditions, {
access_token: accessToken,
createtime: createTime,
... ... @@ -174,7 +173,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var title = '进入人员列表'
common.openWin('machineroom/staffList', title, {id: id}, ['确定', '取消'])
common.openWin('machineroom/staffList', title, {id: id})
}
// 加载查询条件下拉框
... ... @@ -186,7 +185,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
$.each(response.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
});
options += "<option value='0'>其他</option>";
$('#slt-staff-group').html(options);
form.render();
});
... ...
... ... @@ -64,7 +64,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
userName: $('#userName').val(),
theirType: $('#theirType').val(),
},
height: 'full-300',
height: 'full-200',
page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
, theme: '#1E9FFF'//自定义分页主题颜色
... ...
... ... @@ -57,14 +57,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
time: 1000,
}, function () {
layer.closeAll()
table.reload('table-staff-view', {
where: {
access_token: accessToken,
createtime: "month",
viewMode: 'true',
dateLimit: ""
},
});
//模拟申请人回车事件，刷新父页面
var evt = $.Event('keydown', {keyCode: 13});
$('#applyUser').trigger(evt);
// table.reload('table-staff-view', {
// where: {
// access_token: accessToken,
// createtime: "month",
// viewMode: 'true',
// dateLimit: ""
// },
// });
})
} else {
layer.msg(res.msg, {
... ...
... ... @@ -75,7 +75,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
dateLimit: '',
viewMode: false
},
height: 'full-300',
height: 'full-200',
page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
, theme: '#1E9FFF'//自定义分页主题颜色
... ...
... ... @@ -184,7 +184,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
elem: '#table-workreport-view',
url: domainName + '/api-web/workreport/page',
where: conditions,
height: 'full-360',
height: 'full-180',
page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
theme: '#1E9FFF'
... ...
... ... @@ -9,7 +9,7 @@
<input hidden id="id" lay-verify="checkReportIsExist" name="id">
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label">设备类型</label>
<label class="layui-form-label">设备类型<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-repairadd-res" lay-filter="slt-repairadd-res"
lay-verify="required" name="resType">
... ... @@ -18,7 +18,7 @@
</div>
</div>
<div class="layui-inline inline-half">
<label class="layui-form-label">设备序列号</label>
<label class="layui-form-label">设备序列号<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="resourceSN" lay-verify="required" maxlength="25" name="resourceSN"
type="text">
... ... @@ -27,13 +27,13 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label">故障时间</label>
<label class="layui-form-label">故障时间<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="hitchtime" lay-verify="required" name="hitchtime" type="text">
</div>
</div>
<div class="layui-inline inline-half">
<label class="layui-form-label">维修时间</label>
<label class="layui-form-label">维修时间<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="createtime" lay-verify="required" name="createtime" type="text">
</div>
... ... @@ -41,13 +41,13 @@
</div>
<div class="layui-form-item hide" id="form-item-repTitle">
<div class="layui-inline inline-half">
<label class="layui-form-label">标题</label>
<label class="layui-form-label">标题<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" name="title" type="text">
</div>
</div>
<div class="layui-inline inline-half">
<label class="layui-form-label">汇报人</label>
<label class="layui-form-label">汇报人<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="createUser" name="createBy" readonly="readonly" type="text">
</div>
... ... @@ -55,7 +55,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label">归属单位</label>
<label class="layui-form-label">归属单位<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-repairadd-org" lay-filter="slt-repairadd-org"
lay-verify="required" name="orgId">
... ... @@ -64,7 +64,7 @@
</div>
</div>
<div class="layui-inline inline-half">
<label class="layui-form-label">选择厂商</label>
<label class="layui-form-label">选择厂商<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-repairadd-group" lay-filter="slt-repairadd-group"
lay-verify="required" name="manufacturerId">
... ... @@ -75,13 +75,13 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label">受影响系统</label>
<label class="layui-form-label">受影响系统<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="affected" lay-verify="required" name="affected" type="text">
</div>
</div>
<div class="layui-inline inline-half">
<label class="layui-form-label">所属ip</label>
<label class="layui-form-label">所属ip<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="ip" lay-verify="required" name="ip" type="text">
</div>
... ... @@ -102,31 +102,31 @@
<div class="layui-form-item" id="add-repair-form-atta" style="display: none">
<label class="layui-form-label">已存附件</label>
<div class="layui-input-inline"
style="width: 90% !important;max-height: 130px;overflow-y: auto;margin-left: 10px;">
style="width: 85% !important;max-height: 130px;overflow-y: auto;margin-left: 10px;">
<div class="tags" id="selecte_content_id"></div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">故障现象描述</label>
<label class="layui-form-label textarea-label">故障现象描述<span style="color: red">*</span></label>
<div class="layui-input-block">
<textarea class="layui-textarea" lay-verify="required" name="phenomenon"></textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">解决过程描述</label>
<label class="layui-form-label textarea-label">解决过程描述<span style="color: red">*</span></label>
<div class="layui-input-block">
<textarea class="layui-textarea" lay-verify="required" name="solveprocess"></textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">处理结果</label>
<label class="layui-form-label textarea-label">处理结果<span style="color: red">*</span></label>
<div class="layui-input-block">
<textarea class="layui-textarea" lay-verify="required" name="result"></textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">经验总结</label>
<label class="layui-form-label textarea-label">经验总结<span style="color: red">*</span></label>
<div class="layui-input-block">
<textarea class="layui-textarea" lay-verify="required" name="experience"></textarea>
</div>
... ... @@ -146,13 +146,13 @@
<style>
#add-repair-form .layui-form-label {
width: 120px;
width: 146px;
/* padding: 8px 12px; */
text-align: left !important;
text-align: right !important;
}
#add-repair-form .layui-input-block {
margin-left: 120px !important;
margin-left: 146px !important;
}
.tags {
... ... @@ -171,7 +171,7 @@
text-shadow: 1px 1px 1px rgba(0, 0, 0, .15);
}
.tags .close {
.tagsclose {
font-weight: bold;
line-height: 20px;
margin-left: 10px;
... ... @@ -181,4 +181,11 @@
border: 0 none;
background: transparent none repeat scroll 0 0;
}
/*.layui-form-pane .layui-form-label {*/
/* width: 146px;*/
/*}*/
/*.layui-form-pane .layui-input-block {*/
/* margin-left: 146px;*/
/*}*/
</style>
... ...
... ... @@ -11,7 +11,7 @@
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input autocomplete="off" class="layui-input" id="monitor_keyword"
name="title" placeholder="标题搜索，支持内容模糊匹配" type="text">
name="title" placeholder="标题搜索" type="text">
</div>
</div>
<div class="layui-inline">
... ...
... ... @@ -9,7 +9,7 @@
<input hidden id="id" lay-verify="checkReportIsExist" name="id">
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">报表类型</label>
<label class="layui-form-label">报表类型<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-docType" lay-filter="slt-docType"
name="docType">
... ... @@ -19,7 +19,7 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">操作类型</label>
<label class="layui-form-label">操作类型<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-actionType" lay-filter="slt-actionType"
name="actionType">
... ... @@ -30,7 +30,7 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">设备型号</label>
<label class="layui-form-label">设备型号<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="deviceModel" lay-verify="required" name="deviceModel"
type="text">
... ... @@ -39,7 +39,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">机房</label>
<label class="layui-form-label">机房<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-staffadd-machine" lay-filter="slt-staffadd-machine"
lay-verify="required" name="machineRoomId">
... ... @@ -48,7 +48,7 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">选择单位</label>
<label class="layui-form-label">选择单位<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-staffadd-group" lay-filter="slt-staffadd-group"
lay-verify="required" name="manufacturerId">
... ... @@ -59,7 +59,7 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">申请人</label>
<label class="layui-form-label">申请人<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="applyUser" lay-verify="required" name="applyUser" type="text">
</div>
... ... @@ -67,19 +67,19 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">联系方式</label>
<label class="layui-form-label">联系方式<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="phone" lay-verify="required|phone" name="phone" type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">进入时间</label>
<label class="layui-form-label">进入时间<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="enterTime" lay-verify="required" name="enterTime" type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">出来时间</label>
<label class="layui-form-label">出来时间<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="outTime" lay-verify="required" name="outTime" type="text">
</div>
... ... @@ -87,7 +87,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">现物理位置</label>
<label class="layui-form-label">现物理位置<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="localPlace" lay-verify="required" name="localPlace" type="text">
</div>
... ... @@ -100,7 +100,7 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">值班人</label>
<label class="layui-form-label">值班人<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="watchkeeper" lay-verify="required" name="watchkeeper"
type="text">
... ... @@ -109,21 +109,21 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">设备负责人(甲方)</label>
<label class="layui-form-label">设备负责人(甲方)<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="machineRoomLeader" lay-verify="required" name="machineRoomLeader"
type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">总集成</label>
<label class="layui-form-label">总集成<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="integration" lay-verify="required" name="integration"
type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">运维负责人</label>
<label class="layui-form-label">运维负责人<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="operationUser" lay-verify="required" name="operationUser"
type="text">
... ... @@ -131,7 +131,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">进入事由</label>
<label class="layui-form-label textarea-label">进入事由<span style="color: red">*</span></label>
<div class="layui-input-block">
<textarea class="layui-textarea" id="reason" lay-verify="required" name="reason"></textarea>
</div>
... ... @@ -195,4 +195,12 @@
fn({{ d }});
})
</script>
<style>
.layui-form-pane .layui-form-label {
width: 146px;
}
.layui-form-pane .layui-input-block {
margin-left: 146px;
}
</style>
... ...
... ... @@ -20,18 +20,18 @@
</div>
<div class="layui-card-body" style="margin-top: 10px;">
<div style="display: flex">
<form class="layui-form layui-card-header" lay-filter="form-enterStaff-condition"
<form class="layui-form layui-card-header" lay-filter="form-enterDevice-condition"
onsubmit="return false">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input autocomplete="off" class="layui-input" id="applyUser"
<input autocomplete="off" class="layui-input" id="applyUserDevice"
name="applyUser" placeholder="申请人" type="text">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select id="slt-staff-group" lay-filter="slt-staff-group"
<select id="slt-device-group" lay-filter="slt-device-group"
lay-search name="manufacturerId">
<option value="">=工作单位=</option>
</select>
... ...
... ... @@ -9,7 +9,7 @@
<input hidden id="id" lay-verify="checkReportIsExist" name="id">
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">机房</label>
<label class="layui-form-label">机房<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-staffadd-machine" lay-filter="slt-staffadd-machine" lay-verify="required"
name="machineRoomId">
... ... @@ -18,7 +18,7 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">选择单位</label>
<label class="layui-form-label">选择单位<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select id="slt-staffadd-group" lay-filter="slt-staffadd-group"
lay-verify="required" name="manufacturerId">
... ... @@ -29,7 +29,7 @@
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">申请人</label>
<label class="layui-form-label">申请人<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="applyUser" lay-verify="required" name="applyUser" type="text">
</div>
... ... @@ -37,19 +37,19 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">联系方式</label>
<label class="layui-form-label">联系方式<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="phone" lay-verify="required|phone" name="phone" type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">进入时间</label>
<label class="layui-form-label">进入时间<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="enterTime" lay-verify="required" name="enterTime" type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">出来时间</label>
<label class="layui-form-label">出来时间<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="outTime" lay-verify="required" name="outTime" type="text">
</div>
... ... @@ -57,21 +57,21 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-onethird">
<label class="layui-form-label">机房负责人(甲方)</label>
<label class="layui-form-label">机房负责人(甲方)<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="machineRoomLeader" lay-verify="required" name="machineRoomLeader"
type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">项目管理员(甲方)</label>
<label class="layui-form-label">项目管理员(甲方)<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="projectLeader" lay-verify="required" name="projectLeader"
type="text">
</div>
</div>
<div class="layui-inline inline-onethird">
<label class="layui-form-label">运维负责人</label>
<label class="layui-form-label">运维负责人<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="operationUser" lay-verify="required" name="operationUser"
type="text">
... ... @@ -80,13 +80,13 @@
</div>
<div class="layui-form-item">
<div class="layui-inline inline-half">
<label class="layui-form-label">携带物品</label>
<label class="layui-form-label">携带物品<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="belongings" lay-verify="required" name="belongings" type="text">
</div>
</div>
<div class="layui-inline inline-half">
<label class="layui-form-label">值班人</label>
<label class="layui-form-label">值班人<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" id="watchkeeper" lay-verify="required" name="watchkeeper"
type="text">
... ... @@ -94,7 +94,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">进入事由</label>
<label class="layui-form-label textarea-label">进入事由<span style="color: red">*</span></label>
<div class="layui-input-block">
<textarea class="layui-textarea" id="reason" lay-verify="required" name="reason"></textarea>
</div>
... ... @@ -133,5 +133,13 @@
fn({{ d }});
})
</script>
<style>
.layui-form-pane .layui-form-label {
width: 146px;
}
.layui-form-pane .layui-input-block {
margin-left: 146px;
}
</style>
... ...
... ... @@ -610,12 +610,14 @@ export default {
proxy.$refs[id].validate((valid) => {
if (valid) {
let params = docForm.value;
// joke 屏蔽 20221117 如果执行下边屏蔽代码，有错误
// if (currentNodeData.value.id == undefined || currentNodeData.value.id == '') {
// params.pid = '0'
// } else {
// params.pid = currentNodeData.value.id;
// }
//joke 修改 20221121
if (params.id == '' || params.id == null){
if (currentNodeData.value.id == undefined || currentNodeData.value.id == '') {
params.pid = '0'
} else {
params.pid = currentNodeData.value.id;
}
}
if (isUserFolder.value) {
params.id = "";
params.docNo = "user";
... ...