safecheck-client 3.0.33-5 → 3.0.33-50

package/src/filiale/yongzhou/pc/communityTypeDetailM.vue

@@ -1,207 +1,114 @@
 <template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <criteria-paged :model="model" v-ref:paged>
-        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
-          <div partial>
-            <div class="row">
-              <div class="form-group col-sm-4">
-                <label class="font_normal_body">开始时间:</label>
-                <datepicker
-                  placeholder='请选择'
-                  style="width:60%"
-                  :disabled-days-of-week="[]"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  :value.sync="model.start_time"
-                  v-model="model.start_time"
-                  condition="tcp.f_upload_date >= '{} 00:00:00'">
-                </datepicker>
-              </div>
-              <div class="form-group col-sm-4">
-                <label class="font_normal_body">结束时间:</label>
-                <datepicker
-                  placeholder='请选择'
-                  :disabled-days-of-week="[]"
-                  style="width:60%"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  :value.sync="model.end_time"
-                  v-model="model.end_time"
-                  condition="tcp.f_upload_date <= '{} 23:59:59'">
-                </datepicker>
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">小区名称：</label>
-                <input style="width: 60%" class="input_search" v-model="model.f_residential_area"
-                       placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
-              </div>
-              <div class="col-sm-4 form-group" style="margin: 0">
-                <role-selector-safe
-                  role-name="安检员"
-                  :resobjprop.sync="$parent.$parent.resids"
-                  role-lable="安&nbsp;检&nbsp;员&nbsp;"
-                  @re-res="$parent.$parent.getRes"
-                  :value.sync="model.f_checker_id"
-                  v-model="model.f_checker_id"
-                  condition="tcp.f_checker_name = '{}'">
-                </role-selector-safe>
-              </div>
-              <div style="float: right">
-                <export-excel-safe :data="$parent.$parent.searchData"
-                                   :field="$parent.$parent.excelHeaders"
-                                   progress="safeGetExportProgress"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="communityTypeDetailM"
-                                   template-name='居民隐患类型明细' :choose-col="true"></export-excel-safe>
-              </div>
-              <print-data-safe :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.print_model" :field="$parent.$parent.excelHeaders"
-                          :defaultfield="$parent.$parent.defaultPrint" :chooserow="true"
-                          :titletable="'居民隐患类型明细'" :starthead="$parent.$parent.getstart"
-              ></print-data-safe>
-              <button class="button_spacing button_search" @click="search()">查询</button>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false'>
+      <criteria partial='criteria' @condition-changed='$parent.reSearch' class="search_area">
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                condition="tcp.f_checker_name = '{}'">
+              </role-selector-safe>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="startDate" class="font_normal_body">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          style="width: 60%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          condition="tcp.f_upload_date >= '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          condition="tcp.f_upload_date <= '{}'"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2"  >
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" condition="tcp.f_residential_area like '%{}%'">
+            </div>
+            <div class="col-sm-4 form-group" style="margin-top: 8px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <report-print id='checkerPrint' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+              <report-excel id='checkerPrint'></report-excel>
             </div>
           </div>
-        </criteria>
-        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th>
-                <nobr>序号</nobr>
-              </th>
-              <th>
-                <nobr>小区名称</nobr>
-              </th>
-              <th>
-                <nobr>隐患类型-漏气</nobr>
-              </th>
-              <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>
-          <template partial='body'>
-
-            <td style="text-align: center">{{ $index + 1 }}</td>
-            <td style="text-align: center">{{ row.f_residential_area }}</td>
-            <td style="text-align: center">{{ row.ljcount }}</td>
-            <td style="text-align: center">{{ row.jgcount }}</td>
-            <td style="text-align: center">{{ row.rqjcount }}</td>
-            <td style="text-align: center">{{ row.yhhs }}</td>
-            <td style="text-align: center">{{ row.yclyh }}</td>
-            <td style="text-align: center">{{ row.clzyh }}</td>
-            <td style="text-align: center">{{ row.wcl }}</td>
-          </template>
-          <template partial="foot">
-            <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
-            <td style="text-align: center">{{ model.sums.yhhs }}</td>
-            <td style="text-align: center">{{ model.sums.ljcount }}</td>
-            <td style="text-align: center">{{ model.sums.jgcount }}</td>
-            <td style="text-align: center">{{ model.sums.rqjcount }}</td>
-            <td style="text-align: center">{{ model.sums.yclyh }}</td>
-            <td style="text-align: center">{{ model.sums.clzyh }}</td>
-            <td style="text-align: center">{{ model.sums.wcl }}</td>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
+        </div>
+      </criteria>
+      <div partial='list' id='checkerPrint' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='9' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">隐患类型明细表(民用)</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='9' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='9' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+          <tr style="height: 100px"></tr>
+        </table>
+      </div>
+    </criteria-paged>
   </div>
