sale-client 4.3.53 → 4.3.54

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
+
+## **🚀 V4.3.54 -2026-05-13   `@柳博`**
+
+### `🌟` 功能调整
+
+---
+
+优化保险开始日期逻辑
+
+- 移除了开始日期字段的验证样式绑定
+- 统一日期格式为 'yyyy-MM-dd' 不再包含时间部分
+- 添加了默认保险开始日期计算方法
+- 实现了保险开始日期必须在当前日期次日之后的验证
+- 在购买日期初始化时设置标准时间格式
+- 重构了保险开始日期设置逻辑
+- 简化了续保日期计算逻辑
+- 添加了日期格式化和解析工具方法
+- 添加了核销期判断逻辑和二次确认警告
+
+
+
 ## **🚀 V4.3.29 2026-04-08   `@张科科`**
 ### `🌟` 功能调整
 - 洪雅 机表收费 页面中 实欠气费 改为 用气金额

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://222.83.114.229:31785/', 'http://127.0.0.1:9026/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -56,24 +56,6 @@ var devConfig = {
       //   },
       //   target: "http://localhost:8080"
       // },
-      '/api/af-revenue/file': {
-        pathRewrite: {
-          '/api/af-revenue': '/'
-        },
-        target: localUrl
-      },
-      '/api/af-revenue/handPlanAudit': {
-        pathRewrite: {
-          '/api/af-revenue': '/'
-        },
-        target: localUrl
-      },
-      '/api/af-revenue/logic/getBatchOperaPro': {
-        pathRewrite: {
-          '/api/af-revenue': '/'
-        },
-        target: localUrl
-      },
       '/api': {
         target: serverRul
       },

package/package.json

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

package/src/filiale/jinhong/InsuranceAdd.vue

@@ -42,7 +42,7 @@
                         :show-reset-button="true">
             </datepicker>
           </div>
-          <div class="col-sm-6  form-group" :class="[$v.f_ins_start_date.required ? 'has-error' : '']" v-if="model.f_state === '待执行'">
+          <div class="col-sm-6  form-group" v-if="model.f_state === '待执行'">
             <label class="font_normal_body">本次保费开始日期</label>
             <input type="text" v-show="false" v-model="model.f_ins_start_date">
             <datepicker id="f_ins_start_date" placeholder="本次保费开始日期" style="width:60%"
@@ -52,14 +52,13 @@
                         :show-reset-button="true">
             </datepicker>
           </div>
-          <div class="col-sm-6  form-group" :class="[$v.f_ins_start_date.required ? 'has-error' : '']" v-else="model.f_state !== '待执行'">
+          <div class="col-sm-6  form-group" v-else="model.f_state !== '待执行'">
             <label class="font_normal_body">本次保费开始日期</label>
-            <input type="text" v-show="false" v-model="model.f_ins_start_date"
-                   v-validate:f_ins_start_date='{required: true }'>
+            <input type="text" v-show="false" v-model="model.f_ins_start_date">
             <datepicker id="f_ins_start_date" placeholder="本次保费开始日期" style="width:60%"
                         v-model="model.f_ins_start_date"
                         :value.sync="model.f_ins_start_date"
-                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :format="'yyyy-MM-dd'"
                         :show-reset-button="true">
             </datepicker>
           </div>
@@ -81,7 +80,7 @@
                       v-ref:f_expiration_date
                       v-model="model.f_expiration_date"
                       :value.sync="model.f_expiration_date"
-                      :format="'yyyy-MM-dd HH:mm:ss'"
+                      :format="'yyyy-MM-dd'"
                       :show-reset-button="true">
           </datepicker>
         </div>
@@ -93,7 +92,7 @@
                         v-ref:f_expiration_date
                         v-model="model.f_expiration_date"
                         :value.sync="model.f_expiration_date"
-                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :format="'yyyy-MM-dd'"
                         :show-reset-button="true">
             </datepicker>
           </div>
@@ -219,6 +218,7 @@
           insurancestate: '有效'
         },
         model: {
+          f_buy_date: Util.toStandardTimeString(),
           f_ins_start_date: '',
           f_receivable: 0,
           f_money: 0
@@ -287,17 +287,13 @@
             f_user_phone: this.row.f_user_phone,
             f_salecount: this.row.f_saleCount,
             f_userinfo_code: this.row.f_userinfo_code,
-            f_ins_start_date:Util.toStandardTimeString(),
+            f_ins_start_date: Util.toStandardDateString(),
             f_last_insexpiration_date: this.row.f_ins_stop_date
           }
         }
       }
