manage-client 3.3.135 → 3.3.136-mx

package/package.json

@@ -1,111 +1,111 @@
-{
-  "name": "manage-client",
-  "version": "3.3.135",
-  "description": "经营管控模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {
-    "crypto-js": "^4.1.1",
-    "swiper": "^5.4.5"
-  },
-  "devDependencies": {
-    "axios": "0.15.3",
-    "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",
-    "filemanager-webpack-plugin": "^2.0.5",
-    "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.7",
-    "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",
-    "swiper": "^5.4.5",
-    "system-clients": "3.2.61",
-    "url-loader": "^0.5.7",
-    "vue-amap": "0.5.10",
-    "vue-client": "1.24.123",
-    "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",
-    "webpack-parallel-uglify-plugin": "^1.0.0"
-  },
-  "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",
-    "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
-    "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true 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.3.136-mx",
+  "description": "经营管控模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "swiper": "^5.4.5"
+  },
+  "devDependencies": {
+    "axios": "0.15.3",
+    "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",
+    "filemanager-webpack-plugin": "^2.0.5",
+    "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.7",
+    "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",
+    "swiper": "^5.4.5",
+    "system-clients": "3.2.61",
+    "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
+    "vue-client": "1.24.123",
+    "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",
+    "webpack-parallel-uglify-plugin": "^1.0.0"
+  },
+  "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",
+    "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true 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/components/sale/config/exportConfig.js

@@ -674,7 +674,7 @@ export default{
   },
   ReportListConfig: {
     'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址',
-    'f_hand_date': '上报日期', 'f_jval': '表内剩余金额', 'f_tablebase': '本次抄表底数', 'f_valvestate': '阀门状态',
+    'f_hand_date': '上报日期', 'f_jval': '表内剩余金额', 'f_tablebase': '本次抄表底数', 'f_valvestate': '阀门状态', 'flowmetertemperature': '温度', 'flowmeterpressure': '压力',
     'f_upload_type': '上报类型', 'f_insert_date': '系统接收时间', 'f_meterDebitAmt': '表内累计充值金额',
     'f_signal': '噪音强度', 'f_snr': '信噪比', 'f_batterylevel': '电压', 'f_lowlithiumbattery': '电压状态', 'f_networkshutvalve': '阀门强制状态',
     'f_wmprepaytype': '计量类型', 'f_moneystate': '金额状态', 'f_magneticInterference': '磁干扰异常', 'f_compensateState': '补偿状态'

package/src/components/valueaddinfo/valueAddUserQuery.vue

@@ -160,7 +160,7 @@
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
               <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
-                <nobr>{{row.f_orgname}}</nobr>
+                <nobr>{{row.f_remark}}</nobr>
               </td>
             </template>
             <template partial='foot'></template>

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -442,7 +442,7 @@
         this.operators = []
          this.$MagGetSaleParam.inputtors.forEach((res) => {
           if(res.rolestr != null &&  res.rolestr!='' ){
-            if(res.rolestr.indexOf("营业员")>-1 && res.f_orgid == orgid) {
+            if( res.f_orgid == orgid) {
               let temp = {
                 label :res.name,
                 value:res.name,

package/src/components/webmeter/report/ReportList.vue

@@ -132,6 +132,9 @@
                 <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>
@@ -157,6 +160,8 @@
                 <th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.flowmetertemperature}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.flowmeterpressure}}</nobr></th>
 
 
                 <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>

package/src/filiale/lixianV3/HandplanQuery.vue

@@ -351,6 +351,12 @@
                 <th>
                   <nobr>抄表员</nobr>
                 </th>
+                <th>
+                  <nobr>用气性质</nobr>
+                </th>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
                 <th>
                   <!--                  <nobr>录入日期</nobr>-->
                   <data-order field="f_input_date" name="录入日期"
@@ -522,6 +528,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_inputtor}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_input_date}}</nobr>
               </td>

package/src/filiale/lixianV3/config/exportConfig.js

@@ -792,6 +792,8 @@ export default {
     'f_curbalance': '本期余额',
     'f_input_person': '录入人员',
     'f_inputtor': '抄表员',
+    'f_gasproperties': '用气性质',
+    'f_meter_brand': '气表品牌',
     'f_input_date': '录入日期',
     'f_whether_pay': '是否缴费',
     'f_operator': '下发人员',

package/src/filiale/qianneng/HandplanQuery.vue

@@ -483,6 +483,9 @@
                 <th>
                   <nobr>状态</nobr>
                 </th>
+                <th>
+                  <nobr>是否单户抄表</nobr>
+                </th>
                 <th>
                   <nobr>下发人员</nobr>
                 </th>
@@ -646,6 +649,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_hand_state}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_isone == '是' ? '是': '否'}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operator}}</nobr>
               </td>

