From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaApplyChangeDetailWindow.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 763ce82..9e76416 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -49,8 +49,9 @@
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="model.solutionType == 0 &&[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+ <el-button v-if="[0,1].includes(model.solutionType) &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
<el-button v-if="model.solutionType == 0 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
+ <el-button v-if=" model.solutionType == 1 && [1].includes(model.status)" type="primary" @click="$refs.ApplyChangeDetails.open('鎶曚繚瀹℃牳',apply,model,1)">鎵规敼瀹℃牳</el-button>
</template>
</div>
</div>
@@ -146,6 +147,7 @@
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ v-if="apply && apply.hasDispatchUnit !== 1"
prop="duName"
label="娲鹃仯鍗曚綅">
</el-table-column>
@@ -242,11 +244,20 @@
<el-button @click="visiblePhone=false">鍙� 娑�</el-button>
</span>
</el-dialog>
+ <el-dialog title="鎵瑰崟鍒楄〃" :modal="false" :visible.sync="flieVisible">
+ <el-table :data="model.pidanFileList">
+ <el-table-column property="name" label="鏂囦欢鍚嶇О"></el-table-column>
+ <el-table-column label="鎿嶄綔" width="90">
+ <template slot-scope="{row}">
+ <el-button type="primary" @click="yulan(row.name, row.fileurlFull)">棰勮</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
</GlobalWindow>
-
</template>
<script>
@@ -320,7 +331,8 @@
activeName: '0',
total: 0,
currentPage: 1,
- loading: false
+ loading: false,
+ flieVisible: false,
}
},
created () {
@@ -447,10 +459,10 @@
}
},
viewPidan(){
- if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
- this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎵瑰崟',this.model.pidanFile.fileurlFull)
- // window.open(this.model.pidanFile.fileurlFull)
- }
+ this.flieVisible = true
+ },
+ yulan(name, url) {
+ this.$refs.OperaPdfViewerWindow.open(name, url)
},
handleSizeChange(val){
console.log(val)
--
Gitblit v1.9.3