manage-client 3.2.74 → 3.2.75

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/.classpath

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

package/.editorconfig

@@ -1,9 +1,9 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

package/.project

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>client</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>client</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

package/README.md

@@ -1,39 +1,39 @@
-# ManageClient
-
-#### 项目介绍
-{**以下是码云平台说明，您可以替换为您的项目简介**
-码云是开源中国推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本项目
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 码云特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+# ManageClient
+
+#### 项目介绍
+{**以下是码云平台说明，您可以替换为您的项目简介**
+码云是开源中国推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
+无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 使用说明
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 参与贡献
+
+1. Fork 本项目
+2. 新建 Feat_xxx 分支
+3. 提交代码
+4. 新建 Pull Request
+
+
+#### 码云特技
+
+1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
+3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
+4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
+5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
 6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

package/build/dev-server.js

@@ -10,78 +10,78 @@ 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', system = 'http://36.103.224.217:6300/'
+// 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:8090'
 // var bendi = 'http://172.168.1.11:9001'
-var system = 'http://192.168.17.52:8600'
-// var system = 'http://172.168.1.11:9001'
+var fuwu = 'http://121.36.106.17:8400/'
+// var fuwu = 'http://172.168.1.11:9001'
 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'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: system
+    target: fuwu
   },
   '/files': {
-    target: system
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: system
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: system
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: system
+    target: fuwu
   },
   '/rs/logic/getSaleInitData':{
-    target: system
+    target: fuwu
   },
   // 用户登录服务地址
   '/rs/user': {
-    target: system
+    target: fuwu
   },
   '/rs/path/getParams': {
-    target: system
+    target: fuwu
   },
   '/rs/data': {
-    target: system
+    target: fuwu
   },
   '/rs/license': {
-    target: system
+    target: fuwu
   },
   '/rs/db': {
-    target: system
+    target: fuwu
   },
   '/excel': {
-    target: system
+    target: fuwu
   },
   '/rs/config': {
-    target: system
+    target: fuwu
   },
   '/rs/sql/getLicenseById': {
-    target: system
+    target: fuwu
   },
   '/rs/report': {
-    target: bendi
+    target: fuwu
   },
   '/rs/vue': {
-    target: system
+    target: fuwu
   },
   '/rs/file': {
-    target: bendi
+    target: fuwu
   },
   '/rs/logic/SumSettleFileImport': {
     target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: system
+    target: fuwu
   }
 }
 

package/config/dev.env.js

@@ -1,6 +1,6 @@
-var merge = require('webpack-merge')
-var prodEnv = require('./prod.env')
-
-module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
-})
+var merge = require('webpack-merge')
+var prodEnv = require('./prod.env')
+
+module.exports = merge(prodEnv, {
+  NODE_ENV: '"development"'
+})

package/config/prod.env.js

@@ -1,3 +1,3 @@
-module.exports = {
-  NODE_ENV: '"production"'
-}
+module.exports = {
+  NODE_ENV: '"production"'
+}

package/config/test.env.js

@@ -1,6 +1,6 @@
-var merge = require('webpack-merge')
-var devEnv = require('./dev.env')
-
-module.exports = merge(devEnv, {
-  NODE_ENV: '"testing"'
-})
+var merge = require('webpack-merge')
+var devEnv = require('./dev.env')
+
+module.exports = merge(devEnv, {
+  NODE_ENV: '"testing"'
+})

package/package.json

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

package/release.bat

@@ -1,5 +1,5 @@
-git add -A
-git commit -m "[build] %1"
-git tag -a V%1 -m "Release version %1"
-git push origin --tags
-git push
+git add -A
+git commit -m "[build] %1"
+git tag -a V%1 -m "Release version %1"
+git push origin --tags
+git push

package/src/components/MeterManage/ChangeMeterQuery.vue

@@ -1,82 +1,82 @@
-<template >
-  <div id="stand-work-list" class="flex bg-white p-10">
-    <div class="height:auto">
-      <criteria-paged :model="model" v-ref:paged  >
-        <data-grid :model="model" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th>序号</th>
-              <th><nobr>换表类型</nobr></th>
-              <th><nobr>换表费</nobr></th>
-              <th><nobr>旧表底数</nobr></th>
-              <th><nobr>新表底数</nobr></th>
-              <th><nobr>旧卡号</nobr></th>
-              <th><nobr>新卡号</nobr></th>
-              <th><nobr>换表日期</nobr></th>
-            </tr>
-          </template>
-          <template partial='body' partial='list' v-ref:grid>
-            <tr >
-              <td style="text-align: center;">{{$index+1}}</td>
-              <td style="text-align: center;"><nobr>{{row.f_change_type}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-
-  export default {
-    title: '收费',
-    data () {
-      return {
-        condition: '1=1',
-        model: new PagedList('rs/sql/changeMeterQuery', 15),
-        row: null,
-        isdeal: true,
-        obj: {
-          userid: this.$login.f.id,
-          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-          res: this.$login.f.f_fengongsi,
-          resids: this.$login.f.f_orgids
-        },
-        show: false
-      }
-    },
-    props:
-      {
-        f_userinfo_id: '',
-        isdeal: {},
-        args:{}
-      },
-    ready () {
-      this.search()
-    },
-    methods: {
-      search(){
-        if(this.args && this.args.model) {
-          this.condition = `f_userinfo_id = ${this.f_userinfo_id} `
-          if (this.args.model.f_start_date) this.condition += `and f_changemeter_date >= '${this.args.model.f_start_date} '`
-          if (this.args.model.f_end_date) this.condition += `and f_changemeter_date <= '${this.args.model.f_end_date}' `
-          this.model.search(this.condition, this.args.model)
-        }
-      }
-    },
-    watch:{
-      args(val){
-        this.search()
-      }
-    }
-  }
-</script>
+<template >
+  <div id="stand-work-list" class="flex bg-white p-10">
+    <div class="height:auto">
+      <criteria-paged :model="model" v-ref:paged  >
+        <data-grid :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th><nobr>换表类型</nobr></th>
+              <th><nobr>换表费</nobr></th>
+              <th><nobr>旧表底数</nobr></th>
+              <th><nobr>新表底数</nobr></th>
+              <th><nobr>旧卡号</nobr></th>
+              <th><nobr>新卡号</nobr></th>
+              <th><nobr>换表日期</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align: center;">{{$index+1}}</td>
+              <td style="text-align: center;"><nobr>{{row.f_change_type}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '收费',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('rs/sql/changeMeterQuery', 15),
+        row: null,
+        isdeal: true,
+        obj: {
+          userid: this.$login.f.id,
+          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+          res: this.$login.f.f_fengongsi,
+          resids: this.$login.f.f_orgids
+        },
+        show: false
+      }
+    },
+    props:
+      {
+        f_userinfo_id: '',
+        isdeal: {},
+        args:{}
+      },
+    ready () {
+      this.search()
+    },
+    methods: {
+      search(){
+        if(this.args && this.args.model) {
+          this.condition = `f_userinfo_id = ${this.f_userinfo_id} `
+          if (this.args.model.f_start_date) this.condition += `and f_changemeter_date >= '${this.args.model.f_start_date} '`
+          if (this.args.model.f_end_date) this.condition += `and f_changemeter_date <= '${this.args.model.f_end_date}' `
+          this.model.search(this.condition, this.args.model)
+        }
+      }
+    },
+    watch:{
+      args(val){
+        this.search()
+      }
+    }
+  }
+</script>