+
 </template>
 
 <script>
-import {PagedList} from "vue-client";
+import {DataModel, HttpResetClass} from 'vue-client'
 
 export default {
-  name: "communityTypeDetailM",
-  title: "居民隐患类型明细",
-  data() {
+  title: '隐患类型明细表',
+  data () {
+    let model = new DataModel('rs/report/areaPitfallReport', {})
+    // model.f_filialeid = '(' + this.$login.f.orgid + ')'
     return {
-      model: new PagedList("/rs/sql/communityTypeDetailM", 999, {orgid: this.$login.f.orgid}, {
-        yhhs: '',
-        yclyh: '',
-        clzyh: '',
-        rqjcount: '',
-        ljcount: '',
-        wcl:'',
-        jgcount: ''
-      }),
-      resids: {},
-      print_model:{},
-      searchData: {
-        condition: "1=1",
-        orgid: this.$login.f.orgid
-      },
-      excelHeaders: {
-        'f_residential_area': '小区名称',
-        'ljcount': '隐患类型-漏气',
-        'jgcount': '隐患类型-胶管',
-        'rqjcount': '隐患类型-燃气具老化',
-        'yhhs': '存在隐患户数',
-        'yclyh': '已处理户数',
-        'clzyh': '处理中户数',
-        'wcl' : '未处理户数'
-      },
-      printshow: false,
-      defaultPrint: ['f_residential_area', 'ljcount','jgcount','rqjcount','yhhs', 'yclyh', 'clzyh','wcl'],
-      sumsmodel: {},
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
+      userid: this.$login.f.id,
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+      model: model
     }
   },
-  ready() {
-    // this.model.search('1=1')
-  },
   methods: {
-    async selfSearch(args) {
-      await this.model.search(args.condition, args.model, args.condValue)
-      this.searchData.condition = args.condition
-      this.print_model = JSON.parse(JSON.stringify(this.$refs.paged.$refs.grid.model))
-      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-      this.print_model.rows.push({
-        f_residential_area: '合计',
-        ljcount : this.sumsmodel.ljcount,
-        jgcount : this.sumsmodel.jgcount,
-        rqjcount : this.sumsmodel.rqjcount,
-        yhhs: this.sumsmodel.yhhs,
-        yclyh: this.sumsmodel.yclyh,
-        clzyh: this.sumsmodel.clzyh,
-        wcl: this.sumsmodel.wcl,
-      })
-      this.print_model.totalPage = 0
+    getRes (obj) {
+      this.model.f_filialeid = this.$login.convertToIn(obj.resids)
     },
-    getRes(obj) {
-      //tag
-      this.resids = {res: obj.res[0], resids: obj.resids[0]}
-      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-    },
-    // 打印
-    stamp() {
-      this.printshow = true
-    },
-    close() {
-      this.printshow = false
+    reSearch(args){
+      args.condition += ` and tcp.f_check_type = '民用' `
+      this.model.search(args.condition, args.model)
     }
   },
+  ready () {
+  },
   computed: {
-    getstart() {
-      return `开始时间：${this.$refs.paged.$refs.criteria.model.start_time} 结束时间：${this.$refs.paged.$refs.criteria.model.end_time}`
-    },
+    selected () {
+      return this.$refs.grid.selected
+    }
   }
 }
 </script>
-
-<style scoped>
-
-</style>

package/src/filiale/yongzhou/pc/safeDetail.vue

@@ -53,7 +53,7 @@
                   @re-res="$parent.$parent.getRes"
                   :value.sync="model.f_checker_id"
                   v-model="model.f_checker_id"
-                  condition="tcp.f_checker_name = '{}'">
+                  condition="tcp.f_checker = '{}'">
                 </role-selector-safe>
               </div>
               <div style="float: right">
@@ -64,10 +64,10 @@
                                    :choose-col="true"></export-excel-safe>
               </div>
               <print-data-safe :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.print_model"
-                          :field="$parent.$parent.excelHeaders"
-                          :defaultfield="$parent.$parent.defaultPrint"
-                          :titletable="'安检情况明细'" :starthead="$parent.$parent.getstart"
-                          ></print-data-safe>
+                               :field="$parent.$parent.excelHeaders"
+                               :defaultfield="$parent.$parent.defaultPrint"
+                               :titletable="'安检情况明细'" :starthead="$parent.$parent.getstart"
+              ></print-data-safe>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
           </div>
@@ -84,6 +84,7 @@
               <th>
                 <nobr>计划安检总户数</nobr>
               </th>
+
               <th>
                 <nobr>未检户数</nobr>
               </th>
@@ -111,13 +112,19 @@
               <th>
                 <nobr>安检率</nobr>
               </th>
+              <th>
+                <nobr>申请安检户数</nobr>
+              </th>
+              <th>
+                <nobr>总入户数</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
 
             <td style="text-align: center">{{ $index + 1 }}</td>
             <td style="text-align: center">{{ row.f_residential_area }}</td>
-            <td style="text-align: center">{{ row.totalcount }}</td>
+            <td style="text-align: center"><a @click="$parent.$parent.$parent.modalShow(row,'1')">{{ row.totalcount }}</a></td>
             <td style="text-align: center">{{ row.wjcount }}</td>
             <td style="text-align: center">{{ row.yjcount }}</td>
             <td style="text-align: center">{{ row.rhcount }}</td>
@@ -127,17 +134,16 @@
             <td style="text-align: center">{{ row.unique_dfby_count }}</td>
             <td style="text-align: center">{{ row.jjcount }}</td>
             <td style="text-align: center">{{ row.check_bv }}</td>
+            <td style="text-align: center"><a @click="$parent.$parent.$parent.modalShow(row,'0')">{{ row.sqajcount }}</a></td>
+            <td style="text-align: center">{{ row.ruhucount }}</td>
+
           </template>
           <template partial="foot">
             <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
             <td style="text-align: center">{{ model.sums.totalcount }}</td>
-
             <td style="text-align: center">{{ model.sums.wjcount }}</td>
-
             <td style="text-align: center">{{ model.sums.yjcount }}</td>
-
             <td style="text-align: center">{{ model.sums.rhcount }}</td>
-
             <td style="text-align: center">{{ model.sums.dfbycount1 }}</td>
             <td style="text-align: center">{{ model.sums.dfbycount2 }}</td>
             <td style="text-align: center">{{ model.sums.dfbycount3 }}</td>
@@ -146,11 +152,142 @@
             <td style="text-align: center">
               {{ ((model.sums.yjcount / model.sums.totalcount)*100.0).toFixed(2) }}%
             </td>
-
+            <td style="text-align: center">{{ model.sums.sqajcount }}</td>
+            <td style="text-align: center">{{ model.sums.ruhucount }}</td>
           </template>
         </data-grid>
       </criteria-paged>
     </div>
+    <modal :show.sync="modal_show" backdrop="false"
+           class="allQuotaRecordModalShow" width="80%">
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <criteria partial='criteria' class="search_area" v-ref:criteria>
+          <div partial>
+            <div class="row">
+              <div class="form-group col-sm-4">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker
+                  placeholder='请选择'
+                  style="width:60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  :value.sync="$parent.$parent.modalSearchData.start_time"
+                  v-model="$parent.$parent.modalSearchData.start_time"
+                >
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-4">
+                <label class="font_normal_body">结束时间</label>
+                <datepicker
+                  placeholder='请选择'
+                  :disabled-days-of-week="[]"
+                  style="width:60%"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  :value.sync="$parent.$parent.modalSearchData.end_time"
+                  v-model="$parent.$parent.modalSearchData.end_time">
+                </datepicker>
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">用户编号</label>
+                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_userinfo_code">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">用户名称</label>
+                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_user_name">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">用户地址</label>
+                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_address">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">用户电话</label>
+                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_user_phone">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">安检员</label>
+                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_checker">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">安检状态</label>
+                <v-select :value.sync="$parent.$parent.modalSearchData.f_last_check_state" v-model='$parent.$parent.modalSearchData.f_last_check_state'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.last_check_states' placeholder='安检状态'
+                          close-on-select
+                ></v-select>
+              </div>
+              <div class="form-group col-sm-4">
+                <label class="font_normal_body">用户类型</label>
+                <v-select :value.sync="$parent.$parent.modalSearchData.f_user_type" v-model='$parent.$parent.modalSearchData.f_user_type'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.user_types' placeholder='用户类型'
+                          close-on-select
+                ></v-select>
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">到访不遇次数</label>
+                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_check_version">
+              </div>
+              <button class="button_spacing button_search" @click="$parent.$parent.modalSearch()">查询</button>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" :model="modalModel" v-ref:modalgrid partial='list'>
+          <template partial='head'>
+            <th>
+              <nobr>用户编号</nobr>
+            </th>
+            <th>
+              <nobr>用户名称</nobr>
+            </th>
+            <th>
+              <nobr>小区</nobr>
+            </th>
+            <th>
+              <nobr>地址</nobr>
+            </th>
+            <th>
+              <nobr>客户电话</nobr>
+            </th>
+            <th>
+              <nobr>到访不遇次数</nobr>
+            </th>
+            <th>
+              <nobr>安检时间</nobr>
+            </th>
+            <th>
+              <nobr>安检员</nobr>
+            </th>
+            <th>
+              <nobr>用户类型</nobr>
+            </th>
+            <th v-if="$parent.$parent.$parent.$parent.type === '1'">
+              <nobr>安检状态</nobr>
+            </th>
+          </template>
+          <template partial='body'>
+            <td style="text-align:center">{{row.f_userinfo_code}}</td>
+            <td style="text-align:center">{{row.f_user_name }}</td>
+            <td style="text-align:center">{{row.f_residential_area}}</td>
+            <td style="text-align:center">{{row.f_address}}</td>
+            <td style="text-align:center">{{row.f_user_phone}}</td>
+            <td style="text-align:center">{{row.f_check_version}}</td>
+            <td style="text-align:center">{{row.f_last_check_date}}</td>
+            <td style="text-align:center">{{row.f_checker}}</td>
+            <td style="text-align:center">{{row.f_user_type}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.$parent.type === '1'">{{row.f_last_check_state}}</td>
+          </template>
+        </data-grid>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='modal_show = false'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -165,6 +302,8 @@ export default {
     return {
       model: new PagedList("/rs/sql/safeDetail", 999, {orgid: this.$login.f.orgid}, {
         totalcount: '',
+        sqajcount:'',
+        ruhucount:'',
         wjcount: '',
         yjcount: '',
         rhcount: '',
@@ -175,11 +314,19 @@ export default {
         jjcount: ''
       }),
       resids: {},
+      modalModel: new PagedList('rs/sql/singleTable_OrderBy', 99999, {
+        items: '"tcpi.*,tcp.f_checker"',
+        tablename: '"t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id"',
+        orderitem: '"1"'
+      }),
+      modalSearchData:{},
       searchData: {
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      modal_show:false,
       print_model:{},
+      last_check_states:[{label:'全部',value:''},{label:'入户',value:'入户'},{label:'拒检',value:'拒检'},{label:'到访不遇',value:'到访不遇'}],
       user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       excelHeaders: {
         'f_residential_area': '小区名称',
@@ -192,10 +339,14 @@ export default {
         'dfbycount3': '到访不遇-3次',
         'unique_dfby_count': '到访不遇小计',
         'jjcount': '拒检户数',
-        'check_bv':'安检率'
+        'check_bv':'安检率',
+        'sqajcount': '申请安检户数',
+        'ruhucount': '总入户数',
       },
+      modalRow:{},
+      type:'1',
       printshow: false,
-      defaultPrint: ['f_residential_area', 'totalcount', 'wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv'],
+      defaultPrint: ['f_residential_area', 'totalcount','wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv', 'sqajcount', 'ruhucount'],
       sumsmodel: {},
     }
   },
@@ -203,6 +354,51 @@ export default {
     // this.model.search('1=1')
   },
   methods: {
+    async modalShow (row,type) {
+      this.type = type
+      this.modalRow = row
+      this.modal_show = true
+      this.modalSearchData = {}
+      await this.modalSearch(row)
+    },
+    modalSearch () {
+      let modalCondition = this.$refs.paged.model.condition
+      if (this.modalSearchData.f_last_check_state){
+        modalCondition += ` and tcpi.f_last_check_state = '${this.modalSearchData.f_last_check_state}'`
+      }
+      if (this.modalSearchData.f_user_name){
+        modalCondition += ` and tcpi.f_user_name = '${this.modalSearchData.f_user_name}'`
+      }
+      if (this.modalSearchData.f_user_type){
+        modalCondition += ` and tcpi.f_user_type = '${this.modalSearchData.f_user_type}'`
+      }
+      if (this.modalSearchData.start_time){
+        modalCondition += ` and tcp.f_create_time >= '${this.modalSearchData.start_time}'`
+      }
+      if (this.modalSearchData.end_time){
+        modalCondition += ` and tcp.f_create_time <= '${this.modalSearchData.end_time}'`
+      }
+      if (this.modalSearchData.f_userinfo_code){
+        modalCondition += ` and tcpi.f_userinfo_code = '${this.modalSearchData.f_userinfo_code}'`
+      }
+      if (this.modalSearchData.f_address){
+        modalCondition += ` and tcpi.f_address = '${this.modalSearchData.f_address}'`
+      }
+      if (this.modalSearchData.f_user_phone){
+        modalCondition += ` and tcpi.f_user_phone = '${this.modalSearchData.f_user_phone}'`
+      }
+      if (this.modalSearchData.f_checker){
+        modalCondition += ` and tcp.f_checker = '${this.modalSearchData.f_checker}'`
+      }
+      if (this.modalSearchData.f_check_version){
+        modalCondition += ` and tcpi.f_check_version = '${this.modalSearchData.f_check_version}'`
+      }
+      modalCondition += ` and tcpi.f_residential_area = '${this.modalRow.f_residential_area}'`
+      if (this.type == '0') {
+        modalCondition += ` and tcp.f_safecheck_type = '临时安检'`
+      }
+      this.modalModel.search(modalCondition, this.modalModel)
+    },
     async selfSearch(args) {
       await this.model.search(args.condition, args.model, args.condValue)
       this.searchData.condition = args.condition
@@ -218,7 +414,9 @@ export default {
         dfbycount2: this.sumsmodel.dfbycount2,
         dfbycount3: this.sumsmodel.dfbycount3,
         unique_dfby_count: this.sumsmodel.unique_dfby_count,
-        check_bv:`${((this.sumsmodel.yjcount / this.sumsmodel.totalcount)*100.0).toFixed(2)}%`
+        check_bv:`${((this.sumsmodel.yjcount / this.sumsmodel.totalcount)*100.0).toFixed(2)}%`,
+        sqajcount: this.sumsmodel.sqajcount,
+        ruhucount: this.sumsmodel.ruhucount
       })
       this.print_model.totalPage = 0
     },

package/src/filiale/yongzhou/pc.js

@@ -5,10 +5,13 @@ import Vue from "vue";
 let specialComp = {
   "plan-manage":(resolve) => { require(['./pc/PlanManage'], resolve) },
   "role-selector-safe":(resolve) => { require(['./pc/RoleSelector'], resolve) },
+  "select-check-plan":(resolve) => { require(['./pc/SelectCheckPlan.vue'], resolve) },
+  "check-plan":(resolve) => { require(['./pc/CheckPlan.vue'], resolve) },
   "check-user-list":(resolve) => { require(['./pc/checkUserList'], resolve) },
   'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   "safe-table":(resolve) => { require(['./pc/safeTable'], resolve) },
   "safe-detail":(resolve) => { require(['./pc/safeDetail'], resolve) },
+  "safe-defect-paper-new":(resolve) => { require(['./pc/DefectPaperNew.vue'], resolve) },
   'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
   "community-detail":(resolve) => { require(['./pc/communityDetail'], resolve) },
   "community-type-detail-g":(resolve) => { require(['./pc/communityTypeDetailG'], resolve) },