From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OpearaUnionApply.vue | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index 246eccf..db5f01a 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -9,17 +9,20 @@
>
<div class="list">
<el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
- <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
+ <el-form-item label="淇濋櫓鏂规锛�" prop="baseSolutionId">
+ <div style="display: flex; flex-direction: column;">
<el-select v-model="form.baseSolutionId" @change="selectSolutions" placeholder="璇烽�夋嫨">
<el-option
v-for="item in solutions"
- :key="item.baseId"
+ :key="item.id"
:label="item.name"
- :value="item.baseId">
+ :value="item.id">
</el-option>
</el-select>
+ <span style="color: orange; font-size: 14px;"><i class="el-icon-warning"></i>1. 璇峰厛閫夋嫨鏂规鏌ョ湅鐢宠璁板綍</span>
+ </div>
</el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥璧锋鏈�" prop="startDate">
+ <el-form-item label="淇濋櫓鐢熸晥璧锋鏈燂細" prop="startDate" style="margin-left: 40px">
<div style="display: flex; flex-direction: column;">
<el-date-picker
@change="changeTime"
@@ -30,7 +33,7 @@
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" />
- <span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+ <span style="color: orange; font-size: 14px;"><i class="el-icon-warning"></i>2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯</span>
</div>
</el-form-item>
<el-form-item label="璐圭敤" v-if="item">
@@ -48,8 +51,8 @@
</div>
<div class="btns">
<div class="btns_item">
- <el-button type="primary" @click="selectApplicationForm">閫夋嫨鐢宠鍗�</el-button>
- <el-button type="primary" @click="$refs.employeeList.open('鎶曚繚鍛樺伐鍚嶅崟')">鏌ョ湅鍚嶅崟</el-button>
+<!-- <el-button type="primary" @click="selectAll">鏉冮檺</el-button>-->
+<!-- <el-button type="primary" @click="$refs.employeeList.open('鎶曚繚鍛樺伐鍚嶅崟')">鏌ョ湅鍚嶅崟</el-button>-->
</div>
</div>
<el-table
@@ -84,26 +87,31 @@
label="鎶曚繚浜烘暟">
</el-table-column>
<el-table-column
+ prop="guaranteeNum"
+ label="鍦ㄤ繚浜烘暟">
+ </el-table-column>
+ <el-table-column
prop="fee"
label="鎬昏垂鐢�">
</el-table-column>
- <el-table-column
- label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button type="text" @click="$refs.employeeList.open('鎶曚繚鍛樺伐鍚嶅崟')">鏌ョ湅鍚嶅崟</el-button>
- <el-button type="text" style="color: #ff0000;">鍒犻櫎</el-button>
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.InsuranceDetails.open('鎶曚繚浜哄憳鍚嶅崟',row,2)">鏌ョ湅鍚嶅崟</el-button>
+<!-- <el-button type="text" style="color: #ff0000;">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
+ <div style="color: orange; font-size: 14px;width: 100%;text-align: left"><i class="el-icon-warning"></i>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="getValue" />
</GlobalWindow>
</template>
@@ -113,12 +121,13 @@
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, selectApplicationForm, employeeList },
+ components: { GlobalWindow, InsuranceDetails,selectApplicationForm, employeeList },
data () {
return {
form: {
@@ -208,8 +217,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 = ''
@@ -246,16 +255,12 @@
this.getList()
},
getList () {
- fetchList({
- capacity: 10,
- page: this.currentPage,
- model: {
- solutionBaseId: this.form.solutionsId,
+ 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()
@@ -267,7 +272,7 @@
selectSolutions (id) {
this.search()
this.solutions.forEach(item => {
- if (item.baseId === id) {
+ if (item.id === id) {
this.item = item
}
})
@@ -303,6 +308,7 @@
margin-bottom: 10px;
}
.info {
+ margin-top: 30px;
width: 100%;
font-size: 14px;
color: black;
--
Gitblit v1.9.3