sale-client 3.6.263 → 3.6.264

package/package.json

@@ -1,120 +1,120 @@
-{
-  "name": "sale-client",
-  "version": "3.6.263",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "webpack-dev-server --config ./build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf lib && mkdirp lib && cross-env 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/product.git"
-  },
-  "dependencies": {
-    "crypto-js": "^4.1.1",
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.24.137",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.2.56",
-    "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",
-    "compression-webpack-plugin": "1.1.2",
-    "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": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "file-loader": "^0.8.4",
-    "filemanager-webpack-plugin": "^2.0.5",
-    "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.62",
-    "less": "^2.7.3",
-    "manage-client": "3.1.8-88",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "qrcodejs2": "0.0.2",
-    "rimraf": "^2.5.0",
-    "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.2.61",
-    "url-loader": "^0.5.7",
-    "vue-clipboard2": "0.3.1",
-    "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": "^3.12.0",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "webpack-parallel-uglify-plugin": "^1.0.0",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "keywords": [
-    "selling-clients"
-  ],
-  "author": "张桥",
-  "license": "ISC",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "3.6.264",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "webpack-dev-server --config ./build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env 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/product.git"
+  },
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "webpack-dev-server": "^2.11.5",
+    "vue-client": "1.24.137",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.2.56",
+    "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",
+    "compression-webpack-plugin": "1.1.2",
+    "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": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "file-loader": "^0.8.4",
+    "filemanager-webpack-plugin": "^2.0.5",
+    "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.62",
+    "less": "^2.7.3",
+    "manage-client": "3.1.8-88",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "qrcodejs2": "0.0.2",
+    "rimraf": "^2.5.0",
+    "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.2.61",
+    "url-loader": "^0.5.7",
+    "vue-clipboard2": "0.3.1",
+    "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": "^3.12.0",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "keywords": [
+    "selling-clients"
+  ],
+  "author": "张桥",
+  "license": "ISC",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/components/revenue/comprehen/Maintenance/hand/handListMaintain.vue

