mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-12 12:26:47 +08:00
fix:修改审核项目和课程的时间
This commit is contained in:
@@ -43,7 +43,7 @@ export default defineComponent({
|
||||
const store = useStore();
|
||||
const isLogin = ref(false);
|
||||
// console.log("router", router.getRoutes(), route);
|
||||
console.log("版本0.9.2------------");
|
||||
console.log("版本0.9.3------------");
|
||||
const routes = computed(() => {
|
||||
return router.getRoutes().filter((e) => e.meta?.isLink);
|
||||
});
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* @Author: lixg lixg@dongwu-inc.com
|
||||
* @Date: 2022-11-21 14:32:52
|
||||
* @LastEditors: lixg lixg@dongwu-inc.com
|
||||
* @LastEditTime: 2022-12-06 18:00:21
|
||||
* @LastEditTime: 2022-12-07 08:54:55
|
||||
* @FilePath: /fe-manage/src/api/config.js
|
||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
*/
|
||||
@@ -55,10 +55,10 @@ http.interceptors.response.use(
|
||||
if (code === 0 || code === 200) {
|
||||
return response;
|
||||
} else {
|
||||
// if (code === 1000) {
|
||||
// window.open("https://u-pre.boe.com/web/", '_self');
|
||||
// // window.open("http://111.231.196.214:12013/manage/login", '_self');
|
||||
// }
|
||||
if (code === 1000) {
|
||||
window.open("https://u-pre.boe.com/web/", '_self');
|
||||
// window.open("http://111.231.196.214:12013/manage/login", '_self');
|
||||
}
|
||||
console.log("api %o", msg);
|
||||
}
|
||||
return response;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* @Author: lixg lixg@dongwu-inc.com
|
||||
* @Date: 2022-11-16 20:59:06
|
||||
* @LastEditors: lixg lixg@dongwu-inc.com
|
||||
* @LastEditTime: 2022-11-16 21:08:27
|
||||
* @LastEditTime: 2022-12-07 08:53:23
|
||||
* @FilePath: /fe-manage/src/views/examine/CourseReviewed.vue
|
||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%A
|
||||
-->
|
||||
@@ -14,24 +14,38 @@
|
||||
<div class="tmplh_inp">
|
||||
<div class="inpbox">
|
||||
<div class="inpbox1">
|
||||
<a-select v-model:value="valueproj" value-key="value"
|
||||
:options="[{ label: '请选择内容分类', value: '' }, ...calssifyList]" />
|
||||
<a-select
|
||||
v-model:value="valueproj"
|
||||
value-key="value"
|
||||
:options="[
|
||||
{ label: '请选择内容分类', value: '' },
|
||||
...calssifyList,
|
||||
]"
|
||||
/>
|
||||
</div>
|
||||
<div class="inpbox1">
|
||||
<a-input v-model:value="valuecreater" style="
|
||||
<a-input
|
||||
v-model:value="valuecreater"
|
||||
style="
|
||||
width: 270px;
|
||||
height: 40px;
|
||||
border-radius: 8px;
|
||||
margin-right: 14px;
|
||||
" placeholder="请输入创建人" />
|
||||
"
|
||||
placeholder="请输入创建人"
|
||||
/>
|
||||
</div>
|
||||
<div class="inpbox1">
|
||||
<a-input v-model:value="valuename" style="
|
||||
<a-input
|
||||
v-model:value="valuename"
|
||||
style="
|
||||
width: 270px;
|
||||
height: 40px;
|
||||
border-radius: 8px;
|
||||
margin-right: 14px;
|
||||
" placeholder="请输入名称" />
|
||||
"
|
||||
placeholder="请输入名称"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -48,56 +62,71 @@
|
||||
</div>
|
||||
<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" />
|
||||
<a-table
|
||||
: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" />
|
||||
<a-pagination
|
||||
v-if="total > 10"
|
||||
showSizeChanger="true"
|
||||
show-quick-jumper
|
||||
:pageSize="pageSize"
|
||||
v-model:current="currentPage"
|
||||
:total="total"
|
||||
class="pagination"
|
||||
@change="changePagination"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 审核日志弹窗 -->
|
||||
<a-modal
|
||||
v-model:visible="projAuditModal"
|
||||
:footer="null"
|
||||
:closable="closeBack"
|
||||
wrapClassName="projAuditModal"
|
||||
centered="true"
|
||||
>
|
||||
<div class="delete">
|
||||
<div class="del_header"></div>
|
||||
<div class="del_main">
|
||||
<div class="header">
|
||||
<div class="icon"></div>
|
||||
<span>审核记录</span>
|
||||
<!-- <div class="close_exit" @click="closeProjAuditModal"></div> -->
|
||||
<!-- 审核日志弹窗 -->
|
||||
<a-modal
|
||||
v-model:visible="projAuditModal"
|
||||
:footer="null"
|
||||
:closable="closeBack"
|
||||
wrapClassName="projAuditModal"
|
||||
centered="true"
|
||||
>
|
||||
<div class="delete">
|
||||
<div class="del_header"></div>
|
||||
<div class="del_main">
|
||||
<div class="header">
|
||||
<div class="icon"></div>
|
||||
<span>审核记录</span>
|
||||
<!-- <div class="close_exit" @click="closeProjAuditModal"></div> -->
|
||||
</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"
|
||||
/>
|
||||
</div>
|
||||
<div class="del_btnbox">
|
||||
<div class="del_btn btn1" @click="closeProjAuditModal">
|
||||
<div class="btnText">取消</div>
|
||||
</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"
|
||||
/>
|
||||
</div>
|
||||
<div class="del_btnbox">
|
||||
<div class="del_btn btn1" @click="closeProjAuditModal">
|
||||
<div class="btnText">取消</div>
|
||||
</div>
|
||||
<div class="del_btn btn2" @click="closeProjAuditModal">
|
||||
<div class="btnText">确定</div>
|
||||
</div>
|
||||
<div class="del_btn btn2" @click="closeProjAuditModal">
|
||||
<div class="btnText">确定</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a-modal>
|
||||
</div>
|
||||
</a-modal>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@@ -131,7 +160,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>
|
||||
),
|
||||
},
|
||||
|
||||
{
|
||||
@@ -139,7 +170,7 @@ export default {
|
||||
dataIndex: "createTime",
|
||||
key: "createTime",
|
||||
align: "center",
|
||||
width: 220
|
||||
width: 220,
|
||||
},
|
||||
|
||||
{
|
||||
@@ -173,7 +204,8 @@ export default {
|
||||
dataIndex: "content",
|
||||
key: "content",
|
||||
align: "center",
|
||||
customRender: ({ text }) => state.calssifyList.find(e => e.value == text)?.label,
|
||||
customRender: ({ text }) =>
|
||||
state.calssifyList.find((e) => e.value == text)?.label,
|
||||
},
|
||||
{
|
||||
title: "审核状态",
|
||||
@@ -195,7 +227,6 @@ export default {
|
||||
customRender: (time) => {
|
||||
return <div style="color:#387DF7">{time.record.time}</div>;
|
||||
},
|
||||
|
||||
},
|
||||
{
|
||||
title: "审核说明",
|
||||
@@ -209,12 +240,17 @@ export default {
|
||||
key: "opt",
|
||||
align: "center",
|
||||
customRender: (value) => {
|
||||
return <div
|
||||
style="color:#387DF7;cursor:pointer;"
|
||||
onClick={() => {
|
||||
console.log(value)
|
||||
showProjAuditModal(value.record.auditLogDtoList);
|
||||
}}>审核日志</div>;
|
||||
return (
|
||||
<div
|
||||
style="color:#387DF7;cursor:pointer;"
|
||||
onClick={() => {
|
||||
console.log(value);
|
||||
showProjAuditModal(value.record.auditLogDtoList);
|
||||
}}
|
||||
>
|
||||
审核日志
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
],
|
||||
@@ -243,7 +279,7 @@ export default {
|
||||
pageNo: state.currentPage,
|
||||
pageSize: 10,
|
||||
};
|
||||
console.log(objn)
|
||||
console.log(objn);
|
||||
courseListView(objn)
|
||||
.then((res) => {
|
||||
console.log("获取已审核课程成功", res.data.data);
|
||||
@@ -256,14 +292,14 @@ export default {
|
||||
};
|
||||
const setTableData = (table) => {
|
||||
if (!table || !table.length) {
|
||||
state.tableData1 = []
|
||||
return
|
||||
state.tableData1 = [];
|
||||
return;
|
||||
}
|
||||
let data = table;
|
||||
let array = [];
|
||||
data.map((item, n) => {
|
||||
let obj = {
|
||||
number: n+1 + (state.currentPage-1) *10,
|
||||
number: n + 1 + (state.currentPage - 1) * 10,
|
||||
name: item.name || "- ",
|
||||
type: item.type == 1 ? "线上" : "线下",
|
||||
content: item.categoryId,
|
||||
@@ -271,24 +307,24 @@ export default {
|
||||
item.auditStatus == 0
|
||||
? "未提交"
|
||||
: item.auditStatus == 1
|
||||
? "提交待审核"
|
||||
: item.auditStatus == 2
|
||||
? "通过"
|
||||
: item.auditStatus == -1
|
||||
? "拒绝"
|
||||
: "-",
|
||||
? "提交待审核"
|
||||
: item.auditStatus == 2
|
||||
? "通过"
|
||||
: item.auditStatus == -1
|
||||
? "拒绝"
|
||||
: "-",
|
||||
creater: item.createName,
|
||||
time: item.createTime,
|
||||
msg: item.description || "-",
|
||||
auditLogDtoList: item.auditLogDtoList
|
||||
auditLogDtoList: item.auditLogDtoList,
|
||||
};
|
||||
array.push(obj);
|
||||
});
|
||||
state.tableData1 = array;
|
||||
console.log(data)
|
||||
console.log(data);
|
||||
};
|
||||
const reset = () => {
|
||||
(state.valueproj = ''),
|
||||
(state.valueproj = ""),
|
||||
(state.valuecreater = null),
|
||||
(state.valuename = null),
|
||||
getList();
|
||||
@@ -297,21 +333,27 @@ export default {
|
||||
state.currentPage = pagina;
|
||||
getList();
|
||||
};
|
||||
const getDictList = (param) => api1.getDict({
|
||||
pageNo: 1,
|
||||
pageSize: 20,
|
||||
setCode: param
|
||||
}).then((res) => res.data.data.rows)
|
||||
const getDictList = (param) =>
|
||||
api1
|
||||
.getDict({
|
||||
pageNo: 1,
|
||||
pageSize: 20,
|
||||
setCode: param,
|
||||
})
|
||||
.then((res) => res.data.data.rows);
|
||||
|
||||
onMounted(async () => {
|
||||
getList();
|
||||
//获取分类列表
|
||||
state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
|
||||
state.calssifyList = (await getDictList("faceclassClass")).map((e) => ({
|
||||
label: e.dictName,
|
||||
value: e.dictCode,
|
||||
}));
|
||||
});
|
||||
|
||||
// 显示审核
|
||||
const showProjAuditModal = (data) => {
|
||||
state.tableDataAudit = data
|
||||
state.tableDataAudit = data;
|
||||
state.projAuditModal = true;
|
||||
};
|
||||
|
||||
@@ -326,7 +368,7 @@ export default {
|
||||
reset,
|
||||
changePagination,
|
||||
showProjAuditModal,
|
||||
closeProjAuditModal
|
||||
closeProjAuditModal,
|
||||
};
|
||||
},
|
||||
};
|
||||
@@ -522,8 +564,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%
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* @Author: lixg lixg@dongwu-inc.com
|
||||
* @Date: 2022-11-16 20:59:33
|
||||
* @LastEditors: lixg lixg@dongwu-inc.com
|
||||
* @LastEditTime: 2022-11-29 22:30:01
|
||||
* @LastEditTime: 2022-12-07 08:49:02
|
||||
* @FilePath: /fe-manage/src/views/examine/CourseReviewedN.vue
|
||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
-->
|
||||
@@ -426,7 +426,7 @@ export default {
|
||||
let array = [];
|
||||
data.map((item, i) => {
|
||||
let obj = {
|
||||
number: i+1 + (state.currentPage-1) *10,
|
||||
number: i + 1 + (state.currentPage - 1) * 10,
|
||||
name: item.name,
|
||||
type: item.type == 1 ? "线上" : "线下",
|
||||
content: item.categoryId,
|
||||
@@ -442,7 +442,7 @@ export default {
|
||||
: "-",
|
||||
change: "-",
|
||||
creater: item.createName,
|
||||
time: item.createTime,
|
||||
time: item.processTime,
|
||||
createrId: item.createId,
|
||||
offId: item.offcourseId,
|
||||
};
|
||||
|
||||
@@ -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%
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* @Author: lixg lixg@dongwu-inc.com
|
||||
* @Date: 2022-11-16 21:01:51
|
||||
* @LastEditors: lixg lixg@dongwu-inc.com
|
||||
* @LastEditTime: 2022-11-16 21:10:02
|
||||
* @LastEditTime: 2022-12-07 08:42:20
|
||||
* @FilePath: /fe-manage/src/views/examine/ProjectReviewedN.vue
|
||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
-->
|
||||
@@ -14,33 +14,45 @@
|
||||
<div class="tmplh_inp">
|
||||
<div class="inpbox">
|
||||
<div class="inpbox1">
|
||||
<a-input v-model:value="valueproj" style="
|
||||
<a-input
|
||||
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="
|
||||
<a-input
|
||||
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="
|
||||
<a-input
|
||||
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" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
|
||||
<!-- :placeholder="[' 开始时间', ' 结束时间']" @change="rankTimeChange" />-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="inpbox1">-->
|
||||
<!-- <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
|
||||
<!-- :placeholder="[' 开始时间', ' 结束时间']" @change="rankTimeChange" />-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="tmplh_btn">
|
||||
@@ -56,26 +68,46 @@
|
||||
</div>
|
||||
<div class="tmpl_body">
|
||||
<div class="tmpl_tabbox">
|
||||
<a-table :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false"
|
||||
expandRowByClick="true" @expand="expandTable" :pagination="false" :scroll="{ x: 1300 }" />
|
||||
<a-table
|
||||
:columns="columns1"
|
||||
:data-source="tableData1"
|
||||
:loading="tableDataTotal === -1 ? true : false"
|
||||
expandRowByClick="true"
|
||||
@expand="expandTable"
|
||||
:pagination="false"
|
||||
:scroll="{ x: 1300 }"
|
||||
/>
|
||||
</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" />
|
||||
<a-pagination
|
||||
v-if="total > 10"
|
||||
showSizeChanger="true"
|
||||
show-quick-jumper
|
||||
:pageSize="pageSize"
|
||||
v-model:current="currentPage"
|
||||
:total="total"
|
||||
class="pagination"
|
||||
@change="changePagination"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 审核项目页面 -->
|
||||
<project-audit v-model:ProjAuditvisible="ProjAuditvisible" v-model:chooseProject="chooseProject"
|
||||
v-model:chooseCreateId="chooseCreateId" v-model:chooseCreater="chooseCreater" v-model:finishdFun="getProjList" />
|
||||
<project-audit
|
||||
v-model:ProjAuditvisible="ProjAuditvisible"
|
||||
v-model:chooseProject="chooseProject"
|
||||
v-model:chooseCreateId="chooseCreateId"
|
||||
v-model:chooseCreater="chooseCreater"
|
||||
v-model:finishdFun="getProjList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import {onMounted, reactive, toRefs} from "vue";
|
||||
import { onMounted, reactive, toRefs } from "vue";
|
||||
import ProjectAudit from "../../components/drawers/ProjectAudit";
|
||||
import {auditlist} from "../../api/indexAudit";
|
||||
import { auditlist } from "../../api/indexAudit";
|
||||
|
||||
export default {
|
||||
name: "ProjectViewedN",
|
||||
@@ -116,7 +148,7 @@ export default {
|
||||
key: "name",
|
||||
align: "center",
|
||||
},
|
||||
// todo 根项目保存
|
||||
// todo 根项目保存
|
||||
// {
|
||||
// title: "所属项目",
|
||||
// dataIndex: "sourceBelongName",
|
||||
@@ -135,7 +167,7 @@ export default {
|
||||
dataIndex: "status",
|
||||
key: "status",
|
||||
align: "center",
|
||||
customRender: ()=><div>待审核</div>,
|
||||
customRender: () => <div>待审核</div>,
|
||||
},
|
||||
{
|
||||
title: "创建人",
|
||||
@@ -145,8 +177,8 @@ export default {
|
||||
},
|
||||
{
|
||||
title: "创建时间",
|
||||
dataIndex: "createTime",
|
||||
key: "createTime",
|
||||
dataIndex: "processTime",
|
||||
key: "processTime",
|
||||
align: "center",
|
||||
},
|
||||
|
||||
@@ -175,8 +207,7 @@ export default {
|
||||
},
|
||||
},
|
||||
],
|
||||
tableData1: [
|
||||
],
|
||||
tableData1: [],
|
||||
});
|
||||
const showProjAudit = (id, createId, creater) => {
|
||||
state.ProjAuditvisible = true;
|
||||
@@ -186,9 +217,11 @@ export default {
|
||||
};
|
||||
const getProjList = () => {
|
||||
let objn = {
|
||||
beginTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]),
|
||||
beginTime:
|
||||
state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]),
|
||||
createName: state.valuecreater,
|
||||
endTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
|
||||
endTime:
|
||||
state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
|
||||
manager: state.valuename,
|
||||
name: state.valueproj,
|
||||
pageNo: state.currentPage,
|
||||
@@ -202,14 +235,14 @@ export default {
|
||||
state.total = result.total;
|
||||
// state.tableData1 = result.rows
|
||||
|
||||
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;
|
||||
|
||||
// setProjList(result.rows);
|
||||
})
|
||||
@@ -222,10 +255,10 @@ export default {
|
||||
getProjList();
|
||||
};
|
||||
const reset = () => {
|
||||
state.valueproj = "",
|
||||
state.valuecreater = "",
|
||||
state.valuename = "",
|
||||
state.valueDate = undefined;
|
||||
(state.valueproj = ""),
|
||||
(state.valuecreater = ""),
|
||||
(state.valuename = ""),
|
||||
(state.valueDate = undefined);
|
||||
getProjList();
|
||||
};
|
||||
onMounted(() => {
|
||||
|
||||
Reference in New Issue
Block a user