safecheck-client 4.0.2-6 → 4.0.2-60

package/src/filiale/jinhong/android.js

@@ -5,7 +5,10 @@ import Vue from "vue";
 let specialComp = {
   'phone-insurance-record-list': (resolve) => { require(['./android/PhoneInsuranceRecordList.vue'], resolve) },
   'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) },
-  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) }
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal.vue'], resolve) },
+  'android-notified-deal': (resolve) => { require(['./android/AndroidNotifiedDeal'], resolve) }
 }
 exports.specialComp = specialComp
 

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>-->

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

@@ -179,6 +179,21 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">年份</label>
+              <input type="number" class="input_search" v-model="$parent.$parent.f_year"
+                     style="width: 60%" placeholder="年份">
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">{{$parent.$parent.f_year}}年未入户</label>
+              <v-select class="select_list select"
+                        :placeholder="$parent.$parent.f_year + '年未入户'" style="width: 60%"
+                        :value.sync="model.is_no_ruhu" v-model="model.is_no_ruhu"
+                        :options='$parent.$parent.SafeCheckSXs'
+                        close-on-select clear-button
+                        :value-single="true">
+              </v-select>
+            </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">距上次安检天数</label>
               <input type="number" class="input_search" v-model="model.f_check_date"
@@ -378,6 +393,9 @@
             <th>
               <nobr>通气日期</nobr>
             </th>
+            <th>
+              <nobr>最后一次入户时间</nobr>
+            </th>
             <th v-show="$parent.$parent.$parent.showcode">
               <nobr>二维码</nobr>
             </th>
@@ -403,6 +421,7 @@
           </td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.last_ruhu_f_offsite_time }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center" v-show="$parent.$parent.$parent.showcode">
             <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.searchInfo(row.f_userinfo_code)' >点击</button>
           </td>
@@ -494,11 +513,12 @@ export default {
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],
       checkStates:[],
+      f_year:2,
       SafeCheckXZ: '',
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
       SafeCheckXZs: [{label: '全部', value: ''}, {label: '未安检', value: '未安检'}, {label: '已安检', value: '已安检'}], // 安检筛选选项
-      SafeCheckSXs: [{label: '是', value: '是'}, {label: '否', value: '否'}, {label: '全部', value: ''}],
+      SafeCheckSXs: [ {label: '全部', value: ''},{label: '是', value: '是'}, {label: '否', value: '否'}],
       // user_states:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],
       IsShares: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       IsShare: '否',
@@ -807,9 +827,29 @@ export default {
         con+= ` and f_check_version  = '${args.model.f_check_version}'`
       }
       con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ' and 1=1'
+      let condition3 = `1=1`
+      if (args.model.is_no_ruhu){
+        if (!this.f_year){
+          this.$showMessage('选择未入户时，需选择指定年限')
+          return
+        }
+        if (this.f_year <=0){
+          this.$showMessage('年份输入错误')
+          return
+        }
+        if (args.model.is_no_ruhu == '否'){
+          condition3 += ` and f_entry_status = '入户' and f_offsite_time >= DATEADD(YEAR, -${this.f_year}, GETDATE()) AND f_offsite_time < GETDATE()`
+          args.condition += ` and aj_count > 0`
+        }else {
+          condition3 += ` and f_entry_status = '入户' and f_offsite_time >= DATEADD(YEAR, -${this.f_year}, GETDATE()) AND f_offsite_time < GETDATE()`
+          args.condition += ` and aj_count is null`
+        }
+      }
+
       let condition = {
         condition1: args.condition,
-        condition2: con
+        condition2: con,
+        condition3: condition3
       }
       this.searchData.condition = condition
       return this.model.search(condition, args.model)