manage-client 4.1.36 → 4.1.38

package/build/dev-server.js

@@ -11,17 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-// var shaoguan = 'http://61.163.123.47:30785/'
-// var qtx = 'http://61.163.123.47:30785/'
+var shaoguan = 'http://61.163.123.47:30785/'
+var qtx = 'http://61.163.123.47:30785/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:31567/'
+var bendi = 'http://61.163.123.47:30785/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:31567/'
+var wode = 'http://61.163.123.47:30785/'
 // 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'
@@ -30,41 +30,41 @@ var proxyTable = {
     target: bendi
   },
   '/dataManage': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://203.57.101.233:9001/'
 
   },
   '/api/af-revenue/sql/WeChatPaydetail': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api/af-revenue/sql/WeChatPayment': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api/af-revenue/sql/getGasInspection': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api/af-revenue/sql/inspectList_sellinggas': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api/af-revenue/sql/inspectList': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://61.163.123.47:30785/'
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
@@ -78,7 +78,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://61.163.123.47:30785/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -120,7 +120,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://61.163.123.47:30785/'
   },
   '/rs/file': {
     target: bendi

package/package.json

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

package/src/components/SellReport/outletSell.vue

@@ -27,13 +27,13 @@
               </datepicker>
             </div>
             <div class="col-sm-3">
-              <label class="font_normal_body">气表品牌</label>
+              <label class="font_normal_body" title="参数名称：【气表类型】">气表类型</label>
               <v-select :value.sync="model.gasbrand"
                         v-model='model.gasbrand'
-                        :options='$parent.$parent.meterbrands'
+                        :options='$parent.$parent.metertype'
                         :multiple = "true"
-                        condition="f_meter_brand in {}"
-                        placeholder='气表品牌'
+                        condition="f_meter_type in {}"
+                        placeholder='气表类型'
                         close-on-select></v-select>
             </div>
             <res-select-group :style="'col-sm-3'" @re-res="$parent.$parent.getRes" :show-component="$parent.$parent.showComponent" v-ref:sel></res-select-group>
@@ -132,7 +132,6 @@ let saveFile = function * (self) {
 }
 let readySomething = async function(self) {
   await self.$LoadParams.loadParam(self.f_filialeid)
-  self.loadMeterBooks()
 }
 export default {
   title: '网点汇总报表',
@@ -149,7 +148,6 @@ export default {
       operatorid: [],
       depid: [],
       showComponent:['company','department','operator'],
-      meterbrands:[{label: '全部',value: ''}],
       orgname: '',
       depname: '',
       operatorname: '',
@@ -169,12 +167,6 @@ export default {
     console.log(this.$login.f)
   },
   methods: {
-    loadMeterBooks(){
-      let meterbrand = this.$GetSaleParam.getGasbrand()
-      for(let row of meterbrand){
-        this.meterbrands.push({label: row.label,value: row.value.f_meter_brand})
-      }
-    },
     search () {
       this.$refs.paged.$refs.criteria.search()
     },
@@ -245,7 +237,9 @@ export default {
     }
   },
   computed: {
-
+    metertype () {
+      return this.$getParams('气表类型', [{label: '全部', value: ''}])
+    }
   }
 }
 </script>

package/src/filiale/fugou/OtherChargeQuery.vue

@@ -570,10 +570,6 @@
         args.condition = `${args.condition}` + this.orgCondtionStr
       await this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      this.sumsmodel.hushu =[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
-      if(this.sumsmodel.hushu===null){
-        this.sumsmodel.hushu = 0
-      }
     },
       clear() {
         //清空部门和人员