safecheck-client 4.0.2-7 → 4.0.2-71

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

@@ -204,7 +204,7 @@
               <v-select id="f_plan_name" :value.sync="model.f_plan_name" class="input-font"
                         :options='$parent.$parent.planNameOptions' placeholder='计划名称' :width="'60%'" v-model="model.f_plan_name"
                         @change="$parent.$parent.planNameChange"
-                        condition="f_plan_name like '%{}%'" close-on-select clear-button>
+                        condition="f_plan_name = '{}'" close-on-select clear-button>
               </v-select>
             </div>
 
@@ -271,6 +271,15 @@
                         :options='$parent.$parent.user_types' placeholder='请选择用户类型' v-model="model.f_user_type"
                         condition="f_user_type='{}'" close-on-select clear-button></v-select>
             </div>
+            <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_civill_name" class="font text-left">单位名称：</label>
+              </div>
+              <v-select id="f_civill_name" :value.sync="model.f_civill_name" class="input-font" :width="'60%'"
+                        :options='$parent.$parent.civill_names' placeholder='请选择单位名称' v-model="model.f_civill_name"
+                        condition="f_civill_name = '{}'" close-on-select clear-button></v-select>
+            </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-6">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -442,7 +451,7 @@
                 <div class="col-xs-12">
                   <button type="button" name="button" class="btn btn-primary"
                           style="background-color:#499edf;float: right"
-                          @click="$parent.$parent.$parent.inspect(row)">处理</button>
+                          @click="$parent.$parent.$parent.inspect(row,$index)">处理</button>
                   <button type="button" name="button" class="btn btn-primary"
                           style="background-color:#499edf;float: right;margin-right:10px;"
                           @click="$parent.$parent.$parent.queryplan(row.id)">转发</button>
