manage-client 3.2.18 → 3.2.20-aode

package/src/components/sale/businessquery/InspectListGas.vue

@@ -53,13 +53,10 @@
             <div class="span" style="float:right;">
               <button class="btn button_search" @click="search()">查询</button>
               <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
+              <export-excel-plus :defaultselect="$parent.$parent.selectfields" :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
-                            :footer="$parent.$parent.footer"
-                            :header="$parent.$parent.other"
-                            sqlurl="rs/logic/exportfile"
-                            :sql-name="$parent.$parent.sqlName"
-                            template-name='购气稽查导出'  :choose-col="true"></export-excel>
+                            :exportprogress="true"
+                            sqlurl="rs/logic/exportfileplus"  :sql-name="$parent.$parent.sqlName" template-name='购气稽查导出'  :choose-col="true"></export-excel-plus>
               <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :sumsmodel="$parent.$parent.sumsmodel" ></print-data>
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
 
@@ -152,41 +149,6 @@
               </v-select>
             </div>
 
-            <div class="col-sm-2">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                     condition="f_meternumber = '{}'" placeholder='表号'>
-            </div>
-            <div class="col-sm-2 ">
-              <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_user_type"
-                        @change="$parent.$parent.userTypeChange()"
-                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                        condition="f_user_type = '{}'"
-                        close-on-select></v-select>
-            </div>
-
-            <div class="col-sm-2">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户名称</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     condition="f_user_name like '%{}%'" placeholder="客户名称">
-            </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户编号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                     condition="f_userinfo_code = '{}' " placeholder="客户编号">
-            </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户地址</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                     condition="f_address like '%{}%'" placeholder='客户地址'>
-            </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户电话</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
-                     condition="f_user_phone like '%{}%'" placeholder="客户电话">
-            </div>
-
           </div>
 
         </div>
@@ -196,7 +158,7 @@
           <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>
@@ -210,9 +172,9 @@
 <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>-->
 <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>-->
 <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表气量</nobr></th>-->
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify =='物联网表'"><nobr>期间购气次数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>期间购气次数</nobr></th>
             <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表次数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify == '物联网表'"><nobr>期间购气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>期间购气量</nobr></th>
             <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表气量</nobr></th>
 <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>-->
 <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>-->
@@ -246,15 +208,15 @@
         <table class="table-hover">
           <tr style="position: relative" class="table-bordered">
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
-            <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
-            <td v-if="meter_classify == '卡表' || meter_classify == '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>
-            <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
-            <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>
+            <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
+            <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">期间购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>
+            <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
+            <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">期间抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>
           </tr>
         </table>
   </div>
-      <div class="flex" v-if="show">
-        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      <div v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div></div>
 </template>
@@ -267,7 +229,7 @@
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
   let readySomething = async function (self) {
-
+    self.$refs.paged.$refs.cri.model.f_table_state = ['正常']
     // self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStandardDateString() + ' 00:00:00'
     // self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString() + ' 23:59:59'
     let year = new Date().getFullYear()
@@ -281,8 +243,6 @@
     title: '购气稽查',
     data () {
       return {
-        other:[],
-        footer:[],
         org:[this.$login.f.orgid],
         criteriaShow: false,
         meter_classify:'卡表',
@@ -290,10 +250,10 @@
         filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        getfield:{"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+        getfield:{"f_userinfo_code":"客户编号","f_user_phone":"用户电话","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期",
-          "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"},
+          "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织"},
         model: new PagedList('rs/sql/inspectList_sellinggas', 50,{},{sellpregas: 0}),
         rows: null,
         //orgid:'',
@@ -310,38 +270,29 @@
           user:[],
         },
         defaultfield: [],
+        selectfields:[],
+        searchCondition:[],
+        gasproperties:[{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')],
+        tablestate :[{label: '全部', value: ''},...this.$appdata.getParam('气表状态')]
       }
     },
     watch:{
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      },
+
       meter_classify(val){
         if(val == '卡表') {
           this.url = 'rs/sql/inspectList_sellinggas'
           this.sqlName = 'inspectList_sellinggas'
-          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
-            "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-            "delivery_date":"最后购气日期",
-            "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"}
-        }if(val == '物联网表'){
-          this.url = 'rs/sql/getwulw_listgas'
-          this.sqlName = 'getwulw_listgas'
-          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_user_phone":"用户电话","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期",
-            "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"}
-        }
-        if(val == '机表'){
+            "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织"}
+        }else{
           this.url = 'rs/sql/handinspectList_sellinggas'
           this.sqlName = 'handinspectList_sellinggas'
-          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_user_phone":"用户电话","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期",
-            "sellcishu":"期间抄表次数","sellpregas":"期间抄表气量","f_orgname":"组织机构"}
+            "sellcishu":"期间抄表次数","sellpregas":"期间抄表气量","f_orgname":"组织"}
         }
         this.clear()
       }
