sale-client 3.5.82 → 3.5.86

package/build/dev-server.js

@@ -12,7 +12,7 @@ var compiler = webpack(config)
 // https://github.com/chimurai/http-proxy-middleware
 var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-var fuwu = 'http://47.93.217.125:8400/'
+var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://121.36.106.17:8400/'
 // 铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
@@ -36,6 +36,9 @@ var proxyTable = {
   '/rs/logic/saleGetExportProgress': {
     target: fuwu
   },
+  '/rs/logic/getWarningMsg': {
+    target: 'http://localhost:8080/'
+  },
   '/rs/file': {
     target: fuwu
   },
@@ -160,5 +163,5 @@ module.exports = app.listen(8089, function (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:8085')
+  console.log('Listening at http://localhost:8089')
 })

package/package.json

@@ -1,117 +1,117 @@
-{
-  "name": "sale-client",
-  "version": "3.5.82",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node 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": {
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.2.29",
-    "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": "^1.0.1",
-    "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.7",
-    "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.25",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.67",
-    "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": "^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",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "keywords": [
-    "selling-clients"
-  ],
-  "author": "张桥",
-  "license": "ISC",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "3.5.86",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node 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": {
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.2.29",
+    "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": "^1.0.1",
+    "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.7",
+    "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.25",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.67",
+    "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": "^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",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "keywords": [
+    "selling-clients"
+  ],
+  "author": "张桥",
+  "license": "ISC",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/charge/business/OtherChargeNew.vue

@@ -168,7 +168,7 @@
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
       </validator>
-
+      <upload :blodid="blodid" v-if="config.showupload"  isremark="true" fusetype="其他收费"></upload>
     </div>
     <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
   </div>
@@ -281,6 +281,7 @@ export default {
   data () {
     return {
       config: {
+        showupload: true,
         checkFlag: false,
         modificationList: false,
         dispatch: false,

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -119,9 +119,9 @@
           </button>
         </div>
         <!--<upload :blodid="blodid" isremark="true" fusetype="过户"></upload>-->
+        <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="过户管理"></upload>
       </validator>
     </div>
-    <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="过户管理"></upload>
     <modal v-if="loaduserflag" :show.sync="loaduserflag" width="80%" title="过户资产信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <tranfersel-list :f_filialeid.sync="f_filialeid"></tranfersel-list>
@@ -185,7 +185,7 @@
     data () {
       return {
         config: {
-          showupload:false,  //默认不显示上传附件
+          showupload:true,  //默认显示上传附件
           hasPrint: false,  // 默认打票
           hasAcceptance: false,
           hasBillManage: false,  // 默认不启用发票管理

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,12 +414,13 @@
           dep: [],
           user: []
         },
-        config:{
-          examine: false,
+        config: {
+          examine: false
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
+        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -444,8 +445,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -475,7 +476,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -596,9 +597,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log("-----------val2:",val)
+        console.log('-----------val2:', val)
         this.imgfilename = `rs/image/file/` + val
-        console.log("-----------imgfilename2:",this.imgfilename)
+        console.log('-----------imgfilename2:', this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -632,6 +633,17 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
+        // 抄表员查询条件
+        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
+        if (this.inputtouPerson.length !== 0) {
+          let str = JSON.stringify(this.inputtouPerson)
+          str = str.replace(/"/g, `'`)
+          str = str.replace(/\[/g, ``)
+          str = str.replace(/\]/g, ``)
+          console.log('=====抄表员model22222222222绑定====', str)
+          // 查询多个抄表员时条件
+          args.condition += ` and f_inputtor in  ( ${str} )`
+        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -696,7 +708,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      },
+      }
 
     },
     computed: {

package/src/filiale/qianneng/eticket/EticketPrint.vue

@@ -132,11 +132,12 @@ export default {
             id: ticket_id,
             f_bill_code: req.fpDm,
             f_bill_number: req.fpHm,
-            f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-            f_sign_result: req.msg,
+            f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+            f_sign_url: req.shareurl,
+            f_sign_result: req.sharecode,
             f_bill_state: req.status
           }
-          this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+          this.eticket_src = 'https://qnjtkf.cn:7400' + model.f_bill_url
         } else if (req.status === '开票中') {
           model = {
             id: ticket_id,
@@ -303,11 +304,12 @@ export default {
                   f_eticket_id: ticket_id,
                   f_bill_code: req.fpDm,
                   f_bill_number: req.fpHm,
-                  f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-                  f_sign_result: req.msg,
+                  f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+                  f_sign_url: req.shareurl,
+                  f_sign_result: req.sharecode,
                   f_bill_state: req.status
                 })
-                this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+                this.eticket_src = 'https://qnjtkf.cn:7400' + req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download')
               } else if (req && req.status !== '开票中') {
                 clearInterval(interval)
                 // TODO 失败后保存发票详情

package/src/filiale/shiquan/CardList.vue

@@ -36,26 +36,6 @@
                        type="text"
                        v-model="model.f_operator">
               </div>
-              <div class="form-group col-sm-7" v-show="$parent.$parent.$parent.criteriaShow">
-                <!-- <label>开始时间:</label> -->
-                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
-                            class="datepicker"
-                            condition="r.f_operate_date >= '{} 00:00:00' "
-                            placeholder="开始时间"
-                            style="width:60%"
-                            v-model="model.f_start_date"
-                ></datepicker>
-              </div>
-              <div class="form-group col-sm-7" v-show="$parent.$parent.$parent.criteriaShow">
-                <!-- <label>结束时间:</label> -->
-                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
-                            class="datepicker"
-                            condition="r.f_operate_date <= '{} 00:00:00' "
-                            placeholder="结束时间"
-                            style="width:60%"
-                            v-model="model.f_end_date"
-                ></datepicker>
-              </div>
             </div>
             <!-- <partial name="cardcriteria"></partial> -->
             <!-- <div class="form-group">
@@ -335,6 +315,13 @@
             resolveMsg: null,
             rejectMsg: '验证权限错误！！'
           })
+          let a = this.$login.toStandardDateString() + ' 00:00:00'
+          if(row.type === '物联网收费'){
+            if(row.f_operate_date < a){
+              this.$showAlert('不能撤销不是当天的操作', 'warning', 3000)
+              return
+            }
+          }
           if (!res.data.pass) {
             this.$showMessage(res.data.msg)
             return