@@ -556,11 +556,12 @@ const myMap = new Map()
         this.show = true
       },
       selfSearch (args) {
+        console.log('>>> args = ', args)
         if (!this.f_orgid) {
           this.f_orgid = this.$login.f.orgid
         }
         let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and h.f_orgid in ('" + this.f_orgid + "')"
-        args.condValueStr = `${args.condValueStr} ` + f_orgstr
+        args.condValueStr = `${args.condValueStr === undefined ? '1=1' : args.condValueStr} ` + f_orgstr
         this.model.search(args.condition, args.model, args.condValueStr)
         this.condition = args.condition
         this.condValueStr = args.condValueStr

package/src/filiale/jingyang/GovernmentSell.vue

@@ -1,329 +1,329 @@
-<template>
-
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
-        <div class="form-horizontal select-overspread container-fluid auto" novalidate  partial>
-          <div class="row">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户状态</label>
-              <v-select id=""
-                        v-model="$parent.$parent.f_whether"
-                        placeholder='用户状态'
-                        :value.sync="$parent.$parent.f_whether"
-                        :options='$parent.$parent.whether'
-                        style="width: 60%"
-                        close-on-select >
-              </v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">气表类型</label>
-              <v-select :value.sync="model.f_meter_classify" v-model="model.f_meter_classify"
-                        :options='$parent.$parent.meters' placeholder='气表类型'
-                        close-on-select
-                        condition="f_meter_classify = '{}'"
-                        style="width: 60%"
-                        default-value="'机表'">
-
-              </v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
-                        :options='$parent.$parent.getusertype' placeholder='用户类型'
-                        close-on-select
-                        condition="f_user_type = '{}'"
-                        style="width: 60%">
-
-              </v-select>
-            </div>
-
-            <div class="span" style="float:right;">
-              <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
-              <button class="button_clear button_spacing width-60" @click="$parent.$parent.arrcreate()">附件上传</button>
-              <button v-show="$parent.$parent.rollback" class="button_clear button_spacing width-60" @click="$parent.$parent.retrun()"  v-el:cba>返回</button>
-
-              <div
-                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                @click="$parent.$parent.hidden()" class="button_spacing" style="float: right">
-              </div>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body">开始日期</label>
-              <datepicker placeholder="开始日期"
-                          style="width:60%"
-                          class="datepicker"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-              ></datepicker>
-            </div>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body">结束日期</label>
-              <datepicker placeholder="结束日期"
-                          style="width:60%"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-              ></datepicker>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户编号</label>
-              <input  type="text" class="form-control" v-model="model.f_userinfo_code" placeholder='用户编号' v-filter v-figure_filter
-                      condition="f_userinfo_code = '{}'" v-next-el='username'  style="width: 60%"
-                      :size="model.f_userinfo_code ? model.f_userinfo_id.length  : 4">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户姓名</label>
-              <input  type="text" class="form-control" v-model="model.f_user_name" placeholder='用户姓名'
-                      condition="f_user_name like '{}'" v-next-el='area'  style="width: 60%"
-                      :size="model.f_user_name ? model.f_user_name.length * 2 : 4">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">选择小区</label>
-              <v-select :value.sync="model.f_residential_area" :value-single="true"
-                        class="select_list select"
-                        style="width: 60%"
-                        condition="f_residential_area like '%{}%'"
-                        :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                        close-on-select search="true">
-              </v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">付款类型</label>
-              <v-select :value.sync="model.f_payment" :value-single="true"
-                        class="select_list select"
-                        v-model="model.f_payment"
-                        style="width: 60%"
-                        :options='$parent.$parent.chonetype' placeholder='付款类型'
-                        condition="f_cost_type like '{}'"
-                        close-on-select search="true">
-              </v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">应交金额</label>
-              <v-input :value.sync="$parent.f_oughtfee" :expression.sync = 'model.f_oughtfee'
-                       condition="f_oughtfee {}" v-model="model.f_oughtfee"  style="width: 60%"
-                       placeholder="应交金额" v-next-el="cx" ></v-input>
-            </div>
-          </div>
-
-
-
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' class="table_sy"  v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>
-              <input type="checkbox"  @click="$parent.$parent.$parent.isAll(model.pageIndex)">
-            </th>
-            <th>序号</th>
-            <th>用户编号</th>
-            <th>用户姓名</th>
-            <th>身份证号</th>
-            <th>表号</th>
-            <th>补贴气量</th>
-            <th>补贴气量</th>
-            <th>补贴金额</th>
-            <th>备注</th>
-            <th>表具类型</th>
-            <th>导入时间</th>
-            <th>充值时间</th>
-            <th>充值编号</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td style="text-align:center">
-            <input type="checkbox" v-model="$parent.$parent.$parent.ids"
-                   :value="row.f_userinfo_id">
-          </td>
-          <td>{{$index+1}}</td>
-          <td style="text-align:center">{{row.f_userinfo_id}}&nbsp;&nbsp;{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}</td>
-          <td style="text-align:center">{{row.f_userinfo_code}}</td>
-          <td style="text-align:center">{{row.f_user_type}}</td>
-          <td style="text-align:center">{{row.f_residential_area}}</td>
-          <td style="text-align:center">{{row.f_input_date}}</td>
-          <td style="text-align:center">{{row.f_last_tablebase.toFixed(2)}}</td>
-          <td style="text-align:center">{{row.f_tablebase.toFixed(2)}}</td>
-          <td style="text-align:center">{{row.f_oughtamount.toFixed(2)}}</td>
-          <td style="text-align:center">{{row.f_oughtfee.toFixed(2)}}</td>
-          <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
-          <td style="text-align:center">{{row.f_oughtfee_all.toFixed(2)}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-      <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
-        <article slot="modal-body" class="modal-body">
-          <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile"
-                       tagname="确定" multiple v-ref:file></file-upload>
-          <button class="button_clear btn-gn" style="margin-top: 10px;background-color: #6aa6e2;"
-                  @click="downloadFiles()">模板下载
-          </button>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-        </footer>
-      </modal>
-</template>
-
-<script>
-  /**
-   *阶梯水价查询列表
-   */
-  import { PagedList, HttpResetClass } from 'vue-client'
-  import Vue from 'vue'
-  import axios from 'axios'
-  export default {
-    data () {
-      return {
-        model: new PagedList('rs/sql/arrearsQuery', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate',condValue:'` 1=1 `',orderitem: '"' + this.orderitem + '"'}),
-        batchMeterShow: false
-      }
-    },
-    props: {
-      orderitem: {
-        type: String,
-        default: 'p.f_userinfo_id'
-      },
-      rollback: false
-    },
-    ready () {
-      this.getaddress()
-      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-      this.search({condition: `1=1 `, model: this.$refs.paged.$refs.cri.model})
-    },
-    watch: {
-      'f_whether' (val) {
-        if (val[0] === '全部') {
-          this.f_whether = '欠费'
-          this.$dispatch('all', '全部')
-        }
-      }
-    },
-    methods: {
-      downloadFiles() {
-        let downurl = 'rs/downloadfile/file?filename=政府补贴导入Excel模板'
-        this.$downFile(downurl, '政府补贴导入Excel模板.xlsx')
-      },
-
-      search (args) {
-        args.condition = `${args.condition} and f_orgid = ` + `'${Vue.$login.f.orgid}'`
-        console.log('查看条件', args.condition)
-        this.model.search(args.condition, args.model)
-      },
-
-      arrcreate () {
-        this.arrshow = true
-      },
-      isAll (page) {
-        if (this.pages.includes(page)) { // 已添加,取消动作
-          // 从ids中删除本页所有数据的ids
-          this.addOrRemove(false)
-          this.pages = this.pages.filter((item) => {
-            return item !== page
-          })
-        } else { // 未添加
-          this.pages.push(page) // 添加id，添加动作
-          this.addOrRemove(true)
-        }
-      },
-      addOrRemove (is) {
-        let that = this
-        if (is) { // 添加本页所有数据到ids中
-          this.model.rows.forEach((row) => {
-            if (!that.ids.includes(row.f_userinfo_id)) {
-              that.ids.push(row.f_userinfo_id)
-            }
-          })
-        } else { // 从ids中取消所有的数据
-          this.model.rows.forEach((row) => {
-            that.ids = that.ids.filter((item) => {
-              return item !== row.f_userinfo_id
-            })
-          })
-        }
-      }
-    },
-    computed: {
-
-    },
-    events:{
-      'onFileUpload': async function (file, res) {
-        if (this.batchMeterShow) {
-          this.iswork = true
-          // 当前上传的是批量导入的档案
-          let param = {
-            filepath: res.f_downloadpath,
-            f_operator: this.$login.f.name,
-            f_operatorid: this.$login.f.id,
-            f_orgid: this.$login.f.orgid,
-            f_orgname: this.$login.f.orgs,
-            f_depid: this.$login.f.depids,
-            f_depname: this.$login.f.deps
-          }
-          let self = this
-          try {
-            await axios.post('rs/logic/newSettleFileImport',
-              {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
-              if (res.data) {
-                self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
-                self.iswork = false
-                // this.$showAlert('导入成功','success',2000)
-              }
-            })
-          } catch (error) {
-            if (error.response) {
-              if (error.response.status == 500) {
-                this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
-              } else if (error.response.status == 404) {
-                this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
-              } else {
-                this.$showAlert(error.response.data, 'danger', 2000)
-              }
-              console.log(error.response.data)
-              console.log(error.response.status)
-              console.log(error.response.headers)
-            } else if (error.request) {
-              console.log(error.request)
-              this.$showAlert(error.request, 'danger', 2000)
-            } else {
-              console.log('Error', error.message)
-              this.$showAlert(error.message, 'danger', 2000)
-            }
-            this.iswork = false
-          }
-          this.batchMeterShow = false
-          // this.$showAlert(`一共上传${res.data.total}条数据, 成功${res.data.successnum}条`, 'success', 2000)
-          this.search()
-        } else {
-          let data = {
-            tablename: 't_userinfo',
-            filepath: res.f_downloadpath,
-            f_operator: this.$login.f.name,
-            f_operatorid: this.$login.f.id,
-            f_orgid: this.$login.f.orgid,
-            f_orgname: this.$login.f.orgs,
-            f_depid: this.$login.f.depids,
-            f_depname: this.$login.f.deps
-          }
-          this.$resetpost('rs/logic/sale_userfilesImp', {data: data}, {
-            resolveMsg: null,
-            rejectMsg: '上传失败'
-          }).then((res) => {
-            this.show = false
-            this.$showAlert(`一共上传${res.data.total}条数据, 成功${res.data.successnum}条`, 'success', 2000)
-            this.search()
-          })
-        }
-      },
-    }
-  }
-</script>
-<style>
-  .form-group{
-    height: 30px;
-  }
-</style>
+<template>
+
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" novalidate  partial>
+          <div class="row">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户状态</label>
+              <v-select id=""
+                        v-model="$parent.$parent.f_whether"
+                        placeholder='用户状态'
+                        :value.sync="$parent.$parent.f_whether"
+                        :options='$parent.$parent.whether'
+                        style="width: 60%"
+                        close-on-select >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :value.sync="model.f_meter_classify" v-model="model.f_meter_classify"
+                        :options='$parent.$parent.meters' placeholder='气表类型'
+                        close-on-select
+                        condition="f_meter_classify = '{}'"
+                        style="width: 60%"
+                        default-value="'机表'">
+
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                        :options='$parent.$parent.getusertype' placeholder='用户类型'
+                        close-on-select
+                        condition="f_user_type = '{}'"
+                        style="width: 60%">
+
+              </v-select>
+            </div>
+
+            <div class="span" style="float:right;">
+              <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
+              <button class="button_clear button_spacing width-60" @click="$parent.$parent.arrcreate()">附件上传</button>
+              <button v-show="$parent.$parent.rollback" class="button_clear button_spacing width-60" @click="$parent.$parent.retrun()"  v-el:cba>返回</button>
+
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.hidden()" class="button_spacing" style="float: right">
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">开始日期</label>
+              <datepicker placeholder="开始日期"
+                          style="width:60%"
+                          class="datepicker"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">结束日期</label>
+              <datepicker placeholder="结束日期"
+                          style="width:60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户编号</label>
+              <input  type="text" class="form-control" v-model="model.f_userinfo_code" placeholder='用户编号' v-filter v-figure_filter
+                      condition="f_userinfo_code = '{}'" v-next-el='username'  style="width: 60%"
+                      :size="model.f_userinfo_code ? model.f_userinfo_id.length  : 4">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户姓名</label>
+              <input  type="text" class="form-control" v-model="model.f_user_name" placeholder='用户姓名'
+                      condition="f_user_name like '{}'" v-next-el='area'  style="width: 60%"
+                      :size="model.f_user_name ? model.f_user_name.length * 2 : 4">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">选择小区</label>
+              <v-select :value.sync="model.f_residential_area" :value-single="true"
+                        class="select_list select"
+                        style="width: 60%"
+                        condition="f_residential_area like '%{}%'"
+                        :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                        close-on-select search="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">付款类型</label>
+              <v-select :value.sync="model.f_payment" :value-single="true"
+                        class="select_list select"
+                        v-model="model.f_payment"
+                        style="width: 60%"
+                        :options='$parent.$parent.chonetype' placeholder='付款类型'
+                        condition="f_cost_type like '{}'"
+                        close-on-select search="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">应交金额</label>
+              <v-input :value.sync="$parent.f_oughtfee" :expression.sync = 'model.f_oughtfee'
+                       condition="f_oughtfee {}" v-model="model.f_oughtfee"  style="width: 60%"
+                       placeholder="应交金额" v-next-el="cx" ></v-input>
+            </div>
+          </div>
+
+
+
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <input type="checkbox"  @click="$parent.$parent.$parent.isAll(model.pageIndex)">
+            </th>
+            <th>序号</th>
+            <th>用户编号</th>
+            <th>用户姓名</th>
+            <th>身份证号</th>
+            <th>表号</th>
+            <th>补贴气量</th>
+            <th>补贴气量</th>
+            <th>补贴金额</th>
+            <th>备注</th>
+            <th>表具类型</th>
+            <th>导入时间</th>
+            <th>充值时间</th>
+            <th>充值编号</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align:center">
+            <input type="checkbox" v-model="$parent.$parent.$parent.ids"
+                   :value="row.f_userinfo_id">
+          </td>
+          <td>{{$index+1}}</td>
+          <td style="text-align:center">{{row.f_userinfo_id}}&nbsp;&nbsp;{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}</td>
+          <td style="text-align:center">{{row.f_userinfo_code}}</td>
+          <td style="text-align:center">{{row.f_user_type}}</td>
+          <td style="text-align:center">{{row.f_residential_area}}</td>
+          <td style="text-align:center">{{row.f_input_date}}</td>
+          <td style="text-align:center">{{row.f_last_tablebase.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_tablebase.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_oughtamount.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_oughtfee.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_oughtfee_all.toFixed(2)}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+      <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
+        <article slot="modal-body" class="modal-body">
+          <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile"
+                       tagname="确定" multiple v-ref:file></file-upload>
+          <button class="button_clear btn-gn" style="margin-top: 10px;background-color: #6aa6e2;"
+                  @click="downloadFiles()">模板下载
+          </button>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+        </footer>
+      </modal>
+</template>
+
+<script>
+  /**
+   *阶梯水价查询列表
+   */
+  import { PagedList, HttpResetClass } from 'vue-client'
+  import Vue from 'vue'
+  import axios from 'axios'
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/arrearsQuery', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate',condValue:'` 1=1 `',orderitem: '"' + this.orderitem + '"'}),
+        batchMeterShow: false
+      }
+    },
+    props: {
+      orderitem: {
+        type: String,
+        default: 'p.f_userinfo_id'
+      },
+      rollback: false
+    },
+    ready () {
+      this.getaddress()
+      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.search({condition: `1=1 `, model: this.$refs.paged.$refs.cri.model})
+    },
+    watch: {
+      'f_whether' (val) {
+        if (val[0] === '全部') {
+          this.f_whether = '欠费'
+          this.$dispatch('all', '全部')
+        }
+      }
+    },
+    methods: {
+      downloadFiles() {
+        let downurl = 'rs/downloadfile/file?filename=政府补贴导入Excel模板'
+        this.$downFile(downurl, '政府补贴导入Excel模板.xlsx')
+      },
+
+      search (args) {
+        args.condition = `${args.condition} and f_orgid = ` + `'${Vue.$login.f.orgid}'`
+        console.log('查看条件', args.condition)
+        this.model.search(args.condition, args.model)
+      },
+
+      arrcreate () {
+        this.arrshow = true
+      },
+      isAll (page) {
+        if (this.pages.includes(page)) { // 已添加,取消动作
+          // 从ids中删除本页所有数据的ids
+          this.addOrRemove(false)
+          this.pages = this.pages.filter((item) => {
+            return item !== page
+          })
+        } else { // 未添加
+          this.pages.push(page) // 添加id，添加动作
+          this.addOrRemove(true)
+        }
+      },
+      addOrRemove (is) {
+        let that = this
+        if (is) { // 添加本页所有数据到ids中
+          this.model.rows.forEach((row) => {
+            if (!that.ids.includes(row.f_userinfo_id)) {
+              that.ids.push(row.f_userinfo_id)
+            }
+          })
+        } else { // 从ids中取消所有的数据
+          this.model.rows.forEach((row) => {
+            that.ids = that.ids.filter((item) => {
+              return item !== row.f_userinfo_id
+            })
+          })
+        }
+      }
+    },
+    computed: {
+
+    },
+    events:{
+      'onFileUpload': async function (file, res) {
+        if (this.batchMeterShow) {
+          this.iswork = true
+          // 当前上传的是批量导入的档案
+          let param = {
+            filepath: res.f_downloadpath,
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps
+          }
+          let self = this
+          try {
+            await axios.post('rs/logic/newSettleFileImport',
+              {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
+              if (res.data) {
+                self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
+                self.iswork = false
+                // this.$showAlert('导入成功','success',2000)
+              }
+            })
+          } catch (error) {
+            if (error.response) {
+              if (error.response.status == 500) {
+                this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
+              } else if (error.response.status == 404) {
+                this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
+              } else {
+                this.$showAlert(error.response.data, 'danger', 2000)
+              }
+              console.log(error.response.data)
+              console.log(error.response.status)
+              console.log(error.response.headers)
+            } else if (error.request) {
+              console.log(error.request)
+              this.$showAlert(error.request, 'danger', 2000)
+            } else {
+              console.log('Error', error.message)
+              this.$showAlert(error.message, 'danger', 2000)
+            }
+            this.iswork = false
+          }
+          this.batchMeterShow = false
+          // this.$showAlert(`一共上传${res.data.total}条数据, 成功${res.data.successnum}条`, 'success', 2000)
+          this.search()
+        } else {
+          let data = {
+            tablename: 't_userinfo',
+            filepath: res.f_downloadpath,
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps
+          }
+          this.$resetpost('rs/logic/sale_userfilesImp', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: '上传失败'
+          }).then((res) => {
+            this.show = false
+            this.$showAlert(`一共上传${res.data.total}条数据, 成功${res.data.successnum}条`, 'success', 2000)
+            this.search()
+          })
+        }
+      },
+    }
+  }
+</script>
+<style>
+  .form-group{
+    height: 30px;
+  }
+</style>

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-// import FilialeSale from './filiale/wuhai/sale'
+import FilialeSale from './filiale/wuan/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -22,7 +22,7 @@ Vue.config.silent = true
 all()
 system(false)
 sale()
-// FilialeSale()
+FilialeSale()
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Mar 22 15:51:22 CST 2024
-gradle.version=7.4