package/src/components/MeterManage/HandQuery.vue

@@ -1,72 +1,72 @@
-<template >
-  <div id="stand-work-list" class="flex bg-white p-10">
-    <div class="height:auto">
-      <criteria-paged :model="model" v-ref:paged  >
-        <data-grid :model="model" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th>序号</th>
-              <th><nobr>上次实际结余</nobr></th>
-              <th><nobr>本次实际结余</nobr></th>
-              <th><nobr>上次抄表底数 </nobr></th>
-              <th><nobr>本次抄表底数 </nobr></th>
-              <th><nobr>缴费日期</nobr></th>
-            </tr>
-          </template>
-          <template partial='body' partial='list' v-ref:grid>
-            <tr >
-              <td style="text-align: center;">{{$index+1}}</td>
-              <td style="text-align:center">{{row.f_balance}}</td>
-              <td style="text-align:center">{{row.f_curbalance}}</td>
-              <td style="text-align:center">{{row.f_last_tablebase}}</td>
-              <td style="text-align:center">{{row.f_tablebase}}</td>
-              <td style="text-align:center">{{row.f_hand_date}}</td>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-
-  export default {
-    title: '抄表',
-    data () {
-      return {
-        condition: '1=1',
-        model: new PagedList('rs/sql/manage_singleTable', 20, {items: '`*`', tablename: '`t_handplan`', orderitem: '`f_hand_date DESC`'}),
-        row: null,
-        isdeal: true,
-        show: false
-      }
-    },
-    props:
-      {
-        f_userinfo_id: '',
-        isdeal: {},
-        args:{}
-      },
-    ready () {
-      console.log('-------------ready handquery')
-      this.search()
-    },
-    methods: {
-      search(){
-        this.condition = `f_userinfo_id = ${this.f_userinfo_id} `
-        if(this.args.model.f_start_date) this.condition += `and f_hand_date >= '${this.args.model.f_start_date}' `
-        if(this.args.model.f_end_date) this.condition += `and f_hand_date <= '${this.args.model.f_end_date}' `
-        this.model.search(this.condition, this.args.model)
-      }
-    },
-    watch: {
-      args(val){
-        this.search()
-      }
-    }
-  }
-</script>
-
+<template >
+  <div id="stand-work-list" class="flex bg-white p-10">
+    <div class="height:auto">
+      <criteria-paged :model="model" v-ref:paged  >
+        <data-grid :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th><nobr>上次实际结余</nobr></th>
+              <th><nobr>本次实际结余</nobr></th>
+              <th><nobr>上次抄表底数 </nobr></th>
+              <th><nobr>本次抄表底数 </nobr></th>
+              <th><nobr>缴费日期</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align: center;">{{$index+1}}</td>
+              <td style="text-align:center">{{row.f_balance}}</td>
+              <td style="text-align:center">{{row.f_curbalance}}</td>
+              <td style="text-align:center">{{row.f_last_tablebase}}</td>
+              <td style="text-align:center">{{row.f_tablebase}}</td>
+              <td style="text-align:center">{{row.f_hand_date}}</td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '抄表',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('rs/sql/manage_singleTable', 20, {items: '`*`', tablename: '`t_handplan`', orderitem: '`f_hand_date DESC`'}),
+        row: null,
+        isdeal: true,
+        show: false
+      }
+    },
+    props:
+      {
+        f_userinfo_id: '',
+        isdeal: {},
+        args:{}
+      },
+    ready () {
+      console.log('-------------ready handquery')
+      this.search()
+    },
+    methods: {
+      search(){
+        this.condition = `f_userinfo_id = ${this.f_userinfo_id} `
+        if(this.args.model.f_start_date) this.condition += `and f_hand_date >= '${this.args.model.f_start_date}' `
+        if(this.args.model.f_end_date) this.condition += `and f_hand_date <= '${this.args.model.f_end_date}' `
+        this.model.search(this.condition, this.args.model)
+      }
+    },
+    watch: {
+      args(val){
+        this.search()
+      }
+    }
+  }
+</script>
+