From 49522fcc80c31225bcd7bab78315206567e84146 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 16 十一月 2024 09:26:55 +0800
Subject: [PATCH] 优化
---
company/src/utils/resetMessage.js | 32 ++++
company/src/views/business/solutions.vue | 5
company/src/views/business/switchCourt.vue | 1
company/src/components/business/OperaCompanyDescWindow.vue | 6
company/src/api/business/solutions.js | 9 +
company/src/components/business/OperaInsuranceApplyWindow.vue | 6
company/src/components/business/detailsEntrustedInsurance.vue | 2
company/src/components/business/modification.vue | 15 +
company/src/main.js | 2
company/src/views/indexShop.vue | 48 ++++++
company/src/components/business/OperaCompanyUserApplyCarefulWindow.vue | 11
company/src/views/business/contract.vue | 4
company/src/components/business/OperaCompanyUserApplyWindow.vue | 2
company/src/components/business/OperaApplyChangeCheckWindow.vue | 17 +
company/src/components/business/OperaApplyChangeDetailWindow.vue | 23 ++
company/src/components/business/OperaUnionChangeUnitCheckWindow.vue | 21 +-
company/src/components/business/OperaUnionChangeUnitDetailWindow.vue | 35 +++-
company/src/views/index.vue | 149 +++++++++++++++++
company/src/utils/request.js | 2
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 42 ++++
company/src/components/business/operaCompanyUserApplyDescWindow.vue | 1
company/src/components/business/OperaContractWindow.vue | 2
22 files changed, 363 insertions(+), 72 deletions(-)
diff --git a/company/src/api/business/solutions.js b/company/src/api/business/solutions.js
index 1a01567..aedfa3a 100644
--- a/company/src/api/business/solutions.js
+++ b/company/src/api/business/solutions.js
@@ -13,7 +13,10 @@
}
// 鏌ヨ鍏ㄩ儴淇濋櫓鏂规
-export function all (data) {
+export function all (data, type) {
+ if (!type) {
+ data.status = 0
+ }
return request.post('/business/solutions/list', data)
}
@@ -47,3 +50,7 @@
return request.get(`/business/solutions/getUseList?companyId=${companyId}&dateType=${dateType}`)
}
+// 鏍规嵁ID鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/business/solutions/delete/${id}`)
+}
diff --git a/company/src/components/business/OperaApplyChangeCheckWindow.vue b/company/src/components/business/OperaApplyChangeCheckWindow.vue
index eebee83..cd4959c 100644
--- a/company/src/components/business/OperaApplyChangeCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeCheckWindow.vue
@@ -101,7 +101,7 @@
<div class="form_item">
<div class="form_item_label"><span>*</span>涓婁紶鎵瑰崟锛�</div>
<div class="form_item_val">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
+ <UploadFile :limit="99" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @remove="removePIDAN" @uploadSuccess="baoxianFileUploaded" />
</div>
</div>
</div>
@@ -185,7 +185,7 @@
applyStartTime: null,
delValidTime: null,
validCode: null,
- pidanFile: null,
+ pidanFile: [],
editPidanFile: null,
fileList1: [],
fileList2: [],
@@ -217,7 +217,7 @@
delValidTime: null,
applyStartTime: null,
validCode: null,
- pidanFile: null,
+ pidanFile: [],
editPidanFile: null,
fileList1: [],
fileList2: [],
@@ -313,7 +313,14 @@
}
},
baoxianFileUploaded (data) {
- this.form.pidanFile = data
+ this.form.pidanFile.push(data)
+ },
+ removePIDAN(e) {
+ this.form.pidanFile.forEach((item, index) => {
+ if (e === item.imgaddr) {
+ this.form.pidanFile.splice(index, 1)
+ }
+ })
},
editBaoxianFileUploaded (data) {
this.form.editPidanFile = data
@@ -353,7 +360,7 @@
applyStartTime: (this.model.delOnlyReplace != 1 ? this.form.applyStartTime : this.form.delValidTime),
delValidTime: this.form.delValidTime,
validCode: this.form.validCode,
- pidanFile: this.form.pidanFile
+ pidanFileList: this.form.pidanFile
})
.then(response => {
this.visible = false
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index c7ca116..9e76416 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -147,6 +147,7 @@
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ v-if="apply && apply.hasDispatchUnit !== 1"
prop="duName"
label="娲鹃仯鍗曚綅">
</el-table-column>
@@ -243,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>
@@ -321,7 +331,8 @@
activeName: '0',
total: 0,
currentPage: 1,
- loading: false
+ loading: false,
+ flieVisible: false,
}
},
created () {
@@ -448,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)
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index ec6984c..e4fcf77 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -127,6 +127,7 @@
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ v-if="hasDispatchUnit !== 1"
prop="oldDuName"
label="鍘熸淳閬ｅ崟浣�">
</el-table-column>
@@ -139,6 +140,7 @@
label="淇濋櫓鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ v-if="hasDispatchUnit !== 1"
prop="duName"
label="鏇存崲鍚庢淳閬ｅ崟浣�">
</el-table-column>
@@ -212,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" />
<!-- 浼佷笟鐢宠閫�鍥� -->
@@ -308,7 +331,9 @@
activeName: '0',
total: 0,
currentPage: 1,
- loading: false
+ loading: false,
+ hasDispatchUnit: null,
+ visibleFile: false
}
},
created () {
@@ -331,6 +356,9 @@
this.timer=null
this.getDetail()
this.getList()
+ },
+ chakan(name, url) {
+ this.$refs.OperaPdfViewerWindow.open(name, url)
},
send () {
sendSms({
@@ -440,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)
@@ -458,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 => {
})
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index 666b788..eaf6c4a 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -179,6 +179,7 @@
<OperaCompanyWindow ref="operaCompanyWindow" @success="callback"/>
<!-- 淇敼淇濋櫓鏂规 -->
<modification ref="modification" @success="callback"/>
+ <OperaPdfViewerWindow ref="operaPdfViewerWindow" />
<!-- 淇敼鎵嬫満鍙� -->
<el-dialog
title="鏇存敼缁戝畾鎵嬫満鍙�"
@@ -217,13 +218,14 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import OperaCompanyWindow from '@/components/business/OperaCompanyWindow'
import modification from '@/components/business/modification'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import { getById, updatePhone } from '@/api/business/company'
import { listForCompany } from '@/api/business/solutions'
import { sendSms } from '@/api/business/smsEmail'
export default {
name: 'OperaCompanyDescWindow',
extends: BaseOpera,
- components: { GlobalWindow, OperaCompanyWindow, modification },
+ components: { GlobalWindow, OperaCompanyWindow, modification, OperaPdfViewerWindow },
data () {
return {
ruleForm: {
@@ -250,7 +252,7 @@
},
methods: {
openFile(url) {
- window.open(url)
+ this.$refs.operaPdfViewerWindow.open('鏂规纭涔�', url)
},
close () {
this.visiblePhone = false
diff --git a/company/src/components/business/OperaCompanyUserApplyCarefulWindow.vue b/company/src/components/business/OperaCompanyUserApplyCarefulWindow.vue
index 878a2c0..60d5475 100644
--- a/company/src/components/business/OperaCompanyUserApplyCarefulWindow.vue
+++ b/company/src/components/business/OperaCompanyUserApplyCarefulWindow.vue
@@ -37,15 +37,17 @@
<el-radio :label="2">瀹℃牳涓嶉�氳繃</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="椹冲洖鐞嗙敱" prop="checkInfo" :rules="form.status === 2 ? { required: true, message: '椹冲洖鐞嗙敱涓嶈兘涓虹┖', trigger: 'blur' } : { required: false } ">
+ <el-form-item :label="form.status === 1 ? '澶囨敞鐞嗙敱' : '椹冲洖鐞嗙敱'" prop="checkInfo" :rules="form.status === 2 ? { required: true, message: '椹冲洖鐞嗙敱涓嶈兘涓虹┖', trigger: 'blur' } : { required: false } ">
<el-input
type="textarea"
- placeholder="璇疯緭鍏ラ┏鍥炵悊鐢�"
+ placeholder="璇疯緭鍏�"
v-model="form.checkInfo"
maxlength="300"
show-word-limit />
</el-form-item>
</el-form>
+ <!-- 棰勮pdf -->
+ <OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
</GlobalWindow>
</template>
@@ -53,11 +55,12 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadFile from '@/components/common/UploadFile'
+ import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import { audit, getById } from '@/api/business/companyUserApply'
export default {
name: 'OperaCompanyUserApplyCarefulWindow',
extends: BaseOpera,
- components: { GlobalWindow, UploadFile },
+ components: { GlobalWindow, UploadFile, OperaPdfViewerWindow },
data () {
return {
// 琛ㄥ崟鏁版嵁
@@ -84,7 +87,7 @@
})
},
openFile(url) {
- window.open(url)
+ this.$refs.OperaPdfViewerWindow.open('闄勪欢', url)
},
confirm() {
this.$refs.form.validate((valid) => {
diff --git a/company/src/components/business/OperaCompanyUserApplyWindow.vue b/company/src/components/business/OperaCompanyUserApplyWindow.vue
index 2cfa21d..d3a5d01 100644
--- a/company/src/components/business/OperaCompanyUserApplyWindow.vue
+++ b/company/src/components/business/OperaCompanyUserApplyWindow.vue
@@ -22,8 +22,6 @@
v-model="form.companyIds"
multiple
filterable
- allow-create
- default-first-option
placeholder="璇烽�夋嫨">
<el-option
v-for="item in company"
diff --git a/company/src/components/business/OperaContractWindow.vue b/company/src/components/business/OperaContractWindow.vue
index f66a7a4..a9717b9 100644
--- a/company/src/components/business/OperaContractWindow.vue
+++ b/company/src/components/business/OperaContractWindow.vue
@@ -43,7 +43,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="鍚堝悓闄勪欢" prop="multifile" :rules="[{required:true,message:'璇蜂笂浼犳柟妗堢‘璁や功'}]">
- <div>
+ <div v-if="visible">
<UploadFile @remove="deleFile" :uploadData="{ folder: 'contract', fileType:'.pdf' }" :fileList="fileList" @uploadSuccess="editFanganFile" />
</div>
</el-form-item>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 30af9eb..f08683b 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -38,16 +38,16 @@
<el-button v-if="[12].includes(model.status)" type="primary" @click="review">鎶曚繚澶嶅</el-button>
<el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+ <el-button v-if="[27,5].includes(model.status)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="[2,10].includes(model.status) && model.solutionType ==0" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 3 && model.solutionType ==0" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
+ <el-button v-if="model.status === 3 && userInfo.type === 0" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
<!-- <el-button v-if="model.status == 26 && model.solutionType == 1" type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>-->
<el-button v-if="[6,7,8,11].includes(model.status) && model.solutionType ==0" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
<el-button v-if="[22, 0].includes(model.status) && [0,1].includes(model.solutionType)" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
<el-button v-if="![1, 4, 5].includes(model.status) && [0,1].includes(model.solutionType)" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.status == 5 && model.solutionType ==0" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
+ <el-button v-if="[5,27].includes(model.status) && userInfo.type === 0" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
</template>
</div>
</div>
diff --git a/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue b/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
index 5791392..cd8673d 100644
--- a/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
@@ -35,7 +35,7 @@
<el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="涓婁紶鎵瑰崟锛�" prop="baoxianFile">
- <UploadFile @remove="dele3" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
+ <UploadFile @remove="dele3" :limit="99" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
</el-form-item>
<div class="box_table">
<div class="box_table_head">
@@ -108,7 +108,7 @@
backCheckInfo: '',
applyTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
bxdMultifileList: [],
fileList1: [],
selectRadio: 0
@@ -134,8 +134,12 @@
this.form.bxdMultifileList[index].name = null
}
},
- dele3 () {
- this.form.baoxianFile = null
+ dele3 (e) {
+ this.form.baoxianFile.forEach((item, index) => {
+ if (e === item.imgaddr) {
+ this.form.baoxianFile.splice(index, 1)
+ }
+ })
},
open (title, target, flag) {
this.visible = true
@@ -145,7 +149,7 @@
backCheckInfo: '',
startTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
bxdMultifileList:[],
fileList1: [],
selectRadio: 0,
@@ -198,7 +202,7 @@
}
},
baoxianFileUploaded (data) {
- this.form.baoxianFile = data
+ this.form.baoxianFile.push(data)
},
baoxianFileUploaded2 (data) {
this.form.bxdMultifileList[data.index].fileurl = data.fileurl
@@ -225,8 +229,9 @@
id: this.model.id,
applyDate: this.form.applyTime,
code: this.form.code,
- fileurl: this.form.baoxianFile.fileurl,
- name: this.form.baoxianFile.name,
+ // fileurl: this.form.baoxianFile.fileurl,
+ // name: this.form.baoxianFile.name,
+ pidanFileList: this.form.baoxianFile,
applyChangeBXDList:this.form.bxdMultifileList
}
uploadBXD(param)
diff --git a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
index df35918..f186563 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>
@@ -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) {
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 7ad08e6..05fb9c5 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -20,7 +20,7 @@
<el-button v-if="[0].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 1" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鎶曚繚鍗�</el-button>
<el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="[2].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
+<!-- <el-button v-if="[2].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>-->
<el-button v-if="model.status == 3" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
</template>
diff --git a/company/src/components/business/modification.vue b/company/src/components/business/modification.vue
index 6bcff4c..081cdb9 100644
--- a/company/src/components/business/modification.vue
+++ b/company/src/components/business/modification.vue
@@ -23,8 +23,7 @@
align="center"
label="淇濋櫓鏂规">
<template slot-scope="scope">
-<!-- :value="{ id:item.id, baseId: item.baseId }"-->
- <el-select v-model="scope.row.solution.id" filterable @change="changeSolution($event, scope.$index)" placeholder="璇烽�夋嫨">
+ <el-select v-model="scope.row.solution.id" :disabled="scope.row.disabled" filterable @change="changeSolution($event, scope.$index)" placeholder="璇烽�夋嫨">
<el-option
v-for="item in programme"
:key="item.id"
@@ -38,7 +37,7 @@
align="center"
label="濮旀墭鍟嗘埛">
<template slot-scope="scope">
- <el-select :ref="'shopSelect'+scope.$index" :disabled="scope.row.solution.type ==1" v-model="scope.row.shopId" clearable value-key="id" placeholder="璇烽�夋嫨">
+ <el-select :ref="'shopSelect'+scope.$index" disabled v-model="scope.row.shopId" clearable value-key="id" placeholder="璇烽�夋嫨">
<el-option
v-for="item in shops"
:key="item.id"
@@ -61,7 +60,7 @@
label="绛剧讲鐘舵��">
<template slot-scope="{row}">
<template v-if="row.signStatus === 0">寰呯绔�</template>
- <template v-if="row.signStatus === 1">宸茬绔�</template>
+ <template v-else-if="row.signStatus === 1">宸茬绔�</template>
</template>
</el-table-column>
<el-table-column
@@ -69,7 +68,7 @@
align="center"
width="100">
<template slot-scope="scope">
- <el-button type="text" size="small" style="color: red;" @click="dele(scope.$index)" v-if="scope.row.signStatus === 0 || !scope.row.signStatus">鍒犻櫎</el-button>
+ <el-button type="text" size="small" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -171,18 +170,20 @@
.then(resa => {
resa.forEach(item => {
this.form.solutionList.push({
+ disabled: true,
solution: { id: item.solutionId, baseId: item.solutionBaseId,type:item.solutionType },
shopId: item.shopId,
canAdd: 1,
- canReduce: 1
+ canReduce: 1,
+ signStatus: item.signStatus
})
})
- console.log(this.form.solutionList)
that.visible = true
})
},
add () {
this.form.solutionList.push({
+ disabled: false,
solution: { id: null, baseId: null },
shopId: null,
canAdd: 1,
diff --git a/company/src/components/business/operaCompanyUserApplyDescWindow.vue b/company/src/components/business/operaCompanyUserApplyDescWindow.vue
index 0d0e349..9c7a58e 100644
--- a/company/src/components/business/operaCompanyUserApplyDescWindow.vue
+++ b/company/src/components/business/operaCompanyUserApplyDescWindow.vue
@@ -97,7 +97,6 @@
})
},
openFile(name, url) {
- console.log(url)
this.$refs.OperaPdfViewerWindow.open(name, url)
}
}
diff --git a/company/src/main.js b/company/src/main.js
index e3587f1..175888f 100644
--- a/company/src/main.js
+++ b/company/src/main.js
@@ -10,7 +10,6 @@
import plugins from './plugins'
import { mapState, mapMutations } from 'vuex'
import { fetchMenuTree } from './api/system/menu'
-
Vue.config.productionTip = false
Vue.use(ElementUI, {
size: 'small'
@@ -19,7 +18,6 @@
Vue.use(directives)
Vue.use(filters)
Vue.use(plugins)
-
new Vue({
data: {
loading: false
diff --git a/company/src/utils/request.js b/company/src/utils/request.js
index 39e92c7..df73178 100644
--- a/company/src/utils/request.js
+++ b/company/src/utils/request.js
@@ -42,8 +42,6 @@
// 鏂板缓鍝嶅簲鎷︽埅鍣�
axiosInstance.interceptors.response.use((response) => {
- // console.log(response.status)
- // debugger
// 璇锋眰澶辫触
if (response.status !== 200) {
return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
diff --git a/company/src/utils/resetMessage.js b/company/src/utils/resetMessage.js
new file mode 100644
index 0000000..9408177
--- /dev/null
+++ b/company/src/utils/resetMessage.js
@@ -0,0 +1,32 @@
+//resetMessage.js
+/**閲嶇疆message锛岄槻姝㈤噸澶嶇偣鍑婚噸澶嶅脊鍑簃essage娑堟伅鎻愮ず */
+import {
+ Message
+} from 'element-ui';
+
+let messageInstance = null;
+
+const resetMessage = (options) => {
+ if(messageInstance) {
+ messageInstance.close();
+
+ }
+ Message.closeAll(); //鎵嬪姩鍏抽棴鎵�鏈夋秷鎭彁绀哄疄渚�
+ messageInstance = Message(options);
+ // console.log(Message(options));
+
+};
+
+['error','success','info','warning'].forEach(type => {
+ resetMessage[type] = options => {
+ if(typeof options === 'string') {
+ options = {
+ message:options
+ }
+ }
+ options.type = type
+ return resetMessage(options)
+ }
+})
+
+export const message = resetMessage
diff --git a/company/src/views/business/contract.vue b/company/src/views/business/contract.vue
index 65db1de..84b03d5 100644
--- a/company/src/views/business/contract.vue
+++ b/company/src/views/business/contract.vue
@@ -30,7 +30,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:contract:create']" v-if="[0,2].includes(userInfo.type)">
- <li><el-button type="primary" @click="$refs.operaContractWindow.open('鏂板缓鍚堝悓淇℃伅琛�', null, 2)" icon="el-icon-plus" v-permissions="['business:contract:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaContractWindow.open('鏂板缓鍚堝悓淇℃伅琛�', null, userInfo.type)" icon="el-icon-plus" v-permissions="['business:contract:create']">鏂板缓</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -72,7 +72,7 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
- min-width="220"
+ min-width="150"
fixed="right"
>
<template slot-scope="{row}">
diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index 6ab1414..17f8511 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -38,8 +38,8 @@
<el-table-column prop="solutionBaseName" label="涓绘柟妗�" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
<el-table-column label="鎶曚繚绫诲瀷" min-width="120px" align="center">
<template slot-scope="{row}">
- <span v-if="row.type === 0">鐩翠繚</span>
- <span v-if="row.type === 1">濮旀墭<div style="color: blue;display: block" >{{row.shopName||'-'}}</div></span>
+ <span v-if="row.type === 0">鐩翠繚<div style="color: blue;display: block" >{{ row.shopName || '-' }}</div></span>
+ <span v-if="row.type === 1">濮旀墭<div style="color: blue;display: block" >{{ row.shopName || '-' }}</div></span>
</template>
</el-table-column>
<el-table-column label="鎶曚繚浠锋牸" min-width="100px">
@@ -100,6 +100,7 @@
<template v-if="userInfo.type === 1 && row.signStatus === 1">
<el-button type="text" icon="el-icon-tickets" @click="seeFleSignUrl(row.fileSignUrl)">鏌ョ湅鏂规纭涔�</el-button>
</template>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:solutions:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index 38b6647..d0e21ae 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -79,6 +79,7 @@
<span :class="'change-status'+ row.status" v-if="row.status === 3 || row.status === 4">閫�鍥炵敵璇�</span>
<span :class="'change-status'+ row.status" v-if="row.status ===5 || row.status === 8">宸查��鍥�</span>
<span :class="'change-status'+ row.status" v-if="row.status ===6">宸插叧闂�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status ===9">鎵规敼鐢宠涓�</span>
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="150px" align="center"></el-table-column>
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index ff4cb7f..5850eaa 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -123,10 +123,105 @@
</el-pagination>
</div>
</div>
+
+ <div v-if="activeName === '6'">
+ <div class="home_content_right_list" v-if="tableData6 && tableData6.length">
+ <div class="list_item" v-for="(item, index) in tableData6" :key="index">
+ <div class="list_item_left">
+ <span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
+ <span>{{item.info}}锛坽{item.content}}锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>{{item.companyName}}</span>
+ <span>鎻愪氦鏃堕棿 {{item.createDate}}</span>
+ </div>
+ <div class="list_item_right">
+ <span @click="jump('/business/contract')">鏌ョ湅</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange2"
+ :current-page="page6"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="totalPage6">
+ </el-pagination>
+ </div>
+ </div>
+ <div v-if="activeName === '7'">
+ <div class="home_content_right_list" v-if="tableData7 && tableData7.length">
+ <div class="list_item" v-for="(item, index) in tableData7" :key="index">
+ <div class="list_item_left">
+ <span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
+ <span>{{item.info}}锛坽{item.content}}锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>{{item.companyName}}</span>
+ <span>鎻愪氦鏃堕棿 {{item.createDate}}</span>
+ </div>
+ <div class="list_item_right">
+ <span @click="jump('/business/solutions')">鏌ョ湅</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange2"
+ :current-page="page7"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="totalPage7">
+ </el-pagination>
+ </div>
+ </div>
+ <div v-if="activeName === '8'">
+ <div class="home_content_right_list" v-if="tableData7 && tableData7.length">
+ <div class="list_item" v-for="(item, index) in tableData7" :key="index">
+ <div class="list_item_left">
+ <span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
+ <span>{{item.info}}锛坽{item.content}}锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>{{item.companyName}}</span>
+ <span>鎻愪氦鏃堕棿 {{item.createDate}}</span>
+ </div>
+ <div class="list_item_right">
+ <span @click="jump('/business/companyUserApply')">鏌ョ湅</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange2"
+ :current-page="page7"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="totalPage7">
+ </el-pagination>
+ </div>
+ </div>
+
</div>
</div>
<OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
- <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handleCurrentChange0()"/>
+ <OperaWtbApplyShopWindow ref="OperaWatbApplyShopWindow" @success="handleCurrentChange0()"/>
<dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handleCurrentChange0()"/>
<OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handleCurrentChange2()"/>
<OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
@@ -165,12 +260,21 @@
page0: 1,
page1: 1,
page2: 1,
+ page6: 1,
+ page7: 1,
+ page8: 1,
+ totalPage8: 0,
+ totalPage7: 0,
+ totalPage6: 0,
totalPage2: 0,
totalPage1: 0,
totalPage0: 0,
tableData0: [],
tableData1: [],
tableData2: [],
+ tableData6: [],
+ tableData7: [],
+ tableData8: [],
cate: [
{
name: '鎶曚繚鐢宠',
@@ -317,9 +421,22 @@
if (type === 1) {
this.tableData1 = response.records
this.totalPage1 = response.total
- } if (type === 2) {
+ }
+ if (type === 2) {
this.tableData2 = response.records
this.totalPage2 = response.total
+ }
+ if (type === 6) {
+ this.tableData6 = response.records
+ this.totalPage6 = response.total
+ }
+ if (type === 7) {
+ this.tableData7 = response.records
+ this.totalPage7 = response.total
+ }
+ if (type === 8) {
+ this.tableData8 = response.records
+ this.totalPage8 = response.total
}
})
.catch(e => {
@@ -341,10 +458,12 @@
this.tabs.push({ name: '2', label: '鐞嗚禂鎻愰啋' })
// this.handleCurrentChange2(0);
}
- //鏂板鍒嗙被
- if (pemissons.includes('business:notice:settle')) {
- this.tabs.push({ name: '3', label: '鍚堝悓绛剧讲鎻愰啋' })
- // this.handleCurrentChange2(0);
+ if (this.userInfo.type === 1) {
+ this.tabs.push({ name: '7', label: '鏂规绛剧讲鎻愰啋' })
+ }
+ this.tabs.push({ name: '6', label: '鍚堝悓绛剧讲鎻愰啋' })
+ if (this.userInfo.type === 0) {
+ this.tabs.push({ name: '8', label: '闆嗗洟鐢宠鎻愰啋' })
}
/* if (pemissons.includes('business:notice:insurance')) {
this.getNoticeList(0, this.page0)
@@ -364,6 +483,12 @@
this.handleCurrentChange1(0)
} else if (this.activeName === '2') {
this.handleCurrentChange2(0)
+ } else if (this.activeName === '6') {
+ this.handleCurrentChange6(0)
+ } else if (this.activeName === '7') {
+ this.handleCurrentChange7(0)
+ } else if (this.activeName === '8') {
+ this.handleCurrentChange8(0)
}
},
handleCurrentChange0 (page) {
@@ -378,6 +503,18 @@
this.page2 = page
this.getNoticeList(2, this.page2)
},
+ handleCurrentChange6 (page) {
+ this.page6 = page
+ this.getNoticeList(6, this.page6)
+ },
+ handleCurrentChange7 (page) {
+ this.page7 = page
+ this.getNoticeList(7, this.page7)
+ },
+ handleCurrentChange8 (page) {
+ this.page8 = page
+ this.getNoticeList(8, this.page8)
+ },
jump (url) {
if (!url) return
this.$router.push({ path: url })
diff --git a/company/src/views/indexShop.vue b/company/src/views/indexShop.vue
index ce5e346..62d3e57 100644
--- a/company/src/views/indexShop.vue
+++ b/company/src/views/indexShop.vue
@@ -86,6 +86,39 @@
</el-pagination>
</div>
</div>
+
+ <div v-if="activeName === '6'" >
+ <div class="home_content_right_list" v-if="tableData6&&tableData6.length">
+ <div class="list_item" v-for="(item, index) in tableData6" :key="index">
+ <div class="list_item_left">
+ <span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
+ <span>{{item.info}}锛坽{item.content}}锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>{{item.companyName}}</span>
+ <span>鎻愪氦鏃堕棿 {{item.createDate}}</span>
+ </div>
+ <div class="list_item_right">
+ <span @click="jump('/business/contract')">鏌ョ湅</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange1"
+ :current-page="page1"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="totalPage1">
+ </el-pagination>
+ </div>
+ </div>
+
</div>
</div>
<OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
@@ -118,12 +151,15 @@
page0: 1,
page1: 1,
page2: 1,
+ page6: 1,
+ totalPage6: 0,
totalPage2: 0,
totalPage1: 0,
totalPage0: 0,
tableData0: [],
tableData1: [],
tableData2: [],
+ tableData6: [],
cate: [
{
name: '鎶曚繚鐢宠瀹℃牳',
@@ -201,6 +237,7 @@
initLoadData () {
this.handleCurrentChange0(0)
this.handleCurrentChange1(0)
+ this.handleCurrentChange6(0)
},
getNoticeList (type, page) {
noticeList({
@@ -218,6 +255,10 @@
this.tableData1 = response.records
this.totalPage1 = response.total
}
+ if (type === 6) {
+ this.tableData6 = response.records
+ this.totalPage6 = response.total
+ }
})
.catch(e => {
this.$tip.apiFailed(e)
@@ -226,6 +267,7 @@
initPanel () {
this.tabs.push({ name: '0', label: '鐩存帴鎶曚繚寰呭姙' })
this.tabs.push({ name: '1', label: '濮旀墭鎶曚繚寰呭姙' })
+ this.tabs.push({ name: '6', label: '鍚堝悓绛剧讲鎻愰啋' })
},
handleClick (e) {
this.activeName = e.name
@@ -233,6 +275,8 @@
this.handleCurrentChange0(0)
} else if (this.activeName === '1') {
this.handleCurrentChange1(0)
+ } else if (this.activeName === '6') {
+ this.handleCurrentChange6(0)
}
},
handleCurrentChange0 (page) {
@@ -243,6 +287,10 @@
this.page1 = page
this.getNoticeList(4, this.page1)
},
+ handleCurrentChange6 (page) {
+ this.page6 = page
+ this.getNoticeList(6, this.page6)
+ },
jump (url) {
if (!url) return
this.$router.push({ path: url })
--
Gitblit v1.9.3