From 90a94e6d42bf78bfeea8d9a84406553bd8ac918f Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 26 Nov 2022 17:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=B5=A0=E9=80=81=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addCouponPropertyPool.html                    | 15 ++++++++++++---
 .../addCouponPropertyPool.js                      |  7 ++-----
 .../scm/addCouponRuleCpps/addCouponRuleCpps.html  | 13 +++++++++++++
 .../scm/addCouponRuleCpps/addCouponRuleCpps.js    |  4 +++-
 .../scm/couponRuleCpps/couponRuleCpps.html        |  5 +++++
 .../editCouponPropertyPool.html                   |  9 +++++++++
 .../editCouponPropertyPool.js                     |  2 ++
 .../editCouponRuleCpps/editCouponRuleCpps.html    | 13 +++++++++++++
 .../scm/editCouponRuleCpps/editCouponRuleCpps.js  |  2 ++
 9 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.html b/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.html
index 39d0f7f1b..ef8ff302b 100644
--- a/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.html
+++ b/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.html
@@ -29,8 +29,8 @@
                     </option>
                     <option value="1011">{{vc.i18n('购物','addCouponPropertyPool')}}
                     </option>
-                    <option value="2002">{{vc.i18n('缴费','addCouponPropertyPool')}}
-                    </option>
+                    <!-- <option value="2002">{{vc.i18n('缴费','addCouponPropertyPool')}}
+                    </option> -->
                     <option value="3003">{{vc.i18n('维修劵','addCouponPropertyPool')}}
                     </option>
                     <option value="4004">{{vc.i18n('停车劵','addCouponPropertyPool')}}
@@ -56,13 +56,22 @@
               </div>
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='有效期' namespace=' addCouponPropertyPool'></vc:i18n>
+                    <vc:i18n name='有效期' namespace='addCouponPropertyPool'></vc:i18n>
                   </span></label>
                 <div class="col-sm-10">
                   <input v-model="addCouponPropertyPoolInfo.validityDay" type="text"
                     :placeholder="vc.i18n('必填，请填写有效期(天)','addCouponPropertyPool')" class="form-control">
                 </div>
               </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label"><span>
+                    <vc:i18n name='使用说明' namespace='addCouponPropertyPool'></vc:i18n>
+                  </span></label>
+                <div class="col-sm-10">
+                  <textarea :placeholder="vc.i18n('必填，请填写使用说明','addCouponPropertyPool')" class="form-control"
+                    v-model="addCouponPropertyPoolInfo.remark"></textarea>
+                </div>
+              </div>
 
               <div class="ibox-content">
                 <button class="btn btn-primary float-right" type="button" v-on:click="saveCouponPropertyPoolInfo()"><i
diff --git a/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.js b/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.js
index acbfa694b..f646c30b6 100644
--- a/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.js
+++ b/public/components/scm/addCouponPropertyPool/addCouponPropertyPool.js
@@ -13,6 +13,7 @@
                 toType: '',
                 stock: '',
                 validityDay: '',
+                remark:'',
                 toTypes:[]
             }
         },
@@ -89,10 +90,6 @@
                             errInfo: "有效期'不能超过12"
                         },
                     ],
-
-
-
-
                 });
             },
             saveCouponPropertyPoolInfo: function () {
@@ -138,6 +135,7 @@
                     toType: '',
                     stock: '',
                     validityDay: '',
+                    remark:'',
                     toTypes:[]
 
                 };
@@ -153,7 +151,6 @@
                         page:1,
                         row:100
                     }
