manage-client 3.2.136 → 3.2.140

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

@@ -65,14 +65,14 @@
                   <!--<input type="text" style="width:60%" class="input_search" v-model="model.id"-->
                          <!--condition="id = '{}'" placeholder="收费编号">-->
                 <!--</div>-->
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
-                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
-                            style="width:60%"
-                            close-on-select
-                            condition="f_meter_book_num = '{}'"></v-select>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>-->
+<!--                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"-->
+<!--                            :options='$parent.$parent.meterbooks' placeholder='抄表册'-->
+<!--                            style="width:60%"-->
+<!--                            close-on-select-->
+<!--                            condition="f_meter_book_num = '{}'"></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_user_phone"
@@ -149,38 +149,37 @@
                   <v-select :value.sync="model.f_price_name"
                             v-model="model.f_price_name"
                             :options="$parent.$parent.getPricenames"
-                            condition="f_price_name = '{}'"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="欠费气量大于">欠费气量</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtamount"
-                         condition="f_oughtamount > '{}'" placeholder="欠费气量大于">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="气费金额大于">气费金额</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_new"
-                         condition="f_oughtfee_new > '{}'" placeholder="气费金额大于">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="欠费金额大于">欠费金额</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_all"
-                         condition="f_oughtfee_all > '{}'" 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.c"
-                         condition="c > '{}'" placeholder='欠费期数大于'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
-                  <v-select :value.sync="model.f_inputtor"
-                            v-model="model.f_inputtor"
-                            :options='$parent.$parent.inputtores' placeholder='请选择'
-                            condition="f_inputtor = '{}'"
-                            close-on-select  :search="false">
-                  </v-select>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body" title="欠费气量大于">欠费气量</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtamount"-->
+<!--                         condition="f_oughtamount > '{}'" placeholder="欠费气量大于">-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body" title="气费金额大于">气费金额</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_new"-->
+<!--                         condition="f_oughtfee_new > '{}'" placeholder="气费金额大于">-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body" title="欠费金额大于">欠费金额</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_all"-->
+<!--                         condition="f_oughtfee_all > '{}'" 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.c"-->
+<!--                         condition="c > '{}'" placeholder='欠费期数大于'>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>-->
+<!--                  <v-select :value.sync="model.f_inputtor"-->
+<!--                            v-model="model.f_inputtor"-->
+<!--                            :options='$parent.$parent.inputtores' placeholder='请选择'-->
+<!--                            condition="f_inputtor = '{}'"-->
+<!--                            close-on-select  :search="false">-->
+<!--                  </v-select>-->
+<!--                </div>-->
                 <div class="col-sm-2 form-group" v-if="false">
                   <label class="font_normal_body">&nbsp;抄&nbsp;表&nbsp;员</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_inputtor"

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

