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/OperaApplyChangeUnitDetailWindow.vue | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index d245367..e4fcf77 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -49,7 +49,8 @@
<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=" model.solutionType == 1 && [1].includes(model.status)" type="primary" @click="$refs.ApplyChangeDetails.open('鎶曚繚瀹℃牳',apply,model,1)">鎵规敼瀹℃牳</el-button>
+ <el-button v-if="[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>
</template>
</div>
@@ -126,6 +127,7 @@
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ v-if="hasDispatchUnit !== 1"
prop="oldDuName"
label="鍘熸淳閬ｅ崟浣�">
</el-table-column>
@@ -138,6 +140,7 @@
label="淇濋櫓鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ v-if="hasDispatchUnit !== 1"
prop="duName"
label="鏇存崲鍚庢淳閬ｅ崟浣�">
</el-table-column>
@@ -211,6 +214,27 @@
<el-button @click="visiblePhone=false">鍙� 娑�</el-button>
</span>
</el-dialog>
+ <el-dialog
+ title="鏌ョ湅鎵瑰崟"
+ :visible.sync="visibleFile"
+ width="800px"
+ :modal="false"
+ :show-close="true"
+ :close-on-click-modal="false"
+ append-to-body
+ center>
+ <el-table :data="model.pidanFileList">
+ <el-table-column property="name" label="鏂囦欢鍚�"></el-table-column>
+ <el-table-column label="鎿嶄綔" width="90px">
+ <template slot-scope="{row}">
+ <el-button type="primary" @click="chakan(row.name, row.fileurlFull)">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="visibleFile=false">鍏� 闂�</el-button>
+ </span>
+ </el-dialog>
<ApplyChangeUnitDetails ref="ApplyChangeDetails" @success="successEvent" />
<OperaApplyChangeUnitCheckWindow ref="OperaApplyChangeCheckWindow" @success="successEvent" />
<!-- 浼佷笟鐢宠閫�鍥� -->
@@ -307,7 +331,9 @@
activeName: '0',
total: 0,
currentPage: 1,
- loading: false
+ loading: false,
+ hasDispatchUnit: null,
+ visibleFile: false
}
},
created () {
@@ -330,6 +356,9 @@
this.timer=null
this.getDetail()
this.getList()
+ },
+ chakan(name, url) {
+ this.$refs.OperaPdfViewerWindow.open(name, url)
},
send () {
sendSms({
@@ -439,10 +468,11 @@
}
},
viewPidan(){
- if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
- this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎵瑰崟',this.model.pidanFile.fileurlFull)
- // window.open(this.model.pidanFile.fileurlFull)
- }
+ this.visibleFile = true
+ // if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
+ // this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎵瑰崟',this.model.pidanFile.fileurlFull)
+ // // window.open(this.model.pidanFile.fileurlFull)
+ // }
},
handleSizeChange (val) {
console.log(val)
@@ -457,15 +487,14 @@
},
getDetail () {
getDetail(this.dataId).then(res => {
+ this.hasDispatchUnit = res.hasDispatchUnit
this.apply = res
- console.log(this.tableData)
}).catch(err => {
})
getChangeDetail(this.modelId).then(res => {
this.model = res
this.tableData = new Array()
this.tableData.push(res)
- console.log(this.tableData)
this.activities = res.applyLogList
}).catch(err => {
})
--
Gitblit v1.9.3