safecheck-client 4.0.2-5 → 4.0.2-51

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>
 
@@ -442,7 +442,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>
@@ -613,6 +613,7 @@ export default {
       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,7 +668,9 @@ export default {
       notVisited: 0,
       checked: 0,
       notChecked: 0,
-      enterRate: 0
+      enterRate: 0,
+      ruhunum:0
+
     }
   },
   ready() {
@@ -866,7 +869,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 +954,8 @@ export default {
         })
       }
     },
-    inspect(row) {
+    inspect(row,index) {
+      this.index = index
       var _this = this
       try {
         let http = new HttpResetClass()
@@ -975,7 +979,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 +996,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 +1030,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,10 +1057,10 @@ 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 +"'"
@@ -1068,7 +1089,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
@@ -1210,8 +1231,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 +1247,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 = {