sale-client 3.6.544 → 3.6.545-2

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://192.168.50.67:30785/', 'http://192.168.50.67:30785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/Util.js

@@ -21,19 +21,19 @@ export function getAttendanceState (item, timeToWork, timeToGo) {
   }
 }
 
-//获取随机uuid
-export function generateUUID() {
+// 获取随机uuid
+export function generateUUID () {
   // 'x' 代表数字与大小写字母中的任意一个
-  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-  let uuid = '';
+  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+  let uuid = ''
   // 第一个字符是 '0'-'7' 之间的随机数字，用于版本标识
-  uuid += chars.charAt(Math.floor(Math.random() * 8) + Math.floor(Math.random() * 8) % 8);
+  uuid += chars.charAt(Math.floor(Math.random() * 8) + Math.floor(Math.random() * 8) % 8)
   for (let i = 0; i < 31; i++) {
     // 随机选择字符
-    uuid += chars.charAt(Math.random() * chars.length | 0);
+    uuid += chars.charAt(Math.random() * chars.length | 0)
   }
   // 修正长度和格式，以确保它看起来像是一个标准的UUID
-  return uuid.substr(0, 8)  + uuid.substr(8, 4)  + uuid.substr(12, 4)  + uuid.substr(16, 4)  + uuid.substr(20, 12);
+  return uuid.substr(0, 8) + uuid.substr(8, 4) + uuid.substr(12, 4) + uuid.substr(16, 4) + uuid.substr(20, 12)
 }
 
 export function toStandardYearMonth () {
@@ -53,29 +53,29 @@ export function toStandardDateString () {
   let date = dt.getDate()
   return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
 }
-export function getLastDayOfMonth(dateString) {
+export function getLastDayOfMonth (dateString) {
   // 解析输入日期字符串
-  var parts = dateString.split('-');
-  var year = parseInt(parts[0], 10);
-  var month = parseInt(parts[1], 10);
+  var parts = dateString.split('-')
+  var year = parseInt(parts[0], 10)
+  var month = parseInt(parts[1], 10)
 
   // 创建一个日期对象，表示下个月的第一天
-  var nextMonthFirstDay = new Date(year, month, 1);
+  var nextMonthFirstDay = new Date(year, month, 1)
 
   // 减去一天，得到本月的最后一天
-  nextMonthFirstDay.setDate(nextMonthFirstDay.getDate() - 1);
+  nextMonthFirstDay.setDate(nextMonthFirstDay.getDate() - 1)
 
   // 获取年、月、日
-  var lastDay = nextMonthFirstDay.getDate();
-  var lastMonth = nextMonthFirstDay.getMonth() + 1; // 月份从0开始，需要加1
-  var lastYear = nextMonthFirstDay.getFullYear();
+  var lastDay = nextMonthFirstDay.getDate()
+  var lastMonth = nextMonthFirstDay.getMonth() + 1 // 月份从0开始，需要加1
+  var lastYear = nextMonthFirstDay.getFullYear()
 
   // 格式化日期为 YYYY-MM-DD
   var formattedDate = lastYear + '-' +
     (lastMonth < 10 ? '0' + lastMonth : lastMonth) + '-' +
-    (lastDay < 10 ? '0' + lastDay : lastDay);
+    (lastDay < 10 ? '0' + lastDay : lastDay)
 
-  return formattedDate;
+  return formattedDate
 }
 
 export function toStartAndEndDateString () {

package/src/components/revenue/comprehen/Maintenance/T+MoneyDocking/moneyDockingTow.vue

@@ -80,7 +80,7 @@
 
 <script>
   import { PagedList } from 'vue-client'
-  import * as Util from "../../../../../Util";
+  import * as Util from '../../../../../Util'
 
   export default {
     data () {

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -174,13 +174,13 @@ export default {
       for (let i = 0; i < this.devicesinfonew.length; i++) {
         if (this.devicesinfonew[i].f_devices_type == '报警器') {
           this.alarmExpireDate(i)
-        } else if (this.devicesinfonew[i].f_devices_type == '切断阀') {
+        } else if (this.devicesinfonew[i].f_devices_type == '切断阀' || this.devicesinfonew[i].f_devices_type == '自闭阀') {
           this.expireDate(i)
         }
       }
     },
     expireDate (index) {
-      if (this.devicesinfonew[index].f_devices_type == '切断阀') {
+      if (this.devicesinfonew[index].f_devices_type == '切断阀' || this.devicesinfonew[index].f_devices_type == '自闭阀') {
         if (this.devicesinfonew[index].f_input_date === '' || this.devicesinfonew[index].f_input_date === undefined) {
         } else {
           let b = new Date(this.devicesinfonew[index].f_input_date)
@@ -199,7 +199,7 @@ export default {
       if (this.devicesinfonew[index].f_firstcheck_date === '' || this.devicesinfonew[index].f_firstcheck_date === undefined || this.devicesinfonew[index].f_firstcheck_date === null) {
       } else {
         let b = new Date(this.devicesinfonew[index].f_firstcheck_date)
-        let year = (b.getFullYear() - 0) + 3
+        let year = (b.getFullYear() - 0) + 5
         let year2 = (b.getFullYear() - 0) + 1
         let month = (b.getMonth() - 0) + 1
         var day = b.getDate()
@@ -235,7 +235,8 @@ export default {
       console.log('设备信息', this.devicesinfonew)
       this.devicesinfonew.push({
         f_devices_type: '调压器',
-        f_input_date: this.$login.toStandardTimeString()
+        f_input_date: this.$login.toStandardTimeString(),
+        f_firstcheck_date: this.$login.toStandardTimeString()
       })
     }
   }

package/src/filiale/rongcheng/UserDeviceInfoTest.vue

@@ -222,7 +222,7 @@
               }
             })
             this.$watch(() => device.f_devices_type, (newType) => {
-              if (newType === '自闭阀' && device.f_input_date) {
+              if (device.f_input_date) {
                 this.updateExpireDate(device)
               } else {
                 device.f_expire_date = ''

package/src/filiale/rongcheng/UserGeneralInfoTest.vue

@@ -68,7 +68,7 @@
 <script>
 import UserPaperInfoTest from './UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
-import * as Util from '../../util'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()

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/bayan/sale'
+import FilialeSale from './filiale/rongcheng/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 @@
-#Thu May 15 14:43:19 CST 2025
-gradle.version=5.2.1