safecheck-client 4.0.2-4 → 4.0.2-41

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

@@ -667,7 +667,9 @@ export default {
       notVisited: 0,
       checked: 0,
       notChecked: 0,
-      enterRate: 0
+      enterRate: 0,
+      ruhunum:0
+
     }
   },
   ready() {
@@ -1210,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_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'
       }
@@ -1226,6 +1228,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() {

package/src/filiale/jinhong/pc/CheckBookList.vue

@@ -26,24 +26,30 @@
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                         condition="tcb.id in {}"></v-select>
             </div>
-            <!--            <div :class="$parent.$parent.style">-->
-            <!--              <label class="font_normal_body">表册类型</label>-->
-            <!--              <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
-            <!--                        :value-single="true" style="width: 60%"-->
-            <!--                        class="select_list select"-->
-            <!--                        :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
-            <!--                        close-on-select-->
-            <!--                        condition="tcb.f_check_book_type ='{}'"></v-select>-->
-            <!--            </div>-->
-            <!--            <div :class="$parent.$parent.style">-->
-            <!--              <label class="font_normal_body">用户类型</label>-->
-            <!--              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
-            <!--                        :value-single="true" style="width: 60%"-->
-            <!--                        class="select_list select"-->
-            <!--                        :options='$parent.$parent.userTypes' placeholder='用户类型'-->
-            <!--                        close-on-select-->
-            <!--                        condition="tcb.f_user_type ='{}'"></v-select>-->
-            <!--            </div>-->
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">开始时间</label>
+              <datepicker
+                :value.sync="model.f_check_start"
+                placeholder='最后一次下发开始时间'
+                style="width: 60%"
+                :format="'yyyy-MM-dd 00:00:00'"
+                :show-rest-button="reset"
+                v-model="model.f_check_start"
+                condition="lasttime.last_check_time > '{}'">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">结束时间</label>
+              <datepicker
+                :value.sync="model.f_check_end"
+                placeholder='最后一次下发截止时间'
+                style="width: 60%"
+                :format="'yyyy-MM-dd 23:59:59'"
+                :show-rest-button="reset"
+                v-model="model.f_check_end"
+                condition="lasttime.last_check_time < '{}'">
+              </datepicker>
+            </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <button type="button" class="button_search button_spacing" @click="$parent.$parent.clean()">重置</button>
@@ -129,6 +135,9 @@
             <th>
               <nobr>未下发</nobr>
             </th>
+            <th>
+              <nobr>最后下发时间</nobr>
+            </th>
 <!--            <th>
               <nobr>已检</nobr>
             </th>
@@ -150,6 +159,7 @@
           <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num}}</b></button></td>
           <td  style="text-align: center;">{{ row.xiafa }}</td>
           <td  style="text-align: center;">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
+          <td  style="text-align: center;">{{ row.last_check_time }}</td>
 <!--          <td  style="text-align: center;">{{ row.yijian }}</td>
           <td  style="text-align: center;">{{ row.weijian }}</td>-->
           <!--          <td  v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->