safecheck-client 3.0.34-1 → 3.0.34-100

package/src/filiale/yangchunboneng/android/safeHistoryLook.vue

@@ -303,15 +303,7 @@ export default {
         {label: '左表', value: '左表'},
         {label: '右表', value: '右表'}
       ],
-      check_states: [
-        {label: '请选择安检状态', value: ''},
-        {label: '入户', value: '入户'},
-        {label: '到访不遇', value: '到访不遇'},
-        {label: '拒检', value: '拒检'},
-        {label: '停用', value: '停用'},
-        {label: '未通气', value: '未通气'},
-        {label: '拆除', value: '拆除'}
-      ],
+      check_states: Vue.$appdata.getParam('安检状态'),
       last_check_states: [
         {label: '请选择上次安检状态', value: ''},
         {label: '入户', value: '入户'},
@@ -437,10 +429,13 @@ export default {
           condition += " and f_offsite_time < '"+this.$refs.paged.$refs.cri.model.f_end_date +"'"
         }
       }
-      if(this.$refs.paged.$refs.cri.model.f_state){
-        if(this.$refs.paged.$refs.cri.model.f_state.toString().trim()){
-          condition += " and f_entry_status = '"+this.$refs.paged.$refs.cri.model.f_state +"'"
-        }
+      if(this.$refs.paged.$refs.cri.model.f_state.length > 0){
+        let last_check_state = ''
+        this.$refs.paged.$refs.cri.model.f_state.forEach((item) => {
+          last_check_state = last_check_state + `'${item}',`
+        })
+        last_check_state = last_check_state.slice(0, -1)
+        condition += " and f_entry_status in ("+last_check_state+")"
       }
       if(this.$refs.paged.$refs.cri.model.f_user_type){
         if(this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()){

package/src/filiale/yangchunboneng/pc/CheckBookSearchUser.vue

@@ -68,10 +68,11 @@
             </div>
             <div class="row">
               <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">通气开始</label>
+                <label class="font_normal_body">首次通气开始</label>
                 <datepicker
                   :value.sync="model.f_gas_date_str"
                   style="width: 60%"
+                  placeholder='首次通气开始日期'
                   :format="'yyyy-MM-dd 00:00:00'"
                   v-model="model.f_gas_date_str"
                   condition="f_uservent_date > '{}'"
@@ -79,40 +80,50 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">通气结束</label>
+                <label class="font_normal_body">首次通气结束</label>
                 <datepicker
                   :value.sync="model.f_gas_date_end"
                   style="width: 60%"
+                  placeholder='首次通气结束日期'
                   :format="'yyyy-MM-dd 23:59:59'"
                   v-model="model.f_gas_date_end"
                   condition="f_uservent_date < '{}'"
                 >
                 </datepicker>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">开始时间</label>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">表具通气开始</label>
                 <datepicker
                   :value.sync="model.f_check_start"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='表具通气开始时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_start"
-                  condition="f_uservent_date > ='{} 00:00:00'">
+                  condition="f_gas_date > ='{} 00:00:00'">
                 </datepicker>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">结束时间</label>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">表具通气结束</label>
                 <datepicker
                   :value.sync="model.f_check_end"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='表具通气结束时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_end"
-                  condition="f_uservent_date <=  '{} 23:59:59'">
+                  condition="f_gas_date <=  '{} 23:59:59'">
                 </datepicker>
               </div>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用户状态</label>
+                <v-select :value.sync="model.f_user_state" v-model='model.f_user_state'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.userstates'
+                          close-on-select
+                          condition="f_user_state = '{}'"></v-select>
+              </div>
             </div>
           </div>
         </criteria>
@@ -291,6 +302,7 @@ export default {
       f_orgid: '',
       bookAll: false,
       bookList: [],
+      userstates:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],
       selectBook:'',
       userTypes: [{label: '全部', value: ''},{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
       // init:false,
@@ -635,7 +647,7 @@ export default {
     // this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
     // //tag
     // // this.init=true
-    // this.freshCheckBook()
+    this.freshCheckBook()
   }
 }
 </script>

package/src/filiale/yangchunboneng/pc/CheckBookUser.vue

@@ -36,27 +36,27 @@
                         condition="tuf.f_user_type ='{}'"></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">通气开始</label>
+              <label class="font_normal_body">首次通气开始</label>
               <datepicker
                 :value.sync="model.f_gas_start"
-                placeholder='开始时间' style="width: 60%"
+                placeholder='首次通气开始' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
                 v-model="model.f_gas_start"
-                condition="f_gas_date > ='{} 00:00:00'">
+                condition="tui.f_uservent_date > ='{} 00:00:00'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">通气结束</label>
+              <label class="font_normal_body">首次通气结束</label>
               <datepicker
                 :value.sync="model.f_gas_end"
-                placeholder='结束时间' style="width: 60%"
+                placeholder='首次通气结束' style="width: 60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
                 v-model="model.f_gas_end"
-                condition="f_gas_date <=  '{} 23:59:59'">
+                condition="tui.f_uservent_date <=  '{} 23:59:59'">
               </datepicker>
             </div>
           </div>
@@ -83,7 +83,7 @@
             <th><nobr>用户姓名</nobr></th>
             <th><nobr>用户电话</nobr></th>
             <th><nobr>用户地址</nobr></th>
-            <th><nobr>通气日期</nobr></th>
+            <th><nobr>首次通气日期</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
         </template>
@@ -99,7 +99,7 @@
             <td style="text-align:center">{{row.f_user_name}}</td>
             <td style="text-align:center">{{row.f_user_phone}}</td>
             <td style="text-align:center">{{row.f_address}}</td>
-            <td style="text-align:center">{{row.f_gas_date}}</td>
+            <td style="text-align:center">{{row.f_uservent_date}}</td>
             <td style="text-align: center">
               <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.remove(row)'>移出安检册</button>
             </td>
@@ -131,7 +131,7 @@ export default {
         'f_user_name': '客户姓名',
         'f_user_phone':'客户电话',
         'f_address': '客户地址',
-        'f_gas_date': '通气日期'
+        'f_uservent_date': '首次通气日期'
       },
       userTypes: [{label: '全部', value: ''},{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
       model: new PagedList('rs/sql/getUserByCheckBook', 50)

package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue

@@ -161,19 +161,22 @@
               <nobr>计划总数</nobr>
             </th>
             <th>
-              <nobr>未检</nobr>
+              <nobr>未上门</nobr>
             </th>
             <th>
-              <nobr>已检</nobr>
+              <nobr>未安检</nobr>
             </th>
             <th>
-              <nobr>入户</nobr>
+              <nobr>已上门</nobr>
             </th>
             <th>
-              <nobr>到访不遇</nobr>
+              <nobr>已安检</nobr>
             </th>
             <th>
-              <nobr>拒检</nobr>
+              <nobr>已完成</nobr>
+            </th>
+            <th>
+              <nobr>入户</nobr>
             </th>
             <th>
               <nobr>拆除</nobr>
@@ -184,9 +187,30 @@
             <th>
               <nobr>未通气</nobr>
             </th>
+            <th>
+              <nobr>拒检</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇1</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇2</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇3</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇3+</nobr>
+            </th>
+            <th>
+              <nobr>上门率</nobr>
+            </th>
             <th>
               <nobr>安检率</nobr>
             </th>
+            <th>
+              <nobr>完成率</nobr>
+            </th>
             <!--<th>-->
             <!--<nobr>查看</nobr>-->
             <!--</th>-->
@@ -209,15 +233,23 @@
             <td style="text-align:center" :class="{'td-0':row && !row.department,'td-1':model.rows && model.rows.length!=($index+1)&&row.department && row.department.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.department &&row.department.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.department &&row.department.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.department &&row.department.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('department')">{{row.department && row.department.indexOf('*&')!=-1?'':row.department}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
+            <td style="text-align:center">{{row.f_weishangmen}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
-            <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
+            <td style="text-align:center">{{row.f_yishangmen}}</td>
+            <td style="text-align:center">{{row.f_yijian}}</td>
+            <td style="text-align:center"><nobr>{{row.f_yiwancheng}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
-            <td style="text-align:center">{{row.f_buyu}}</td>
-            <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_chaichu}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_tingyong}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_weitongqi}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
+            <td style="text-align:center">{{row.f_buyu}}</td>
+            <td style="text-align:center">{{row.f_buyu2}}</td>
+            <td style="text-align:center">{{row.f_buyu3}}</td>
+            <td style="text-align:center">{{row.f_buyu4}}</td>
+            <td style="text-align:center"><nobr>{{row.f_shangmen_bv}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_wangcheng_bv}}</nobr></td>
             <!--<td style="text-align: center;">-->
             <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
             <!--</td>-->
@@ -234,15 +266,23 @@
           <th v-if="$parent.$parent.$parent.nameForSql.includes('department')"></th>
           <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"></th>
           <td style="text-align: center">{{model.sums.f_plan_total}}</td>
+          <td style="text-align: center">{{model.sums.f_weishangmen}}</td>
           <td style="text-align: center">{{model.sums.f_weijian}}</td>
+          <td style="text-align: center">{{model.sums.f_yishangmen}}</td>
           <td style="text-align: center">{{model.sums.f_yijian}}</td>
+          <td style="text-align: center">{{model.sums.f_yiwancheng}}</td>
           <td style="text-align: center">{{model.sums.f_ruhu}}</td>
-          <td style="text-align: center">{{model.sums.f_buyu}}</td>
-          <td style="text-align: center">{{model.sums.f_jujian}}</td>
           <td style="text-align: center">{{model.sums.f_chaichu}}</td>
           <td style="text-align: center">{{model.sums.f_tingyong}}</td>
           <td style="text-align: center">{{model.sums.f_weitongqi}}</td>
-          <td style="text-align: center">{{(parseFloat(model.sums.f_yijian) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
+          <td style="text-align: center">{{model.sums.f_tingyong}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu2}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu3}}</td>
+          <td style="text-align: center">{{model.sums.f_buyu4}}</td>
+          <td style="text-align: center">{{(parseFloat(model.sums.f_yishangmen) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
+          <td style="text-align: center">{{(parseFloat(model.sums.f_ruhu) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
+          <td style="text-align: center">{{(parseFloat(model.sums.f_yiwancheng) / parseFloat(model.sums.f_plan_total) * 100).toFixed(2) + '%'}}</td>
 
         </template>
       </data-grid>
@@ -262,14 +302,20 @@
       return {
         model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{
           f_plan_total:'',
+          f_weishangmen:'',
           f_weijian:'',
+          f_yishangmen:'',
           f_yijian:'',
+          f_yiwancheng:'',
           f_ruhu:'',
-          f_buyu:'',
-          f_jujian:'',
           f_chaichu:'',
           f_tingyong:'',
-          f_weitongqi:''
+          f_weitongqi:'',
+          f_jujian:'',
+          f_buyu:'',
+          f_buyu2:'',
+          f_buyu3:'',
+          f_buyu4:'',
         }),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
@@ -286,15 +332,24 @@
         f_safe_end:'',
         planName:[{label: '全部', value: ''}],
         exportExcelField: {
-          'f_weijian':'未检',
-          'f_yijian':'已检',
-          'f_ruhu':'入户',
-          'f_buyu':'到访不遇',
-          'f_jujian':'拒检',
-          'f_chaichu':'拆除',
-          'f_tingyong':'停用',
-          'f_weitongqi':'未通气',
-          'f_check_bv':'安检率'
+          f_plan_total:'计划总数',
+          f_weishangmen:'未上门',
+          f_weijian:'未安检',
+          f_yishangmen:'已上门',
+          f_yijian:'已安检',
+          f_yiwancheng:'已完成',
+          f_ruhu:'入户',
+          f_chaichu:'拆除',
+          f_tingyong:'停用',
+          f_weitongqi:'未通气',
+          f_jujian:'拒检',
+          f_buyu:'到访不遇1',
+          f_buyu2:'到访不遇2',
+          f_buyu3:'到访不遇3',
+          f_buyu4:'到访不遇3+',
+          f_shangmen_bv:'上门率',
+          f_check_bv:'安检率',
+          f_wangcheng_bv:'完成率'
         }
       }
     },
@@ -329,13 +384,24 @@
       // 获取导出列
       getexportExcelField(){
         this.exportExcelField = {
-          'f_weijian':'未检',
-          'f_yijian':'已检',
-          'f_ruhu':'入户',
-          'f_buyu':'到访不遇',
-          'f_jujian':'拒检',
-          'f_check_bv':'安检率',
-          'f_plan_total':'计划总数'
+          f_plan_total:'计划总数',
+          f_weishangmen:'未上门',
+          f_weijian:'未安检',
+          f_yishangmen:'已上门',
+          f_yijian:'已安检',
+          f_yiwancheng:'已完成',
+          f_ruhu:'入户',
+          f_chaichu:'拆除',
+          f_tingyong:'停用',
+          f_weitongqi:'未通气',
+          f_jujian:'拒检',
+          f_buyu:'到访不遇1',
+          f_buyu2:'到访不遇2',
+          f_buyu3:'到访不遇3',
+          f_buyu4:'到访不遇3+',
+          f_shangmen_bv:'上门率',
+          f_check_bv:'安检率',
+          f_wangcheng_bv:'完成率'
         }
         let forName = this.groupNameForSql.split(",")
         for (let i = 0; i < forName.length; i++) {