manage-client 4.0.91 → 4.0.93

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.91",
+    "version": "4.0.93",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/filiale/WEINAN/webmeter/NewQueryInstruct.vue

@@ -224,16 +224,12 @@
               <th style="text-align:center">
                 <nobr>指令类型</nobr>
               </th>
-              <th style="text-align:center">
-                <nobr>指令标题</nobr>
-              </th>
+
               <th style="text-align:center">
                 <nobr>执行状态</nobr>
               </th>
               <th style="text-align:center"><nobr>执行结果</nobr></th>
-              <th style="text-align:center"><nobr>指令生成人</nobr></th>
               <th style="text-align:center"><nobr>指令生成时间</nobr></th>
-              <th style="text-align:center"><nobr>指令发送时间</nobr></th>
               <th style="text-align:center"><nobr>上表时间</nobr></th>
               <th style="text-align:center">
                 <nobr>充值金额</nobr>
@@ -283,22 +279,15 @@
               <td style="text-align:center">
                 <nobr>{{row.f_instruct_type}}</nobr>
               </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_instruct_title}}</nobr>
-              </td>
               <td style="text-align:center">
                 <nobr>{{row.f_instruct_state}}</nobr>
               </td>
               <td style="text-align:center">
                 <nobr>{{row.f_receive_state}}</nobr>
               </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_inputtor}}</nobr>
-              </td>
               <td style="text-align:center">
                 <nobr>{{row.f_instruct_date}}</nobr>
               </td>
-              <td style="text-align:center"><nobr>{{row.f_send_date}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_callback_date}}</nobr></td>
               <th style="text-align:center">
                 <nobr>{{row.f_collection}}</nobr>
@@ -382,7 +371,7 @@
           excelHeaders: {
             'f_userinfo_code': '客户编号','f_address': '客户地址','f_user_name': '客户姓名',
             'f_meternumber': '表号','f_meter_brand': '气表品牌','f_instruct_type': '指令类型',
-            'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_inputtor': '指令生成人','f_instruct_date': '指令时间',
+            'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_instruct_date': '指令时间',
             'note':'操作内容','f_info':'操作原因','f_operator':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
             'f_orgname': '组织机构'
           }

package/src/filiale/rongcheng/RecordInfoQuery.vue

@@ -337,6 +337,14 @@
                               close-on-select
                               condition="f_usetype = '{}'"></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">是否换表安检</label>
+                    <v-select :value.sync="model.f_ischange_check" v-model="model.f_ischange_check"
+                              :options='$parent.$parent.ischangecheck' placeholder='请选择'
+                              style="width:60%"
+                              close-on-select
+                              condition="f_ischange_check = '{}' "></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -402,6 +410,7 @@
 
                   <th><nobr>气表型号</nobr></th>
                   <th><nobr>表状态</nobr></th>
+                  <th><nobr>是否换表安检</nobr></th>
                   <th><nobr>初始气表底数</nobr></th>
                   <th><nobr>累计用气金额</nobr></th>
                   <th><nobr>表累购气量</nobr></th>
@@ -492,6 +501,7 @@
 
                 <td style="text-align: center;"><nobr>{{row.f_meter_style}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_ischange_check}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_initial_base}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_total_usegas_amount}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_total_gas}}</nobr></td>