@@ -355,27 +306,15 @@
       })
     },
     methods: {
-      getotherfooter(){
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
       cancel() {
         this.show = false
+        let self = this;
+        setTimeout(function(){
+          self.$refs.paged.$refs.cri.model = self.searchCondition;
+        },800);
       },
       showmsg(obj){
+        this.searchCondition = this.$refs.paged.$refs.cri.model
         this.rowdata=obj
         this.show=true
       },
@@ -409,17 +348,7 @@
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch (args) {
-        console.log('9999999999999999999', this.meter_classify )
-        console.log('9999999999999999999', this.meter_classify.length)
-        if(this.meter_classify == '卡表'){
-          this.model.url='rs/sql/inspectList_sellinggas'
-        }
-        if(this.meter_classify == '机表'){
-          this.model.url='rs/sql/handinspectList_sellinggas'
-        }
-        if(this.meter_classify == '物联网表'){
-          this.model.url= 'rs/sql/getwulw_listgas'
-        }
+        this.model.url = this.meter_classify === '卡表' ? 'rs/sql/inspectList_sellinggas': 'rs/sql/handinspectList_sellinggas'
         console.log(this.$login.f)
         if(this.$refs.paged.$refs.cri.model.startDate){
           this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate} 00:00:00' `
@@ -469,17 +398,9 @@
 
     },
     computed: {
-      gasproperties() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      tablestate () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
-      },
+
       f_meter_classify(){
-        return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '网表', value: '物联网表'} ]
+        return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'} ]
         // return [{label: '卡表', value: '卡表'}]
       },
       contain_newfiles(){

package/src/components/sale/businessquery/InspectListUser.vue

@@ -7,12 +7,12 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
           <div class="row">
             <div class="col-sm-2">
-              <label class="font_normal_body">&emsp;&emsp;公司</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
               <right-tree @re-res="$parent.$parent.getorg"
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
             <div class="col-sm-2 ">
-              <label for="f_gasproperties"class="font_normal_body">用气性质</label>
+              <label for="f_gasproperties"class="font_normal_body">&nbsp;&nbsp;&nbsp;用气性质</label>
               <v-select id="f_gasproperties"
                         style="width:60%"
                         v-model="model.f_gasproperties"
@@ -24,7 +24,7 @@
               </v-select>
             </div>
             <div   v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">未购天数</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;未购天数&nbsp;</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
                        condition="diffday >= {} " placeholder="">
@@ -35,7 +35,7 @@
 
             </div>
             <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">未抄天数</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;未抄天数&nbsp;</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.handdiffdaymin"
                        condition="diffday >= {} " placeholder="">
@@ -46,7 +46,7 @@
 
             </div>
             <div class="col-sm-2 ">
-              <label class="font_normal_body">截止时间</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;截止时间</label>
               <datepicker id="endDate" placeholder="截止时间"
                           v-model="model.endDate"
                           style="width:60%"
@@ -56,17 +56,13 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-
             <div class="span" style="float:right;">
               <button class="btn button_search" @click="search()">查询</button>
               <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
+              <export-excel-plus :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                             :field="$parent.$parent.getfield"
-                            :footer="$parent.$parent.footer"
-                            :header="$parent.$parent.other"
-                            sqlurl="rs/logic/exportfile"
-                            :sql-name="$parent.$parent.sqlName"
-                            template-name='用户稽查导出'  :choose-col="true"></export-excel>
+                            :exportprogress="true"
+                            sqlurl="rs/logic/exportfileplus"  :sql-name="$parent.$parent.sqlName" template-name='用户稽查导出'  :choose-col="true"></export-excel-plus>
               <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :sumsmodel="$parent.$parent.sumsmodel" ></print-data>
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
 
@@ -74,21 +70,21 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="col-sm-2 ">
-              <label for="f_meter_classify"class="font_normal_body">气表类型</label>
+              <label for="f_meter_classify"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表类型</label>
               <v-select id="f_meter_classify"
-                        v-model="model.f_meter_classify"
-                        placeholder='气表类型'
+                        v-model="$parent.$parent.meter_classify"
+                        placeholder='表类型'
                         style="width:70%"
-                        :value.sync="model.f_meter_classify"
+                        :value.sync="$parent.$parent.meter_classify"
                         :options='$parent.$parent.f_meter_classify'
-                        condition="f_meter_classify = '{}'"
+                        condition="f_meter_type like '%{}'"
                         :value-single="true"
                         close-on-select >
               </v-select>
             </div>
 
             <div class="col-sm-2 ">
-              <label for="f_table_state"class="font_normal_body">&emsp;表状态</label>
+              <label for="f_table_state"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表状态</label>
               <v-select id="f_table_state"
                         style="width:60%"
                         v-model="model.f_table_state"
@@ -100,7 +96,7 @@
               </v-select>
             </div>
             <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label   class="font_normal_body">总购次数</label>
+              <label   class="font_normal_body">&nbsp;&nbsp;&nbsp;总购次数&nbsp;</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.cishumin"
                        condition="cishu >= {} " placeholder="">
@@ -110,7 +106,7 @@
               </div>
             </div>
             <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label  class="font_normal_body">抄表次数</label>
+              <label  class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表次数&nbsp;</label>
 
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.handmin"
@@ -122,7 +118,7 @@
 
             </div>
             <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label  class="font_normal_body">总购气量</label>
+              <label  class="font_normal_body">&nbsp;&nbsp;&nbsp;总购气量&nbsp;</label>
 
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.pregasmin"
@@ -135,7 +131,7 @@
 
             </div>
             <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label class="font_normal_body">总用气量</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;总用气量&nbsp;</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.pregasusemin"
                        condition="pregas >= {} " placeholder="">
@@ -145,41 +141,6 @@
               </div>
             </div>
 
-            <div class="col-sm-2">
-              <label class="font_normal_body">&emsp;&emsp;表号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                     condition="f_meternumber = '{}'" placeholder='表号'>
-            </div>
-            <div class="col-sm-2 ">
-              <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_user_type"
-                        @change="$parent.$parent.userTypeChange()"
-                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                        condition="f_user_type = '{}'"
-                        close-on-select></v-select>
-            </div>
-
-            <div class="col-sm-2">
-              <label class="font_normal_body">客户名称</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     condition="f_user_name like '%{}%'" placeholder="客户名称">
-            </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">客户编号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                     condition="f_userinfo_code = '{}' " placeholder="客户编号">
-            </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">客户地址</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                     condition="f_address like '%{}%'" placeholder='客户地址'>
-            </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">客户电话</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
-                     condition="f_user_phone like '%{}%'" placeholder="客户电话">
-            </div>
-
 
           </div>
 
@@ -190,7 +151,7 @@
           <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>
@@ -239,15 +200,15 @@
         <table class="table-hover">
           <tr style="position: relative" class="table-bordered">
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
-            <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">阶段购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>-->
-            <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">阶段抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>-->
+            <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">阶段购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>-->
+            <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">阶段抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>-->
           </tr>
         </table>
   </div>
-      <div class="flex" v-if="show">
-        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      <div v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div></div>
 </template>
@@ -260,7 +221,7 @@
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
   let readySomething = async function (self) {
-
+    self.$refs.paged.$refs.cri.model.f_table_state = ['正常']
     self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString()
 
     // await self.$refs.paged.$refs.cri.search()
@@ -270,8 +231,6 @@
     title: '用户稽查',
     data () {
       return {
-        other:[],
-        footer:[],
         org:[this.$login.f.orgid],
         criteriaShow: false,
         meter_classify:'卡表',
@@ -282,7 +241,7 @@
         getfield:{"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
-          "diffday":"未购气总天数"},
+          "diffday":"未购气总天数","f_orgname":"组织"},
         model: new PagedList('rs/sql/inspectList', 50,{endDate:'this.model.endDate'},{pregas: 0}),
         rows: null,
         //orgid:'',
@@ -294,6 +253,11 @@
           defaultPrint: ['f_userinfo_code','f_user_id']
         },
         defaultfield: [],
+        selectfields:[],
+        searchCondition:[],
+        selectorgid:[],
+        gasproperties:[{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')],
+        tablestate:[{label: '全部', value: ''},...this.$appdata.getParam('气表状态')]
       }
     },
     watch:{
@@ -301,25 +265,19 @@
         if(val == '卡表') {
           this.url = 'rs/sql/inspectList'
           this.sqlName = 'inspectList'
-          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_user_phone":"用户电话","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
-            "diffday":"累计未购气天数"}
+            "diffday":"累计未购气天数","f_orgname":"组织"}
         }else{
           this.url = 'rs/sql/handinspectList'
           this.sqlName = 'handinspectList'
-          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_user_phone":"用户电话","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
-            "diffday":"累计未抄表天数"}
+            "diffday":"累计未抄表天数","f_orgname":"组织"}
         }
         this.clear()
