manage-client 3.3.10 → 3.3.12

package/package.json

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

package/src/components/WebReport/EchartsBox.vue

@@ -39,12 +39,12 @@
     <div style="height: 97%;" v-if="showPage === 1">
       <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
         <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
-          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
                         v-ref:pay></site-manager>
 <!--        <test></test>-->
         </div>
         <div style="flex: 1;width: 50%">
-          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
                         v-ref:pay></bank-manager>
         </div>
       </div>
@@ -52,7 +52,7 @@
 
         <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
           <div style="flex: 1;">
-            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
                         v-ref:pay></paymentpie>
           </div>
           <!--          <div style="flex: 1;">-->
@@ -61,7 +61,7 @@
         </div>
 
         <div style="flex: 1;width: 50%">
-          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
                           v-ref:pay></bussiness-type>
         </div>
       </div>
@@ -69,7 +69,7 @@
     <div style="height: 97%;" v-if="showPage === 2">
       <div class="flex-row" style="flex: 1;height: 96%">
         <div style="flex: 1">
-          <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>
+          <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'></gas-properties-manager>
         </div>
       </div>
     </div>
@@ -102,7 +102,7 @@ export default {
       jurisdiction: this.$login.r,
       model: {
         id: [this.$login.f.orgid],
-        orgid: [this.$login.f.orgid],
+        orgid: this.$login.f.orgid,
         startDate: Util.toStandardDateString(),
         endDate: Util.toStandardDateString()
       }
@@ -121,7 +121,17 @@ export default {
       }
     },
     getRes (obj) {
-      this.model.orgid = obj
+      console.log('obj--------',obj)
+      let stringValue = ''
+      for (var i = 0; i < obj.length; i++) {
+        if (i === obj.length - 1) {
+          stringValue = stringValue + "'" + obj[i] + "'"
+        } else {
+          stringValue = stringValue + "'" + obj[i] + "',"
+        }
+      }
+      console.log('stringValue--------',stringValue)
+      this.model.orgid = stringValue
     }
   }
 }

package/src/components/WebReport/Paymentpie.vue

@@ -105,7 +105,7 @@ export default {
        },
     series : [
       {
-        name: '',
+        name: '气量',
         type: 'pie',
         radius: ['0%', '40%'],
         center: ['25%', '50%'],
@@ -117,7 +117,7 @@ export default {
         data: gasdata
         },
       {
-        name: '笔数',
+        name: '金额',
         type: 'pie',
         radius: ['0%', '40%'],
         center: ['65%', '50%'],

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

@@ -89,7 +89,7 @@
                   <v-select :value.sync="model.f_meter_brand" multiple
                             v-model="model.f_meter_brand"
                             :options="$parent.$parent.meterbrands"
-                            condition="ss.f_meter_brand = '{}'"
+                            condition="ss.f_meter_brand in {}"
                             value-single="false"
                             close-on-select></v-select>
                 </div>

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -340,7 +340,7 @@
         props: ['data'],
         data() {
             return {
-                model: new PagedList('rs/sql/getExceptionList', 20),
+                model: new PagedList('rs/sql/getExceptionList',20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
                 reportStr: null,
                 show: false,
                 startDate: '',

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

@@ -135,12 +135,12 @@ export default{
     'f_usetype':'使用类型','f_meter_style': '气表型号','f_table_state': '表状态','f_initial_base': '初始气表底数',
     'f_total_usegas_amount': '累计用气金额','f_total_gas': '表累购气量','f_total_fee': '表累购金额','f_inputtor': '表册抄表员',
     'f_book_inputtor': '档案抄表员',
-    'f_userfiles_address': '安装地址','f_install_person': '安装人','f_gas_person': '通气人',
+    'f_install_person': '安装人','f_gas_person': '通气人',
     'f_meter_book_num': '抄表册编号','f_meter_book_sort': '抄表册顺序',
     'f_balance_amount': '表剩余金额','f_times': '写卡次数',
     'f_fillcard_times': '补卡次数','f_sendsuccess': '表同步状态','f_isband': '微信绑定','f_cost_type':'缴费类型'
     ,'f_bank_accopen':'银行户名','f_bank_name':'银行名称','f_bank_account':'银行账号',
-    'f_bank_idnumber':'银行身份证号','f_bank_pay_number':'缴费编号'
+    'f_bank_idnumber':'银行身份证号','f_bank_pay_number':'缴费编号','f_userfiles_address': '用气点名'
   },
   changemeterConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址',

package/src/filiale/shanxian/ChangeMeterQuery.vue

@@ -177,12 +177,12 @@
                 </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_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber_old"
                          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_meternumber"
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
                        condition="f_card_old = '{}'" placeholder='旧卡号'>
                 </div>
               </div>