@@ -576,6 +586,7 @@ let readySomething = async function (self) {
   // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
   // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
   // await self.$refs.paged.$refs.cri.search()
+  self.$refs.paged.$refs.cri.model.f_ischange_check = ['否']
 }
 export default {
   data() {
@@ -681,7 +692,7 @@ export default {
       this.show=true
     },
     selfSearch (args) {
-
+      console.log('看看选择框',this.$refs.paged.$refs.cri.model.f_table_state)
       //抄表员查询条件
       this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
       if(this.inputtouPerson.length !== 0){
@@ -736,6 +747,7 @@ export default {
       Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
         this.$refs.paged.$refs.cri.model[key] = []
       })
+      this.$refs.paged.$refs.cri.model.f_ischange_check = ['否']
     },
     hidden(){
       this.criteriaShow = !this.criteriaShow
@@ -825,6 +837,9 @@ export default {
     usetypes() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
     },
+    ischangecheck() {
+      return [{label: '否', value: '否'},{label: '是', value: '是'}]
+    },
     zbf() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('自闭阀')]
     },

package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="unit" class="flex-row"  >
     <div class="basic-main"  @keyup.enter="search" >
-      <div class="flex"  :class="{showbottom:showbottomsum}" v-if="!show">
+      <div class="flex"  :class="{showbottom:showbottomsum}" v-show="!show">
         <criteria-paged :model="model" v-ref:paged @sort="sort">
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -108,14 +108,6 @@
                             condition="f_type = '{}'"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">换&nbsp;表&nbsp;&nbsp;人</label>
-                  <v-select :value.sync="model.f_change_operator"
-                            v-model="model.f_change_operator"
-                            :options='$parent.$parent.changePerson' placeholder='请选择'
-                            condition="f_change_operator = '{}'"
-                            close-on-select></v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">卡&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
@@ -199,9 +191,9 @@
                          condition="f_meternumber_old = '{}'" placeholder='旧表号'>
                 </div>
                 <div class="col-sm-2 form-group">
-                <label class="font_normal_body">旧&emsp;卡&emsp;号</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
-                       condition="f_card_old = '{}'" placeholder='旧卡号'>
+                  <label class="font_normal_body">旧&emsp;卡&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
+                         condition="f_card_old = '{}'" placeholder='旧卡号'>
                 </div>
               </div>
             </div>
@@ -226,12 +218,7 @@
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
-                <th>
-                  <nobr>上期底数</nobr>
-                </th>
-                <th>
-                  <nobr>本期底数</nobr>
-                </th>
+
                 <th>
                   <nobr>表上余额</nobr>
                 </th>
@@ -261,9 +248,9 @@
                 <th>
                   <nobr>新表号</nobr>
                 </th>
-<!--                <th>-->
-<!--                  <nobr>表封号</nobr>-->
-<!--                </th>-->
+                <!--                <th>-->
+                <!--                  <nobr>表封号</nobr>-->
+                <!--                </th>-->
                 <th>
                   <nobr>旧气表品牌</nobr>
                 </th>
@@ -276,15 +263,15 @@
                 <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>
@@ -340,12 +327,7 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_base}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_using_base_old}}</nobr>
-              </td>
+
               <td style="text-align: center;">
                 <nobr>{{row.f_balance_amount}}</nobr>
               </td>
@@ -374,9 +356,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
-<!--              <td style="text-align: center;">-->
-<!--                <nobr>{{row.f_metertitles}}</nobr>-->
-<!--              </td>-->
+              <!--              <td style="text-align: center;">-->
+              <!--                <nobr>{{row.f_metertitles}}</nobr>-->
+              <!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand_old}}</nobr>
               </td>
@@ -389,15 +371,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_remanent_money}}</nobr>
               </td>
-<!--              <td style="text-align: center;">-->
-<!--                <nobr>{{row.f_serial_number}}</nobr>-->
-<!--              </td>-->
+              <!--              <td style="text-align: center;">-->
+              <!--                <nobr>{{row.f_serial_number}}</nobr>-->
+              <!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_change_operator}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_state}}</nobr>
               </td>
@@ -507,7 +486,7 @@
       </div>
     </div>
     <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
