sale-client 4.3.78 → 4.3.79

package/package.json

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

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -363,14 +363,7 @@ export default {
     return {
       selectedOption: '手动',
       delaySeconds: '',
-      networkValveOptions: [
-        '手动',
-        '自动',
-        '1小时后自动',
-        '3小时后自动',
-        '6小时后自动',
-        '12小时后自动'
-      ],
+      networkValveOptions: [],
       showModal: false,
       disableModel: {
         f_othereason: '',
@@ -385,17 +378,47 @@ export default {
       valve: false,
       showselectncuserinfo: false,
       f_network_valve: this.$appdata.getParam('阀控状态') ? [{
-        // label: '全部',
         value: ''
       }, ...this.$appdata.getParam('阀控状态')] : []
     }
   },
   ready () {
     this.getDevice()
+    this.getnetworkValveOptions()
     this.valveLimit = this.$login.r.includes('开关阀权限')
     this.autoValveLimit = this.$login.r.includes('自动阀控权限')
   },
   methods: {
+    getnetworkValveOptions () {
+      let networkValve = this.$appdata.getParam('阀控执行状态')
+      if (networkValve.length > 1) {
+        networkValve.forEach(item => {
+          this.networkValveOptions.put(item.value)
+        })
+      } else {
+        this.networkValveOptions = [
+          '手动',
+          '自动',
+          '1小时后自动',
+          '3小时后自动',
+          '6小时后自动',
+          '12小时后自动',
+          '24小时后自动',
+          '2天后自动',
+          '3天后自动',
+          '7天后自动'
+        ]
+      }
+    },
+    convertToSeconds (text) {
+      // 匹配数字
+      let num = parseInt(text) || 0
+      if (text.includes('手动')) return 0
+      if (text.includes('自动') && !text.includes('小时') && !text.includes('天')) return -1 // 纯自动
+      if (text.includes('小时')) return num * 60 * 60
+      if (text.includes('天')) return num * 24 * 60 * 60
+      return 0
+    },
     // 发送请求去数据
     async getDevice () {
       if (this.row) {
@@ -582,22 +605,7 @@ export default {
       let _this = this
 
       // 计算延迟时间
-      switch (_this.selectedOption) {
-        case '1小时后自动':
-          delaySeconds = 3600 // 1小时 = 3600秒
-          break
-        case '3小时后自动':
-          delaySeconds = 10800 // 3小时 = 10800秒
-          break
-        case '6小时后自动':
-          delaySeconds = 21600 // 6小时 = 21600秒
-          break
-        case '12小时后自动':
-          delaySeconds = 43200 // 12小时 = 43200秒
-          break
-        default:
-          delaySeconds = 0
-      }
+      delaySeconds = _this.convertToSeconds(_this.selectedOption)
       adjustedTime.setSeconds(adjustedTime.getSeconds() + delaySeconds)
       let adjustedBeijingTime = new Date(adjustedTime.getTime() + 8 * 60 * 60 * 1000)
       let formattedAdjustedBeijingTime = adjustedBeijingTime.toISOString().slice(0, 19).replace('T', ' ')

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed May 13 15:19:48 CST 2026
-gradle.version=5.2.1