-      this.model.f_buy_date = Util.toStandardTimeString()
-      if(this.model.f_ins_stop_date && this.model.f_ins_stop_date>Util.toStandardTimeString()){
-        this.$set('model.f_ins_start_date',this.model.f_ins_stop_date)
-      }else{
-        this.$set('model.f_ins_start_date',Util.toStandardTimeString())
-      }
+      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.configMerge()
     },
@@ -311,12 +307,7 @@
             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
-          if (tmp.month < (tmpdate.getMonth() + 1)) {
-            date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000 * 2)
-          } else {
-            date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000)
-          }
+          let date = tmpdate
           let jt = {
             year: date.getFullYear(),
             month: date.getMonth() + 1,
@@ -344,12 +335,7 @@
             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
-          if (tmp.month < (tmpdate.getMonth() + 1)) {
-            date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000 * 2)
-          } else {
-            date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000)
-          }
+          let date = tmpdate
           let jt = {
             year: date.getFullYear(),
             month: date.getMonth() + 1,
@@ -365,7 +351,7 @@
         if (val && this.model.f_userinfo_id) {
           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 = Util.toStandardDateString()
+          this.model.f_ins_start_date = this.getDefaultInsStartDate()
           console.log('cs===================cs', this.model.f_userinfo_id, this.model.f_ins_start_date)
         }
       }
@@ -425,13 +411,47 @@
         this.$dispatch('refresh', this.row)
         this.$dispatch('close')
       },
+      formatYmd (date) {
+        let month = date.getMonth() + 1
+        let day = date.getDate()
+        return date.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
+      },
+      parseDateOnly (val) {
+        if (!val) return null
+        let date = new Date(String(val).replace(/-/g, '/'))
+        if (isNaN(date.getTime())) return null
+        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 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
+          }
+        }
+        return this.formatYmd(minDate)
+      },
       async save () {
         let saveState = true
+        let startDate = this.parseDateOnly(this.model.f_ins_start_date)
+        let tomorrow = new Date()
+        tomorrow.setHours(0, 0, 0, 0)
+        tomorrow.setDate(tomorrow.getDate() + 1)
+        if (!startDate || startDate.getTime() < tomorrow.getTime()) {
+          this.$showAlert('保险开始日期必须在当前日期的次日及之后', 'warning', 2000)
+          saveState = false
+        }
         if (this.model.f_state !== '待执行') {
-          if (Date.parse(this.model.f_ins_start_date) > Date.parse(this.model.f_expiration_date)) {
+          if (saveState && Date.parse(this.model.f_ins_start_date) > Date.parse(this.model.f_expiration_date)) {
             this.$showAlert('结束日期不能早于开始日期', 'warning', 2000)
             saveState = false
-          } else if (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)) {
+          } 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
           }
@@ -447,6 +467,13 @@
           }
         }
         if (saveState) {
+          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_total_ins_charge = this.model.f_total_ins_charge == null ? 0 : this.model.f_total_ins_charge
           this.model.f_operat_type = '保险'
           this.model.f_operator = this.operatorname[0]

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">撤销原因:</label>
+              <label for="f_cancel_reason" class=" col-sm-2 control-label">撤销原因1:</label>
               <div class="col-sm-8">
                 <textarea class="form-control"
                           v-model="model.f_cancel_reason" rows="2"
@@ -253,6 +253,29 @@ export default {
         inputDate.getDate() === today.getDate()
       )
     },
