Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

This commit is contained in:
zhangyc
2022-12-11 11:55:07 +08:00
35 changed files with 3285 additions and 1437 deletions

View File

@@ -81,7 +81,7 @@
<a-table
:columns="columns1"
:data-source="tableData1"
:loading="tableDataTotal === -1 ? true : false"
:loading="loading"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 1300 }"
@@ -155,6 +155,7 @@ export default {
setup() {
const state = reactive({
loading:false,
optionsproj: [
{
value: "jack",
@@ -260,7 +261,7 @@ export default {
<div>
<span
onClick={() => {
showProjAuditModal(value.record.auditList);
showProjAuditModal(value.record.auditList.length!==0?value.record.auditList.slice(value.record.auditList.length-1):[]);
}}
style="cursor:pointer;color:#387DF7"
>
@@ -310,6 +311,7 @@ export default {
tableData1: [],
});
const getProjList = () => {
state.loading=true
let objn = {
beginTime: state.valueDate ? state.valueDate[0] : "",
endTime: state.valueDate ? state.valueDate[1] : "",
@@ -332,6 +334,7 @@ export default {
});
state.tableData1 = numdata;
state.loading=false
});
};
const changePagination = (pagina) => {