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/OperaUnionChangeUnitDetailWindow.vue | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
index df35918..61d53af 100644
--- a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
@@ -10,7 +10,7 @@
<div class="desc_item">
<div class="desc_item_label">
<div class="desc_item_label_left">
- <span>鎶曚繚浜猴細{{ model.shopName}}</span>
+ <span>鎶曚繚浜猴細{{ model.shopName}} </span>
<span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
<span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
<span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
@@ -27,7 +27,7 @@
<el-button v-if="[1,2].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[0].includes(model.status)" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
- <el-button v-if=" [1].includes(model.status)" type="primary" @click="$refs.OperaUnionChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
+ <el-button v-if=" [1].includes(model.status) && userInfo.type !== 2" type="primary" @click="$refs.OperaUnionChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="[0,1].includes(model.status)" type="danger" @click="$refs.OperaUnionChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
</template>
<template v-if="0">
@@ -113,6 +113,7 @@
label="琚繚闄╀汉">
</el-table-column>
<el-table-column
+ v-if="hasDispatchUnit !== 1"
prop="oldDuName"
label="鍘熸淳閬ｅ崟浣�">
</el-table-column>
@@ -121,6 +122,7 @@
label="鍘熸墍灞炲伐绉�">
</el-table-column>
<el-table-column
+ v-if="hasDispatchUnit !== 1"
prop="duName"
label="鏇存崲鍚庢淳閬ｅ崟浣�">
</el-table-column>
@@ -203,21 +205,29 @@
</span>
</el-dialog>
<el-dialog
- title="鏌ョ湅淇濋櫓鍗�"
+ title="鏌ョ湅鎵瑰崟"
:visible.sync="visibleFile"
width="800px"
- :modal="true"
+ :modal="false"
:show-close="true"
:close-on-click-modal="false"
append-to-body
center>
- <div class="desc_item_from" v-for="(item, index) in pidanFileData" :key="index" style="margin-bottom: 15px">
- <span v-if="index ==0">{{item.name}}锛�</span>
- <span v-if="index >0">琚繚闄╀汉锛坽{item.name}}锛変繚闄╁崟锛�</span>
- <a style="cursor: pointer;color: #2E68EC" v-if="item.file && item.file.fileurl && index ==0" @click="openFile(item.file.fileurlFull,item.name)">鍦ㄧ嚎棰勮</a>
- <a style="cursor: pointer;color: #2E68EC" v-if="item.file && item.file.fileurl && index !=0 " @click="openFile(item.file.fileurlFull,'琚繚闄╀汉锛�'+item.name+'锛変繚闄╁崟')">鍦ㄧ嚎棰勮</a>
- <span v-if="!item.file || !item.file.fileurl">鏈笂浼�</span>
- </div>
+ <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>
+<!-- <div class="desc_item_from" v-for="(item, index) in pidanFileData" :key="index" style="margin-bottom: 15px">-->
+<!-- <span v-if="index ==0">{{item.name}}锛�</span>-->
+<!-- <span v-if="index >0">琚繚闄╀汉锛坽{item.name}}锛変繚闄╁崟锛�</span>-->
+<!-- <a style="cursor: pointer;color: #2E68EC" v-if="item.file && item.file.fileurl && index ==0" @click="openFile(item.file.fileurlFull,item.name)">鍦ㄧ嚎棰勮</a>-->
+<!-- <a style="cursor: pointer;color: #2E68EC" v-if="item.file && item.file.fileurl && index !=0 " @click="openFile(item.file.fileurlFull,'琚繚闄╀汉锛�'+item.name+'锛変繚闄╁崟')">鍦ㄧ嚎棰勮</a>-->
+<!-- <span v-if="!item.file || !item.file.fileurl">鏈笂浼�</span>-->
+<!-- </div>-->
<!--
<div class="desc_item_from" v-for="(item, index) in pidanFileData" :key="index" style="margin-bottom: 15px">
<span v-if="index ==0">{{item.name}}锛�</span>
@@ -283,6 +293,7 @@
model: {},
visiblePhone: false,
visibleFile:false,
+ hasDispatchUnit: null,
form: {
businessId: null,
phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
@@ -336,6 +347,9 @@
this.getDetail()
this.getList()
},
+ chakan(name, url) {
+ this.$refs.OperaPdfViewerWindow.open(name, url)
+ },
send () {
sendSms({
phone: this.form.phone
@@ -472,6 +486,7 @@
getApplyList () {
applyList({ unionChangeId: this.model.id, getFiles: 1 }).then(res => {
this.model.applyList = res
+ this.hasDispatchUnit = res[0].hasDispatchUnit
if (res && res.length > 0) {
res.forEach(item => {
if (item.pidanFile) {
--
Gitblit v1.9.3