manage-client 3.2.137 → 3.2.138

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.137",
+  "version": "3.2.138",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -64,7 +64,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-18",
+    "system-clients": "3.1.89-20",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
     "vue-client": "1.24.51",

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/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/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}' )`