sale-client 4.3.54 → 4.3.55

package/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
 
+## **🚀 V4.3.55 -2026-05-14 `@柳博`**
+
+### `🌟` 功能调整
+
+---
+
+修复保险记录表单中的日期验证和计算逻辑
+
+- 移除待执行状态下手动输入保费结束日期功能，改为根据开始日期和购买年限自动计算
+- 添加保费结束日期的验证逻辑，确保日期在当日之后
+- 重构日期计算方法，统一使用recalcExpirationDate函数处理到期日期计算
+- 优化日期比较逻辑，使用getTime()方法进行准确的时间对比
+- 在保险记录组件中添加太平洋保险公司条件判断
+- 修正日期格式化处理，统一时间戳为00:00:00格式
+- 删除不再使用的datepicker组件相关代码和验证规则
+
 ## **🚀 V4.3.54 -2026-05-13   `@柳博`**
 
 ### `🌟` 功能调整

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.3.54",
+  "version": "4.3.55",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/jinhong/InsuranceAdd.vue

@@ -72,29 +72,19 @@
               <input type="number" v-model="model.f_salecount" placeholder="购买年限" style="width: 60%"
                    class="input_search" v v-el:style v-next-el="inpipe">
           </div>
-          <div class="col-sm-6  form-group" :class="[$v.f_expiration_date2.required ? 'has-error' : '']" v-if="model.f_state === '待执行'">
-          <input type="text" v-show="false" v-model="tmp" :value.sync='model.f_expiration_date'  v-el:f_expiration_date2>
-          <label class="font_normal_body">&emsp;&emsp;保费结束日期</label>
-          <datepicker id="f_expiration_date" placeholder="保费结束日期" style="width:60%"
-                      @con-bulr="isShowSaleCount"
-                      v-ref:f_expiration_date
-                      v-model="model.f_expiration_date"
-                      :value.sync="model.f_expiration_date"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="true">
-          </datepicker>
-        </div>
-          <div class="col-sm-6  form-group" :class="[$v.f_expiration_date2.required ? 'has-error' : '']" v-else="model.f_state !== '待执行'">
+          <div class="col-sm-6  form-group" v-if="model.f_state === '待执行'">
+            <input type="text" v-show="false" v-model="tmp" :value.sync='model.f_expiration_date'  v-el:f_expiration_date2>
+            <label class="font_normal_body">&emsp;&emsp;保费结束日期</label>
+            <input type="text" class="input_search" style="width:60%" disabled="disabled"
+                   :value="model.f_expiration_date"
+                   placeholder="根据开始日期和购买年限自动计算">
+          </div>
+          <div class="col-sm-6  form-group" v-else="model.f_state !== '待执行'">
             <input type="text" v-show="false" v-model="tmp" :value.sync='model.f_expiration_date' v-validate:f_expiration_date2='{required: true }' v-el:f_expiration_date2>
             <label class="font_normal_body">&emsp;&emsp;保费结束日期</label>
-            <datepicker id="f_expiration_date" placeholder="保费结束日期" style="width:60%"
-                        @con-bulr="isShowSaleCount"
-                        v-ref:f_expiration_date
-                        v-model="model.f_expiration_date"
-                        :value.sync="model.f_expiration_date"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="true">
-            </datepicker>
+            <input type="text" class="input_search" style="width:60%" disabled="disabled"
+                   :value="model.f_expiration_date"
+                   placeholder="根据开始日期和购买年限自动计算">
           </div>
           <div class="col-sm-6  form-group" :class="[$v.f_insurance_type.required ? 'has-error' : '']">
             <label class="font_normal_body" title="参数:险种">&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;险种</label>
@@ -295,26 +285,12 @@
       this.model.f_buy_date = this.model.f_buy_date || Util.toStandardTimeString()
       this.$set('model.f_ins_start_date', this.getDefaultInsStartDate())
       this.model.f_salecount = 1
