From df59cad917c6db1db3b36a23f4b3e7be510e9ed0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 11:20:37 +0800
Subject: [PATCH] git ch
---
company/src/components/business/OpearaUnionApply.vue | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index 6ae3352..facef5e 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -99,15 +99,15 @@
</el-table>
<div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�3. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
<div class="info" v-if="item">
- <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
- <span v-if="item.specialInfo">{{item.specialInfo}}</span>
- <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+ <span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
+ <span v-if="item.specialInfo" v-html="item.specialInfo"></span>
+ <span v-if="item.ortherInfo" v-html="item.ortherInfo"></span>
</div>
<!-- 閫夋嫨鐢宠鍗� -->
<selectApplicationForm ref="selectApplicationForm" @success="getValue" />
<!-- 鎶曚繚鍛樺伐鍚嶅崟 -->
<employeeList ref="employeeList" />
- <InsuranceDetails ref="InsuranceDetails" @success="successEvent" />
+ <InsuranceDetails ref="InsuranceDetails" @success="getValue" />
</GlobalWindow>
</template>
@@ -117,11 +117,11 @@
import selectApplicationForm from '@/components/business/selectApplicationForm'
import employeeList from '@/components/business/employeeList'
import { all } from '@/api/business/solutions'
-import { fetchList } from '@/api/business/insuranceApply'
+import { findAllApply } from '@/api/business/insuranceApply'
import InsuranceDetails from '@/components/business/InsuranceDetails'
import { merge } from '@/api/business/unionApply'
export default {
- name: 'factoryChange',
+ name: 'OpearaUnionApply',
extends: BaseOpera,
components: { GlobalWindow, InsuranceDetails,selectApplicationForm, employeeList },
data () {
@@ -213,8 +213,8 @@
},
changeTime (e) {
if (e.length > 0) {
- this.form.startDate = e[0]
- this.form.endDate = e[1]
+ this.form.startDate = e[0]+ ' 00:00:00'
+ this.form.endDate = e[1] + ' 23:59:59'
} else {
this.form.startDate = ''
this.form.endDate = ''
@@ -251,16 +251,12 @@
this.getList()
},
getList () {
- fetchList({
- capacity: 10,
- page: this.currentPage,
- model: {
+ findAllApply({
baseSolutionId: this.form.baseSolutionId,
status: 23
- }
}).then(res => {
- this.list = res.records
- this.total = res.total
+ this.list = res
+ this.total=this.list ?this.list.length:0
this.$nextTick(() => {
if (this.$refs.table && this.$refs.table.doLayout) {
this.$refs.table.doLayout()
--
Gitblit v1.9.3