yili/vue-apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/vue-apps

Browse Source
This commit is contained in:
shangguochao 2022-07-05 19:53:46 +08:00
commit ebe29253d7
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue
View File

@ -109,6 +109,7 @@
<div class="div-repository-title rowDropFilter">
<p class="text-general-color" style="cursor: pointer;" @click="positionTableRoleRepository(scope.row.id, scope.row.versionId, scope.row.childSize, scope.row.folder)">
{{scope.row.name}}
<span style="color: #909399;margin-left: 12px;">( {{ scope.row.versionStatus.versionNo }} )</span>
</p>
</div>
</template>
@ -121,6 +122,7 @@
<div class="div-update-date">
<p>
{{scope.row.updateUser}} 于 {{scope.row.updateDate}}修改
<span :style="{'color': scope.row.versionStatus.stateColor}" style="margin-left: 12px;font-size: 13px;">( {{ scope.row.versionStatus.state }} )</span>
</p>
</div>
</template>
@ -552,7 +554,6 @@
};
// 查询数据
awsuiAxios.post(data).then(function (ro) {
debugger;
if(ro.result == 'ok') {
//isClickTreeRoot
if(ro.data.mainRepository=="undefined"){
@ -569,6 +570,29 @@
that.isClickTreeRoot = ro.data.isClickTreeRoot;
that.category = ro.data.category;
that.moveRepository.categorys = ro.data.category;
for (let i = 0; i < ro.data.tableData.length; i++) {
if (ro.data.tableData[i].versionStatus.isApproval) {
ro.data.tableData[i].versionStatus.stateColor = '#1AA477';
ro.data.tableData[i].versionStatus.state = '审批中';
ro.data.tableData[i].versionStatus.stateCode = 'approval';
} else if (ro.data.tableData[i].versionStatus.isStop) {
ro.data.tableData[i].versionStatus.stateColor = '#D9001B';
ro.data.tableData[i].versionStatus.state = '已停用';
ro.data.tableData[i].versionStatus.stateCode = 'stop';
} else if (ro.data.tableData[i].versionStatus.isPublish) {
ro.data.tableData[i].versionStatus.stateColor = '#1AA477';
ro.data.tableData[i].versionStatus.state = '已发布';
ro.data.tableData[i].versionStatus.stateCode = 'publish';
} else if (ro.data.tableData[i].versionStatus.isUse) {
ro.data.tableData[i].versionStatus.stateColor = '#4E7FF9';
ro.data.tableData[i].versionStatus.state = '设计中';
ro.data.tableData[i].versionStatus.stateCode = 'use';
} else {
ro.data.tableData[i].versionStatus.stateColor = '#4E7FF9';
ro.data.tableData[i].versionStatus.state = '设计中';
ro.data.tableData[i].versionStatus.stateCode = 'designer';
}
}
that.tableData = ro.data.tableData;
that.mainRepository = ro.data.mainRepository;

40
com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue
View File

@ -46,6 +46,7 @@
<div class="div-repository-title">
<p class="text-general-color" style="cursor: pointer;" @click="positionRepositoy(scope.row.id, scope.row.versionId, scope.row.pathData)">
{{scope.row.name}}
<span style="color: #909399;margin-left: 12px;">( {{ scope.row.versionStatus.versionNo }} )</span>
</p>
</div>
</template>
@ -58,6 +59,7 @@
<div class="div-update-date">
<p>
{{scope.row.updateUser}} 于 {{scope.row.updateDate}}修改
<span :style="{'color': scope.row.versionStatus.stateColor}" style="margin-left: 12px;font-size: 13px;">( {{ scope.row.versionStatus.state }} )</span>
</p>
</div>
</template>
@ -131,6 +133,7 @@
<div class="div-repository-title">
<p class="text-general-color" style="cursor: pointer;" @click="positionRepositoy(scope.row.id, scope.row.versionId, scope.row.pathData)">
{{scope.row.name}}
<span style="color: #909399;margin-left: 12px;">( {{ scope.row.versionStatus.versionNo }} )</span>
</p>
</div>
</template>
@ -143,6 +146,7 @@
<div class="div-update-date">
<p>
{{scope.row.updateUser}} 于 {{scope.row.updateDate}}修改
<span :style="{'color': scope.row.versionStatus.stateColor}" style="margin-left: 12px;font-size: 13px;">( {{ scope.row.versionStatus.state }} )</span>
</p>
</div>
</template>
@ -364,7 +368,43 @@
awsuiAxios.post(data).then(function (ro) {
if(ro.result == 'ok') {
that.defaultCategoryName = ro.data.defaultCategoryName;
for (let i = 0; i < ro.data.recentData.length; i++) {
if (ro.data.recentData[i].versionStatus.isApproval) {
ro.data.recentData[i].versionStatus.stateColor = '#1AA477';
ro.data.recentData[i].versionStatus.state = '审批中';
} else if (ro.data.recentData[i].versionStatus.isStop) {
ro.data.recentData[i].versionStatus.stateColor = '#D9001B';
ro.data.recentData[i].versionStatus.state = '已停用';
} else if (ro.data.recentData[i].versionStatus.isPublish) {
ro.data.recentData[i].versionStatus.stateColor = '#1AA477';
ro.data.recentData[i].versionStatus.state = '已发布';
} else if (ro.data.recentData[i].versionStatus.isUse) {
ro.data.recentData[i].versionStatus.stateColor = '#4E7FF9';
ro.data.recentData[i].versionStatus.state = '设计中';
} else {
ro.data.recentData[i].versionStatus.stateColor = '#4E7FF9';
ro.data.recentData[i].versionStatus.state = '设计中';
}
}
that.recentData = ro.data.recentData;
for (let i = 0; i < ro.data.commonData.length; i++) {
if (ro.data.commonData[i].versionStatus.isApproval) {
ro.data.commonData[i].versionStatus.stateColor = '#1AA477';
ro.data.commonData[i].versionStatus.state = '审批中';
} else if (ro.data.commonData[i].versionStatus.isStop) {
ro.data.commonData[i].versionStatus.stateColor = '#D9001B';
ro.data.commonData[i].versionStatus.state = '已停用';
} else if (ro.data.commonData[i].versionStatus.isPublish) {
ro.data.commonData[i].versionStatus.stateColor = '#1AA477';
ro.data.commonData[i].versionStatus.state = '已发布';
} else if (ro.data.commonData[i].versionStatus.isUse) {
ro.data.commonData[i].versionStatus.stateColor = '#4E7FF9';
ro.data.commonData[i].versionStatus.state = '设计中';
} else {
ro.data.commonData[i].versionStatus.stateColor = '#4E7FF9';
ro.data.commonData[i].versionStatus.state = '设计中';
}
}
that.commonData = ro.data.commonData;
that.havingWritePerm = ro.data.havingWritePerm;
that.dataLoading = false;