sale-client 3.6.560 → 3.6.561

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Jun 25 17:54:33 CST 2025
+#Mon Apr 14 10:14:01 CST 2025
 gradle.version=5.2.1

package/package.json

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

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

@@ -50,6 +50,7 @@
         console.log(userinfoid)
         this.showbuy = true
         this.f_userinfo_id = userinfoid
+        console.log("uuuurl", window.location.href)
         this.$resetpost('wx/rs/logic/wordToosRept', {f_userinfo_id: this.f_userinfo_id}, {resolveMsg: null, rejectMsg: '获取合同失败！！'}).then(item => {
           if (item.data.length > 0) {
             this.scheduleData = item.data[0]
@@ -58,7 +59,8 @@
             // 2. 对 URL 进行编码
             let fullUrl = encodeURI(this.url.replace(/\\/g, '/'))
             this.$resetpost(`rs/convert/convertImg`, {url: fullUrl}, {resolveMsg: null, rejectMsg: null}).then((ret) => {
-              let img = window.location.href + 'files' + ret.data
+              let href = window.location.href.split('#')[0]
+              let img = href + 'files' + ret.data
               this.imgurl = encodeURI(img.replace(/\\/g, '/'))
               console.log(this.imgurl)
               this.showbuy = false

package/src/filiale/bayan/NoCardMeterCenter.vue

@@ -109,7 +109,7 @@
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
             <div class="col-sm-4">
-              <label for="f_write_card" style="color: red" class=" font_normal_body">是否写卡</label>
+              <label for="f_write_card" style="color: red" class=" font_normal_body">是否写</label>
               <v-select id="f_write_card"
                         v-model="model.f_write_card"
                         placeholder='是否写卡'
@@ -459,13 +459,21 @@
           }
         }
       },
-      calText (val) {
-        let str = ''
+      calText(val) {
+        let str = '';
+        let total = 0; // 用于存储总金额
+
         val.forEach((item) => {
-          str = str + item.f_price + ' x ' + item.f_gas + '+'
-        })
-        str = str.slice(0, str.length - 1)
-        this.calculatedetail = str
+          const price = parseFloat(item.f_price);
+          const gas = parseFloat(item.f_gas);
+          const result = price * gas; // 计算每项的结果
+          total += result; // 累加到总金额
+          str += `${price} x ${gas} = ${result.toFixed(3)} + `; // 显示三位小数
+        });
+
+        str = str.slice(0, -2); // 去掉最后的 " + "
+        str += ` = ${total.toFixed(3)}`; // 添加总和，并保留三位小数
+        this.calculatedetail = str;
       },
       close () {
         this.print = false

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -172,7 +172,11 @@ export default {
     },
     changeDate () {
       for (let i = 0; i < this.devicesinfonew.length; i++) {
-        if (this.devicesinfonew[i].f_devices_type == '报警器') {
+        if (this.devicesinfonew[i].f_devices_type == '民用-报警器') {
+          this.devicesinfonew[i].f_alarm_type = '民用'
+          this.alarmExpireDate(i)
+        } else if(this.devicesinfonew[i].f_devices_type == '工商-报警器'){
+          this.devicesinfonew[i].f_alarm_type = '工商'
           this.alarmExpireDate(i)
         } else if (this.devicesinfonew[i].f_devices_type == '切断阀' || this.devicesinfonew[i].f_devices_type == '自闭阀') {
           this.expireDate(i)
@@ -200,6 +204,9 @@ export default {
       } else {
         let b = new Date(this.devicesinfonew[index].f_firstcheck_date)
         let year = (b.getFullYear() - 0) + 5
+        if(this.devicesinfonew[index].f_alarm_type == '民用'){
+          year = (b.getFullYear() - 0) + 3
+        }
         let year2 = (b.getFullYear() - 0) + 1
         let month = (b.getMonth() - 0) + 1
         var day = b.getDate()