sale-client 3.6.573 → 3.6.574

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#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.573",
+  "version": "3.6.574",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/business/IOT/IotChangeFill.vue

@@ -284,6 +284,8 @@
     } catch (error) {
       if (error.status === 301) {
         self.$dispatch('refresh')
+      } else if (error.status === 505){
+        self.$showAlert('改数据失败，数据已在其他地方进行修改，请尝试重新操作','danger',0)
       } else {
         if (error) {
           self.$showAlert(error, 'danger', 0)

package/src/filiale/fugu/UserEssentialInfoTest.vue

@@ -35,7 +35,6 @@
                       close-on-select></v-select>
           </div>
           <div style="" class="col-sm-8 form-group"
-               :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '']"
                v-if="baseinfo.base.f_credentials === '身份证'">
             <label for="f_idnumber" class="font_normal_body">*证件号码</label>
             <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"

package/src/filiale/qingjian/SafeCheck.vue

@@ -89,13 +89,29 @@
       </thead>
       <tbody>
       <tr v-show="nextCheckDateShow">
-        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">下次安检时间:</td>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">本次安检时间:</td>
         <td  colspan="3" :style=style>{{ model.f_next_check_date }}</td>
       </tr>
       <tr>
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次安检时间:</td>
         <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_check_date }}</td>
       </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次安检结果:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ lastDefectResult }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次是否有隐患:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ lastDefectResult === '有隐患' ? '是' : '否' }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次隐患名称:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_defect_text }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次处理结果:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_repaired === '已修' ? '已处理' : '未处理' }}</td>
+      </tr>
       <tr>
         <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检员:</td>
         <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{model.f_checker_name}}</td>
@@ -294,6 +310,23 @@
           return '正常';
         }
         return '有隐患';
+      },
+      lastDefectResult() {
+        let content = this.model.f_last_defect_content;
+        if (!content) return '';
+
+        try {
+          // 先解析一次
+          let parsed = typeof content === 'string' ? JSON.parse(content) : content;
+          // 如果 result 还是 undefined，再尝试一次解析
+          if (typeof parsed.result === 'undefined' && typeof parsed === 'string') {
+            parsed = JSON.parse(parsed);
+          }
+          return parsed.result || '';
+        } catch (e) {
+          console.warn('解析 f_last_defect_content 出错', e);
+          return '';
+        }
       }
     },
     watch: {

package/src/filiale/rongcheng/business/CardMeterCenter.vue

@@ -735,18 +735,16 @@
           return this.model.f_balance
         }
         if (this.model.f_preamount) {
-          if (this.row.f_collection_type === '按金额') {
-            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          // if (this.row.f_collection_type === '按金额') {
+          //   return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          // } else {
+          if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
+            return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(4)
           } else {
-            // if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
-            //   return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0) ).toFixed(4)
-            // } else {
-            //   return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - (this.model.f_totalcost - 0)).toFixed(4)
-            // }
             return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
           }
         } else {
-          return 0
+          return this.row.f_balance
         }
       },
       'islegal' () {

package/src/filiale/zhongyi/HandplanQuery.vue

@@ -679,7 +679,7 @@
     console.log('开始查询')
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
     // 抄表员
-    if (!this.$login.f.f_role_name.includes("抄表主管")){
+    if (!this.$login.f.f_role_name.includes("抄表主管") && !this.$login.f.f_role_name.includes("管理员")) {
       self.$refs.paged.$refs.cri.model.f_inputtor = self.$login.f.name
     }
   }
@@ -762,7 +762,7 @@
     },
     ready() {
       console.log('登录信息---------------->', this.$login.f)
-      console.log('登录信息-------111--------->', this.$login.f.f_role_name.includes("抄表主管"))
+      console.log('登录信息-------111--------->', this.$login.f.f_role_name.includes("抄表主管") || this.$login.f.f_role_name.includes("管理员"))
       this.getShowInputor()
       this.getaddress()
       readySomething(this).then(() => {
@@ -774,7 +774,7 @@
     },
     methods: {
       getShowInputor(){
-        if (this.$login.f.f_role_name.includes("抄表主管")){
+        if (this.$login.f.f_role_name.includes("抄表主管") || this.$login.f.f_role_name.includes("管理员")) {
           this.showinputor = true
         }
       },
@@ -870,7 +870,7 @@
 
       async getinputtores () {
         // 获取抄表员
-        if (this.$login.f.f_role_name.includes("抄表主管")){
+        if (this.$login.f.f_role_name.includes("抄表主管") || this.$login.f.f_role_name.includes("管理员")) {
           let rs = []
           if (this.$login.f.f_gasman.length > 0) {
             for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
@@ -1006,9 +1006,9 @@
       async getRes(condition,obj) {
         console.log("condition:----------",condition)
         console.log("obj:----------",obj)
-        if (!this.$login.f.f_role_name.includes("抄表主管")){
+        if (!this.$login.f.f_role_name.includes("抄表主管") && !this.$login.f.f_role_name.includes("管理员")) {
           this.orgCondtionStr = condition + ` and f_inputtor = '${this.$login.f.name}'`
-        }else if (this.$login.f.f_role_name.includes("部门抄表主管")) {
+        }else if (this.$login.f.f_role_name.includes("部门抄表主管") || this.$login.f.f_role_name.includes("部门管理员")) {
           this.orgCondtionStr = condition + ` and f_depid = '${this.$login.f.depids}'`
         }else {
             this.orgCondtionStr = condition
@@ -1149,7 +1149,7 @@
         // 获取抄表员
         console.log('获取抄表员', this.$login.f)
         let rs = []
-        if (this.$login.f.f_role_name.includes("抄表主管")){
+        if (this.$login.f.f_role_name.includes("抄表主管") || this.$login.f.f_role_name.includes("管理员")) {
           if (this.$login.f.f_gasman.length > 0) {
             for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
               let temp = {