manage-client 3.3.125 → 3.3.126-sq

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://121.36.106.17:8400'
+var bendi = 'http://61.185.130.75:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://121.36.106.17:8400'
+var wode = 'http://localhost:9019/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -91,7 +91,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/sql': {
-    target: bendi
+    target: wode
   },
   '/rs': {
     target: wode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.125",
+  "version": "3.3.126-sq",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -68,10 +68,10 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "swiper": "^5.4.5",
-    "system-clients": "3.2.61",
+    "system-clients": "3.2.80",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.123",
+    "vue-client": "1.25.31",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/components/handReport/WebGastypeReport.vue

@@ -51,23 +51,23 @@
         <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
           <thead>
           <tr>
-            <th colspan='4' style="font-weight: bold; text-align: left;">
+            <th colspan='5' style="font-weight: bold; text-align: left;">
               <h3 style="text-align: center">抄表性质统计报表</h3>
             </th>
           </tr>
           <tr>
-            <th colspan='4' style="font-weight: normal; text-align: center;">
+            <th colspan='5' style="font-weight: normal; text-align: center;">
               开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
               结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
             </th>
           </tr>
           <tr>
-            <th colspan='4' style="font-weight: normal; text-align: center;">
+            <th colspan='5' style="font-weight: normal; text-align: center;">
               打印时间：{{{$parent.printTime}}}
             </th>
           </tr>
           <tr>
-            <th colspan='4' style="font-weight: normal; text-align: center;">
+            <th colspan='5' style="font-weight: normal; text-align: center;">
               <div>
                 <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
                 <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
@@ -76,7 +76,7 @@
           </tr>
           </thead>
           <tr>
-            <td colspan='4' style="font-weight: normal;" id="test">
+            <td colspan='5' style="font-weight: normal;" id="test">
               {{{ model.data.substring(26,model.data.length-8) }}}
             </td>
           </tr>

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

@@ -149,9 +149,6 @@
                 <th>
                   <nobr>本期底数</nobr>
                 </th>
-                <th>
-                  <nobr>附件查看</nobr>
-                </th>
                 <th>
                   <nobr>气量</nobr>
                 </th>
@@ -207,10 +204,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_tablebase}}</nobr>
               </td>
-              <td style="text-align:center">
-                <img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
-                <img-self :src="`rs/image/file/${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></img-self>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_real_amount}}</nobr>
               </td>

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

@@ -232,15 +232,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
                          condition="f_serial_id = '{}'" placeholder='流水号'>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="是否开票">是否开票</label>
-                  <v-select :value.sync="model.f_has_bill"
-                            v-model="model.f_has_bill"
-                            :options='$parent.$parent.hasbill' placeholder='请选择'
-                            condition="f_has_bill = '{}'"
-                            close-on-select :value-single="true" :search="false">
-                  </v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">发票号码</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_invoice_num"
@@ -514,9 +505,6 @@
                 <th>
                   <nobr>业务单号</nobr>
                 </th>
-                <th>
-                  <nobr>是否开票</nobr>
-                </th>
                 <th>
                   <nobr>发票号码</nobr>
                 </th>
@@ -731,9 +719,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_serial_number}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_has_bill}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_invoice_num}}</nobr>
               </td>
@@ -1016,12 +1001,9 @@
       })
     },
     methods: {
-      async batchPrintBill(row, type) {
+      async batchPrintBill(row, type){
         this.operate_type = type
-        console.log('this.$refs.paged.$refs.cri.model.f_state', this.$refs.paged.$refs.cri.model.f_state)
-        console.log(this.$refs.paged.$refs.cri.model.f_state.length === 1)
-        console.log(this.$refs.paged.$refs.cri.model.f_state[0] == '有效')
-        if (this.$refs.paged.$refs.cri.model.f_state.length === 1 && this.$refs.paged.$refs.cri.model.f_state[0] == '有效') {
+        if (this.$refs.paged.$refs.cri.model.f_state.length === 1 && this.$refs.paged.$refs.cri.model.f_state[0] === '有效') {
           if (type === '票据补打') {
             this.batchPrintData.push(row)
             this.$showMessage(`您确定补打本张票据吗？？？`, ['confirm', 'cancel']).then(async (res) => {
@@ -1040,8 +1022,7 @@
             } else {
               this.$showMessage(`请先查询数据！！！`, ['confirm'])
             }
-          }
-        } else {
+        }
           this.$showMessage(`请选择有效的收费记录进行票据补打！！！`, ['confirm'])
         }
       },
@@ -1384,9 +1365,6 @@
       invoiceType() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('发票类型查询')]
       },
-      hasbill() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('是否开票')]
-      },
       usertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

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

