manage-client 3.2.70 → 3.2.71-wuan

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Sat Jul 31 14:45:02 CST 2021
-gradle.version=4.4
+#Mon Oct 26 16:02:57 CST 2020
+gradle.version=6.1.1

package/CHANGELOG.md

@@ -13,4 +13,3 @@
 
 ## 1.2.0 -2018-11-11 @何宁社
 - 去掉样式
-- 

package/build/dev-server.js

@@ -75,7 +75,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/file': {
-    target: bendi
+    target: fuwu
   },
   '/rs/logic/SumSettleFileImport': {
     target: 'http://127.0.0.1:8080'

package/package.json

@@ -1,101 +1,101 @@
-{
-  "name": "manage-client",
-  "version": "3.2.70",
-  "description": "经营管控模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "axios": "^0.21.1",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.28",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "3.4.14",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-20",
-    "url-loader": "^0.5.7",
-    "vue-amap": "0.5.10",
-    "vue-client": "1.24.33",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/management_modules.git"
-  },
-  "keywords": [
-    "manage"
-  ],
-  "author": "liuxudong",
-  "license": "ISC"
-}
+{
+  "name": "manage-client",
+  "version": "3.2.71-wuan",
+  "description": "经营管控模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "axios": "^0.21.1",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.28",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.4.14",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.1.89-20",
+    "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
+    "vue-client": "1.24.33",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js --single-run",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/management_modules.git"
+  },
+  "keywords": [
+    "manage"
+  ],
+  "author": "liuxudong",
+  "license": "ISC"
+}

package/src/App.vue

@@ -1,28 +1,28 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
-          <!--<route :comp="{name: 'meter-reading'}"></route>-->
-          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
-          <!--<route :comp="{name: 'vender-management'}"></route>-->
-          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
-          <route :comp="{name: 'login'}"></route>
-          <!-- <route :comp="{name: 'load-data'}"></route> -->
-           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
-          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-
-
-}
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
+          <!--<route :comp="{name: 'meter-reading'}"></route>-->
+          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
+          <!--<route :comp="{name: 'vender-management'}"></route>-->
+          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
+          <route :comp="{name: 'login'}"></route>
+          <!-- <route :comp="{name: 'load-data'}"></route> -->
+           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
+          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+
+
+}
+</script>

package/src/components/MeterManage/MeterList.vue

@@ -163,11 +163,11 @@
               <td ><nobr>{{row.f_address}}</nobr></td>
               <td style="text-align:center" v-show="$parent.$parent.$parent.isdeal">
                 <nobr>
-                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_meternumber}}</a></span>
+                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_user_id}}</a></span>
                 </nobr>
               </td>
               <td style="text-align:center;color:#3c763d" v-show="!$parent.$parent.$parent.isdeal"><nobr>
-                <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_meternumber}}</a></span>
+                <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_user_id}}</a></span>
               </nobr></td>
               <td style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_brand}}</nobr></td>

package/src/components/SellReport/ManageBusSummary.vue

@@ -28,24 +28,28 @@
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
               <right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
             </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='department'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getdep"
-                          :parentresid="$parent.$parent.depresid"
-                          :initresid='$parent.$parent.depid'>
-              </res-select>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+              <v-select id="dep" style="width: 60%"
+                        :multiple="true"
+                        @change="$parent.$parent.getDep"
+                        :value.sync="model.f_depid"
+                        v-model="model.f_depid"
+                        :options='$parent.$parent.depresid' placeholder='请选择'
+                        condition="f_depid in {}">
+              </v-select>
 
             </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='user'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getuser"
-                          :parentresid="$parent.$parent.userresid"
-                          :initresid='$parent.$parent.operatorid'>
-              </res-select>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+              <v-select id="oper" style="width: 60%"
+                        :multiple="false"
+                        @change="$parent.$parent.getOpe"
+                        :value.sync="model.f_operatorid"
+                        v-model="model.f_operatorid"
+                        :options='$parent.$parent.userresid' placeholder='请选择'
+                        condition="f_operatorid in {}">
+              </v-select>
             </div>
           </div>
           <div class="span" style = "float:right;">
@@ -89,7 +93,7 @@
             <div>
               <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
               <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
-              <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
+              <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
             </div>
           </th>
         </tr>
@@ -107,16 +111,40 @@
         </tr>
         </tfoot>
       </table>
-      {{{ $parent.reportStr}}}
     </div>
   </criteria-paged>
   </div>
 </template>
 
 <script>
-  import { DataModel } from 'vue-client'
-  import co from 'co'
-
+import {DataModel, HttpResetClass} from 'vue-client'
+import co from 'co'
+let getorg = async function (self) {
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_department',
+        condition: `1=1`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.depresid = res.data
+    })
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_user',
+        condition: `state = '在职' and f_department_name is not null`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.userresid = res.data
+    })
+}
   export default {
     title: '收费结账报表',
     props: ['data'],
@@ -135,7 +163,7 @@
         criteriaShow: false,
         operatorname: '',
         orgCondtionStr: '1=1',
-        f_state:['有效'],
+        f_state:'',
         model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
@@ -148,6 +176,7 @@
       }
     },
     ready () {
+      getorg(this)
       this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
       console.log(this.$login.f)
@@ -158,20 +187,14 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition ='1=1'
-        if (this.f_orgid && this.f_orgid[0]) {
-          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
-        }
-        if (this.f_depid && this.f_depid[0]) {
-          orgcondition += ' and f_depid in (' + this.f_depid + ')'
-        }
-        if(this.f_operatorid && this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+        let orgcondition = ''
+        if (this.f_orgid[0]) {
+          orgcondition += ` and f_orgid in ('${this.f_orgid.toString().replace(/,/g, "','")}')`
         }
         if(this.f_state && this.f_state[0]) {
           orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
         }
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.$refs.criteria.model.f_orgid = args.condition + orgcondition
         this.$refs.paged.search(args)
       },
 
@@ -180,18 +203,16 @@
       },
       getRes (obj) {
         this.orgname = obj.res[0]
-        this.depresid = obj.resids
         this.f_orgid = obj.resids
       },
-      getdep (obj, val) {
-        this.depname = val[0]
-        this.userresid = obj
-        this.f_depid = obj
+      getDep(val){
+        this.depname = this.depresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+        console.log('dep',this.depname )
+      },
+      getOpe(val){
+        this.operatorname = this.userresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+        console.log('operatorname',this.operatorname )
       },
-      getuser ( obj, val) {
-        this.operatorname = val[0]
-        this.f_operatorid = obj
-      }
     },
     watch: {
       'model.data' (val) {