apply-clients 5.0.35-34 → 5.0.35-37

package/src/components/product/applyReport/ApplyReport.vue

@@ -8,13 +8,10 @@
                 <button type="button" class="btn btn-success" @click='$parent.$parent.showQuery=!$parent.$parent.showQuery'>
                   打印
                 </button>
-                <export-excel :data="$parent.$parent.getCondition"
-                              :field="$parent.$parent.getfield"
-                              sqlurl="rs/logic/exportfile"
-                              sql-name="checkuserReport"
-                              template-name='报装统计导出'
-                              :choose-col="true"></export-excel>
-                <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()" style="margin-left:10%">
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/saleExport" sql-name="checkuserReport" template-name='报装统计导出' :choose-col="true"></export-excel>
+                <button class="btn btn-primary btn-sm" type="button" @click="$parent.$parent.search(),$parent.$parent.showpager()" style="margin-left:10%">
                   <span class="glyphicon glyphicon-search"></span>查询
                 </button>
             </div>
@@ -23,12 +20,12 @@
         <data-grid :model="model" partial='list' v-ref:grid  class="list_area" is-fixed='false'>
           <template partial='head'>
             <tr>
-              <th colspan="6"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+              <th colspan="7"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
             </tr>
             <tr>
               <th colspan="1" rowspan="2">报装人员</th>
               <th colspan="2">个人报建</th>
-              <th colspan="3">集体报建</th>
+              <th colspan="4">集体报建</th>
             </tr>
             <tr class="title">
               <th>
@@ -43,6 +40,9 @@
               <th>
                 <nobr>安装</nobr>
               </th>
+              <th>
+                <nobr>验收</nobr>
+              </th>
               <th>
                 <nobr>通气</nobr>
               </th>
@@ -65,7 +65,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.jconstruction_unit}}</nobr>
               </td>
-
+              <td style="text-align: center;">
+                <nobr>{{row.checking_name}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.jgas_name}}</nobr>
               </td>
@@ -73,6 +75,16 @@
           </template>
         </data-grid>
       </criteria-paged>
+      <div  class="flex" style="height: 10%">
+        <div novalidate class="form-inline auto" partial>
+          <p class="bg-info text-center" style="padding: 8px;font-size: 20px">个体报建
+             勘踏合计：<span style="color: red">{{total.rows[0].sumgname}}</span>次，安装合计：<span style="color: red">{{total.rows[0].sumgunit}}</span>次，
+             集体报建 勘踏合计：<span style="color: red">{{total.rows[0].sumname}}</span>次，安装合计：<span  style="color: red">{{total.rows[0].sumjunit}}</span>次，
+            验收合计：<span style="color: red">{{total.rows[0].sumgcname}}</span>次，
+            通气合计：<span  style="color: red">{{total.rows[0].sunjname}}</span>次
+          </p>
+        </div>
+      </div>
     </div>
     <modal  :show.sync="showQuery" v-ref:modal :large="true" :backdrop="false" title="打印预览">
       <header slot="modal-header" class="modal-header">
@@ -110,7 +122,7 @@
   import * as Util from '../../Util'
 
   export default {
-    title: '报建统计',
+    title: '报建统计报表',
     data() {
       return {
         usertype: this.$appdata.getParam('用户类型'),
@@ -123,6 +135,7 @@
         }),
         condition: '',
         showQuery:false,
+        total: new PagedList('rs/sql/checkuserReportTotal', 999999, {orderitem: '`sumname`'}),
         showstopinfoflag:false,
         stopremarks:"",
         getfield: {
@@ -131,6 +144,7 @@
           'gconstruction_unit': '个体报建安装次数',
           'jsurvey_name': '集体报建踏勘次数',
           'jconstruction_unit': '集体报建安装次数',
+          'checking_name': '集体报建验收次数',
           'jgas_name': '集体报建通气次数'
         }
       }
@@ -138,20 +152,13 @@
     ready() {
       this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-      this.$refs.cp.$refs.cri.search()
+      this.search()
+
     },
     methods: {
       print () {
         this.$refs.print.$refs.print.PrintTable()
       },
-      getCondition() {
-        return {
-          condition: this.$refs.cp.$refs.cri.condition,
-          data: {
-            orgid: this.$login.f.orgid
-          }
-        }
-      },
       stopinfoshow(index){
         this.showstopinfoflag = true;
         let remakrs = this.model.rows[index].f_stop_remarks;
@@ -165,6 +172,14 @@
         this.$refs.cp.pager = false
         this.$dispatch('showbtn', row)
       },
+      search () {
+        let condition = "1=1"
+        //  debugger
+        // let condition =  args.condition
+        debugger
+        this.model.search()
+        this.total.search()
+      },
       showpager() {
         this.$refs.cp.pager = true
         this.$dispatch('hiddenbtn')
@@ -172,6 +187,11 @@
       closestopinfo(){
         this.showstopinfoflag = close;
       }
+    },
+    computed: {
+      getCondition() {
+        return {condition: `1=1`}
+      }
     }
   }
 </script>

package/src/components/product/applyReport/PrintApplyReport.vue

@@ -21,12 +21,12 @@
   <div id="print">
     <table border="1">
       <tr>
-        <th colspan="6"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+        <th colspan="7"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
       </tr>
       <tr>
         <th colspan="1" rowspan="2" class="cen">报装人员</th>
         <th colspan="2" class="cen">个人报建</th>
-        <th colspan="3" class="cen">集体报建</th>
+        <th colspan="4" class="cen">集体报建</th>
       </tr>
       <tr class="title">
         <th class="cen">
@@ -41,6 +41,9 @@
         <th  class="cen">
           <nobr>安装</nobr>
         </th>
+        <th  class="cen">
+          <nobr>验收</nobr>
+        </th>
         <th  class="cen">
           <nobr>通气</nobr>
         </th>
@@ -51,6 +54,7 @@
         <td>{{ item.gconstruction_unit }}</td>
         <td>{{ item.jsurvey_name }}</td>
         <td>{{ item.jconstruction_unit }}</td>
+        <td>{{ item.checking_name }}</td>
         <td>{{ item.jgas_name }}</td>
       </tr>
       <tr v-for="item in supplement">
@@ -60,6 +64,7 @@
         <td></td>
         <td></td>
         <td></td>
+        <td></td>
       </tr>
     </table>
   </div>