-                    
                 }
                  //发送get请求
                  vc.http.apiGet('/couponKey.listCouponKey',
diff --git a/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.html b/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.html
index ead6aefab..7424c58bc 100644
--- a/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.html
+++ b/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.html
@@ -30,6 +30,19 @@
                                         :placeholder="vc.i18n('必填，请填写赠送数量','addCouponRuleCpps')" class="form-control">
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span>
+                                        <vc:i18n name='赠送频率' namespace='addCouponRuleCpps'></vc:i18n>
+                                    </span></label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addCouponRuleCppsInfo.giftFrequency">
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择赠送频率','addCouponRuleCpps')}}
+                                        </option>
+                                        <option value="100301" >赠送一次</option>
+                                        <option value="100302" >每月赠送一次</option>
+                                    </select>
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
diff --git a/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.js b/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.js
index f70eaed04..79bd394aa 100644
--- a/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.js
+++ b/public/components/scm/addCouponRuleCpps/addCouponRuleCpps.js
@@ -11,11 +11,12 @@
                 cppId: '',
                 quantity: '',
                 ruleId:'',
+                giftFrequency:'100301',
                 couponPropertyPools:[]
             }
         },
         _initMethod: function () {
-
+            //100301 赠送一次  100302 每月赠送一次
         },
         _initEvent: function () {
             vc.on('addCouponRuleCpps', 'openAddCouponRuleCppsModal', function (_rule) {
@@ -117,6 +118,7 @@
                     cppId: '',
                     quantity: '',
                     ruleId:'',
+                    giftFrequency:'100301',
                     couponPropertyPools:[]
 
                 };
diff --git a/public/components/scm/couponRuleCpps/couponRuleCpps.html b/public/components/scm/couponRuleCpps/couponRuleCpps.html
index 4bda7529f..69c2b7a72 100644
--- a/public/components/scm/couponRuleCpps/couponRuleCpps.html
+++ b/public/components/scm/couponRuleCpps/couponRuleCpps.html
@@ -26,6 +26,9 @@
                     <th class="text-center"><span>
                             <vc:i18n name='赠送数量' namespace='couponRuleCppsManage'></vc:i18n>
                         </span></th>
+                    <th class="text-center"><span>
+                            <vc:i18n name='赠送频率' namespace='couponRuleCppsManage'></vc:i18n>
+                        </span></th>
                     <th class="text-center"><span>
                             <vc:i18n name='操作'></vc:i18n>
                         </span></th>
@@ -36,6 +39,8 @@
                     <td class="text-center">{{couponRuleCpps.crcId}}</td>
                     <td class="text-center">{{couponRuleCpps.couponName}}</td>
                     <td class="text-center">{{couponRuleCpps.quantity}}</td>
+                    <td class="text-center">{{couponRuleCpps.giftFrequencyName}}</td>
+
                     <td class="text-center">
                         <div class="btn-group">
                             <button class="btn-white btn btn-xs"
diff --git a/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.html b/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.html
index c4302a68b..443c8b7c8 100644
--- a/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.html
+++ b/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.html
@@ -61,6 +61,15 @@
                     :placeholder="vc.i18n('必填，请填写有效期','editCouponPropertyPool')" class="form-control">
                 </div>
               </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label"><span>
+                    <vc:i18n name='使用说明' namespace='editCouponPropertyPool'></vc:i18n>
+                  </span></label>
+                <div class="col-sm-10">
+                  <textarea :placeholder="vc.i18n('必填，请填写使用说明','editCouponPropertyPool')" class="form-control"
+                    v-model="editCouponPropertyPoolInfo.remark"></textarea>
+                </div>
+              </div>
 
               <div class="ibox-content">
                 <button class="btn btn-primary float-right" type="button" v-on:click="editCouponPropertyPool()"><i
diff --git a/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.js b/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.js
index 557e5d4bf..c56000d97 100644
--- a/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.js
+++ b/public/components/scm/editCouponPropertyPool/editCouponPropertyPool.js
@@ -9,6 +9,7 @@
                 toType: '',
                 stock: '',
                 validityDay: '',
+                remark:'',
                 toTypes:[]
             }
         },
@@ -135,6 +136,7 @@
                     toType: '',
                     stock: '',
                     validityDay: '',
+                    remark:'',
                     toTypes:[]
                 }
             },
diff --git a/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.html b/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.html
index d70c869ea..18dafa601 100644
--- a/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.html
+++ b/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.html
@@ -30,6 +30,19 @@
                                         :placeholder="vc.i18n('必填，请填写赠送数量','editCouponRuleCpps')" class="form-control">
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span>
+                                        <vc:i18n name='赠送频率' namespace='editCouponRuleCpps'></vc:i18n>
+                                    </span></label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editCouponRuleCppsInfo.giftFrequency">
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择赠送频率','editCouponRuleCpps')}}
+                                        </option>
+                                        <option value="100301" >赠送一次</option>
+                                        <option value="100302" >每月赠送一次</option>
+                                    </select>
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
diff --git a/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.js b/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.js
index 8070f6cc3..b319b7ed4 100644
--- a/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.js
+++ b/public/components/scm/editCouponRuleCpps/editCouponRuleCpps.js
@@ -7,6 +7,7 @@
                 cppId: '',
                 quantity: '',
                 ruleId:'',
+                giftFrequency:'100301',
                 couponPropertyPools:[]
 
             }
@@ -96,6 +97,7 @@
                     cppId: '',
                     quantity: '',
                     ruleId:'',
+                    giftFrequency:'100301',
                     couponPropertyPools:[]
     
                 }