manage-client 3.2.10-aode → 3.2.11-aode

package/build/dev-server.js

@@ -12,7 +12,8 @@ var compiler = webpack(config)
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
- var str = 'http://192.168.10.14:8300', fuwu = 'http://192.168.10.14:8300'
+var fuwu = 'http://192.168.50.4:8400',  bendi = 'http://localhost:8080/'
+ // var str = 'http://192.168.10.14:8300', fuwu = 'http://192.168.10.14:8300',bendi = 'http://localhost:8080/'
 var proxyTable = {
 
   '/rs/logic/exportfile': {
@@ -65,7 +66,8 @@ var proxyTable = {
     target: fuwu
   },
   '/rs': {
-    target: fuwu
+    // target: fuwu
+    target: bendi
   }
 }
 

package/client.iml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
-    <src_description expected_position="0" />
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
+    <src_description expected_position="0" />
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
+  </component>
 </module>

package/package.json

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

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

@@ -1,147 +1,147 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main">
-      <div class="flex" v-if="!show">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-2">
-              <label class="font_normal_body">公&emsp;&emsp;司</label>
-              <right-tree @re-res="$parent.$parent.getorg"
-                          :initresid='$parent.$parent.org'></right-tree>
-            </div>
-
-            <div class="span" style="float:right;">
-              <button class="btn button_search" @click="search()">查询</button>
-              <button class="btn button_clear" @click="$parent.$parent.clear()">查询全部</button>
-              <export-excel-plus :defaultselect="$parent.$parent.selectfields" :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"
-                            :exportprogress="true"
-                            sqlurl="rs/logic/exportfileplus"  :sql-name="$parent.$parent.sqlName" template-name='抵扣气量导出'  :choose-col="true"></export-excel-plus>
-
-              <!--<div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
-
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>公司名称</nobr></th>
-            <th><nobr>总抵扣气量</nobr></th>
-            <th><nobr>剩余抵扣气量</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
-          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
-          <td style="text-align: center;"><nobr>{{row.f_remanent_gas}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_deduction_gas}}</nobr></td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-    </div>
-  </div>
-</template>
-<script>
-  /**
-   *用户档案查询列表以及添加操作组件
-   */
-  import { PagedList } from 'vue-client'
-  import Vue from 'vue'
-  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-
-  export default {
-    title: '抵扣气量',
-    data () {
-      return {
-        org:'',
-        criteriaShow: false,
-        meter_classify:'卡表',
-        filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
-        userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        getfield:{"f_orgname":"组织","f_remanent_gas":"总抵扣气量","f_deduction_gas":"剩余抵扣气量"},
-        model: new PagedList('rs/sql/getDeductiongas', 50,{}),
-        rows: null,
-        //orgid:'',
-        sumsmodel: {},
-        sqlName:'getDeductiongas',
-        show:false,
-        rowdata:{},
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
-        defaultfield: [],
-        selectfields:[],
-        searchCondition:[]
-      }
-    },
-    ready () {
-
-    },
-    methods: {
-      getorg (obj) {
-        if(obj.resids.length>0){
-          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
-        }
-        else{
-          this.filialeCodeStr= ""
-        }
-      },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-      selfSearch (args) {
-        if(!this.filialeCodeStr){
-          this.filialeCodeStr = `and f_orgid = ${this.$login.f.orgid}`
-        }
-        args.condition = args.condition+ ` ${this.filialeCodeStr}`
-        console.log("拼接的condition", args.condition, this.model)
-        this.model.search(args.condition, args.model)
-      },
-      // show(){
-      //   this.criteriaShow = true
-      // },
-      hidden(){
-        this.criteriaShow = !this.criteriaShow
-      },
-      clear(){
-        this.filialeCodeStr= ""
-        this.model.search('1=1')
-        // Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-        //   this.$refs.paged.$refs.cri.model[key] = []
-        // })
-      }
-
-    },
-    computed: {
-      getCondition () {
-        let result = {
-          condition: '',
-          startDate: '',
-          endDate: ''
-          // diffDay:' 1=1 '
-        }
-        result.condition = this.$refs.paged.$refs.cri.condition + this.filialeCodeStr
-          return result
-      }
-    }
-  }
-</script>
-<style media="screen">
-  .divtext {
-    min-width: 50px;
-    max-width: 200px;
-    border: 1px solid green;
-    display: inline-block;
-  }
-</style>
-
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!show">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2">
+              <label class="font_normal_body">公&emsp;&emsp;司</label>
+              <right-tree @re-res="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.org'></right-tree>
+            </div>
+
+            <div class="span" style="float:right;">
+              <button class="btn button_search" @click="search()">查询</button>
+              <button class="btn button_clear" @click="$parent.$parent.clear()">查询全部</button>
+              <export-excel-plus :defaultselect="$parent.$parent.selectfields" :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            :exportprogress="true"
+                            sqlurl="rs/logic/exportfileplus"  :sql-name="$parent.$parent.sqlName" template-name='抵扣气量导出'  :choose-col="true"></export-excel-plus>
+
+              <!--<div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
+
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>公司名称</nobr></th>
+            <th><nobr>总抵扣气量</nobr></th>
+            <th><nobr>剩余抵扣气量</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
+          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
+          <td style="text-align: center;"><nobr>{{row.f_remanent_gas}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_deduction_gas}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+    </div>
+  </div>
+</template>
+<script>
+  /**
+   *用户档案查询列表以及添加操作组件
+   */
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+  export default {
+    title: '抵扣气量',
+    data () {
+      return {
+        org:'',
+        criteriaShow: false,
+        meter_classify:'卡表',
+        filialeNameStr: null,
+        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+        getfield:{"f_orgname":"组织","f_remanent_gas":"总抵扣气量","f_deduction_gas":"剩余抵扣气量"},
+        model: new PagedList('rs/sql/getDeductiongas', 50,{}),
+        rows: null,
+        //orgid:'',
+        sumsmodel: {},
+        sqlName:'getDeductiongas',
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        defaultfield: [],
+        selectfields:[],
+        searchCondition:[]
+      }
+    },
+    ready () {
+
+    },
+    methods: {
+      getorg (obj) {
+        if(obj.resids.length>0){
+          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= ""
+        }
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+        if(!this.filialeCodeStr){
+          this.filialeCodeStr = `and f_orgid = ${this.$login.f.orgid}`
+        }
+        args.condition = args.condition+ ` ${this.filialeCodeStr}`
+        console.log("拼接的condition", args.condition, this.model)
+        this.model.search(args.condition, args.model)
+      },
+      // show(){
+      //   this.criteriaShow = true
+      // },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear(){
+        this.filialeCodeStr= ""
+        this.model.search('1=1')
+        // Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        //   this.$refs.paged.$refs.cri.model[key] = []
+        // })
+      }
+
+    },
+    computed: {
+      getCondition () {
+        let result = {
+          condition: '',
+          startDate: '',
+          endDate: ''
+          // diffDay:' 1=1 '
+        }
+        result.condition = this.$refs.paged.$refs.cri.condition + this.filialeCodeStr
+          return result
+      }
+    }
+  }
+</script>
+<style media="screen">
+  .divtext {
+    min-width: 50px;
+    max-width: 200px;
+    border: 1px solid green;
+    display: inline-block;
+  }
+</style>
+

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