package/src/filiale/shanxian/UserQuery.vue

@@ -209,22 +209,22 @@
                   <!--            </div>-->
                   <div class="col-sm-2 form-group">
                     <label for="startDate" class="font_normal_body">开始日期</label>
-                    <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                    <datepicker id="startDate" placeholder="开户日期" style="width:60%"
                                 v-model="model.startDate"
                                 :value.sync="model.startDate"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
-                                condition="f_createfile_date >= '{} 00:00:00'">
+                                condition="f_open_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label for="endDate" class="font_normal_body">结束日期</label>
-                    <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                    <datepicker id="endDate" placeholder="开户日期" style="width:60%"
                                 v-model="model.endDate"
                                 :value.sync="model.endDate"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
-                                condition="f_createfile_date <= '{} 23:59:59'">
+                                condition="f_open_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
                   <!--表册片区-->

package/src/filiale/yuncheng/GasInspection.vue

@@ -0,0 +1,596 @@
+<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 form-group">
+              <label class="font_normal_body">公&emsp;&emsp;司&emsp;</label>
+              <right-tree @re-res="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.org'></right-tree>
+            </div>
+
+            <div class="col-sm-2 form-group ">
+              <label for="startDate" class="font_normal_body">抄表开始&emsp;</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          style="width:60%"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group ">
+              <label for="startDate" class="font_normal_body">抄表结束&emsp;</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          style="width:60%"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+
+            <div class="col-sm-2 form-group ">
+              <label for="f_gasproperties"class="font_normal_body">用气性质&emsp;</label>
+              <v-select id="f_gasproperties"
+                        style="width:60%"
+                        v-model="model.f_gasproperties"
+                        placeholder='用气性质'
+                        :value.sync="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select >
+              </v-select>
+            </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 :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            :footer="$parent.$parent.footer"
+                            :header="$parent.$parent.other"
+                            sqlurl="rs/logic/exportfile"
+                            :sql-name="$parent.$parent.sqlName"
+                            template-name='用气稽查导出'  :choose-col="true"></export-excel>
+              <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :sumsmodel="$parent.$parent.sumsmodel" ></print-data>
+              <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 class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户状态&emsp;  </label>
+              <v-select :value.sync="model.f_user_state"
+                        v-model="model.f_user_state"
+                        :options='$parent.$parent.userstates' placeholder='请选择'
+                        condition="f_user_state = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表状态&emsp;</label>
+              <v-select :value.sync="model.f_table_state"
+                        v-model="model.f_table_state"
+                        :options='$parent.$parent.tablestate' placeholder='请选择'
+                        condition="f_table_state = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">表&emsp;&emsp;号&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                     condition="f_meternumber = '{}'" placeholder='表号'>
+            </div>
+            <div class="col-sm-2 form-group ">
+              <label class="font_normal_body">用户类型&emsp;</label>
+              <v-select :value.sync="model.f_user_type"
+                        @change="$parent.$parent.userTypeChange()"
+                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户名称&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     condition="f_user_name like '%{}%'" placeholder="客户名称">
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户编号&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                     condition="f_userinfo_code = '{}' " placeholder="客户编号">
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="旧客户编号">档案编号&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                     condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">表箱号&emsp;&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
+                     condition="f_metertitles = '{}'" placeholder="表箱号">
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户地址&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                     condition="f_address like '%{}%'" placeholder='客户地址'>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户电话&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                     condition="f_user_phone like '%{}%'" placeholder="客户电话">
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表品牌&emsp;</label>
+              <v-select :value.sync="model.f_meter_brand"
+                        v-model="model.f_meter_brand"
+                        :options='$parent.$parent.meterbrands' placeholder='请选择'
+                        condition="f_meter_brand = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">表册片区&emsp;</label>
+              <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"
+                        :options='$parent.$parent.bookSlice' placeholder='片区/表册'
+                        style="width:60%"
+                        close-on-select
+                        condition="f_book_slice_area = '{}'"></v-select>
+            </div>
+            <div class="col-sm-2 ">
+              <label for="f_meter_classify"class="font_normal_body">表类型&emsp;&emsp;</label>
+              <v-select id="f_meter_classify"
+                        v-model="model.meter_classify"
+                        placeholder='表类型'
+                        style="width:70%"
+                        :value.sync="model.meter_classify"
+                        :options='$parent.$parent.f_meter_classify'
+                        condition="f_meter_classify like '%{}'"
+                        :value-single="true"
+                        close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">欠费月数&emsp;</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummax"
+                       placeholder="">
+              </div>
+            </div>
+
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">欠费条数&emsp;</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">总欠费气量</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmin"
+                       placeholder="">
+                <label   class="font_normal_body"> ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">总欠费金额</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">欠费月平均气量</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">用气量&emsp;&emsp;</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_min"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_max"
+                       placeholder="">
+              </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>
+            <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>
+            <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>
+            <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'>
+          <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
+          <td style="text-align: center;"><nobr>
+            <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+          </nobr> </td>
+          <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
+          <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_metertitles}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_book_slice_area}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.end_time}}</nobr></th>
+          <th style="text-align:center"><nobr>{{row.flowmetertemperature}}</nobr></th>
+          <th style="text-align:center"><nobr>{{row.flowmeterpressure}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_oughtamount}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_oughtfee}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.qianfei_month_num}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.qianfei_num}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.qianfei_avg_gas}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_totalowe_gas}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_totalowe_fee}}</nobr></th>
+        </template>
+      </data-grid>
+    </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">总用气量:&emsp;&emsp;{{sumsmodel.f_oughtamount}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总用气金额:&emsp;&emsp;{{sumsmodel.f_oughtfee}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费条数:&emsp;&emsp;{{sumsmodel.qianfei_num}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费气量:&emsp;{{sumsmodel.f_totalowe_gas}}</td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费金额:&emsp;{{sumsmodel.f_totalowe_fee}}</td>
+          </tr>
+        </table>
+  </div>
+      <div class="flex" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div></div>
+</template>
+<script>
+  /**
+   *用户档案查询列表以及添加操作组件
+   */
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+  import exportConfig from "./config/exportConfig";
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.initSlice(self.$login.f.orgid)
+    let year = new Date().getFullYear()
+    self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString() + ' 23:59:59'
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '用气稽查',
+    data () {
+      return {
+        other:[],
+        footer:[],
+        org:[this.$login.f.orgid],
+        criteriaShow: false,
+        filialeNameStr: null,
+        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+        model: new PagedList('rs/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{
+          f_oughtamount:0,
+          f_oughtfee:0,
+          qianfei_num:0,
+          f_totalowe_gas:0,
+          f_totalowe_fee:0
+        }),
+        rows: null,
+        //orgid:'',
+        sumsmodel: {},
+        sqlName:'getGasInspection',
+        config: {
+          defaultPrint: ['f_userinfo_code','f_user_id']
+        },
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        // qianfei_month_nummin:null,
+        // qianfei_month_nummax:null,
+        // qianfei_nummin:null,
+        // qianfei_nummax:null,
+        // qianfei_avg_gasmin:null,
+        // qianfei_avg_gasmax:null,
+        // f_totalowe_feemin:null,
+        // f_totalowe_feemax:null,
+        // f_totalowe_gasmin:null,
+        // f_totalowe_gasmax:null,
+        mycondition:null,
+        defaultfield: [],
+        meterbrands: [],
+        // 表册片区
+        bookSlice:[]
+      }
+    },
+    watch:{
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
+    },
+    ready () {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      // 初始化抄表册片区
+      async initSlice (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          this.bookSlice = [{label: '全部',value: ''}]
+          arr.forEach((res) => {
+            this.bookSlice.push({label: res.name, value: res.name})
+          })
+        }
+      },
+      initParams () {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+      getotherfooter(){
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other=[];
+        this.footer=[];
+        // let exportdata = this.$refs.paged.$refs.cri.model.model.mycondition;
+        let otherInData=[];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      async getorg (obj) {
+        console.log('组织变化',obj)
+        if(obj && obj.resids && obj.resids[0]){
+          this.initSlice(obj.resids[0])
+        }
+
+        if(obj.resids.length>0){
+          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
+        }
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.model.model !==null) {
+          this.$refs.paged.model.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.model.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+          console.log(this.gasproperties )
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+        let a = " and 1=1 "
+        let m=this.$refs.paged.$refs.cri.model.model;
+        if(m.qianfei_month_nummin!=null && m.qianfei_month_nummin!=''){
+          a += " and qianfei_month_num >= "+this.$refs.paged.$refs.cri.model.model.qianfei_month_nummin
+        }
+        if(m.qianfei_month_nummax!=null&&m.qianfei_month_nummax!=''){
+          a+=' and qianfei_month_num <= '+this.$refs.paged.$refs.cri.model.model.qianfei_month_nummax
+        }
+        if(m.qianfei_nummin!=null&&m.qianfei_nummin!=''){
+          a += " and qianfei_num >= "+this.$refs.paged.$refs.cri.model.model.qianfei_nummin
+        }
+        if(m.qianfei_nummax!=null&&m.qianfei_nummax!=''){
+          a +=" and qianfei_num <= "+this.$refs.paged.$refs.cri.model.model.qianfei_nummax
+        }
+        if(m.qianfei_avg_gasmin!=null&&m.qianfei_avg_gasmin!=''){
+          a +=" and qianfei_avg_gas >= "+this.$refs.paged.$refs.cri.model.model.qianfei_avg_gasmin
+        }
+        if(m.qianfei_avg_gasmax!=null&&m.qianfei_avg_gasmax!=''){
+          a += " and qianfei_avg_gas <= "+this.$refs.paged.$refs.cri.model.model.qianfei_avg_gasmax
+        }
+        if(m.f_totalowe_feemin!=null&&m.f_totalowe_feemin!=''){
+          a += " and f_totalowe_fee >= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_feemin
+        }
+        if(m.f_totalowe_feemax!=null&&m.f_totalowe_feemax!=''){
+          a += " and f_totalowe_fee <= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_feemax
+        }
+        if(m.f_totalowe_gasmin!=null&&m.f_totalowe_gasmin!=''){
+          a +=  " and f_totalowe_gas >= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_gasmin
+        }
+        if(m.f_totalowe_gasmax!=null&&m.f_totalowe_gasmax!=''){
+          a += " and f_totalowe_gas <= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_gasmax
+        }
+        if (m.f_oughtamount_min) {
+          a += " and f_oughtamount >= "+this.$refs.paged.$refs.cri.model.model.f_oughtamount_min
+        }
+        if (m.f_oughtamount_max) {
+          a += " and f_oughtamount <= "+this.$refs.paged.$refs.cri.model.model.f_oughtamount_max
+        }
+        if (m.f_book_slice_area) {
+          a += ` and f_book_slice_area = '${this.$refs.paged.$refs.cri.model.model.f_book_slice_area}'`
+        }
+        if(this.$refs.paged.$refs.cri.model.startDate){
+          this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate}' `
+        }else{
+          this.model.params.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+        }
+
+        if(this.$refs.paged.$refs.cri.model.endDate){
+          this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate}' `
+        }else{
+          this.model.params.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+        }
+        this.mycondition = a
+        args.condition = args.condition+ ` ${this.filialeCodeStr}`
+        args.condition = args.condition+ ` ${a}`
+        console.log("拼接的condition", args.condition, this.model)
+        this.model.search(args.condition, args.model)
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear(){
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          if (key != 'startDate' && key != 'endDate')
+            if (key == 'model')
+              this.$refs.paged.$refs.cri.model[key] = {}
+            else
+              this.$refs.paged.$refs.cri.model[key] = []
+        })
+        this.$refs.paged.$refs.cri.model.contain_newfile='是'
+        let year = new Date().getFullYear()
+        this.$refs.paged.$refs.cri.model.startDate =  year+'-01-01'
+        this.$refs.paged.$refs.cri.model.endDate =  this.$login.toStandardDateString()
+      }
+
+    },
+    computed: {
+      userstates (){
+       return this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
+      },
+      tablestate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+      },
+      getfield() {
+        return exportConfig.gasInspectionConfig
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      gasproperties() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
+      f_meter_classify(){
+        return [{label: '全部', value: ''}, {label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '网表', value: '物联网表'} ]
+        // return [{label: '卡表', value: '卡表'}]
+      },
+      getCondition () {
+        let result = {
+          condition: '',
+          startDate: '',
+          endDate: '',
+          mycondition:''
+        }
+        result.condition = this.$refs.paged.$refs.cri.condition + this.filialeCodeStr
+        result.condition = result.condition + this.mycondition
+        let temp2 = this.$refs.paged.$refs.cri
+        if (temp2.model.startDate && temp2.model.endDate) {
+          result.startDate = ` '${temp2.model.startDate}'`
+          result.endDate = ` '${temp2.model.endDate}'`
+        } if (!temp2.model.startDate && !temp2.model.endDate) {
+          result.startDate =  this.$login.toStandardDateString() + ' 00:00:00'
+          result.endDate =  this.$login.toStandardDateString() + ' 23:59:59'
+        }
+          if (temp2.model.startDate&&!temp2.model.endDate) {
+            result.startDate = ` '${temp2.model.startDate}'`
+            result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+          } if (temp2.model.endDate&&!temp2.model.startDate) {
+            result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+            result.endDate = ` '${temp2.model.endDate}'`
+          }
+        if (temp2.model.contain_newfile==='否'){
+          result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate
+        }
+        return result
+      }
+    }
+  }
+</script>
+<style media="screen">
+  .divtext {
+    min-width: 50px;
+    max-width: 200px;
+    border: 1px solid green;
+    display: inline-block;
+  }
+</style>
+

