From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交

---
 company/src/components/business/OpearaUnionApply.vue |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index 6ae3352..418f783 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -19,7 +19,7 @@
                             :value="item.id">
                         </el-option>
                     </el-select>
-                  <span style="color: #F95601; font-size: 14px;">锛�1. 璇峰厛閫夋嫨鏂规鏌ョ湅鐢宠璁板綍锛�</span>
+                  <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" style="margin-left: 40px">
@@ -33,11 +33,11 @@
                             range-separator="鑷�"
                             start-placeholder="寮�濮嬫棩鏈�"
                             end-placeholder="缁撴潫鏃ユ湡" />
-                        <span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬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">
-                    <span>{{item.price}}鍏�</span>
+                    <span>{{item.price}} 鍏�</span>
                     <span v-if="item.timeUnit === 0">/澶�</span>
                     <span v-if="item.timeUnit === 1">/鍗婃湀</span>
                     <span v-if="item.timeUnit === 2">/鏈�</span>
@@ -87,6 +87,10 @@
                 label="鎶曚繚浜烘暟">
             </el-table-column>
             <el-table-column
+                prop="guaranteeNum"
+                label="鍦ㄤ繚浜烘暟">
+            </el-table-column>
+            <el-table-column
                 prop="fee"
                 label="鎬昏垂鐢�">
             </el-table-column>
@@ -97,17 +101,17 @@
                 </template>
             </el-table-column>
         </el-table>
-      <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�3. 璇峰厛閫夋嫨鑷冲皯涓�鏉$敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
+      <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="successEvent" />
+      <InsuranceDetails ref="InsuranceDetails" @success="getValue" />
     </GlobalWindow>
 </template>
 
@@ -117,11 +121,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 +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 = ''
@@ -251,16 +255,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