-      },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
       }
     },
     ready () {
@@ -329,48 +287,31 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
+
     },
     methods: {
-        getotherfooter(){
-          // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-          // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-          this.other=[];
-          this.footer=[];
-          let exportdata = this.getCondition;
-          let otherInData=[];
-          otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-          let footerData=[],exportfield=this.getfield;
-          footerData.push("合计");
-          let self = this;
-          for(var field in self.sumsmodel){
-            footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-          }
-          this.footer.push(footerData);
-          this.other.push(otherInData);
-        },
       getorg (obj) {
         if(obj.resids.length>0){
+          this.selectorgid = obj.resids
           this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
         }
         else{
           this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
         }
       },
-      userTypeChange () {
-        this.gasproperties=[]
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-        }
-        else{
-          this.gasproperties =[{label: '全部', value: ''}]
-        }
-      },
 
       cancel() {
         this.show = false
+        let self = this;
+        setTimeout(function(){
+          self.$refs.paged.$refs.cri.model = self.searchCondition;
+          if (this.selectorgid instanceof Array) {
+            self.org = self.selectorgid
+          }
+        },800);
       },
       showmsg(obj){
+        this.searchCondition = this.$refs.paged.$refs.cri.model
         this.rowdata=obj
         this.show=true
       },
@@ -395,17 +336,9 @@
       }
     },
     computed: {
-      gasproperties() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      tablestate () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
-      },
+
       f_meter_classify(){
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+        return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'}, ]
         // return [{label: '卡表', value: '卡表'}]
       },