package/src/filiale/yuncheng/config/exportConfig.js

@@ -737,7 +737,7 @@ export default{
   },
   gasInspectionConfig: {'f_userinfo_code': '客户编号','f_user_phone': '客户电话', 'f_olduserinfo_code': '档案编号', 'f_meternumber': '表号', 'f_user_name': '客户名称',
     'f_address': '地址', 'f_metertitles': '表箱号', 'f_user_type': '用户类型', 'f_gasproperties': '用气性质', 'f_table_state': '表具状态',
-    'f_meter_brand': '气表品牌', 'f_book_slice_area': '表册片区', 'end_time': '最后抄表日期', 'f_meter_base': '表底数',
+    'f_meter_brand': '气表品牌', 'f_book_slice_area': '表册片区', 'end_time': '最后抄表日期', 'f_meter_base': '表底数', 'flowmetertemperature': '温度', 'flowmeterpressure': '压力',
     'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'qianfei_month_num': '欠费月数', 'qianfei_num': '欠费条数',
     'qianfei_avg_gas': '欠费月平均气量', 'f_totalowe_gas': '欠费气量', 'f_totalowe_fee': '欠费金额'},
   surplusConfig: {

package/src/filiale/yuncheng/sale.js

@@ -9,4 +9,8 @@ export default function () {
   Vue.component('record-info-query', (resolve) => {
     require(['./RecordInfoQuery'], resolve)
   })
+  // 用气稽查查询
+  Vue.component('gas-inspection', (resolve) => {
+    require(['./GasInspection'], resolve)
+  })
 }