@@ -608,11 +617,13 @@ export default {
       f_filialeids: '(' + Vue.user.orgid + ')',
       //f_filialeids:'(305)',
       planparam: [],
+      civill_names:[{label:"全部",value:""}],
       check: '',
       plan: '',
       planid: '',
       model: Vue.android ? new LocalPagedList('androidGetuserinfo', 20, { condition: 'this.condition' }) : new PagedList('AndroidRest/api/af-safecheck/sql/androidGetuserinfo', 20, { condition: 'this.condition' }),
       showModal: false,
+      index:0,
       showModal2: false,
       showModal3: false,
       needid: '',
@@ -667,11 +678,14 @@ export default {
       notVisited: 0,
       checked: 0,
       notChecked: 0,
-      enterRate: 0
+      enterRate: 0,
+      ruhunum:0
+
     }
   },
   ready() {
     this.getCheckBook()
+    this.getCivillNames()
     this.getAllArea()
     this.getAllPlanName()
     this.selfSearch()
@@ -690,6 +704,21 @@ export default {
     window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
   },
   methods: {
+    getCivillNames(){
+      let criteria = {
+        items: 'f_civill_name',
+        tablename: 't_check_plan_item',
+        condition: `f_civill_name IS NOT NULL`,
+        groupitem: 'f_civill_name'
+      }
+      let result = HostApp._executeTask({
+        'type': 'sql',
+        'data': { 'alias': 'safe_singleTable_GroupBy', 'criteria': criteria }
+      })
+      if (result.code == 200) {
+        result.data.rows.forEach(item => this.civill_names.push({ label: item.f_civill_name, value: item.f_civill_name }))
+      }
+    },
     async planNameChange(val){
       if (val.length > 0 && val[0]){
         this.checkBooks=[]
@@ -866,7 +895,7 @@ export default {
         condition += ` and f_checker_id= '${this.check}'`
       }
       if (this.plan) {
-        condition += ` and f_plan_name like '%${this.plan}%'`
+        condition += ` and f_plan_name = '${this.plan}'`
       }
       let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {
         data: {
@@ -951,7 +980,8 @@ export default {
         })
       }
     },
-    inspect(row) {
+    inspect(row,index) {
+      this.index = index
       var _this = this
       try {
         let http = new HttpResetClass()
@@ -975,7 +1005,7 @@ export default {
                 }
                 _this.$dispatch('gotoson', pardate)
                 //tag
-                _this.$goto('safecheck-order-v', { f_plan_id: row.f_plan_id, item: row, role: 'inspect', parentPage: 'CurrentCreate' }, 'self', _this.reload)
+                _this.$goto('safecheck-order-v', { f_plan_id: row.f_plan_id, item: row, role: 'inspect', parentPage: 'CurrentCreate' }, 'self', _this.goNext)
               }).catch((msg) => {
                 this.noLineInspect(row)
               })
@@ -992,6 +1022,23 @@ export default {
         this.noLineInspect(row)
       }
     },
+    goNext(){
+      if (this.index+1 == this.model.rows.length){
+        this.reload()
+        return
+      }
+      console.log(this.index)
+      this.$showMessage(`开始安检之前，请核对用户信息`, ['cancel', 'confirm']).then(
+        (response) => {
+          if (response === 'confirm') {
+            this.inspect(this.model.rows[this.index+1],this.index+1)
+          }else {
+            this.reload()
+            this.index = 0
+          }
+        }
+      )
+    },
     noLineInspect(row){
       let _this = this
       let criteria = {
@@ -1009,7 +1056,7 @@ export default {
           safe:true
         }
         _this.$dispatch('gotoson',pardate)
-        _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.reload)
+        _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.goNext)
       }
     },
     makeAPhoneCall(phoneNumber) {
@@ -1036,15 +1083,11 @@ export default {
       if (this.$refs.paged.$refs.cri.model.f_unit)
         condition += ` and ti.f_unit = '${this.$refs.paged.$refs.cri.model.f_unit}'`
       if (this.planName) {
-        condition += " and f_plan_name like '%" + this.planName + "%'"
+        condition += " and f_plan_name = '" + this.planName + "'"
       } else {
         if (this.$refs.paged.$refs.cri.model.f_plan_name.length > 0)
-          condition += " and f_plan_name like '%" + this.$refs.paged.$refs.cri.model.f_plan_name + "%'"
+          condition += " and f_plan_name = '" + this.$refs.paged.$refs.cri.model.f_plan_name + "'"
       }
-      // if(this.$refs.paged.$refs.cri.model.f_plan_year)
-      //   condition += " and f_plan_year = '"+this.$refs.paged.$refs.cri.model.f_plan_year +"'"
-      // if(this.$refs.paged.$refs.cri.model.f_plan_month)
-      //   condition += " and f_plan_month = '"+this.$refs.paged.$refs.cri.model.f_plan_month +"'"
       if (this.$refs.paged.$refs.cri.model.f_userinfo_code)
         condition += " and ti.f_userinfo_code like '%" + this.$refs.paged.$refs.cri.model.f_userinfo_code + "%'"
       if (this.$refs.paged.$refs.cri.model.f_keyword)
@@ -1053,14 +1096,12 @@ export default {
         condition += " and ti.f_user_name like '%" + this.$refs.paged.$refs.cri.model.f_user_name + "%'"
       if (this.$refs.paged.$refs.cri.model.f_state[0])
         condition += " and ti.f_state='" + this.$refs.paged.$refs.cri.model.f_state[0] + "'"
-      // if(this.$refs.paged.$refs.cri.model.f_last_state[0])
-      //   condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
       if (this.$refs.paged.$refs.cri.model.f_user_type[0])
         condition += " and ti.f_user_type='" + this.$refs.paged.$refs.cri.model.f_user_type[0] + "'"
+      if (this.$refs.paged.$refs.cri.model.f_civill_name[0])
+        condition += " and ti.f_civill_name='" + this.$refs.paged.$refs.cri.model.f_civill_name[0] + "'"
       if (this.$refs.paged.$refs.cri.model.f_meter_no)
         condition += " and tm.f_meter_no like '%" + this.$refs.paged.$refs.cri.model.f_meter_no + "%'"
-      // if(this.$refs.paged.$refs.cri.model.f_flow_direction[0])
-      //   condition += " and tm.f_flow_direction = '"+this.$refs.paged.$refs.cri.model.f_flow_direction[0]+"'"
       if (this.$refs.paged.$refs.cri.model.f_user_phone) {
         condition += `and ti.f_user_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%'`
       }
@@ -1068,7 +1109,7 @@ export default {
         condition += " and ti.f_enter_number like '%" + this.$refs.paged.$refs.cri.model.f_enter_number + "%'"
       if (this.$refs.paged.$refs.cri.model.f_check_book.length > 0){
         if (this.$refs.paged.$refs.cri.model.f_plan_name.length > 0 || this.planName){
-          condition += " and ti.f_check_book_id like '%" + this.$refs.paged.$refs.cri.model.f_check_book + "%'"
+          condition += " and ti.f_check_book_id = '" + this.$refs.paged.$refs.cri.model.f_check_book + "'"
         }else {
           this.$showMessage("使用安检册筛选项必须选择计划名称")
           return
@@ -1076,7 +1117,7 @@ export default {
       }
       if (this.$refs.paged.$refs.cri.model.f_check_version)
         condition += " and ti.f_check_version = " + this.$refs.paged.$refs.cri.model.f_check_version
-      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' )) and ti.f_no_checkplan = '有计划安检'" + condition)
+      this.model.search("((ti.f_complete = '' or ti.f_complete = null or ti.f_complete = '未完成') or (ti.f_state = '未检') or (ti.f_last_check_state = '到访不遇' )) and ti.f_no_checkplan = '有计划安检'" + condition)
 
     },
     getNewOrder() {
@@ -1210,8 +1251,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_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_item tcpi LEFT JOIN t_check_plan tcpl ON tcpi.f_plan_id = tcpl.id ",
         condition: condition,
         orderitem: '1'
       }
@@ -1226,6 +1267,7 @@ export default {
         this.checked = stat.yj_count || 0;
         this.notChecked = stat.wj_count || 0;
         this.enterRate = stat.entry_rate_percent || 0;
+        this.ruhunum = stat.ruhunum || 0;
       }
 
       let criteria = {

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

@@ -1,5 +1,6 @@
 <template>
   <div class="auto clearfix">
+    <work-busy :is-busy="isbusy"></work-busy>
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
         <img alt="" src="../../../assets/add.png" style="width: 20px;margin-bottom: 5px">
@@ -190,7 +191,7 @@
       </div>
     </div>
     <div class="col-xs-12 text-center  app-row">
-      <button class="btn btn-lg btn-font btn-color" style="width: 22%;" type="button" @click="commit()">提交</button>
+      <button class="btn btn-lg btn-font btn-color" style="width: 22%;" type="button" @click="check()">提交</button>
     </div>
   </div>
 </template>
@@ -204,7 +205,7 @@ export default {
   data() {
     return {
       create_date: Util.getNowDate(),
-      isCommit: false,
+      isbusy: false,
       insurance_types: [{label: '请选择', value: ''}, ...this.$appdata.getParam('险种')],
       insurance_companys: [{label: '请选择', value: ''}, ...this.$appdata.getParam('保险公司')],
       payTypes: [{label: '请选择', value: ''}, ...this.$appdata.getParam('付款方式')],
@@ -269,6 +270,27 @@ export default {
     this.model.f_id_type = '身份证'
   },
   methods: {
+    //查询是否在今天已经操作过了
+    async check() {
+      let http = new HttpResetClass()
+      // 获取今天的开始和结束时间
+      let startOfDay =Util.toStartDateString() + ' 00:00:00'
+      let endOfDay =Util.toEndDateString() + ' 23:59:59'
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: 'id',
+          tablename: 't_userfees',
+          condition: `f_userinfo_id= '${this.model.f_userinfo_id}' and f_state='有效' and f_fee_type='保险收费' and f_operate_date >= '${startOfDay}' and f_operate_date <= '${endOfDay}'`,
+          orderitem: 'id'
+        }
+      }, { resolveMsg: null, rejectMsg: null }).then((res) => {
+        if (res.data.length > 0) {
+          this.$showMessage('今天已经进行了保险收费，请勿重复操作。')
+        } else {
+          this.commit()
+        }
+      })
+    },
     async commit() {
       if (!this.model.f_payment) {
         this.$showMessage('收款方式未选择，请选择后重新尝试。')
@@ -353,6 +375,7 @@ export default {
             return
           }
         }
+        this.isbusy= true
         commit_data.f_receivable = this.model.f_money
         commit_data.f_operate_date = Util.toStandardTimeString()
         commit_data.f_state = '有效'
@@ -360,12 +383,14 @@ 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
         this.$back()
       } catch (error) {
         this.$showMessage('提交失败')
-        this.isCommit = false
+        this.isbusy= false
       }
     },
     changeExpirationDate() {