+    parseDateTime (val) {
+      if (val == null || val === '') return null
+      const d = new Date(String(val).replace(/-/g, '/'))
+      return isNaN(d.getTime()) ? null : d
+    },
+    /** 核销期使用购买时间判断：当前操作时间已超过购买当日 17:30:00 */
+    needsVerificationPeriod (row) {
+      if (!row) return false
+      const buyDate = this.parseDateTime(row.f_buy_date)
+      if (!buyDate) return false
+      const now = new Date()
+      const verifyStart = new Date(buyDate.getFullYear(), buyDate.getMonth(), buyDate.getDate(), 17, 30, 0, 0)
+      return now.getTime() > verifyStart.getTime()
+    },
+    needsExtraTwoStepDialogs (row) {
+      return this.needsVerificationPeriod(row)
+    },
+    buildFirstWarnMessage () {
+      return '当前保单已进入核销期或已出单，撤销可能产生费用或合约影响，须事先与保险公司沟通确认。保险公司联系人：瞿成，联系电话：15932351515。'
+    },
+    secondWarnMessage () {
+      return '请确认：操作员已向保险公司咨询（或报备），已知悉撤销后果，并同意继续办理撤销。'
+    },
     async getAuditor () {
       await this.$GetSaleParam.initinputtor()
       this.auditor = this.$GetSaleParam.getAudit(this.$login.f.orgid)
@@ -320,17 +343,26 @@ export default {
         // 执行logic
         logicName: 'cancelInsurance'
       }
-      this.$resetpost('api/af-revenue/logic/commonAuditLogic', param, {
-        warnMsg: `确定要对用户${this.recordlist[0].f_user_name}进行保险冲正吗？`,
-        resolveMsg: `提交审核完成！！`,
-        rejectMsg: `提交审核失败！！请重试！！`
-      }).then((res) => {
-        this.clean()
-      })
+      const postOpts = this.needsExtraTwoStepDialogs(this.obj)
+        ? {
+          resolveMsg: `提交审核完成！！`,
+          rejectMsg: `提交审核失败！！请重试！！`
+        }
+        : {
+          warnMsg: `确定要对用户${this.recordlist[0].f_user_name}进行保险冲正吗？`,
+          resolveMsg: `提交审核完成！！`,
+          rejectMsg: `提交审核失败！！请重试！！`
+        }
+      const submit = () => {
+        this.$resetpost('api/af-revenue/logic/commonAuditLogic', param, postOpts).then((res) => {
+          this.clean()
+        })
+      }
+      this.runTwoStepInsuranceWarnThen(this.obj, submit)
     },
     cancelinsurance (row) {
       this.show = true
-      if (row.f_payment.indexOf('扫码枪') > -1) {
+      if (row.f_payment && row.f_payment.indexOf('扫码枪') > -1) {
         this.paymentShow = false
       }
       this.obj = row
@@ -342,26 +374,44 @@ export default {
         f_cancel_reason: ''
       }
     },
+    submitCancelInsuranceApi () {
+      this.obj.f_operator = this.$login.f.name
+      this.obj.f_operatorid = this.$login.f.id
+      this.obj.f_orgid = this.$login.f.orgid
+      this.obj.f_orgname = this.$login.f.orgs
+      this.obj.f_depid = this.$login.f.depids
+      this.obj.f_depname = this.$login.f.deps
+      this.obj.f_payment = this.recordlist[0].f_payment
+      this.obj.f_cancel_reason = this.model.f_cancel_reason
+      console.log(this.obj)
+      this.$resetpost('api/af-revenue/logic/cancelInsurance', {data: this.obj}).then(() => {
+        this.$dispatch('refresh')
+        this.clean()
+        this.search()
+      })
+    },
+    runTwoStepInsuranceWarnThen (row, nextFn) {
+      if (!this.needsExtraTwoStepDialogs(row)) {
+        nextFn()
+        return
+      }
+      this.$showMessage(this.buildFirstWarnMessage(), ['confirm', 'cancel']).then((res) => {
+        if (res !== 'confirm') return
+        this.$showMessage(this.secondWarnMessage(), ['confirm', 'cancel']).then((res2) => {
+          if (res2 === 'confirm') nextFn()
+        })
+      })
+    },
     // 最后一条才能冲正
     confirm () {
-      this.$showMessage('冲正后不可恢复，确认冲正吗？', ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          this.obj.f_operator = this.$login.f.name
-          this.obj.f_operatorid = this.$login.f.id
-          this.obj.f_orgid = this.$login.f.orgid
-          this.obj.f_orgname = this.$login.f.orgs
-          this.obj.f_depid = this.$login.f.depids
-          this.obj.f_depname = this.$login.f.deps
-          this.obj.f_payment = this.recordlist[0].f_payment
-          this.obj.f_cancel_reason = this.model.f_cancel_reason
-          console.log(this.obj)
-          this.$resetpost('api/af-revenue/logic/cancelInsurance', {data: this.obj}).then(() => {
-            this.$dispatch('refresh')
-            this.clean()
-            this.search()
-          })
-        }
-      })
+      const run = () => this.submitCancelInsuranceApi()
+      if (this.needsExtraTwoStepDialogs(this.obj)) {
+        this.runTwoStepInsuranceWarnThen(this.obj, run)
+      } else {
+        this.$showMessage('冲正后不可恢复，确认冲正吗？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') run()
+        })
+      }
     }
   },
   watch: {

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/dexin/sale'
+import FilialeSale from './filiale/jinhuang/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Mar 18 10:18:57 CST 2026
-gradle.version=5.2.1