-      <article slot="modal-body">
+      <article slot="modal-body" style="height:90vh">
         <upload  :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表" ></upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -550,234 +529,233 @@
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from '../DefaultPrint'
-  import exportConfig from '../exportConfig'
-  let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
-    // self.$refs.paged.$refs.cri.search()
-    await self.$MagLoadParams.loadParam()
-    self.initParams()
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-  }
-  export default {
-    props:['data'],
-    title: '换表查询',
-    data() {
-      return {
-        data: {},
-        other:[],
-        footer:[],
-        check:{
-          f_chagetables_check_state:'',
-          f_changetables_check_reason:''
-        },
-        meterbrands: [],
-        pricenames: [],
-        model: new PagedList('api/af-revenue/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0}),
-        criteriaShow: false,
-        orgCondtionStr: '',
-        modelval: [],
-        printshow: false,
-        all: false,
-        fields: {},
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
-        },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
-        show:false,
-        showCheck:false,
-        rowdata:{},
-        showupload:false,
-        selected:{},
-        thead: '',
-        tfoot: '',
-        defaultfield: [],
-        // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
-        //合计数据
-        sumsmodel: {},
-        changemeter_fee:[
-          {label: '全部', value: ''},
-          {label: '销售', value: '> 0'},
-          {label: '免费', value: '= 0'}
-        ]
-      }
-
-    },
-    ready() {
-      console.log(this.$login.r)
-      this.startDate=this.$parent.startDate
-      this.endDate=this.$parent.endDate
-      readySomething(this)
-    },
-    methods: {
-      checkData(obj){
-        this.rowdata=obj
-        this.showCheck=true
+import {PagedList} from 'vue-client'
+import defaultPrint from '../DefaultPrint'
+import exportConfig from '../exportConfig'
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  await self.$MagLoadParams.loadParam()
+  self.initParams()
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  props:['data'],
+  title: '换表查询',
+  data() {
+    return {
+      data: {},
+      other:[],
+      footer:[],
+      check:{
+        f_chagetables_check_state:'',
+        f_changetables_check_reason:''
       },
-      view(row){
-        this.showupload = true
-        this.selected= row
-        console.log("11",row)
+      meterbrands: [],
+      pricenames: [],
+      model: new PagedList('api/af-revenue/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0}),
+      criteriaShow: false,
+      orgCondtionStr: '',
+      modelval: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[],
       },
-      search(){
-        this.$refs.paged.$refs.cri.search()
+      config: {
+        defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
       },
-      cancel() {
-        this.show = false
+      //排序
+      orderitem:'f_operate_date desc',
+      orderFields: {
+        f_operate_date: 'no'
       },
-      confirmCheck(){
-        this.rowdata.f_changetables_check_person = this.$login.f.name
-        this.rowdata.f_changetables_check_reason = this.check.f_changetables_check_reason
-        this.rowdata.f_changetables_check_state = this.check.f_changetables_check_state
-        this.$resetpost('api/af-revenue/logic/changeTablesCheck',{data:this.rowdata}).then((res)=>{
-          this.showCheck = false
-          this.check={
-            f_changetables_check_reason: '',
-            f_chagetables_check_state: '',
-          }
+      show:false,
+      showCheck:false,
+      rowdata:{},
+      showupload:false,
+      selected:{},
+      thead: '',
+      tfoot: '',
+      defaultfield: [],
+      // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
+      //合计数据
+      sumsmodel: {},
+      changemeter_fee:[
+        {label: '全部', value: ''},
+        {label: '销售', value: '> 0'},
+        {label: '免费', value: '= 0'}
+      ]
+    }
 
-          this.search()
-        })
-      },
-      cancelCheck(){
+  },
+  ready() {
+    console.log(this.$login.r)
+    this.startDate=this.$parent.startDate
+    this.endDate=this.$parent.endDate
+    readySomething(this)
+  },
+  methods: {
+    checkData(obj){
+      this.rowdata=obj
+      this.showCheck=true
+    },
+    view(row){
+      this.showupload = true
+      this.selected= row
+      console.log("11",row)
+    },
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    cancel() {
+      this.show = false
+    },
+    confirmCheck(){
+      this.rowdata.f_changetables_check_person = this.$login.f.name
+      this.rowdata.f_changetables_check_reason = this.check.f_changetables_check_reason
+      this.rowdata.f_changetables_check_state = this.check.f_changetables_check_state
+      this.$resetpost('api/af-revenue/logic/changeTablesCheck',{data:this.rowdata}).then((res)=>{
         this.showCheck = false
-      },
-      showmsg(obj){
-        this.rowdata=obj
-        this.show=true
-      },
-      getotherfooter () {
-        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.check={
+          f_changetables_check_reason: '',
+          f_chagetables_check_state: '',
         }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-        let date = []
-        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
-        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
-        this.other.push(date)
-      },
-      async initParams() {
-    // 初始化气表品牌
-    let brandArr = []
-    await this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-      let temp = {}
-      temp.label = item.label
-    temp.value = item.value.f_meter_brand
-    brandArr.push(temp)
-  })
-    this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-  },
-  async selfSearch(args) {
-    if (this.data) {
-      this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
-      this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
-    }
-    args.condition = `${args.condition}` + this.orgCondtionStr
-    args.condition = args.condition.replace(/f_zones/, "f_slice_area")
-    await this.model.search(args.condition, args.model)
-    this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
 
-    // this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
+        this.search()
+      })
+    },
+    cancelCheck(){
+      this.showCheck = false
+    },
+    showmsg(obj){
+      this.rowdata=obj
+      this.show=true
+    },
+    getotherfooter () {
+      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);
+      let date = []
+      date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+      date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+      this.other.push(date)
+    },
+    async initParams() {
+      // 初始化气表品牌
+      let brandArr = []
+      await this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        brandArr.push(temp)
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+    },
+    async selfSearch(args) {
+      if (this.data) {
+        this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+        this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+      }
+      args.condition = `${args.condition}` + this.orgCondtionStr
+      args.condition = args.condition.replace(/f_zones/, "f_slice_area")
+      await this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
 
-  },
-  clear() {
-    //清空部门和人员
-    this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
-    //部门和人员变为全选
-    this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
-    this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
-    Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-      this.$refs.paged.$refs.cri.model[key] = []
-  })
-  },
-  show() {
-    this.criteriaShow = true
-  },
-  hidden() {
-    this.criteriaShow = !this.criteriaShow
-  },
-  getRes(obj) {
-    this.orgCondtionStr = obj
-  },
-  stamp() {
-    this.all = false
-    //默认选择要打印的列
-    this.modelval = defaultPrint.config
-    this.fields = this.getfield
-    this.printshow = true
-    this.put()
-  },
-  dealmsg(val) {
-    val.model = this.model.model
-    this.$dispatch('deal-msg', val)
-  },
-  put() {
-    // 对Modelval进行排序
-    this.sortModelval()
-    this.thead = `<tr><th colspan=${this.modelval.length}>换表查询统计报表</th></tr><tr>`
-    for (let key of this.modelval) {
-      this.thead += '<th>' + this.fields[key] + '</th>'
-    }
-    this.thead += '</tr>'
-  },
-  print() {
-    this.$refs.print.PrintAsFile()
-    this.printshow = false
-  },
-  close() {
-    this.printshow = false
-    this.all = false
-  },
-  // 对选择的列进行排序
-  sortModelval() {
-    let sortModel = []
-    Object.keys(this.fields).forEach((key) => {
-      if (this.modelval.includes(key)) {
-      sortModel.push(key)
-    }
-  })
-    this.modelval = sortModel
-    console.log('选择的打印的字段', this.modelval)
-  },
-  sort (field, rule) {
-    // 将所有排序方式设为不排序，实现相互排斥
-    for (let key in this.orderFields) {
-      if (key === field) {
-        this.orderFields[key] = rule
+      // this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
+
+    },
+    clear() {
+      //清空部门和人员
+      this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+      //部门和人员变为全选
+      this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+      this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
+    },
+    show() {
+      this.criteriaShow = true
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes(obj) {
+      this.orgCondtionStr = obj
+    },
+    stamp() {
+      this.all = false
+      //默认选择要打印的列
+      this.modelval = defaultPrint.config
+      this.fields = this.getfield
+      this.printshow = true
+      this.put()
+    },
+    dealmsg(val) {
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    put() {
+      // 对Modelval进行排序
+      this.sortModelval()
+      this.thead = `<tr><th colspan=${this.modelval.length}>换表查询统计报表</th></tr><tr>`
+      for (let key of this.modelval) {
+        this.thead += '<th>' + this.fields[key] + '</th>'
+      }
+      this.thead += '</tr>'
+    },
+    print() {
+      this.$refs.print.PrintAsFile()
+      this.printshow = false
+    },
+    close() {
+      this.printshow = false
+      this.all = false
+    },
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
+        }
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    },
+    sort (field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderitem}'`
       } else {
-        this.orderFields[key] = 'no'
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
       }
-    }
-    // 如果新规则不排序，还原为默认排序
-    if (rule === 'no') {
-      this.model.paramSource.orderitem = `'${this.orderitem}'`
-    } else {
-      this.model.paramSource.orderitem = `'${field} ${rule}'`
-    }
 
-    this.search()
-  },
+      this.search()
+    },
   },
   watch: {
     'all'(val) {
@@ -845,10 +823,10 @@
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
     }
   }
