fix:修改审核项目和课程的时间

This commit is contained in:
lixg
2022-12-07 08:55:24 +08:00
parent a8315cd85d
commit ef5aa57930
6 changed files with 301 additions and 201 deletions

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-16 21:00:40
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-16 21:09:49
* @LastEditTime: 2022-12-07 08:53:15
* @FilePath: /fe-manage/src/views/examine/ProjectReviewed.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -15,49 +15,52 @@
<div class="inpbox">
<div class="inpbox1">
<a-input
v-model:value="valueproj"
style="
v-model:value="valueproj"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入项目名称/所属项目"
placeholder="请输入项目名称/所属项目"
/>
</div>
<div class="inpbox1">
<a-input
v-model:value="valuename"
style="
v-model:value="valuename"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入项目经理"
placeholder="请输入项目经理"
/>
</div>
<div class="inpbox1">
<a-input
v-model:value="valuecreater"
style="
v-model:value="valuecreater"
style="
width: 270px;
height: 40px;
border-radius: 8px;
margin-right: 14px;
"
placeholder="请输入创建人"
placeholder="请输入创建人"
/>
</div>
<div class="inpbox1">
<a-range-picker
v-model:value="valueDate"
:show-time="{
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
v-model:value="valueDate"
:show-time="{
defaultValue: [
moment('00:00:00', 'HH:mm:ss'),
moment('23:59:59', 'HH:mm:ss'),
],
}"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
/>
</div>
</div>
@@ -76,26 +79,26 @@
<div class="tmpl_body">
<div class="tmpl_tabbox">
<a-table
:columns="columns1"
:data-source="tableData1"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 1300 }"
:pagination="false"
:columns="columns1"
:data-source="tableData1"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 1300 }"
:pagination="false"
/>
</div>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="total > 10"
showSizeChanger="true"
show-quick-jumper
:pageSize="pageSize"
v-model:current="currentPage"
:total="total"
class="pagination"
@change="changePagination"
v-if="total > 10"
showSizeChanger="true"
show-quick-jumper
:pageSize="pageSize"
v-model:current="currentPage"
:total="total"
class="pagination"
@change="changePagination"
/>
</div>
</div>
@@ -103,11 +106,11 @@
</div>
<!-- 审核日志弹窗 -->
<a-modal
v-model:visible="projAuditModal"
:footer="null"
:closable="closeBack"
wrapClassName="projAuditModal"
centered="true"
v-model:visible="projAuditModal"
:footer="null"
:closable="closeBack"
wrapClassName="projAuditModal"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
@@ -119,14 +122,14 @@
</div>
<div class="body">
<a-table
style="width: 90%"
:columns="columnsAudit"
:data-source="tableDataAudit"
:loading="tableDataTotalAudit === -1 ? true : false"
expandRowByClick="true"
:scroll="{ y: 150 }"
@expand="expandTable"
:pagination="false"
style="width: 90%"
:columns="columnsAudit"
:data-source="tableDataAudit"
:loading="tableDataTotalAudit === -1 ? true : false"
expandRowByClick="true"
:scroll="{ y: 150 }"
@expand="expandTable"
:pagination="false"
/>
</div>
<div class="del_btnbox">
@@ -143,9 +146,9 @@
</div>
</template>
<script>
import {onMounted, reactive, toRefs} from "vue";
import {auditedlist} from "../../api/indexAudit";
import * as moment from 'moment'
import { onMounted, reactive, toRefs } from "vue";
import { auditedlist } from "../../api/indexAudit";
import * as moment from "moment";
export default {
name: "ProjectViewed",
@@ -192,7 +195,15 @@ export default {
key: "topName",
align: "center",
width: "10%",
customRender: ({record: {gaName,faName,name}}) => <div>{ faName ?gaName!==null?gaName+'/'+faName:faName:name}</div>,
customRender: ({ record: { gaName, faName, name } }) => (
<div>
{faName
? gaName !== null
? gaName + "/" + faName
: faName
: name}
</div>
),
},
{
title: "项目经理",
@@ -205,7 +216,9 @@ export default {
dataIndex: "status",
key: "status",
align: "center",
customRender: ({record: {status}}) => <div>{status==-2?'未通过':'已通过'}</div>,
customRender: ({ record: { status } }) => (
<div>{status == -2 ? "未通过" : "已通过"}</div>
),
},
{
title: "创建人",
@@ -224,7 +237,17 @@ export default {
dataIndex: "description",
key: "description",
align: "center",
customRender: ({record: {auditList,description}}) => <div>{auditList.length!==0?auditList[auditList.length-1].description?auditList[auditList.length-1].description:'-':description?description:'-'}</div>,
customRender: ({ record: { auditList, description } }) => (
<div>
{auditList.length !== 0
? auditList[auditList.length - 1].description
? auditList[auditList.length - 1].description
: "-"
: description
? description
: "-"}
</div>
),
},
{
@@ -234,16 +257,16 @@ export default {
align: "center",
customRender: (value) => {
return (
<div>
<div>
<span
onClick={() => {
showProjAuditModal(value.record.auditList);
}}
style="cursor:pointer;color:#387DF7"
onClick={() => {
showProjAuditModal(value.record.auditList);
}}
style="cursor:pointer;color:#387DF7"
>
审核日志
</span>
</div>
</div>
);
},
},
@@ -262,7 +285,9 @@ export default {
dataIndex: "status",
key: "status",
align: "center",
customRender: ({record: {status}}) => <div>{{'2': '审核通过', '-2': '审核拒绝'}[(status + '')]}</div>,
customRender: ({ record: { status } }) => (
<div>{{ 2: "审核通过", "-2": "审核拒绝" }[status + ""]}</div>
),
},
{
@@ -270,7 +295,7 @@ export default {
dataIndex: "createTime",
key: "createTime",
align: "center",
width: 220
width: 220,
},
{
@@ -286,8 +311,8 @@ export default {
});
const getProjList = () => {
let objn = {
beginTime: state.valueDate ? state.valueDate[0] : '',
endTime: state.valueDate ? state.valueDate[1] : '',
beginTime: state.valueDate ? state.valueDate[0] : "",
endTime: state.valueDate ? state.valueDate[1] : "",
createName: state.valuecreater,
manager: state.valuename,
name: state.valueproj,
@@ -296,18 +321,18 @@ export default {
status: 1,
};
auditedlist(objn).then((res) => {
console.log('获取已审核项目列表数据',res)
console.log("获取已审核项目列表数据", res);
let result = res.data.data;
state.total = res.data.data.total;
let numdata = []
let numdata = [];
result.rows.map((value, index) => {
let obj = value
obj.number = index+1 + (state.currentPage-1) *10
let obj = value;
obj.number = index + 1 + (state.currentPage - 1) * 10;
numdata.push(obj);
});
state.tableData1 = numdata
})
state.tableData1 = numdata;
});
};
const changePagination = (pagina) => {
state.currentPage = pagina;
@@ -325,7 +350,7 @@ export default {
state.projAuditModal = false;
};
const showProjAuditModal = (data) => {
state.tableDataAudit = data
state.tableDataAudit = data;
state.projAuditModal = true;
};
const setAudit = (table) => {
@@ -335,13 +360,13 @@ export default {
let obj = {
name: item.create_name,
belong:
item.status == 1
? "提交待审核"
: item.status == 2
? "通过"
: item.status == 3
? "拒绝"
: "-",
item.status == 1
? "提交待审核"
: item.status == 2
? "通过"
: item.status == 3
? "拒绝"
: "-",
time: item.createTime,
description: item.description,
};
@@ -362,7 +387,7 @@ export default {
reset,
closeProjAuditModal,
showProjAuditModal,
setAudit
setAudit,
};
},
};
@@ -398,8 +423,8 @@ export default {
width: calc(100%);
height: 68px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}