kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 29015

Browse Source
This commit is contained in:
aixianling
2022-04-11 10:13:48 +08:00
parent 09d107514b
commit 63649d631f
2 changed files with 85 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
project/xiushan/apps/processManagement/approvalManage/AppApprovalManage.vue
View File

@@ -19,76 +19,76 @@
</template>
<script>
import forMyApproval from "./components/forMyApproval";
import approvalDetail from "./components/approvalDetail";
import forMyApproval from "./components/forMyApproval";
import approvalDetail from "./components/approvalDetail";
export default {
name: "AppApprovalManage",
label: "审批管理",
components: {approvalDetail},
provide() {
return {
approval: this
}
},
props: {
instance: Function,
dict: Object,
permissions: Function
},
data() {
return {
currIndex: '0',
showList: true,
currentPage: "",
detail: {},
}
},
computed: {
tabs() {
return [
{
label: "待我审批", name: "forMyApproval", value: "0", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
{
label: "我已审批", name: "forMyApproval", value: "1", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
{
label: "抄送我的", name: "forMyApproval", value: "3", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
{
label: "超时督办", name: "forMyApproval", value: "4", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
]
},
currentTab() {
return this.tabs[this.currIndex] || {}
}
},
methods: {
goPage(obj) {
this.currentPage = this.tabs[Number(this.currIndex)][obj.key];
obj.row && (this.detail = obj.row)
this.showList = false;
},
goBack() {
this.showList = true;
this.$nextTick(() => {
this.$refs[this.currIndex][0].getList();
})
},
export default {
name: "AppApprovalManage",
label: "审批管理(秀山)",
components: {approvalDetail},
provide() {
return {
approval: this
}
},
props: {
instance: Function,
dict: Object,
permissions: Function
},
data() {
return {
currIndex: '0',
showList: true,
currentPage: "",
detail: {},
}
},
computed: {
tabs() {
return [
{
label: "待我审批", name: "forMyApproval", value: "0", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
{
label: "我已审批", name: "forMyApproval", value: "1", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
{
label: "抄送我的", name: "forMyApproval", value: "3", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
{
label: "超时督办", name: "forMyApproval", value: "4", comp: forMyApproval, detail: approvalDetail,
permission: ""
},
]
},
currentTab() {
return this.tabs[this.currIndex] || {}
}
},
methods: {
goPage(obj) {
this.currentPage = this.tabs[Number(this.currIndex)][obj.key];
obj.row && (this.detail = obj.row)
this.showList = false;
},
goBack() {
this.showList = true;
this.$nextTick(() => {
this.$refs[this.currIndex][0].getList();
})
},
}
}
</script>
<style lang="scss" scoped>
.approval-manage {
width: 100%;
height: 100%;
background-color: #F3F6F9;
}
.approval-manage {
width: 100%;
height: 100%;
background-color: #F3F6F9;
}
</style>

193
project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
View File

@@ -14,7 +14,7 @@
</ai-title>
<template #content>
<ai-sidebar :tabTitle="menuList" @change="change"></ai-sidebar>
<ai-sidebar :tabTitle="menuList" @change="change"/>
<el-scrollbar>
<template v-if="currentMenu==0">
<ai-card title="基本信息">
@@ -41,10 +41,15 @@
<p>{{ detail.createTime |format }}</p>
</li>
</ul>
<svg class="svgStatus" aria-hidden="true">
<use xlink:href="#iconsp_ing" v-if="detail.approvalStatus==0"></use>
<use xlink:href="#iconsp-pass" v-if="detail.approvalStatus==1"></use>
<use xlink:href="#iconsp_refused" v-if="detail.approvalStatus==2"></use>
<use xlink:href="#iconcancel" v-if="detail.approvalStatus==3"></use>
</svg>
</template>
</ai-card>
</template>
<template v-if="currentMenu==1">
<ai-card title="申请表单">
<template #content>
@@ -53,11 +58,13 @@
<div v-for="(item, index) in applyForm" :key="index">
<ai-title :title="index"></ai-title>
<el-form-item v-for="e in item" :key="e.id" :label="[e.fieldName,e.fieldNameSuffix].join('')">
<el-input :value="getFieldValue(e)" readonly style="width: 100%;" v-if="e.fieldDataType!=5 && e.fieldDataType!=10"/>
<el-input :value="getFieldValue(e)" readonly style="width: 100%;"
v-if="e.fieldDataType!=5 && e.fieldDataType!=10"/>
<el-input :value="getAreaName(e)" readonly style="width: 100%;" v-if="e.fieldDataType==10"/>
<el-checkbox-group v-model="!e.fieldValue ? '' : String(e.fieldValue).split(',')">
<el-checkbox :label="val.dictValue" disabled
v-for="(val,idx) in dict.getDict(e.dictionaryCode)" :key="idx">{{val.dictName}}</el-checkbox>
v-for="(val,idx) in dict.getDict(e.dictionaryCode)" :key="idx">{{ val.dictName }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</div>
@@ -69,8 +76,6 @@
</template>
</ai-card>
</template>
<template v-if="currentMenu==2">
<ai-card title="附件材料">
<template #content>
@@ -93,7 +98,6 @@
</template>
</ai-card>
</template>
<template v-if="currentMenu==3">
<ai-card title="审批记录">
<template #content>
@@ -186,7 +190,6 @@
</template>
</ai-card>
</template>
<template v-if="currentMenu==4 && detailObj.tableType && detailObj.tableType === '2'">
<ai-card title="签署文件">
<template #right>
@@ -224,7 +227,7 @@
:maxlength="op.fieldLength"/>
<el-input type="textarea" :rows="3" placeholder="请输入..." v-model.trim="op.fieldValue"
clearable v-if="op.fieldDataType=='1'" show-word-limit
clearable v-if="op.fieldDataType=='1'" show-word-limit
:maxlength="op.fieldLength"/>
<el-radio-group style="width: 100%;" v-if="op.fieldDataType==4" v-model="op.fieldValue">
@@ -310,12 +313,6 @@
</el-button>
</div>
</el-dialog>
<svg class="svgStatus" aria-hidden="true" v-if="currentMenu==0">
<use xlink:href="#iconsp_ing" v-if="detail.approvalStatus==0"></use>
<use xlink:href="#iconsp-pass" v-if="detail.approvalStatus==1"></use>
<use xlink:href="#iconsp_refused" v-if="detail.approvalStatus==2"></use>
<use xlink:href="#iconcancel" v-if="detail.approvalStatus==3"></use>
</svg>
</div>
</template>
@@ -669,6 +666,11 @@ export default {
height: 100%;
display: flex;
flex-direction: column;
overflow: auto;
::v-deep.ai-detail__content--wrapper {
min-width: 720px;
}
::v-deep .el-scrollbar {
min-height: 0;
@@ -683,38 +685,6 @@ export default {
overflow-x: hidden;
}
.right-content {
position: relative;
height: 100%;
padding: 0 !important;
width: 760px;
display: flex;
flex-direction: column;
gap: 16px;
overflow: visible !important;
.applyForm {
min-height: 0;
flex: 1;
}
.sealFile {
min-height: 0;
flex: 1;
background: #F7F7F7;
border: 1px solid #DDDDDD;
padding: 20px;
text-align: center;
width: 100%;
.el-image {
width: 100%!important;
height: 100%;
background: #fff;
border: 1px solid #EEEEEE;
}
}
}
}
::v-deep .dynamicFormItem {
@@ -730,28 +700,6 @@ export default {
height: 64px;
}
.com_nav {
height: 48px;
line-height: 48px;
background-color: #fff;
padding: 0 16px;
font-weight: bold;
border-bottom: 1px solid #D8DCE3;
display: flex;
justify-content: space-between;
}
.add_title {
height: 56px;
line-height: 56px;
border-bottom: 1px solid #eee;
color: #333;
font-weight: bold;
margin-bottom: 16px;
display: flex;
justify-content: space-between;
}
.border-wrap {
box-sizing: border-box;
padding: 20px;
@@ -781,8 +729,8 @@ export default {
.svgStatus {
position: absolute;
top: 80px;
right: 380px;
top: -20px;
right: 20px;
width: 90px;
}
@@ -959,12 +907,6 @@ export default {
user-select: none;
cursor: pointer;
}
}
</style>
<style lang="scss">
.app_detail {
height: 100%;
overflow: auto;
.el-step.is-vertical .el-step__line {
width: 1px;
@@ -1012,11 +954,6 @@ export default {
margin-bottom: 30px;
}
.line-left {
flex: 1;
display: flex;
justify-content: flex-end;
}
.dia_ul {
justify-content: left;
@@ -1027,26 +964,6 @@ export default {
}
}
.line-right {
width: 90px;
}
.right_p {
border: 1px dashed #2266FF;
width: 40px;
height: 40px;
border-radius: 50%;
line-height: 40px;
text-align: center;
color: #2266FF;
margin: 0 22px;
cursor: pointer;
box-sizing: border-box;
.el-icon-plus {
font-size: 20px;
}
}
.right_name {
border: 1px solid #fff;
@@ -1077,76 +994,6 @@ export default {
}
}
.material {
box-sizing: border-box;
padding: 30px 40px;
.mat-title {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
& > p:nth-child(1) {
width: 120px;
text-align: center;
}
& > p:nth-child(2) {
width: 350px;
text-align: center;
}
& > p:nth-child(3) {
width: 145px;
text-align: center;
}
& > p {
color: #333333;
}
}
.mat-item {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 13px;
& > p:nth-child(1) {
width: 120px;
text-align: center;
}
& > p:nth-child(2) {
width: 350px;
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
& > img {
margin-right: 8px;
margin-bottom: 8px;
width: 64px;
height: 64px;
}
}
& > p:nth-child(3) {
width: 145px;
color: #5088FF;
user-select: none;
cursor: pointer;
text-align: center;
& > span:nth-child(2) {
margin-left: 16px;
}
}
}
}
.upload-demo {
::v-deep .el-icon-close {
@@ -1163,7 +1010,5 @@ export default {
justify-content: flex-end;
}
}
}
</style>