@@ -137,12 +137,10 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
-                  <v-select :value.sync="model.f_gasproperties"
-                            v-model="model.f_gasproperties"
+                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            :multiple="true"
-                            condition="f_gasproperties in {}">
-                  </v-select>
+                            condition="f_gasproperties = '{}'"
+                            close-on-select></v-select>
                 </div>
                 <!--表册片区-->
                 <div class="col-sm-2 form-group">
@@ -177,12 +175,12 @@
                          condition="f_oughtamount <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="startHandDate" class="font_normal_body">通气时间</label>
+                  <label for="startHandDate" class="font_normal_body">开户时间</label>
                   <datepicker id="startHandDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startGasDate"
-                              :value.sync="model.startGasDate"
+                              v-model="model.startOpenDate"
+                              :value.sync="model.startOpenDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              condition="f_gas_date >= '{}'"
+                              condition="f_open_date >= '{}'"
                               :show-reset-button="true"
                   >
                   </datepicker>
@@ -190,10 +188,10 @@
                 <div class="col-sm-2 form-group">
                   <label for="endHandDate" class="font_normal_body">&emsp;&emsp;&emsp;至</label>
                   <datepicker id="endHandDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endGasDate"
-                              :value.sync="model.endGasDate"
+                              v-model="model.endOpenDate"
+                              :value.sync="model.endOpenDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              condition="f_gas_date <= '{}'"
+                              condition="f_open_date <= '{}'"
                               :show-reset-button="true"
                   >
                   </datepicker>
@@ -202,10 +200,9 @@
                   <label class="font_normal_body">&nbsp;抄&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
                             v-model="model.f_inputtor"
-                            :multiple="true"
                             :options='$parent.$parent.inputtores' placeholder='请选择'
-                            condition="f_inputtor in {}"
-                            :search="false">
+                            condition="f_inputtor = '{}'"
+                            close-on-select :search="false">
                   </v-select>
                 </div>
               </div>
@@ -296,7 +293,7 @@
                   <nobr>期末底数</nobr>
                 </th>
                 <th>
-                  <nobr>通气时间</nobr>
+                  <nobr>建档日期</nobr>
                 </th>
               </tr>
             </template>
@@ -389,7 +386,7 @@
                 <nobr>{{row.f_tablebase}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_gas_date}}</nobr>
+                <nobr>{{row.f_createfile_date}}</nobr>
               </td>
             </template>
             <template partial='foot'></template>
@@ -483,7 +480,7 @@ import exportConfig from '../config/exportConfig'
         printshow: false,
         all: false,
         fields: {},
-        inputtores:[{label: '全部',value: ''}],
+        inputtores: [],
         thead: '',
         tfoot: '',
         //表册片区
@@ -505,7 +502,6 @@ import exportConfig from '../config/exportConfig'
     },
     ready () {
       readySomething(this)
-      this.getinputtores()
     },
     methods: {
       initParams(){
@@ -535,19 +531,16 @@ import exportConfig from '../config/exportConfig'
           })
         }
       },
