diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html index b00bdbb3..672d69d1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html @@ -29,14 +29,14 @@
  • - - + +
  • - - + + - - +
  •  搜索 @@ -64,6 +64,8 @@ var removeFlag = [[${@permission.hasPermi('system:baseEvectionForm:remove')}]]; var cancelFlag = [[${@permission.hasPermi('system:baseEvectionForm:cancel')}]]; var restoreFlag = [[${@permission.hasPermi('system:baseEvectionForm:restore')}]]; + var hrRecordFlag = [[${@permission.hasPermi('system:baseEvectionForm:hrRecord')}]]; + var hrApproveFlag = [[${@permission.hasPermi('system:baseEvectionForm:hrApprove')}]]; var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; var useStatusDatas = [[${@dict.getType('useStatus')}]]; var administrationStatusDatas = [[${@dict.getType('administration_status')}]]; @@ -118,6 +120,9 @@ { title: '当前状态',field: 'taskStatus', align: 'center', formatter: function(value, row, index) { + if(value == "未启动" || value == "审核拒绝"){ + return '' + value + ''; + } return '' + value + ''; } }, @@ -138,7 +143,7 @@ } }, {title: '出差单编号',field: 'evectionCode',align: 'center',}, - {title: '出差人',field: 'evectionBy',align: 'center',}, + {title: '出差人',field: 'evectionBy',align: 'center',visible: false,}, {title: '同行人',field: 'partnerBy',align: 'center',}, {title: '出差地',field: 'evectionAddr',align: 'center',}, {title: '出差详细地址',field: 'evectionDetailAddr',align: 'center',}, @@ -161,10 +166,24 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - // 审核状态-审核通过 - if(row.auditStatus=="1"){ + // 审核状态-审核通过 使用状态是 + if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "0"){ // 编辑 // actions.push(' 编辑 '); + actions.push(' 出行费用 '); + } + if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "1"){ + // 核准 + actions.push(' 核准 '); + } + if(row.auditStatus == "1"&& row.useStatus == "1"){ + // 作废 + actions.push(' 作废'); + } + // 已作废 + if(row.useStatus=="2" && !row.restoreInstanceId){ + // 恢复 + actions.push(' 恢复 '); } // 有流程实例id if (row.instanceId) { @@ -197,7 +216,39 @@ } }; $.table.init(options); + selectUserAll(); }); + + function cancel(id) { + $.modal.confirm("确定作废该出差单信息吗？", function() { + var url = prefix + "/cancel/" + id; + $.modal.open("作废", url); + }) + } + function selectUserAll(){ + $.ajax({ + url: ctx +'system/baseExpense/getExpenseUser', + type: 'post', + async: false, + success: function (result) { + userList = result.data; + var selectUser = $("select[name='applyUser']"); + var selectHtml = ''; + userList.forEach(function (user) { + selectHtml += ''; + }); + selectUser.html(selectHtml); + } + }); + } + + function hrRecord(evectionId){ + $.modal.open("出行费用",prefix + "/hrRecord/" + evectionId); + } + + function hrApprove(evectionId){ + $.modal.open("核准",prefix + "/hrApprove/" + evectionId); + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/cancel.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/cancel.html new file mode 100644 index 00000000..c1aa9c85 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/cancel.html @@ -0,0 +1,32 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrApprove.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrApprove.html new file mode 100644 index 00000000..a1d3034a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrApprove.html @@ -0,0 +1,181 @@ + + + + + + + +
    +
    + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + + - + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +

    人事行政

    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + + - + + +
    +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrRecord.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrRecord.html index a80c7031..eebe3a26 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrRecord.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrRecord.html @@ -6,7 +6,7 @@
    -
    +
    -
    - -
    -
    - - - - - - -
    -
    -
    \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCcjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCcjlVerify.html index c472d88f..94a63e3f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCcjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCcjlVerify.html @@ -84,6 +84,12 @@ +
    @@ -94,6 +100,12 @@
    +
    + +
    + +
    +
    @@ -104,6 +116,12 @@ var prefix = ctx + "system/baseEvectionForm"; $("#form-baseEvectionForm-ccjl").validate({focusCleanup: true}); + $(function() { + var instanceType = [[${formData.instanceType}]]; + if(instanceType === "cancel"){ + $("#cancelRemark").show(); + } + }); function submitHandler() { if ($.validate.form()) { if ($('textarea[name="comment"]').val()) { diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCczgVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCczgVerify.html index 9213ff59..d93c44ae 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskCczgVerify.html @@ -21,53 +21,53 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - + - - +
    @@ -75,13 +75,19 @@
    - +
    - + +
    +
    +
    @@ -94,6 +100,12 @@
    +
    + +
    + +
    +
    @@ -104,6 +116,12 @@ var prefix = ctx + "system/baseEvectionForm"; $("#form-baseEvectionForm-cczg").validate({focusCleanup: true}); + $(function() { + var instanceType = [[${formData.instanceType}]]; + if(instanceType === "cancel"){ + $("#cancelRemark").show(); + } + }); function submitHandler() { if ($.validate.form()) { if ($('textarea[name="comment"]').val()) { diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskFzjlVerify.html index abbe2d5a..780a6168 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskFzjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskFzjlVerify.html @@ -21,53 +21,53 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - + - - +
    @@ -75,13 +75,19 @@
    - +
    - + +
    +
    +
    @@ -94,6 +100,12 @@
    +
    + +
    + +
    +
    @@ -104,6 +116,12 @@ var prefix = ctx + "system/baseEvectionForm"; $("#form-baseEvectionForm-fzjl").validate({focusCleanup: true}); + $(function() { + var instanceType = [[${formData.instanceType}]]; + if(instanceType === "cancel"){ + $("#cancelRemark").show(); + } + }); function submitHandler() { if ($.validate.form()) { if ($('textarea[name="comment"]').val()) { diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskModifyApply.html index e8a88530..f45c48bf 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskModifyApply.html @@ -21,19 +21,19 @@
    - +
    - +
    - +
    @@ -64,10 +64,10 @@
    - + - - +
    @@ -84,6 +84,15 @@
    +
    + +
    + +
    +
    @@ -111,11 +120,6 @@ autoclose: true }); - $("input[name='realityeEvenctionTime']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskYfzjVerify.html index 0a4d4190..65736600 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskYfzjVerify.html @@ -21,53 +21,53 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - + - - +
    @@ -75,13 +75,19 @@
    - +
    - + +
    +
    +
    @@ -94,6 +100,12 @@
    +
    + +
    + +
    +
    @@ -104,6 +116,12 @@ var prefix = ctx + "system/baseEvectionForm"; $("#form-baseEvectionForm-yfzj").validate({focusCleanup: true}); + $(function() { + var instanceType = [[${formData.instanceType}]]; + if(instanceType === "cancel"){ + $("#cancelRemark").show(); + } + }); function submitHandler() { if ($.validate.form()) { if ($('textarea[name="comment"]').val()) { diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskZjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskZjlVerify.html index f6b86842..20d0d4fe 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskZjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/taskZjlVerify.html @@ -21,53 +21,53 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - + - - +
    @@ -75,13 +75,19 @@
    - +
    - + +
    +
    +
    @@ -94,6 +100,12 @@
    +
    + +
    + +
    +
    @@ -104,6 +116,12 @@ var prefix = ctx + "system/baseEvectionForm"; $("#form-baseEvectionForm-zjl").validate({focusCleanup: true}); + $(function() { + var instanceType = [[${formData.instanceType}]]; + if(instanceType === "cancel"){ + $("#cancelRemark").show(); + } + }); function submitHandler() { if ($.validate.form()) { if ($('textarea[name="comment"]').val()) {