-  }
+}
 </script>
 <style scoped>
-  .showbottom{
-    height:95%
-  }
+.showbottom{
+  height:95%
+}
 </style>

package/src/filiale/rongcheng/exportConfig.js

@@ -171,6 +171,7 @@ export default {
     'f_meter_style': '气表型号',
     'f_meter_type': '气表类型',
     'f_table_state': '表状态',
+    'f_ischange_check ': '是否换表安检',
     'f_initial_base': '初始气表底数',
     'f_meter_base': '气表底数',
     'f_total_usegas_amount': '累计用气金额',

package/src/filiale/shanxian/FmyGasDeviceQuery.vue

@@ -488,16 +488,16 @@
                   <nobr>{{row.f_checker_name}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_total_gas}}</nobr>
+                  <nobr>{{row.f_defect_content?row.f_total_gas:''}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.c}}</nobr>
+                  <nobr>{{row.f_defect_content?row.c:''}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{$parent.$parent.$parent.getContent(row.f_defect_content)}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_repair_date}}</nobr>
+                  <nobr>{{row.f_defect_content?row.f_repair_date:''}}</nobr>
                 </td>
 
                 <td style="text-align: center;">
@@ -635,7 +635,7 @@
       getContent(defectContent){
 
         if(defectContent =='' || defectContent == null){
-          return '正常'
+          return '未知'
         }
         const defectData = JSON.parse(defectContent);
         if (defectData.result === '正常') {

package/src/filiale/wuhai/UserGasList.vue

@@ -296,11 +296,16 @@
         ],
         styles:false,
         orgid:[this.$login.f.orgid],
-        getfield:{"f_insert_date":"上报日期","anzhuang":"安装户数",
+        getfield:{
+          "rownumber":"序号",
+          "f_insert_date":"上报日期",
+          "anzhuang":"安装户数",
           "c0":"停用户数",
           "c":"在用户数","user_bv":"用户使用率",
           "c1":"抄表成功户数",
-          "f_gas_all":"总用气量","f_gas":"日均户均用气量(成功)",
+          "f_gas_all":"总用气量",
+          "f_fee_all":"总用气金额",
+          "f_gas":"日均户均用气量(成功)",
           "f_gas1":"日均户均用气量(在用)",
           "f_bv1":"抄表成功率"
         },

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Apr 15 16:40:30 CST 2025
-gradle.version=8.5