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/enterprise/OperaInsuranceApplyWindow.vue |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index e0c78be..2423a30 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -121,6 +121,14 @@
                 {{item.type==1?'-':row.fee}}
               </template>
             </el-table-column>
+          <el-table-column
+              prop="remark"
+              align="center"
+              label="澶囨敞">
+            <template slot-scope="{row}">
+                <el-input v-model="row.remark" placeholder="璇疯緭鍏�"></el-input>
+            </template>
+          </el-table-column>
             <el-table-column
                 label="鎿嶄綔">
                 <template slot-scope="scope">
@@ -164,7 +172,7 @@
 import { mapState } from 'vuex'
 import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
 export default {
-  name: 'OperaInsuranceApplyWindow2',
+  name: 'OperaInsuranceApplyWindow',
   extends: BaseOpera,
   components: { GlobalWindow, selectEmployees, addEmployee, OperaWtbApplyShopWindow, importEmployees, confirmJobType, detailsPolicyholder, OperaInsuranceApplyDetails },
   data () {
@@ -310,7 +318,7 @@
         if (index === 0) {
           sums[index] = '鎬讳环'
         } else if (index === 7) {
-          if(this.item.type == 1){
+          if(this.item || this.item.type == 1){
             sums[index] = "-"
           }else{
             let total = 0

--
Gitblit v1.9.3