-      async getinputtores () {
-        // 获取抄表员
-        let rs = []
-        if (this.$login.f.f_gasman.length > 0) {
-          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
-            let temp = {
-              label: this.$login.f.f_gasman[i].name,
-              value: this.$login.f.f_gasman[i].name
-            }
-            rs.push(temp)
-          }
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.inputtores = [];
+        this.inputtores.push({label: '全部', value: ''})
+        this.initSlice(this.f_filialeid)
+        if (this.allorgid != null) {
+          this.allorgid.forEach((res) => {
+            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
+          })
         }
-        this.inputtores = [{label: '全部', value: ''}, ...rs]
       },
       //表册片区和抄表册关联
       async inputtorchange(){
@@ -630,7 +623,7 @@ import exportConfig from '../config/exportConfig'
       userTypeChange () {
         this.gasproperties = []
         if (this.$refs.paged.$refs.cri.model !== null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties = []
+          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
 
           console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])

package/src/components/sale/config/exportConfig.js

@@ -450,7 +450,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
     'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_newidnumber': '新客户身份证', 'f_user_phone': '原客户电话',
     'f_idnumber': '原客户身份证', 'f_transfer_fees': '过户费', 'f_contract_id': '合同编号', 'f_operate_date': '过户日期',
-    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号', 'f_comments': '备注'
+    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
   },
   transferRecordConfig: {
     'in_userinfo_code': '转入方编号', 'in_user_name': '转入方名称', 'out_userinfo_code': '转出方编号', 'out_user_name': '转出方名称',
@@ -582,7 +582,7 @@ export default{
   overDueQueryConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_input_date': '抄表日期', 'f_latefee_ought': '减免金额',
-    'f_operator_date': '减免时间', 'f_operator': '操作员', 'f_meternumber': '表号', 'f_comments': '备注'
+    'f_operator_date': '减免时间', 'f_operator': '操作员', 'f_meternumber': '表号'
   },
   GasReimbursementRate: {
     'f_book_slice_area': '片区', 'f_user_num': '户数', 'f_oughtfee': '上月欠款', 'f_month_oughtfee': '本月应收',

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -245,6 +245,11 @@
                     <input type="text" style="width:60%" class="input_search" v-model="model.balance2"
                            condition="f_balance <= '{}'" placeholder="最大值">
                   </div>
+                  <div class="col-sm-2 form-group" >
+                    <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 form-group" >
                     <label class="font_normal_body">用&ensp;气&ensp;点</label>
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_userfiles_address"
@@ -446,19 +451,19 @@
                               condition="f_table_state in {}"></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">表册抄表员</label>
+                    <label class="font_normal_body">档案抄表员</label>
                     <v-select :value.sync="model.f_book_inputtor" v-model='model.f_book_inputtor'
                               style="width:60%"
                               multiple
-                              :options='$parent.$parent.inputtores' placeholder='表册抄表员'
+                              :options='$parent.$parent.inputtores' placeholder='档案抄表员'
                               v-el:cc></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">档案抄表员</label>
+                    <label class="font_normal_body">表册抄表员</label>
                     <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
                               style="width:60%"
                               multiple
-                              :options='$parent.$parent.inputtores' placeholder='档案抄表员'
+                              :options='$parent.$parent.inputtores' placeholder='表册抄表员'
                               v-el:cc></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
@@ -502,7 +507,7 @@
                   <th colspan="6">
                     <nobr>燃气表</nobr>
                   </th>
-                  <th colspan="63">
+                  <th colspan="62">
                     <nobr>其他</nobr>
                   </th>
                 </tr>

package/src/components/webmeter/gasStatistics/GasStatistics.vue

@@ -18,25 +18,25 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                         condition="ss.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
+                         condition="f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
+                         condition="f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
-                         condition="ss.f_address like '%{}%'" v-next-el='f_address' v-el:f_address>
+                         condition="f_address like '%{}%'" v-next-el='f_address' v-el:f_address>
                 </div>
                 <div class="span" style="float:right;margin-top:10px">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                   <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="rs/logic/exportfile" sql-name="gasStatisticsQuery" template-name='用气量统计表'
+                                sqlurl="rs/logic/exportfile" sql-name="queryGasRecord" template-name='用气量统计表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                               :defaultfield="$parent.$parent.defaultfield"
@@ -49,24 +49,24 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">电&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;话</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_user_phone" placeholder='电话'
-                         condition="ss.f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
+                         condition="f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
                   >
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
-                         condition="ss.f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_residential_area>
+                         condition="f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_residential_area>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
-                         condition="ss.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                         condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">燃气证号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_gascode" placeholder='燃气证号'
-                         condition="ss.f_gascode like '%{}%'" v-next-el='f_gascode' v-el:f_gascode
+                         condition="f_gascode like '%{}%'" v-next-el='f_gascode' v-el:f_gascode
                   >
                 </div>
                 <div class="col-sm-2 form-group">
@@ -81,7 +81,7 @@
                   <v-select :value.sync="model.f_price_name"
                             v-model="model.f_price_name"
                             :options="$parent.$parent.getPricenames"
-                            condition="ss.f_price_name = '{}'"
+                            condition="f_price_name = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -89,7 +89,7 @@
                   <v-select :value.sync="model.f_meter_brand"
                             v-model="model.f_meter_brand"
                             :options="$parent.$parent.meterbrands"
-                            condition="ss.f_meter_brand = '{}'"
+                            condition="f_meter_brand = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -97,7 +97,7 @@
                   <v-select :value.sync="model.f_changetable_state"
                             v-model="model.f_changetable_state"
                             :options="$parent.$parent.isChange"
-                            condition="ss.f_changetable_state = '{}'"
+                            condition="f_changetable_state = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -105,27 +105,27 @@
                   <v-select :value.sync="model.f_gas_state"
                             v-model="model.f_gas_state"
                             :options="$parent.$parent.gasState"
-                            condition="ss.f_gas_state = '{}'"
+                            condition="f_gas_state = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
                   <label class="font_normal_body">用气量区间</label>
                   <div class="row">
                     <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
-                           condition="ss.f_oughtamount >= {} " placeholder="">
+                           condition="f_oughtamount >= {} " placeholder="">
                     <label class="font_normal_body"> ≤ x ≤ </label>
                     <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
-                           condition="ss.f_oughtamount <= {} " placeholder="">
+                           condition="f_oughtamount <= {} " placeholder="">
                   </div>
                 </div>
                 <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
                   <label class="font_normal_body">&nbsp;充值区间&nbsp;&nbsp;</label>
                   <div class="row">
                     <input type="text" style="width:27%" class="input_search" v-model="model.f_collection1"
-                           condition="ss.f_collection >= {} " placeholder="">
+                           condition="f_collection >= {} " placeholder="">
                     <label class="font_normal_body"> ≤ x ≤ </label>
                     <input type="text" style="width:27%" class="input_search" v-model="model.f_collection2"
-                           condition="ss.f_collection <= {} " placeholder="">
+                           condition="f_collection <= {} " placeholder="">
                   </div>
                 </div>
                 <div class="col-sm-2 form-group" >
@@ -152,10 +152,10 @@
                   <label class="font_normal_body">余额区间</label>
                   <div class="row">
                     <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_sta"
-                           condition="ss.f_balance_amount >= {} " placeholder="">
+                           condition="f_balance_amount >= {} " placeholder="">
                     <label class="font_normal_body"> ≤ x ≤ </label>
                     <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_end"
-                           condition="ss.f_balance_amount <= {} " placeholder="">
+                           condition="f_balance_amount <= {} " placeholder="">
                   </div>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -292,7 +292,7 @@
       return {
         show:false,
         org:[this.$login.f.orgid],
-        orgcondition: ' and ss.f_orgid = ' + this.$login.f.orgid,
+        orgcondition: ' and f_orgid = ' + this.$login.f.orgid,
         //f_filialeid: this.$login.f.f_orgid,
         detaillist: [],
         meterbrands: [],
@@ -311,7 +311,7 @@
         //默认打印列
         defaultfield: [],
         orgCondtionStr: '',
-        model: new PagedList('rs/sql/gasStatisticsQuery', 50,{
+        model: new PagedList('rs/sql/queryGasRecord', 50,{
           startDate: 'this.model.startDate',
           endDate: 'this.model.endDate'
         },{
@@ -361,9 +361,9 @@
       },
       getorg(obj) {
         if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
-          this.orgcondition = " and ss.f_orgid  in " + plugins.convertToIn(obj)
+          this.orgcondition = " and f_orgid  in " + plugins.convertToIn(obj)
         }else{
-          this.orgcondition = " and ss.f_orgid  = " + this.$login.f.orgid
+          this.orgcondition = " and f_orgid  = " + this.$login.f.orgid
         }
       },
       userTypeChange () {

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -343,9 +343,7 @@
         instructtype:[],
         instructstate:[],
         org:{
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
+          org:[this.$login.f.orgid]
         },
         orgcondition:'',
         show: false,
@@ -409,7 +407,7 @@
       getorg(condition,obj) {
         this.orgcondition = condition.replace('f_orgid','i.f_orgid')
         this.orgcondition = this.orgcondition.replace('f_depid','i.f_depid')
-        this.orgcondition = this.orgcondition.replace('f_operatorid','i.f_operatorid')
+        this.orgcondition = this.orgcondition.replace('f_operatorid','u1.f_operatorid')
         this.orgname = obj.orgnames[0]
       },
       initQueryParam () {

package/src/components/webmeter/operationValueRecord.vue

@@ -189,7 +189,6 @@
   let readyGen = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.getfield = self.config.excelHeaders
-    self.initQueryParam();
   }
   export default {
     title: '开关阀记录查询',
@@ -253,7 +252,7 @@
         let arr = []
         this.$MagGetSaleParam.getGasbrand().forEach((item) => {
           let temp = {}
-          if(item.value.f_meter_type==='物联网表' || item.value.f_meter_type==='机表'){
+          if(item.value.f_meter_type==='物联网表'){
             temp.label = item.label
             temp.value = item.value.f_meter_brand
             arr.push(temp )
@@ -299,6 +298,7 @@
           this.f_orgid = `${this.f_orgid_new}`;
         }
         await this.model.search(args.condition, args.model)
+        await this.initQueryParam();
         await this.$refs.paged.$refs.grid.InitializedData()
         await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
 

package/src/filiale/WEINAN/ResSelectGroupNew.vue

@@ -6,11 +6,10 @@
                 :initresid='initres.org'></right-tree>
   </div>
   <div :class="style" v-show="departmentshow">
-    <label class="font_normal_body" v-html="deptitle"></label>
+    <label class="font_normal_body">部&emsp;&emsp;门</label>
     <res-select restype='department' v-ref:department
                 @res-select="getdep"
                 :parentresid="depresid"
-                :specialquery="specialquery"
                 :initresid='initres.dep'
                 :mustselect="mustselect"
                 :is-mul="mul">
@@ -63,11 +62,6 @@ export default {
       type: Object,
       default: null,
     },
-    //是否只查询营业厅
-    specialquery: {
-      type: Boolean,
-      default: false
-    },
     showComponent:{
       default:['company','department','operator','slicearea']
     },
@@ -94,7 +88,6 @@ export default {
       operatorshow:false,
       sliceareashow:false,
       mustselect:false,
-      deptitle: this.specialquery ? '营&ensp;业&ensp;厅' : '部&emsp;&emsp;门',
       obj:{
         orgnames:[],
         depnames:[],

package/src/filiale/WEINAN/businessquery/WallHangingFurnaceUserQuery.vue

@@ -62,7 +62,6 @@
                   :show-component="['company','department','operator']"
                   :initres="$parent.$parent.initres"
                   @re-res="$parent.$parent.getRes"
-                  :specialquery="true"
                   v-ref:sel
                 ></res-select-group>
                 <div class="col-sm-2 form-group">