@@ -1,34 +1,34 @@
-<template>
-  <tab-button>
-    <tabs header="用户稽查">
-      <inspect-list-user></inspect-list-user>
-    </tabs>
-    <tabs header="购气稽查">
-      <inspect-list-gas v-if="show[1]"></inspect-list-gas>
-    </tabs>
-
-    <tabs header="错误查询">
-      <error-handplan-query></error-handplan-query>
-    </tabs>
-
-  </tab-button>
-
-</template>
-
-<script>
-  import TabButton from "../common/TabButton";
-  import Tabs from "../common/Tabs";
-
-  export default {
-    title: '稽查查询',
-    data(){
-      return{
-        show: [true]
-      }
-    },
-    components: {Tabs, TabButton},
-  }
-</script>
-
-<style scoped>
-</style>
+<template>
+  <tab-button>
+    <tabs header="用户稽查">
+      <inspect-list-user></inspect-list-user>
+    </tabs>
+    <tabs header="购气稽查">
+      <inspect-list-gas v-if="show[1]"></inspect-list-gas>
+    </tabs>
+
+    <tabs header="错误查询">
+      <error-handplan-query></error-handplan-query>
+    </tabs>
+
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from "../common/TabButton";
+  import Tabs from "../common/Tabs";
+
+  export default {
+    title: '稽查查询',
+    data(){
+      return{
+        show: [true]
+      }
+    },
+    components: {Tabs, TabButton},
+  }
+</script>
+
+<style scoped>
+</style>

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

@@ -68,6 +68,14 @@
                             condition=" f_gasproperties in {}"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">气表分类</label>
+                  <v-select :value.sync="model.f_meter_classify"
+                            v-model="model.f_meter_classify"
+                            :options='$parent.$parent.metertypes' placeholder='请选择'
+                            condition="f_meter_classify = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
                   <v-select :value.sync="model.f_meter_brand"
@@ -171,6 +179,9 @@
                 <th>
                   <nobr>累购气量</nobr>
                 </th>
+                <th>
+                  <nobr>气表类型</nobr>
+                </th>
                 <th>
                   <nobr>气表品牌</nobr>
                 </th>
@@ -246,6 +257,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_total_gas}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand}}</nobr>
               </td>
@@ -327,6 +341,7 @@
         sumsmodel: {},
         newuseroptiones:[{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
         selectfields:[],
+          metertypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')],
         backstates:[{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         gaspropertyTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
         getusertypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],