safecheck-client 4.0.2-23 → 4.0.2-25

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.2-23",
+  "version": "4.0.2-25",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/filiale/jinhong/android/CurrentCreate.vue

@@ -1212,8 +1212,8 @@ export default {
         }
       }
       let tjData = {
-        items: " COUNT(*) AS total_items, SUM(CASE WHEN tcpi.f_last_check_state= '到访不遇' THEN 1 ELSE 0 END) AS no_answer_count, SUM(CASE WHEN tcpi.f_last_check_state= '入户' THEN 1 ELSE 0 END) AS ruhunum,SUM(CASE WHEN tcpi.f_state='已检' and f_last_check_state != '到访不遇' THEN 1 ELSE 0 END) AS yj_count, SUM(CASE WHEN tcpi.f_state='未检' THEN 1 ELSE 0 END) AS wj_count, ROUND(SUM(CASE WHEN tcp.f_entry_status='入户' THEN 1 ELSE 0 END)*100.0/COUNT(*),2) AS entry_rate_percent ",
-        tablename: " t_check_plan tcpl LEFT JOIN t_check_plan_item tcpi ON tcpl.id=tcpi.f_plan_id LEFT JOIN t_check_paper tcp ON tcp.f_check_item_id= tcpi.id ",
+        items: " COUNT(*) AS total_items,SUM ( CASE WHEN  tcpi.f_state= '已检'  and tcpi.f_last_check_state= '到访不遇' THEN 1 ELSE 0 END ) AS no_answer_count,SUM ( CASE WHEN  tcpi.f_state= '已检'  and tcpi.f_last_check_state= '入户' THEN 1 ELSE 0 END ) AS ruhunum,SUM ( CASE WHEN tcpi.f_state= '已检' AND f_last_check_state != '到访不遇' THEN 1 ELSE 0 END ) AS yj_count,SUM ( CASE WHEN tcpi.f_state= '未检' THEN 1 ELSE 0 END ) AS wj_count,ROUND( SUM ( CASE WHEN  tcpi.f_state= '已检'  and tcpi.f_last_check_state= '入户' THEN 1 ELSE 0 END ) * 100.0 / COUNT ( * ), 2 ) AS entry_rate_percent  ",
+        tablename: " t_check_plan tcpl LEFT JOIN t_check_plan_item tcpi ON tcpl.id=tcpi.f_plan_id ",
         condition: condition,
         orderitem: '1'
       }

package/src/filiale/jinhong/android/PhoneInsurancePurchaseDetail.vue

@@ -383,6 +383,7 @@ export default {
         commit_data.f_orgname = Vue.user.orgs
         commit_data.f_depid = Vue.user.depids
         commit_data.f_depname = Vue.user.deps
+        commit_data.f_fee_type='保险收费'
         await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/saveInsInfo`, {data: commit_data})
         this.$showMessage('提交成功')
         this.isbusy= false