@@ -34,6 +34,12 @@ export default{
       "上报类型":"f_upload_type",
       "金额状态":"f_moneystate",
 
+      "增加工况瞬时":"operatingModeFlow",
+      "标况瞬时":"standardConditionFlow",
+      "开盖状态" :"f_SplitAlarm",
+      "液晶状态" : "f_XTIpllStopFlag",
+      "声速" :"soundVelocity",
+
       "外电低电":"f_lowlithiumbattery",
       "磁干扰异常":"f_magneticinterference",
       "表内剩余金额":"f_meterbalanceamt",

package/src/filiale/WEINAN/NewAccountQuery.vue

@@ -121,36 +121,25 @@
                 <th>
                   <nobr>气价名称</nobr>
                 </th>
-                <th>
-                  <nobr>开户时间</nobr>
-                </th>
                 <th>
                   <nobr>表号</nobr>
                 </th>
                 <th>
-                  <nobr>置换员</nobr>
-                </th>
-                <th>
-                  <nobr>通气时间</nobr>
+                  <nobr>气表品牌</nobr>
                 </th>
+
                 <th>
-                  <nobr>用气性质</nobr>
+                  <nobr>是否有壁挂炉</nobr>
                 </th>
                 <th>
-                  <nobr>累购气量</nobr>
+                  <nobr>开户人</nobr>
                 </th>
                 <th>
-                  <nobr>气表品牌</nobr>
+                  <nobr>开户时间</nobr>
                 </th>
                 <th>
                   <nobr>开户地点</nobr>
                 </th>
-                <th>
-                  <nobr>是否有壁挂炉</nobr>
-                </th>
-                <th>
-                  <nobr>开户人</nobr>
-                </th>
               </tr>
             </template>
             <template partial='body'>
@@ -172,35 +161,23 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_price_name}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_open_date}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_gas_person}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gas_date}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gasproperties}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_total_gas}}</nobr>
+                <nobr>{{row.f_meter_brand}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_meter_brand}}</nobr>
+                <nobr>{{row.isbgl}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_depname}}</nobr>
+                <nobr>{{row.operator}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.isbgl}}</nobr>
+                <nobr>{{row.f_operate_date}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
+                <nobr>{{row.depname}}</nobr>
               </td>
             </template>
             <template partial='foot'></template>

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -396,7 +396,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

package/src/filiale/liaoyuan/RecordInfoQuery.vue

@@ -609,6 +609,7 @@
             <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 style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">账户余额合计:&emsp;&emsp;{{sumsmodel.f_balance}}</td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">表剩余金额合计:&emsp;&emsp;{{sumsmodel.f_balance_amount}}</td>
             </tr>
           </table>
 
@@ -694,7 +695,8 @@
         other:[],
         footer:[],
         model: new PagedList('rs/sql/compreQuery', 20, {}, {
-          f_balance: 0
+          f_balance: 0,
+          f_balance_amount: 0
         }),
         criteriaShow: false,
         orgCondtionStr:'',

package/src/filiale/macheng/WebmeterSettlementAnalysis.vue

@@ -210,7 +210,7 @@
     </div>
   </div>
   <div v-if="isShowDetailInfo">
-    <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id" @cancel-main="cancelDetail"></user-info-detail-manage-new>
   </div>
 </template>
 
@@ -265,7 +265,7 @@ export default {
     /**
      * 退出用户详细信息页面
      */
-    cancel () {
+    cancelDetail () {
       this.isShowDetailInfo = false
     },
     /**

package/src/filiale/macheng/sale.js

@@ -7,7 +7,6 @@ let specialComp = {
   'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
   'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
   'fmygas-query': (resolve) => { require(['./FMYGasQuery'], resolve) },
-  'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) },
-  'webmeter-settlement-analysis': (resolve) => { require(['./WebmeterSettlementAnalysis'], resolve) }
+  'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/shaoguan/config/exportConfig.js

@@ -200,7 +200,7 @@ export default{
   batchBankConfig: {
     'f_userinfo_code': '客户编号','f_user_phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
     'f_bank_accopen': '银行户名', 'f_bank_pay_number': '缴费编号', 'f_bank_account': '银行开户账号','f_bank_name': '银行名称',
-    'f_shiji_oughtfee':"实际用气金额合计",'f_debt_money':'已交金额','overdue':'滞纳金', 'f_oughtfee': '欠费金额'
+    'f_shiji_oughtfee':"实际用气金额合计",'f_debt_money':'已交金额','overdue':'滞纳金', 'f_oughtfee': '欠费金额', 'f_balance': '上期余额'
   },
   fmygasConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',

package/src/filiale/tongchuan/ReportList.vue

@@ -6,16 +6,17 @@
           <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row" >
-                <div class="col-sm-2">
-                  <label class="font_normal_body">组织机构</label>
-                  <res-select :initresid="$parent.$parent.org"
-                              style="width:60%"
-                              @res-select="$parent.$parent.getorg"
-                              :is-mul=false
-                              restype='organization'>
-                  </res-select>
+                <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <!--<div class="col-sm-2">-->
+                  <!--<label class="font_normal_body">组织机构</label>-->
+                  <!--<res-select :initresid="$parent.$parent.org"-->
+                              <!--style="width:60%"-->
+                              <!--@res-select="$parent.$parent.getorg"-->
+                              <!--:is-mul=false-->
+                              <!--restype='organization'>-->
+                  <!--</res-select>-->
 
-                </div>
+                <!--</div>-->
                 <div class="col-sm-2">
                   <label class="font_normal_body">表&nbsp;&nbsp;号&nbsp;</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
@@ -287,6 +288,12 @@
         rowdata:{},
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
+        // 公司下拉
+        initres: {
+          org: [],
+          dep: [],
+          user: []
+        },
         criteriaShow:false,
         orgCondtionStr: '',
         model: new PagedList('rs/sql/manage_getReportList', 50,{},{f_meterbalanceamt: 0,f_tablebase: 0,f_meterdebitamt: 0})
@@ -321,14 +328,6 @@
         await this.$MagLoadParams.loadParam(this.f_filialeid)
         this.initParams()
       },
-      getorg(obj) {
-        if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
-          this.orgcondition = " and m.f_orgid  in " + plugins.convertToIn(obj)
-        }else{
-          this.orgcondition = " and m.f_orgid  = " + this.$login.f.orgid
-        }
-
-      },
       userTypeChange () {
         this.gasproperties=[]
         if(this.$refs.paged.$refs.criteria.model !==null) {
@@ -363,10 +362,8 @@
           this.$refs.paged.$refs.criteria.model[key] = []
         })
       },
-      getRes (obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
+      async getRes (condition, obj) {
+        this.orgCondtionStr = condition.replace("f_orgid","m.f_orgid")
       },
       showmsg(obj){
         this.rowdata=obj
@@ -374,7 +371,7 @@
       },
 
       search (args) {
-        args.condition =  `${args.condition}`+this.orgcondition
+        args.condition =  `${args.condition}`+this.orgCondtionStr
         console.log(args.condition+"args.condition")
         this.condition = args.condition
         this.model.search(args.condition, args.model)
@@ -389,14 +386,14 @@
       }
     },
     watch: {
-      'orgCondtionStr'(val) {
-        let res = val.match(/'(.*?)'/)
-        console.log('正则提取:',res && res[1])
-        if (res) {
-          this.f_filialeid = res[1]
-          this.updateParams()
-        }
-      }
+      // 'orgCondtionStr'(val) {
+      //   let res = val.match(/'(.*?)'/)
+      //   console.log('正则提取:',res && res[1])
+      //   if (res) {
+      //     this.f_filialeid = res[1]
+      //     this.updateParams()
+      //   }
+      // }
     },
     computed: {
       getPricenames() {
@@ -445,7 +442,7 @@
       getCondition () {
         var con = ""
         if (this.orgCondtionStr) {
-          con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in  (${this.orgCondtionStr})`
+          con = `${this.$refs.paged.$refs.criteria.condition} ${this.orgCondtionStr}`
         }
         else {
           con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`

package/src/reportManage.js

@@ -85,6 +85,10 @@ export default function (filiale) {
   Vue.component('site-manager', (resolve) => {
     require(['./components/SellReport/SiteManager'], resolve)
   })
+  // 用气性质散列图
+  Vue.component('gas-properties-manager', (resolve) => {
+    require(['./components/SellReport/GasPropertiesManager'], resolve)
+  })
 
   /** **************************营收模块(SellReport)******************************/
   // 报表相关，所属为抄表员汇总表（实际为报表汇总表，功能名称后期改变）,调整找那个，尚未归类
@@ -100,6 +104,10 @@ export default function (filiale) {
   Vue.component('report-history', (resolve) => {
     require(['./components/SellReport/ReportHistory'], resolve)
   })
+  // 保存的报表展示
+  Vue.component('report-history-show', (resolve) => {
+    require(['./components/SellReport/ReportHistoryShow'], resolve)
+  })
 
   /** **************************营收模块(SellReport)******************************/
   // 报表相关，所属为抄表员汇总表（实际为报表汇总表，功能名称后期改变）,调整找那个，尚未归类
@@ -579,6 +587,18 @@ export default function (filiale) {
   Vue.component('user-gas-fill-money', (resolve) => {
     require(['./components/SellReport/UserFillmoney'], resolve)
   })
+  // 人员报建表
+  Vue.component('apply-gas-fill-money', (resolve) => {
+    require(['./components/SellReport/ApplyFillmoney'], resolve)
+  })
+  // 材料报建表
+  Vue.component('applys-gas-fill-money', (resolve) => {
+    require(['./components/SellReport/applysFillmoney'], resolve)
+  })
+  // 月度用气性质使用占比报表
+  Vue.component('market-month-gas', (resolve) => {
+    require(['./components/SellReport/MarketMonthgas'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale