manage-client 3.2.90 → 3.2.91-aode

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

@@ -53,24 +53,17 @@
             <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>
 
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-2 flex-row">
-              <label class="font_normal_body" title="旧客户编号">档案编号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                     condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
-            </div>
+
             <div  v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
               <label  class="font_normal_body">&nbsp;&nbsp;&nbsp;期间次数&nbsp;</label>
               <div class="row">
@@ -83,8 +76,9 @@
 
 
             </div>
-            <div  v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
+            <div  v-if="$parent.$parent.meter_classify  != '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
               <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.handsellcishumin"
                        condition="sellcishu >= {} " placeholder="">
@@ -106,7 +100,7 @@
               </div>
 
             </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'"  class="col-sm-2 flex-row" style="white-space: nowrap">
+            <div v-if="$parent.$parent.meter_classify != '卡表'"  class="col-sm-2 flex-row" style="white-space: nowrap">
               <label class="font_normal_body">期间用气量&nbsp;</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmin"
@@ -140,14 +134,8 @@
                         close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-2" >
-              <label  for="f_user_state" class="font_normal_body">客户状态</label>
-              <v-select :value.sync="model.f_user_state"
-                        v-model="model.f_user_state"
-                        :options='$parent.$parent.userstate' placeholder='请选择'
-                        condition="f_user_state = '{}'"
-                        close-on-select></v-select>
-            </div>
+
+
             <div class="col-sm-2 ">
               <label for="f_table_state"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表状态</label>
               <v-select id="f_table_state"
@@ -161,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>
@@ -205,28 +158,27 @@
           <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>
             <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-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>-->
+<!--            <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 == '卡表' || $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>
+            <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>-->
+<!--            <th v-show="$parent.$parent.$parent.meter_classify != '卡表'"><nobr>累计未抄表天数</nobr></th>-->
             <th><nobr>组织机构</nobr></th>
           </tr>
         </template>
@@ -236,10 +188,8 @@
             <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
           </nobr> </td>
           <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
           <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
@@ -259,15 +209,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>
@@ -280,7 +230,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()
@@ -294,8 +244,6 @@
     title: '购气稽查',
     data () {
       return {
-        other:[],
-        footer:[],
         org:[this.$login.f.orgid],
         criteriaShow: false,
         meter_classify:'卡表',
@@ -303,11 +251,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_olduserinfo_code":"档案编号","f_meternumber":"表号",
-          "f_user_name":"客户名称","f_user_state":"客户状态","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:'',
@@ -324,41 +271,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_olduserinfo_code":"档案编号","f_meternumber":"表号",
-            "f_user_name":"客户名称","f_user_state":"客户状态","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_olduserinfo_code":"档案编号","f_meternumber":"表号",
-            "f_user_name":"客户名称","f_user_state":"客户状态","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_olduserinfo_code":"档案编号","f_meternumber":"表号",
-            "f_user_name":"客户名称","f_user_state":"客户状态","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()
       }
@@ -372,27 +307,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
       },
@@ -407,12 +330,12 @@
       userTypeChange () {
         this.gasproperties=[]
         console.log("查气价")
-        console.log(this.$refs.paged.model.model)
+        console.log(this.$refs.paged.$refs.cri.model)
 
-        if(this.$refs.paged.model.model !==null) {
+        if(this.$refs.paged.$refs.cri.model !==null) {
           console.log("进if")
-          this.$refs.paged.model.model.f_gasproperties=''
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.model.model.f_user_type[0])
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
           // this.gasproperties.push({label: '全部', value: ''})
           console.log(this.gasproperties )
         }
@@ -426,17 +349,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' `
@@ -464,6 +377,7 @@
           }
         }
         args.condition = args.condition+ ` ${this.filialeCodeStr}`
+        args.condition = args.condition+ `and f_meter_type like '%${this.meter_classify }%'`
         console.log("拼接的condition", args.condition, this.model)
         this.model.search(args.condition, args.model)
       },
@@ -486,20 +400,9 @@
 
     },
     computed: {
-      gasproperties() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      userstate() {
-        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: '机表'},{label: '物联网表', value: '物联网表'} ]
         // return [{label: '卡表', value: '卡表'}]
       },
       contain_newfiles(){
@@ -535,6 +438,7 @@
         if (temp2.model.contain_newfile==='否'){
           result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate
         }
+        result.condition = result.condition+ `and f_meter_type like '%${this.meter_classify }%'`
 
           return result
       }