sale-client 3.6.596 → 3.6.598

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Sep 26 18:11:39 CST 2025
+#Sat Sep 13 14:19:54 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/components/revenue/base/leftview/SafeCheck.vue

@@ -240,7 +240,7 @@
       let getSafeCheck = await http.load('POST', 'rs/logic/getSafecheck', param, {resolveMsg: null, rejectMsg: null})
       if (!(JSON.stringify(getSafeCheck.data) == '{}')) {
         self.model = {}
-        self.model = Object.assign({}, self.model, getSafeCheck.data)
+        self.model = Object.assign({}, getSafeCheck.data)
         self.hasCheck = 1
       } else {
         self.hasCheck = 0
@@ -286,13 +286,16 @@
       }
     },
     watch: {
-      'data' () {
-        if (this.data == null) {
-          this.hasCheck = 0
-          this.model = {}
-        } else {
-          getSafeCheckGen(this)
-        }
+      'data': {
+        handler (newVal, oldVal) {
+          if (newVal == null) {
+            this.hasCheck = 0
+            this.model = {}
+          } else {
+            getSafeCheckGen(this)
+          }
+        },
+        deep: true
       }
     }
   }

package/src/filiale/shanxian/components/charge/SafeCheck.vue

@@ -125,7 +125,7 @@
         <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)"  style="text-align: center;border: #E9E9E9 solid 1px;color:red;">{{ model.ajresult }}</td>
       </tr>
       <tr>
-        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;color:red;">隐患详情:</td>
+        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;color:red;">安检内容:</td>
         <td  colspan="3" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%;color:red;">
              <span  v-for="deviceCollect in model.deviceCollects">
                       <span class="li-font">
@@ -134,7 +134,7 @@
                 <br>
            </span>
         </td>
-        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">安检内容:</td>
         <td  colspan="3" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))"  style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
              <span  v-for="deviceCollect in model.deviceCollects">
                       <span class="li-font">

package/src/filiale/shimen/ChargeManage.vue

@@ -64,6 +64,8 @@ export default {
         clear_state: this.$appdata.getSingleValue('业务完成是否自动清条件') ? this.$appdata.getSingleValue('业务完成是否自动清条件') : '是',
         reSearchShowMsy: !!this.$appdata.getSingleValue('收费后验证'),
         reSearchShowBusiness: !!this.$appdata.getSingleValue('业务完成重新加载'),
+        shouldNavigateToEvaluation: false, // 标记是否应该导航到评价页面
+        activeBusiness: null, // 当前激活的业务
         show: [true],
         selectFiled: '其他信息',
         worktype: '其他信息',
@@ -135,6 +137,7 @@ export default {
         if (!(obj instanceof Event)) {
         // 对此数据进行验证
           if (await this.validateRow(obj)) {
+            this.shouldNavigateToEvaluation = false
           // 获取未写卡或者写卡失败记录
             let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
@@ -142,6 +145,7 @@ export default {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
             } else {
               this.row = obj
+              this.shouldNavigateToEvaluation = false
               this.row.unWriteSell = getUnWriteSell.data
               this.cardInfo = this.$refs.list.cardInfo
               this.$refs.list.criteriaShow = false
@@ -217,16 +221,39 @@ export default {
           this.cardInfo = this.$refs.list.cardInfo
           this.$refs.list.criteriaShow = false
           // 将列表只显示该条数据
-          this.$refs.list.refreshRow(obj)
+          await this.$refs.list.refreshRow(obj)
+          // 如果应该导航到评价页面，则执行评价业务
+          if (this.shouldNavigateToEvaluation && this.$refs.oper) {
+            this.activeBusiness = '评价'
+            this.$nextTick(() => {
+              this.$refs.oper.business({name: '评价', value: {routeName: 'service-evaluation'}})
+              // 执行完后清除标志
+              this.shouldNavigateToEvaluation = false;
+            }, 100)
+          } else {
+            // 清除标志（普通业务场景）
+            this.shouldNavigateToEvaluation = false;
+          }
+          console.log('this.row', this.row)
         }
       },
-      async serRow (obj) {
+      // 监听业务切换
+      onBusinessChange(businessName) {
+        this.activeBusiness = businessName
+      },
+      async serRow (obj, evaluationFlag = false) {
+        // 设置标志
+        this.shouldNavigateToEvaluation = evaluationFlag;
+
         let newdata = await this.$resetpost('rs/sql/sale_getUser', {
           data: {condition: `i.f_userinfo_code='${obj.f_userinfo_code}' and u.f_filialeid = '${obj.f_filialeid}'`, orderitem: `f_userinfo_id Desc`}
         }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
-        this.toBusiness(newdata.data[0])
+        await  this.toBusiness(newdata.data[0])
         // this.$refs.list.search()
-      }
+        if(evaluationFlag){
+          this.$refs.oper.business({name: '评价', value: {routeName: 'service-evaluation'}})
+        }
+      },
     },
     events: {
       'error' (name, row, res) {
@@ -254,11 +281,24 @@ export default {
         }
         if (name !== '评价' && this.reSearchShowBusiness) {
           console.log('row', row)
-          if (row) {
-            this.serRow(row)
-          } else {
-            this.serRow(this.row)
-          }
+          this.$refs.oper.noButton = false
+          this.$showMessage('要进行业务评价吗？', ['confirm', 'cancel']).then((res) => {
+            if(res !== 'confirm') {
+              if (row) {
+                this.serRow(row)
+                this.activeBusiness = null
+              } else {
+                this.serRow(this.row)
+              }
+              return
+            } else {
+              if (row) {
+                this.serRow(row,true)
+              } else {
+                this.serRow(this.row,true)
+              }
+            }
+          })
           return
         }
         console.log('成功事件')

package/src/filiale/shimen/ChargeOper.vue

@@ -207,6 +207,7 @@ export default {
   },
   methods: {
     business (btn) {
+      this.$dispatch('business-changed', btn.name)
       // // 处理按钮样式
       // this.styleChange(btn.name)
       // this.isBusiness = true
@@ -250,7 +251,16 @@ export default {
   },
   watch: {
     'data' () {
-      getBtnsGen(this)
+      getBtnsGen(this).then(() => {
+        if (this.$parent.activeBusiness) {
+          const targetBtn = this.operBtns.find(btn => btn.name === this.$parent.activeBusiness)
+          if (targetBtn) {
+            this.$nextTick(() => {
+              this.business(targetBtn)
+            })
+          }
+        }
+      })
     }
   },
   events: {

package/src/filiale/shimen/GiftFee/iotTable.vue

@@ -214,7 +214,7 @@ export default {
           this.row.f_bill_style = '普通收据'
           this.print = true
         } else {
-          this.clean()
+          this.printok()
         }
       })
     },