safecheck-client 4.0.0-96 → 4.0.0-98

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

@@ -141,7 +141,7 @@
               </v-select>
             </div>
             <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安检册</label>
+              <label class="font_normal_body">安&ensp;检&ensp;册</label>
               <v-select class="select_list select"
                         placeholder='安检册' style="width: 60%"
                         :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
@@ -540,7 +540,6 @@ export default {
   },
     methods: {
       getchecker(val){
-        debugger
         this.$refs.paged.$refs.criteria.model.f_checker_id = ''
         if(val && val.length > 0){
           this.checker_name = ''

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

@@ -0,0 +1,308 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
+              <role-selector-safe-dep
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                @alluser="$parent.$parent.getchecker"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id">
+              </role-selector-safe-dep>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_start"
+                placeholder='起始月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_end"
+                placeholder='结束月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_start_time"
+                placeholder='安检起始' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_end_time"
+                placeholder='安检截止' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body" >小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" >
+            </div>
+            <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <export-excel   :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="api/af-safecheck/logic/exportfile" sql-name="planCount" template-name='安检计划明细' ></export-excel>
+              <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <div class="button_spacing"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                   @click="$parent.$parent.hiddenr()"></div>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th>安检员</th>
+            <th>总入户量</th>
+            <th>总到访不遇量</th>
+            <th>总拒检量</th>
+            <th>安检总量</th>
+            <th>计划总数</th>
+            <th>入户</th>
+            <th>到访不遇</th>
+            <th>拒检</th>
+            <th>无计划总数</th>
+            <th>无计划入户</th>
+            <th>无计划到访不遇</th>
+            <th>无计划拒检</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center">{{row.f_checker}}</td>
+          <td style="text-align: center">{{row.ruhu_total}}</td>
+          <td style="text-align: center">{{row.daofang_total}}</td>
+          <td style="text-align: center">{{row.jujian_total}}</td>
+          <td style="text-align: center">{{row.total_sum}}</td>
+          <td style="text-align: center">{{row.plannum}}</td>
+          <td style="text-align: center">{{row.ruhu}}</td>
+          <td style="text-align: center">{{row.daofang}}</td>
+          <td style="text-align: center">{{row.jujian}}</td>
+          <td style="text-align: center">{{row.no_plan_num}}</td>
+          <td style="text-align: center">{{row.noruhu}}</td>
+          <td style="text-align: center">{{row.nodaofang}}</td>
+          <td style="text-align: center">{{row.nojujian}}</td>
+        </template>
+        <template partial="foot">
+          <td style="text-align: center"><span><b>合计：</b></span></td>
+          <td style="text-align: center">{{model.sums.ruhu_total}}</td>
+          <td style="text-align: center">{{model.sums.daofang_total}}</td>
+          <td style="text-align: center">{{model.sums.jujian_total}}</td>
+          <td style="text-align: center">{{model.sums.total_sum}}</td>
+          <td style="text-align: center">{{model.sums.plannum}}</td>
+          <td style="text-align: center">{{model.sums.ruhu}}</td>
+          <td style="text-align: center">{{model.sums.daofang}}</td>
+          <td style="text-align: center">{{model.sums.jujian}}</td>
+          <td style="text-align: center">{{model.sums.no_plan_num}}</td>
+          <td style="text-align: center">{{model.sums.noruhu}}</td>
+          <td style="text-align: center">{{model.sums.nodaofang}}</td>
+          <td style="text-align: center">{{model.sums.nojujian}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+
+
+export default {
+  title: '安检计划查询',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for (let i = year - 8; i <= year + 1; i++)
+      options.push({label: i + '', value: i + ''})
+    let model = new PagedList('api/af-safecheck/sql/planCount', 20, {
+      f_filialeids: 'this.f_filialeids',
+      f_start_time: 'this.f_start_time',
+      condition1:'this.condition1',
+      condition2:'this.condition2',
+      condition3:'this.condition3',
+      f_end_time: 'this.f_end_time'
+    }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
+    model.f_filialeids = '('+this.$login.f.orgid+')'
+    return {
+      excelHeaders:{
+        'f_checker': '安检员',
+        'plannum': '计划总数',
+        'ruhu': '入户',
+        'jujian': '拒检',
+        'daofang': '到访不遇',
+        'no_plan_num': '无计划总数',
+        'noruhu': '无计划入户',
+        'nojujian': '无计划拒检',
+        'nodaofang': '无计划到访不遇'
+      },
+      searchData:{
+        condition:"1=1",
+        condition1:"1=1",
+        condition2:"1=1",
+        condition3:"and 1=1",
+        f_plan_year:year[0],
+        f_checker:'',
+        f_filialeids:'('+this.$login.f.orgid+')',
+        f_start_time:'',
+        f_end_time:''
+      },
+      checker: this.$login.f,
+      checkers: [],
+      checkersname: [],
+      checkStates: this.$appdata.getParam('安检状态'),
+      f: this.$login.f,
+      criteriaShow: false,
+      model: model,
+      c_year_list: options,
+      f_check_start:'',
+      f_check_end: '',
+      f_start_time:'',
+      f_end_time:'',
+      checker_name:''
+    }
+  },
+  methods: {
+    getchecker(val){
+      this.$refs.paged.$refs.cri.model.f_checker_id = ''
+      if(val && val.length > 0){
+        this.checker_name = ''
+        val.forEach(user => {
+          this.checker_name += `'${user.name}',`
+        })
+        this.checker_name = this.checker_name.slice(0,this.checker_name.length-1)
+      }else{
+        this.checker_name = ''
+      }
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
+    },
+    search(args) {
+      let tempStr = args.condition
+      let condition1 = tempStr
+      let condition2 = tempStr
+      let condition3 = ' and 1=1 '
+      if (this.f_check_start) {
+        condition1 += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+        condition1 += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+      }
+      if (this.f_check_end) {
+        condition1 += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+        condition1 += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+      }
+      if(args.model.f_residential_area){
+        condition1 += ` AND tcpi.f_residential_area like '${args.model.f_residential_area}' `
+        condition2 += ` AND f_residential_area like '${args.model.f_residential_area}' `
+
+      }
+      if(this.f_start_time){
+        condition2 += ` AND f_offsite_time >= '${this.f_start_time} 00:00:00'`
+      }
+      if (this.f_end_time){
+        condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_id){
+        condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+        condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+      }
+      if(this.checker_name){
+        condition3 += ` and f_checker in (${this.checker_name}) `
+        condition2 += ` AND f_checker_name in (${this.checker_name}) `
+      }
+      this.model.f_start_time=this.f_start_time
+      this.model.f_end_time=this.f_end_time
+      this.model.condition1=condition1
+      this.model.condition2=condition2
+      this.model.condition3=condition3
+
+      this.searchData.condition1=condition1
+      this.searchData.condition2=condition2
+      this.searchData.condition3=condition3
+
+      this.model.search(args.condition, args.model)
+    },
+    getRes(obj){
+      if(obj.orgobj[0]){
+        this.model.f_filialeid = this.$login.convertToIn(obj.orgobj[0].parentid)
+      }else{
+        this.model.f_filialeid = this.$login.convertToIn(this.$login.f.orgid)
+      }
+    }
+  },
+  ready() {
+    this.model.id = this.$login.f.id
+    this.model.f_subcompany = this.$login.f.f_fengongsi
+    this.model.f_filialeid = this.$login.f.orgid
+  },
+
+  watch: {
+    'model.condition'(val) {
+      if(val){
+        this.searchData.condition = val
+      }
+    },
+    'model.f_checker'(val) {
+      if(val){
+        this.searchData.f_checker = val
+      }
+    },
+    'f_start_time'(val) {
+      if(val){
+        this.searchData.f_start_time = val
+      }
+    },
+    'f_end_time'(val) {
+      if(val){
+        this.searchData.f_end_time = val
+      }
+    },
+    'checker'() {
+      // //tag
+      //tag
+      this.model.chosenOrg = this.checker[0]
+    },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1 &&this. model.sums){
+        this.model.sums.yrj = 0
+        this.model.sums.no_plan_num = 0
+        this.model.sums.wrj = 0
+        this.model.sums.ruhu = 0
+        this.model.sums.jujian = 0
+        this.model.sums.daofang = 0
+        this.model.sums.ruhu_total=0
+        this.model.sums.daofang_total=0
+        this.model.sums.jujian_total=0
+        this.model.sums.total_sum=0
+      }
+    }
+  },
+  computed: {
+    selected() {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>

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

@@ -34,11 +34,28 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-1 upuserinfo_sel" >
+              <v-select
+                class="select select_list"
+                :width="'95%'"
+                :value.sync="model.f_meter_book_num"
+                v-model="model.f_meter_book_num"
+                :options='$parent.$parent.checkBooks'
+                :timeout="500"
+                @select-search="$parent.$parent.select_book"
+                placeholder='安检册选择'
+                condition="ua.f_check_book_id = '{}'"
+                close-on-select
+                value-single
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" >
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUploadCodeCondition()">导入编号</button>
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.clearUserInfoId()">清空编号</button>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.clearcon()">重置</button>
             </div>
             <div class="form-group col-sm-1" style="float: right">
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.dragtoPlanItem()">添入计划</button>
@@ -125,11 +142,6 @@
                     >
                     </v-select>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">小区名称:</label>
-                    <input type="text" class="input_search" v-model="model.f_userinfo_code"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_residential_area = '{}'">
-                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">楼&ensp;栋&ensp;号:</label>
                     <input type="text" class="input_search" v-model="model.f_building"
@@ -196,20 +208,6 @@
                     >
                     </v-select>
                   </div>
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>-->
-<!--                    <v-select-->
-<!--                      class="select select_list"-->
-<!--                      :value.sync="model.f_meter_book_num"-->
-<!--                      v-model="model.f_meter_book_num"-->
-<!--                      :options='$parent.$parent.cbc'-->
-<!--                      placeholder='请选择'-->
-<!--                      condition="uf.f_meter_book_num='{}'"-->
-<!--                      close-on-select-->
-<!--                      value-single-->
-<!--                    >-->
-<!--                    </v-select>-->
-<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
                     <v-select
@@ -265,14 +263,6 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4">
-                    <label class="font_normal_body">安检册:</label>
-                    <v-select v-model="model.f_meter_book_num" :multiple="true"
-                              :options='$parent.$parent.checkBooks' :value.sync="model.f_meter_book_num" class="select_list select"
-                              condition="ua.f_check_book_id in {}" placeholder='安检册'
-                              style="width: 60%">
-                    </v-select>
-                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">通气起始:</label>
                     <datepicker
@@ -299,21 +289,6 @@
                       condition="ui.f_uservent_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_hasHousehold"
-                      v-model="model.f_hasHousehold"
-                      :options='$parent.$parent.hasHousehold'
-                      placeholder='请选择'
-                      close-on-select
-                      :search="false"
-                      value-single
-                    >
-                    </v-select>
-                  </div>-->
-
                 </div>
               </div>
               <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -337,16 +312,6 @@
               <footer slot="modal-footer" class="modal-footer">
               </footer>
             </modal>
-            <!--<div class="form-group col-sm-4 button-range" >
-
-              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel   :data="$parent.$parent.exportParameter"
-                                   :field="$parent.$parent.excelHeaders"
-                                   sqlurl="api/af-safecheck/logic/exportfile" sql-name="planItem"
-                                   template-name='安检计划明细' :choose-col="true">
-              </export-excel>
-
-            </div>-->
           </div>
         </div>
       </criteria>
@@ -419,7 +384,6 @@
         entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
         sliceArea:[],
         meterbooks:[],
-        hasCheckBooks:'否',
         checkBooks:[],
         cbc:[],
         areaList:[],
@@ -432,16 +396,15 @@
     },
     props:["selectplan","userlogin"],
     ready(){
-      this.$refs.paged.$refs.criteria.model.f_user_type='民用'
-      this.hasCheckBooks=this.$appdata.getSingleValue('是否使用安检册')
-      // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
-      //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
       this.getCheckBook()
       this.setConList()
       this.loadpage()
       document.addEventListener('keydown', this.handleEnter, true);
     },
     methods: {
+      clearcon(){
+        this.$refs.paged.$refs.criteria.model= {}
+      },
       handleEnter(e) {
         if (e.key === 'Enter') {
           this.$refs.paged.$refs.criteria.search()
@@ -487,11 +450,6 @@
       selfSearch (args) {
         //tag)
         args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-        /*if(args.model.f_hasHousehold=='已入户'){
-          args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
-        }else if(args.model.f_hasHousehold=='未入户'){
-          args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
-        }*/
 
         if (args.model.f_last_check_state == '未检') {
           let nocheckcon = 'and ( ui.f_last_check_date is null '
@@ -568,6 +526,21 @@
           //tag)
         })
       },
+      select_book(text){
+        //tag
+        let pcdText=text?` and f_check_book_name  like '%${text}%'`:''
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_check_book",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          //tag)
+          if(res.data.length>0){
+            this.checkBooks = []
+            this.checkBooks.push({label:"全部",value:""})
+            res.data.forEach((result)=>{
+              this.checkBooks.push({label:result.f_check_book_name,value:result.id})
+            })
+          }
+          //tag)
+        })
+      },
       select_street(){
         //tag
         new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"id,f_street",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}'`}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{

package/src/filiale/jinhong/pc.js

@@ -6,7 +6,8 @@ let specialComp = {
   'safe-defect-list-new': (resolve) => {require(['./pc/DefectListNew'], resolve)},
   'check-user-list': (resolve) => {require(['./pc/checkUserList'], resolve)},
   'plan-manage': (resolve) => {require(['./pc/PlanManage.vue'], resolve)},
-  'check-book-list': (resolve) => {require(['./pc/CheckBookList.vue'], resolve)}
+  'check-book-list': (resolve) => {require(['./pc/CheckBookList.vue'], resolve)},
+  'select-check-plan': (resolve) => {require(['./pc/SelectCheckPlan.vue'], resolve)}
 
 }
 exports.specialComp = specialComp