From 738badf3090b5d203b6316f0fa0ce744c8827bf2 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 9 May 2022 11:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=A5=97=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addFeeCombo/addFeeCombo.html     | 10 +++++
 .../property/addFeeCombo/addFeeCombo.js       |  3 +-
 .../property/editFeeCombo/editFeeCombo.html   | 43 ++++++++++++++-----
 .../property/editFeeCombo/editFeeCombo.js     |  3 +-
 .../feeComboManage/feeComboManage.html        |  8 +++-
 5 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/public/components/property/addFeeCombo/addFeeCombo.html b/public/components/property/addFeeCombo/addFeeCombo.html
index 29db02c8a..44f614c08 100644
--- a/public/components/property/addFeeCombo/addFeeCombo.html
+++ b/public/components/property/addFeeCombo/addFeeCombo.html
@@ -19,6 +19,16 @@
                                         :placeholder="vc.i18n('必填，请填写套餐名称','addFeeCombo')" class="form-control">
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span>
+                                        <vc:i18n name='说明' namespace='addFeeCombo'></vc:i18n>
+                                    </span>
+                                </label>
+                                <div class="col-sm-10">
+                                    <textarea v-model="addFeeComboInfo.remark" 
+                                        :placeholder="vc.i18n('选填，请填写说明','addFeeCombo')" class="form-control"></textarea>
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
diff --git a/public/components/property/addFeeCombo/addFeeCombo.js b/public/components/property/addFeeCombo/addFeeCombo.js
index 87edd5857..7f433c8dc 100644
--- a/public/components/property/addFeeCombo/addFeeCombo.js
+++ b/public/components/property/addFeeCombo/addFeeCombo.js
@@ -9,6 +9,7 @@
             addFeeComboInfo:{
                 comboId:'',
                 comboName:'',
+                remark:'',
 
             }
         },
@@ -88,7 +89,7 @@
             clearAddFeeComboInfo:function(){
                 vc.component.addFeeComboInfo = {
                                             comboName:'',
-
+                                            remark:'',
                                         };
             }
         }
diff --git a/public/components/property/editFeeCombo/editFeeCombo.html b/public/components/property/editFeeCombo/editFeeCombo.html
index af92b0913..f4698b763 100644
--- a/public/components/property/editFeeCombo/editFeeCombo.html
+++ b/public/components/property/editFeeCombo/editFeeCombo.html
@@ -1,21 +1,44 @@
-<div id = "editFeeComboModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editFeeComboModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+    aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b "><span><vc:i18n name="修改费用套餐" namespace="editFeeCombo"></vc:i18n></span></h3>
+                <h3 class="m-t-none m-b "><span>
+                        <vc:i18n name="修改费用套餐" namespace="editFeeCombo"></vc:i18n>
+                    </span></h3>
                 <div class="ibox-content">
                     <div>
                         <div>
                             <div class="form-group row">
-<span><vc:i18n name='套餐名称' namespace='editFeeCombo'></vc:i18n></span> </label>
-         <div class="col-sm-10">
-           <input v-model="editFeeComboInfo.comboName"                   type="text" :placeholder="vc.i18n('必填，请填写套餐名称','editFeeCombo')" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label"><span>
+                                    <vc:i18n name='套餐名称' namespace='editFeeCombo'></vc:i18n>
+                                </span> </label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeeComboInfo.comboName" type="text"
+                                        :placeholder="vc.i18n('必填，请填写套餐名称','editFeeCombo')" class="form-control">
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span>
+                                        <vc:i18n name='说明' namespace='editFeeCombo'></vc:i18n>
+                                    </span>
+                                </label>
+                                <div class="col-sm-10">
+                                    <textarea v-model="editFeeComboInfo.remark" 
+                                        :placeholder="vc.i18n('选填，请填写说明','editFeeCombo')" class="form-control"></textarea>
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editFeeCombo()" ><i class="fa fa-check"></i>&nbsp;<span><vc:i18n name="保存"></vc:i18n></span></button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal"><span><vc:i18n name="取消"></vc:i18n></span></button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="editFeeCombo()"><i
+                                        class="fa fa-check"></i>&nbsp;<span>
+                                        <vc:i18n name="保存"></vc:i18n>
+                                    </span></button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                    data-dismiss="modal"><span>
+                                        <vc:i18n name="取消"></vc:i18n>
+                                    </span></button>
                             </div>
                         </div>
                     </div>
@@ -23,4 +46,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/editFeeCombo/editFeeCombo.js b/public/components/property/editFeeCombo/editFeeCombo.js
index 87ef442c2..6da064d2b 100644
--- a/public/components/property/editFeeCombo/editFeeCombo.js
+++ b/public/components/property/editFeeCombo/editFeeCombo.js
@@ -5,6 +5,7 @@
             editFeeComboInfo: {
                 comboId: '',
                 comboName: '',
+                remark:'',
 
             }
         },
@@ -78,7 +79,7 @@
                 vc.component.editFeeComboInfo = {
                     comboId: '',
                     comboName: '',
-
+                    remark:'',
                 }
             }
         }
diff --git a/public/pages/property/feeComboManage/feeComboManage.html b/public/pages/property/feeComboManage/feeComboManage.html
index 625148b6e..cbb262620 100644
--- a/public/pages/property/feeComboManage/feeComboManage.html
+++ b/public/pages/property/feeComboManage/feeComboManage.html
@@ -64,9 +64,13 @@
                                 <th class="text-center"><span>
                                         <vc:i18n name='套餐名称' namespace='feeComboManage'></vc:i18n>
                                     </span></th>
+                                    
                                     <th class="text-center"><span>
                                         <vc:i18n name='创建时间' ></vc:i18n>
                                     </span></th>
+                                    <th class="text-center"><span>
+                                        <vc:i18n name='说明' ></vc:i18n>
+                                    </span></th>
                                 <th class="text-center"><span>
                                         <vc:i18n name='操作'></vc:i18n>
                                     </span></th>
@@ -77,7 +81,9 @@
                         <tbody>
                             <tr v-for="feeCombo in feeComboManageInfo.feeCombos">
                                 <td class="text-center">{{feeCombo.comboName}}</td>
-                                <td class="text-center">{{feeCombo.createTime}}
+                                <td class="text-center">{{feeCombo.createTime}}</td>
+                                <td class="text-center">{{feeCombo.remark}}</td>
+                                <td class="text-center">
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditFeeComboModel(feeCombo)"><span>