From 56edbd80963acea41d9b9737bb9264f57a6e4ae2 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 十一月 2024 09:13:41 +0800
Subject: [PATCH] 优化
---
company/src/components/enterprise/importEmployees.vue | 10 ++
company/src/components/enterprise/additionSubtractionApplication.vue | 4
company/src/components/enterprise/factoryChange.vue | 2
company/src/components/business/OperaWtbApplyShopWindow.vue | 4
company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue | 2
company/src/components/business/OperaInsuranceApplyWindow.vue | 2
company/src/components/business/detailsEntrustedInsurance.vue | 8 +-
company/src/views/business/applyChange.vue | 3
company/.env.developmentCom | 2
company/.env.developmentShop | 2
company/src/components/business/OperaUnionChangeDetailWindow.vue | 43 ++++++++++---
company/src/views/business/insuranceApply.vue | 1
company/src/components/business/OperaUnionChangeUnitCheckWindow.vue | 44 +++++++-------
company/src/components/business/OperaUnionChangeUnitDetailWindow.vue | 2
company/src/views/enterprise/insuranceApply.vue | 1
company/public/template/personnel_no.xlsx | 0
company/src/components/business/OperaUnionChangeCheckWindow.vue | 31 +++++++---
company/.env.development | 2
18 files changed, 103 insertions(+), 60 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index f368d2b..2c87043 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -11,4 +11,4 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 浠诲悍
-VUE_APP_API = 'http://192.168.0.137:10030/'
+VUE_APP_API = 'http://192.168.0.147:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 92bdf7f..20dc8b0 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -9,6 +9,6 @@
#VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-VUE_APP_API = 'http://192.168.0.137:10031/'
+VUE_APP_API = 'http://192.168.0.147:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index 138de6f..b976fd2 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -7,7 +7,7 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
#VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
- VUE_APP_API = 'http://192.168.0.137:10032/'
+ VUE_APP_API = 'http://192.168.0.147:10032/'
#VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/public/template/personnel_no.xlsx b/company/public/template/personnel_no.xlsx
new file mode 100644
index 0000000..bf128e5
--- /dev/null
+++ b/company/public/template/personnel_no.xlsx
Binary files differ
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index f32f94e..2b8e69d 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -113,7 +113,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="淇濆崟浜哄憳" name="0" ></el-tab-pane>
<el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
- <el-tab-pane label="鏇存崲宸ョ璁板綍" name="2"></el-tab-pane>
+ <el-tab-pane :label="model.hasDispatchUnit !== 1 ? '鏇存崲娲鹃仯鍗曚綅' : '鏇存崲宸ョ璁板綍'" name="2"></el-tab-pane>
</el-tabs>
</div>
<div class="desc_item_search">
diff --git a/company/src/components/business/OperaUnionChangeCheckWindow.vue b/company/src/components/business/OperaUnionChangeCheckWindow.vue
index 94d3dc4..d758456 100644
--- a/company/src/components/business/OperaUnionChangeCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeCheckWindow.vue
@@ -71,7 +71,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">-->
@@ -118,6 +118,13 @@
extends: BaseOpera,
components: { UploadFile, GlobalWindow ,UploadFileLink},
data () {
+ const checkFile = (rule, value, callback) => {
+ if (value.length === 0) {
+ callback(new Error('璇蜂笂浼犳壒鍗�'));
+ } else {
+ callback();
+ }
+ };
return {
// 琛ㄥ崟鏁版嵁
model: {},
@@ -136,7 +143,7 @@
{ required: true, message: '璇峰畬鍠勪俊鎭�' }
],
baoxianFile: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
+ { required: true, validator: checkFile }
]
},
form: {
@@ -145,7 +152,7 @@
applyTime: null,
delValidTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
bxdMultifileList: [],
fileList1: [],
selectRadio: 0
@@ -171,8 +178,12 @@
this.form.bxdMultifileList[index].name = null
}
},
- dele3 () {
- this.form.baoxianFile = null
+ dele3 (imgaddr) {
+ this.form.baoxianFile.forEach((item, index) => {
+ if (imgaddr === item.imgaddr) {
+ this.form.baoxianFile.splice(index, 1)
+ }
+ })
},
open (title, target, flag) {
this.visible = true
@@ -182,7 +193,7 @@
backCheckInfo: '',
startTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
delValidTime: null,
bxdMultifileList:[],
fileList1: [],
@@ -238,7 +249,8 @@
}
},
baoxianFileUploaded (data) {
- this.form.baoxianFile = data
+ this.form.baoxianFile.push(data)
+ console.log(this.form.baoxianFile)
},
baoxianFileUploaded2 (data) {
this.form.bxdMultifileList[data.index].fileurl = data.fileurl
@@ -266,8 +278,9 @@
applyDate: (this.model.delOnlyReplace != 1 ? this.form.applyTime : this.form.delValidTime),
delValidTime:this.form.delValidTime,
code: this.form.code,
- fileurl: this.form.baoxianFile.fileurl,
- name: this.form.baoxianFile.name,
+ pidanFileList: this.form.baoxianFile,
+ // fileurl: this.form.baoxianFile.fileurl,
+ // name: this.form.baoxianFile.name,
applyChangeBXDList:this.form.bxdMultifileList
}
uploadBXD(param)
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index 4c1c624..da2f6fc 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -136,6 +136,7 @@
label="琚繚闄╀汉">
</el-table-column>
<el-table-column
+ v-if="hasDispatchUnit !== 1"
prop="duName"
label="娲鹃仯鍗曚綅">
</el-table-column>
@@ -235,21 +236,37 @@
</span>
</el-dialog>
<el-dialog
- title="鏌ョ湅淇濋櫓鍗�"
+ title="鏌ョ湅鎵瑰崟"
:visible.sync="visibleFile"
- width="500px"
- :modal="true"
+ width="700px"
+ :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"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="name"
+ label="鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ width="90"
+ label="鎿嶄綔">
+ <template slot-scope="{ row }">
+ <el-button type="primary" @click="seePidan(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>-->
<span slot="footer" class="dialog-footer">
<el-button @click="visibleFile=false">鍏� 闂�</el-button>
</span>
@@ -311,6 +328,7 @@
model: {},
visiblePhone: false,
visibleFile:false,
+ hasDispatchUnit: null,
form: {
businessId: null,
phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
@@ -364,6 +382,9 @@
this.getDetail()
this.getList()
},
+ seePidan(name, url) {
+ this.$refs.OperaPdfViewerWindow.open(name, url)
+ },
send () {
sendSms({
phone: this.form.phone
@@ -493,7 +514,6 @@
this.model = res
this.tableData = new Array()
this.tableData.push(res)
- console.log(this.tableData)
this.pidanFileData.push({ name: '鍟嗘埛淇濋櫓鍗�', file: this.model.pidanFile })
this.getApplyList()
}).catch(err => {
@@ -502,6 +522,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/OperaUnionChangeUnitCheckWindow.vue b/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
index cd8673d..685a964 100644
--- a/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
@@ -37,28 +37,28 @@
<el-form-item label="涓婁紶鎵瑰崟锛�" prop="baoxianFile">
<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">
- <div class="box_table_head_item">搴忓彿</div>
- <div class="box_table_head_item">琚繚闄╀汉</div>
- <div v-if="model.type==0" class="box_table_head_item">鍔犱繚浜烘暟</div>
- <div v-if="model.type==0" class="box_table_head_item">鍑忎繚浜烘暟</div>
- <div v-if="model.type==1" class="box_table_head_item">鍙樻洿浜烘暟</div>
- <div class="box_table_head_item">涓婁紶鎵瑰崟</div>
- </div>
- <div class="box_table_content" v-for="(item, index) in model.applyList" :key="index">
- <div class="box_table_content_item">{{index + 1}}</div>
- <div class="box_table_content_item" >{{ item.companyName }}</div>
- <div v-if="model.type==0" class="box_table_content_item">{{ item.addNum }}</div>
- <div v-if="model.type==0" class="box_table_content_item">{{ item.delNum }}</div>
- <div v-if="model.type==1" class="box_table_content_item">{{ item.changeNum }}</div>
- <div class="box_table_content_item">
- <el-form-item label="" prop="bxdMultifileList[index]">
- <UploadFileLink @remove="deleIndex(1,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />
- </el-form-item>
- </div>
- </div>
- </div>
+<!-- <div class="box_table">-->
+<!-- <div class="box_table_head">-->
+<!-- <div class="box_table_head_item">搴忓彿</div>-->
+<!-- <div class="box_table_head_item">琚繚闄╀汉</div>-->
+<!-- <div v-if="model.type==0" class="box_table_head_item">鍔犱繚浜烘暟</div>-->
+<!-- <div v-if="model.type==0" class="box_table_head_item">鍑忎繚浜烘暟</div>-->
+<!-- <div v-if="model.type==1" class="box_table_head_item">鍙樻洿浜烘暟</div>-->
+<!-- <div class="box_table_head_item">涓婁紶鎵瑰崟</div>-->
+<!-- </div>-->
+<!-- <div class="box_table_content" v-for="(item, index) in model.applyList" :key="index">-->
+<!-- <div class="box_table_content_item">{{index + 1}}</div>-->
+<!-- <div class="box_table_content_item" >{{ item.companyName }}</div>-->
+<!-- <div v-if="model.type==0" class="box_table_content_item">{{ item.addNum }}</div>-->
+<!-- <div v-if="model.type==0" class="box_table_content_item">{{ item.delNum }}</div>-->
+<!-- <div v-if="model.type==1" class="box_table_content_item">{{ item.changeNum }}</div>-->
+<!-- <div class="box_table_content_item">-->
+<!-- <el-form-item label="" prop="bxdMultifileList[index]">-->
+<!-- <UploadFileLink @remove="deleIndex(1,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />-->
+<!-- </el-form-item>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</el-form>
<template v-slot:footer>
<el-button type="primary" @click="doSubmit">纭� 瀹�</el-button>
diff --git a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
index f186563..61d53af 100644
--- a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
@@ -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">
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 1bcfa86..a406df4 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -30,7 +30,7 @@
<el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApplyAddWindow.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
<!-- <el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>-->
<el-button v-if="[22,23,24,25,26,27].includes(model.status) && model.shenqingdanFile" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
- <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) && (model.toubaodanFile || model.toubaodanSignedFile) && model.signType !== 1" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
<el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<!-- goSign-->
<el-button v-if="model.status == 20" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
@@ -116,7 +116,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="淇濆崟浜哄憳" name="0" ></el-tab-pane>
<el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
- <el-tab-pane label="鏇存崲宸ョ璁板綍" name="2"></el-tab-pane>
+ <el-tab-pane :label="model.hasDispatchUnit !== 1 ? '鏇存崲娲鹃仯鍗曚綅' : '鏇存崲宸ョ璁板綍'" name="2"></el-tab-pane>
</el-tabs>
</div>
<div class="desc_item_search">
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 8d91903..0c64a2f 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -18,16 +18,16 @@
<template v-if="userInfo.type === 2">
<el-button type="primary" @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
<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="model.status == 1" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">{{model.signType === 1 ? '绛剧讲鐢宠鍗�' : '绛剧讲鎶曚繚鍗�'}}</el-button>
+ <el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</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>
<template v-if="userInfo.type ===0">
- <el-button v-if="[2,3,4,1,5].includes(model.status) && (model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="[2,3,4,1,5].includes(model.status) && (model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</el-button>
<el-button v-if="[0].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
- <el-button v-if="[0, 1].includes(model.status)" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鎶曚繚鍗�</el-button>
+ <el-button v-if="[0, 1].includes(model.status)" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">{{model.signType === 1 ? '绛剧讲鐢宠鍗�' : '绛剧讲鎶曚繚鍗�'}}</el-button>
<el-button v-if="[0,1,2,5].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
<el-button type="primary" @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
diff --git a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
index 1986625..98b1247 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
@@ -551,7 +551,7 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.tableData, solutionId: this.form.solutionId, type: 1, price: this.price })
+ this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.tableData, solutionId: this.form.solutionId, type: 1, hasDispatchUnit: this.item.hasDispatchUnit, price: this.price })
},
// 鍒囨崲鏂规
changeSolution (e) {
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 3a1659a..7451a80 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -567,9 +567,9 @@
}
if (this.activeName === '0') {
- this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId })
+ this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList, type: 1, price: this.price, hasDispatchUnit: this.item.hasDispatchUnit, solutionId: this.item.newVersionSolutionId })
} else {
- this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
+ this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, hasDispatchUnit: this.item.hasDispatchUnit, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
}
},
// 鍒囨崲鏂规
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 0d75d3f..9865d81 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -423,7 +423,7 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.factory, price: this.price })
+ this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.factory, price: this.price, hasDispatchUnit: this.item.hasDispatchUnit })
},
// 鍒囨崲鏂规
changeSolution1 (e) {
diff --git a/company/src/components/enterprise/importEmployees.vue b/company/src/components/enterprise/importEmployees.vue
index a61616f..8e3f2df 100644
--- a/company/src/components/enterprise/importEmployees.vue
+++ b/company/src/components/enterprise/importEmployees.vue
@@ -48,7 +48,8 @@
applyId: null,
addList: [],
delList: [],
- fileName: ''
+ fileName: '',
+ hasDispatchUnit: null
}
},
methods: {
@@ -63,6 +64,7 @@
this.applyId = obj.insuranceApplyId
this.list = obj.arr
this.price = obj.price
+ this.hasDispatchUnit = obj.hasDispatchUnit
this.importing= false
this.confirming= false
},
@@ -70,7 +72,11 @@
exportTemplate () {
// 鎶曚繚鐢宠
if (this.type === 1) {
- window.open('/template/personnel_add.xlsx')
+ if (this.hasDispatchUnit === 1) {
+ window.open('/template/personnel_no.xlsx')
+ } else {
+ window.open('/template/personnel_add.xlsx')
+ }
} else {
window.open('/template/personnel_reduce.xlsx')
}
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 1f4d1df..2031d8a 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -9,9 +9,9 @@
<el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
- <!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
<el-option label="宸查��鍥�" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
+ <el-option label="鎵规敼鐢宠涓�" value="9"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎶曚繚绫诲瀷" prop="solutionType">
@@ -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="100px"></el-table-column>
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index e77d653..3a6cc41 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -181,6 +181,7 @@
status: [
{ label: '寰呭鏍�', id: '0' },
{ label: '寰呭嚭鍗�', id: '1' },
+ { label: '鎶曚繚涓�', id: '26' },
{ label: '寰呯缃�', id: '7' },
{ label: '寰呯敓鏁�', id: '2,0' },
{ label: '淇濋殰涓�', id: '2,1' },
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index d6c42dd..46949c0 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -169,6 +169,7 @@
status: [
{ label: '寰呭鏍�', id: '0' },
{ label: '寰呭嚭鍗�', id: '1' },
+ { label: '鎶曚繚涓�', id: '26' },
{ label: '寰呯缃�', id: '7' },
{ label: '寰呯敓鏁�', id: '2,0' },
{ label: '淇濋殰涓�', id: '2,1' },
--
Gitblit v1.9.3