manage-client 3.2.25 → 3.2.26

package/build/dev-server.js

@@ -13,8 +13,8 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8976/', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://192.168.50.4:8400'
+var bendi = 'http://119.36.179.19:8000', fuwu_login = 'http://192.168.50.4:8400'
+var fuwu = 'http://119.36.179.19:8000'
 var system = 'http://192.168.50.4:8400'
 //192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.25",
+  "version": "3.2.26",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -57,7 +57,7 @@
     "moment": "2.24.0",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
-    "sale-client": "3.2.18-1",
+    "sale-client": "3.4.14",
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
@@ -66,7 +66,7 @@
     "system-clients": "3.1.89-20",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.22.20-5-1",
+    "vue-client": "1.24.33",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -70,11 +70,12 @@
                             v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
                     >
                   </div>
-                  <div class="col-sm-2">
-                    <label class="font_normal_body">公&emsp;&emsp;司</label>
-                    <right-tree @re-res="$parent.$parent.getorg"
-                                :initresid='$parent.$parent.orgid'></right-tree>
-                  </div>
+<!--                  <div class="col-sm-2">-->
+<!--                    <label class="font_normal_body">公&emsp;&emsp;司</label>-->
+<!--                    <right-tree @re-res="$parent.$parent.getorg"-->
+<!--                                :initresid='$parent.$parent.orgid'></right-tree>-->
+<!--                  </div>-->
+                  <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
 <!--                  <div class="col-sm-2 form-group">-->
 <!--                    <label class="font_normal_body">组织机构</label>-->
 <!--                    <res-select :initresid="$parent.$parent.orgid"-->
@@ -360,6 +361,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
     components: {UserGasEcharts},
     data() {
       return {
+        resshow:['company','slicearea'],
         model: new PagedList('rs/sql/webmeter_getUserGasList', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
           f_oughtamount: 0,
           f_oughtfee: 0,
@@ -423,7 +425,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
         orgid:[this.$login.f.orgid],
-        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
+        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
+        zonesdata:''
       }
     },
     ready() {
@@ -495,6 +498,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+        if(this.zonesdata){
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
+        }
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -522,6 +528,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
       getRes(obj) {
         this.orgCondtionStr = plugins.convertToIn(obj)
+        if(obj.indexOf("f_zones = ")>0){
+          this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
+        }else{
+          this.zonesdata='';
+        }
       },
       getorg(obj) {
         this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'

package/src/filiale/macheng/ArrearsQuery.vue

@@ -445,7 +445,7 @@
               上期余额合计: {{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;{{parseFloat((sumsmodel.f_oughtfee_all.toFixed(2)-sumsmodel.f_balance.toFixed(2)).toFixed(2))}}
+              合计欠费:&emsp;{{sumsmodel.f_oughtfee_all}}
             </td>
           </tr>
         </table>

package/src/main.js

@@ -5,6 +5,7 @@ import { all } from 'vue-client'
 // import { sale } from 'sale-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
+import { sale } from 'sale-client'
 import saleManage from './saleManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
@@ -40,7 +41,7 @@ AMap.initAMapApiLoader({
 
 Vue.prototype.$echarts = echarts
 all()
-// sale()
+sale()
 ldap()
 system(false)
 saleManage('macheng')