+      this.recalcExpirationDate()
       this.configMerge()
     },
     watch: {
       'model.f_ins_start_date' (val) {
-        if (val && this.model.f_salecount) {
-          let tx = new Date(val)
-          let tmp = {
-            year: tx.getFullYear(),
-            month: tx.getMonth() + 1,
-            day: tx.getDate()
-          }
-          let tmpdate = new Date((tmp.year + (this.model.f_salecount - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
-          let date = tmpdate
-          let jt = {
-            year: date.getFullYear(),
-            month: date.getMonth() + 1,
-            day: date.getDate()
-          }
-          this.$refs.f_expiration_date.value = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
-        }
+        this.recalcExpirationDate()
       },
       'model.f_money' (val) {
         if (val && (val < 0 || Math.floor(val - 0) !== (val - 0))) {
@@ -328,22 +304,10 @@
           this.model.f_salecount = 0
           this.f_salecount.dctest = false
         } else if (val && this.model.f_ins_start_date) {
-          let tx = new Date(this.model.f_ins_start_date)
-          let tmp = {
-            year: tx.getFullYear(),
-            month: tx.getMonth() + 1,
-            day: tx.getDate()
-          }
-          let tmpdate = new Date((tmp.year + (val - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
-          let date = tmpdate
-          let jt = {
-            year: date.getFullYear(),
-            month: date.getMonth() + 1,
-            day: date.getDate()
-          }
-          this.$refs.f_expiration_date.value = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
+          this.recalcExpirationDate()
           this.f_salecount.dctest = true
         } else {
+          this.model.f_expiration_date = ''
           this.f_salecount.dctest = true
         }
       },
@@ -352,6 +316,8 @@
           this.model.f_insurance_type = this.model.f_insurance_type == null ? this.config.insuranceType : this.model.f_insurance_type
           this.model.f_state = this.model.f_state == null ? this.config.insurancestate : this.model.f_state
           this.model.f_ins_start_date = this.getDefaultInsStartDate()
+          this.model.f_salecount = 1
+          this.recalcExpirationDate()
           console.log('cs===================cs', this.model.f_userinfo_id, this.model.f_ins_start_date)
         }
       }
@@ -423,23 +389,32 @@
         return new Date(date.getFullYear(), date.getMonth(), date.getDate())
       },
       getDefaultInsStartDate () {
-        let tomorrow = new Date()
-        tomorrow.setHours(0, 0, 0, 0)
-        tomorrow.setDate(tomorrow.getDate() + 1)
-        let minDate = tomorrow
+        let today = new Date()
+        today.setHours(0, 0, 0, 0)
         let stopDate = this.parseDateOnly(this.model.f_ins_stop_date)
-        if (stopDate) {
-          let nextStopDate = new Date(stopDate.getTime())
-          nextStopDate.setDate(nextStopDate.getDate() + 1)
-          if (nextStopDate.getTime() > minDate.getTime()) {
-            minDate = nextStopDate
-          }
+        if (stopDate && stopDate.getTime() > today.getTime()) {
+          return this.formatYmd(stopDate)
+        }
+        let tomorrow = new Date(today.getTime())
+        tomorrow.setDate(tomorrow.getDate() + 1)
+        return this.formatYmd(tomorrow)
+      },
+      recalcExpirationDate () {
+        let startDate = this.parseDateOnly(this.model.f_ins_start_date)
+        let saleCount = this.model.f_salecount - 0
+        if (!startDate || !saleCount || saleCount < 0) {
+          this.model.f_expiration_date = ''
+          return
         }
-        return this.formatYmd(minDate)
+        let expirationDate = new Date((startDate.getFullYear() + saleCount) + '-' + ((startDate.getMonth() + 1) < 10 ? '0' + (startDate.getMonth() + 1) : (startDate.getMonth() + 1)) + '-' + (startDate.getDate() < 10 ? '0' + startDate.getDate() : startDate.getDate()))
+        this.model.f_expiration_date = this.formatYmd(expirationDate)
       },
       async save () {
         let saveState = true
         let startDate = this.parseDateOnly(this.model.f_ins_start_date)
+        let expirationDate = this.parseDateOnly(this.model.f_expiration_date)
+        let today = new Date()
+        today.setHours(0, 0, 0, 0)
         let tomorrow = new Date()
         tomorrow.setHours(0, 0, 0, 0)
         tomorrow.setDate(tomorrow.getDate() + 1)
@@ -447,13 +422,20 @@
           this.$showAlert('保险开始日期必须在当前日期的次日及之后', 'warning', 2000)
           saveState = false
         }
+        if (saveState && (!expirationDate || expirationDate.getTime() <= today.getTime())) {
+          this.$showAlert('保单截止日期必须在当日之后', 'warning', 2000)
+          saveState = false
+        }
         if (this.model.f_state !== '待执行') {
-          if (saveState && Date.parse(this.model.f_ins_start_date) > Date.parse(this.model.f_expiration_date)) {
+          if (saveState && startDate.getTime() > expirationDate.getTime()) {
             this.$showAlert('结束日期不能早于开始日期', 'warning', 2000)
             saveState = false
-          } else if (saveState && this.model.f_ins_start_date !== null && this.model.f_ins_start_date !== '' && Date.parse(this.model.f_ins_stop_date) > Date.parse(this.model.f_ins_start_date)) {
-            this.$showAlert('开始日期不能早于上期保费截止日期', 'warning', 2000)
-            saveState = false
+          } else if (saveState) {
+            let stopDate = this.parseDateOnly(this.model.f_ins_stop_date)
+            if (stopDate && stopDate.getTime() > startDate.getTime()) {
+              this.$showAlert('开始日期不能早于上期保费截止日期', 'warning', 2000)
+              saveState = false
+            }
           }
         }
 
@@ -470,9 +452,8 @@
           if (startDate) {
             this.model.f_ins_start_date = this.formatYmd(startDate) + ' 00:00:00'
           }
-          let expirationDate = this.parseDateOnly(this.model.f_expiration_date)
           if (expirationDate) {
-            this.model.f_expiration_date = this.formatYmd(expirationDate) + ' 23:59:59'
+            this.model.f_expiration_date = this.formatYmd(expirationDate) + ' 00:00:00'
           }
           this.model.f_total_ins_charge = this.model.f_total_ins_charge == null ? 0 : this.model.f_total_ins_charge
           this.model.f_operat_type = '保险'

package/src/filiale/jinhong/InsuranceRecord.vue

@@ -149,7 +149,7 @@
               </div>
             </div>
             <div class="form-group" :class="[$v.f_cancel_reason.required ? 'has-error' : 'has-success']">
-              <label for="f_cancel_reason" class=" col-sm-2 control-label">撤销原因1:</label>
+              <label for="f_cancel_reason" class=" col-sm-2 control-label">撤销原因:</label>
               <div class="col-sm-8">
                 <textarea class="form-control"
                           v-model="model.f_cancel_reason" rows="2"
@@ -165,13 +165,13 @@
         </validator>
       </article>
       <footer slot="modal-footer" class="modal-footer">
+        <button class="btn btn-default" @click="clean()">取消</button>
         <button class="btn btn-success" v-if="config.hasAudit && !isTodayResult" @click="auditConfirm()"
                 :disabled="!$v.valid">提交审核
         </button>
         <button class="btn btn-success" v-if="!config.hasAudit || isTodayResult" @click="confirm()"
                 :disabled="!$v.valid">确认
         </button>
-        <button class="btn btn-default" @click="clean()">取消</button>
       </footer>
     </modal>
   </div>
@@ -261,6 +261,7 @@ export default {
     /** 核销期使用购买时间判断：当前操作时间已超过购买当日 17:30:00 */
     needsVerificationPeriod (row) {
       if (!row) return false
+      if (row.f_insurance_company !== '太平洋保险') return false
       const buyDate = this.parseDateTime(row.f_buy_date)
       if (!buyDate) return false
       const now = new Date()