From 0f409b25f91717e00e10c37738740b22583cb4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 五月 2024 09:00:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 91 ++++++++++++++++++++++++++++++---------------
1 files changed, 60 insertions(+), 31 deletions(-)
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 29510f4..39cddd5 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -12,8 +12,8 @@
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
<el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
- <el-button type="primary" v-if="model.status === 27" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
- <el-button type="primary" v-if="model.status === 27" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
+ <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
+ <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
</div>
</div>
<div class="desc_item_label">
@@ -32,9 +32,9 @@
<el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" 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" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
- <el-button v-if="model.status == 21" type="primary" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="model.unionApplyTbdStatus == 1" type="primary" @click="getSignLink(2)">绛剧讲鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 20" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
+ <el-button v-if="model.status == 21" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="model.unionApplyTbdStatus == 1" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(2)">绛剧讲鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 24" type="danger" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-if="userInfo.type === 2">
@@ -271,6 +271,11 @@
<span>{{row.fee!=null?row.fee: '-'}}</span>
</template>
</el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
<el-table
:data="list1"
@@ -300,7 +305,7 @@
</el-table-column>
<el-table-column
:key="Math.random()"
- prop="applyCode"
+ prop="validCode"
align="center"
label="鎵瑰崟鍙�">
</el-table-column>
@@ -326,8 +331,20 @@
:key="Math.random()"
prop="applyStartTime"
align="center"
- label="鎵瑰崟鐢熸晥璧锋湡">
+ label="鎵瑰鐢熸晥鏃ユ湡">
</el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="delValidTime"
+ align="center"
+ label="鎵瑰噺鐢熸晥鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
<el-table-column
align="center"
:key="Math.random()"
@@ -365,7 +382,7 @@
<el-table-column
:key="Math.random()"
align="center"
- prop="applyCode"
+ prop="validCode"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
@@ -385,6 +402,11 @@
prop="applyStartTime"
align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
+ </el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -432,7 +454,7 @@
<!-- 浼佷笟鐢宠閫�鍥� -->
<applyReturn ref="applyReturn" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
+ <OperaInsuranceApplyWindow ref="OperaInsuranceApply" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
@@ -485,6 +507,7 @@
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
+import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import applyReturn from '@/components/enterprise/applyReturn'
@@ -500,7 +523,6 @@
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
import { mapState } from 'vuex'
import {sendSms} from "@/api/business/smsEmail";
@@ -512,7 +534,7 @@
InsuranceDetails,
OperaWtbApplyCheckWindow,
applyReturn,
- OperaInsuranceApply,
+ OperaInsuranceApplyWindow,
additionSubtractionApplication,
factoryChange,
OperaApplyChangeDetailWindow,
@@ -568,7 +590,9 @@
gzList: [],
activeName: '0',
total: 0,
- currentPage: 1
+ currentPage: 1,
+
+ loading: false
}
},
created () {
@@ -616,46 +640,51 @@
this.signTitle = '绛剧讲鎶曚繚鍗�'
}
this.form.type = flag
- this.visiblePhone = true
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- });
+ this.goSignDo()
+ // this.visiblePhone = true
+ // this.$nextTick(() => {
+ // this.$refs.form.resetFields()
+ // });
},
goSignDo(){
- this.$refs.form.validate((valid) => {
- if (!valid) {
- return
- }
- this.isWorking = true
+ // this.$refs.form.validate((valid) => {
+ // if (!valid) {
+ // return
+ // }
+ // this.isWorking = true
+ this.loading = true
if(this.form.type===0){
getSignTBQRSLink(this.form).then(res => {
- setTimeout(() => {
- this.visiblePhone=false
+ this.loading = false
+ // setTimeout(() => {
+ // this.visiblePhone=false
window.open(res)
- }, 500)
+ // }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
})
} else if (this.form.type === 1) {
getMemberListOnlineSignLink(this.form).then(res => {
- setTimeout(() => {
- this.visiblePhone=false
+ this.loading = false
+ // setTimeout(() => {
+ // this.visiblePhone=false
window.open(res)
- }, 500)
+ // }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
})
} else if (this.form.type === 2) {
getSignWTBTBDLink(this.form).then(res => {
- setTimeout(() => {
- this.visiblePhone=false
+ this.loading = false
+ // setTimeout(() => {
+ // this.visiblePhone=false
window.open(res)
- }, 500)
+ // }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
})
}
- })
+ // })
},
send () {
sendSms({
--
Gitblit v1.9.3