manage-client 4.1.63 → 4.1.64-bfsy

package/.eslintrc.js

@@ -15,6 +15,8 @@ module.exports = {
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     // 必须使用全等
-    'eqeqeq': 0
+    'eqeqeq': 0,
+    "import/no-unresolved": ["error", { "caseSensitive": true }],
+    "camelcase": "off"
   }
 }

package/build/dev-server.js

@@ -1,142 +1,108 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
 
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
+const app = express()
+const compiler = webpack(config)
 
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://123.57.3.66:31467/'
-var qtx = 'http://123.57.3.66:31467/'
-// var bendi = 'http://220.194.141.253:8600/'
-// var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
-// var bendi = 'http://203.57.101.233:9001/'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://123.57.3.66:31467/'
-// var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://123.57.3.66:31467/'
-// 192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  // '/rs/logic/exportfile': {
-  //   target: bendi
-  // },
-  // '/dataManage': {
-  //   target: 'http://203.57.101.233:9001/'
-  //
-  // },
-  // '/api/af-revenue/sql/WeChatPaydetail': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
-  //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api/af-revenue/sql/WeChatPayment': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
-  //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api/af-revenue/sql/getGasInspection': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
-  //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api/af-revenue/sql/inspectList_sellinggas': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
-  //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api/af-revenue/sql/inspectList': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/rs'
-  //   },
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/api': {
-  //   target: 'http://123.57.3.66:31467/'
-  //
-  // },
-  // '/rs/sql/chargeQuery_by_gasproperties': {
-  //   target: 'http://localhost:8084/'
-  // },
-  // '/rs/logic/chargeQuery_by_gasproperties_line': {
-  //   target: 'http://localhost:8084/'
-  // },
-  // '/files': {
-  //   target: bendi
-  // },
-  // // 查找资源服务数据
-  // '/rs/search': {
-  //   target: 'http://123.57.3.66:31467/'
-  // },
-  // // 查找资源服务数据
-  // '/rs/logic/getLogin': {
-  //   target: bendi
-  // },
-  // // 查找资源服务数据
-  // '/rs/logic/getInitData': {
-  //   target: bendi
-  // },
-  // '/rs/logic/getSaleInitData': {
-  //   target: bendi
-  // },
-  // // 用户登录服务地址
-  // '/rs/user': {
-  //   target: bendi
-  // },
-  // '/rs/path/getParams': {
-  //   target: bendi
-  // },
-  // '/rs/data': {
-  //   target: bendi
-  // },
-  // '/rs/license': {
-  //   target: bendi
-  // },
-  // '/rs/db': {
-  //   target: bendi
-  // },
-  // '/excel': {
-  //   target: bendi
-  // },
-  // '/rs/config': {
-  //   target: bendi
-  // },
-  // '/rs/sql/getLicenseById': {
-  //   target: bendi
-  // },
-  // '/rs/report': {
-  //   target: bendi
-  // },
-  // '/rs/vue': {
-  //   target: 'http://123.57.3.66:31467/'
-  // },
-  // '/rs/file': {
-  //   target: bendi
-  // },
-  // '/rs/sql/singleTable': {
-  //   target: bendi
-  // },
+const server = 'http://192.168.50.67:31567/'
+const local = 'http://127.0.0.1:9026/'
+const proxyTable = {
+  '/rs/logic/exportfile': {
+    target: server
+  },
+  '/dataManage': {
+    target: server
+  },
+  '/api/af-revenue/sql/': {
+    pathRewrite: {
+      '^/api/af-revenue': '/'
+    },
+    target: local
+  },
+  '/api/af-revenue/report/': {
+    pathRewrite: {
+      '^/api/af-revenue': '/'
+    },
+    target: local
+  },
+  '/api/af-revenue/logic': {
+    pathRewrite: {
+      '^/api/af-revenue': '/'
+    },
+    target: local
+  },
   '/api': {
-    target: wode
+    target: server
+  },
+  '/rs/sql/chargeQuery_by_gasproperties': {
+    target: server
+  },
+  '/rs/logic/chargeQuery_by_gasproperties_line': {
+    target: server
+  },
+  '/files': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: server
+  },
+  '/rs/logic/getSaleInitData': {
+    target: server
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: server
+  },
+  '/rs/path/getParams': {
+    target: server
+  },
+  '/rs/data': {
+    target: server
+  },
+  '/rs/license': {
+    target: server
+  },
+  '/rs/db': {
+    target: server
+  },
+  '/excel': {
+    target: server
+  },
+  '/rs/config': {
+    target: server
+  },
+  '/rs/sql/getLicenseById': {
+    target: server
+  },
+  '/rs/report': {
+    target: server
+  },
+  '/rs/vue': {
+    target: server
+  },
+  '/rs/file': {
+    target: server
+  },
+  '/rs/sql/singleTable': {
+    target: server
   },
   '/rs': {
-    target: wode
+    target: server
   }
 }
 
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: config.output.publicPath,
   stats: {
     colors: true,
@@ -144,7 +110,7 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
   }
 })
 
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
+const hotMiddleware = require('webpack-hot-middleware')(compiler)
 // force page reload when html-webpack-plugin template changes
 compiler.plugin('compilation', function (compilation) {
   compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
@@ -155,69 +121,21 @@ compiler.plugin('compilation', function (compilation) {
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
+  let options = proxyTable[context]
   if (typeof options === 'string') {
     options = {target: options}
   }
   app.use(proxyMiddleware(context, options))
 })
 
-// handle fallback for HTML5 history API
 app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
 
-// serve webpack bundle output
 app.use(devMiddleware)
 
-// enable hot-reload and state-preserving
-// compilation error display
 app.use(hotMiddleware)
 
-// serve pure static assets
 app.use('/static', express.static('./static'))
 
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
 module.exports = app.listen(8015, function (err) {
   if (err) {
     console.log(err)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.63",
+    "version": "4.1.64-bfsy",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -71,7 +71,7 @@
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",
-        "vue-client": "1.24.162",
+        "vue-client": "1.26.6",
         "vue-hot-reload-api": "^1.2.0",
         "vue-html-loader": "^1.0.0",
         "vue-loader": "8.2.1",

package/src/components/SellReport/BrandGasPriceGroup.vue

@@ -36,6 +36,7 @@
         </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <button class="button_search" @click="$parent.$parent.pushAudit()">推送审核</button>
              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
              <report-excel id='gasprice'></report-excel>
             <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
@@ -130,6 +131,80 @@
       <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
     </footer>
   </modal>
+    <modal :show.sync="pushAuditShow" v-ref:pushAuditShowModal large backdrop="false" width="40%" >
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+        <h4 class="modal-title">推送审核</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <form class="form-horizontal select-overspread">
+            <div class="form-group" :class="[$v.f_audit_person.required ? 'has-error' : '']">
+              <label class="col-sm-4 font_normal_body">下一步审核人:</label>
+              <input type="text" v-show="false" v-model="$refs.f_audit_person.selectedItems"
+                     v-validate:f_audit_person='{required: true }'>
+              <div class="col-sm-8">
+                <v-select v-model="pushAuditData.f_audit_person"
+                          placeholder='请选择'
+                          :value.sync="pushAuditData.f_audit_person"
+                          :options='auditor'
+                          :value-single="true"
+                          close-on-select
+                          clear-button
+                          v-ref:f_audit_person>
+                </v-select>
+              </div>
+
+            </div>
+            <div class="form-group" >
+              <label class="col-sm-4 font_normal_body">报表审核人:</label>
+              <div class="col-sm-8">
+                <input class="input_search" style="width:60%"  type="text"
+                       v-model="pushAuditData.f_name" placeholder="报表审核人">
+              </div>
+            </div>
+            <div class="form-group" >
+              <label class="col-sm-4 font_normal_body">报表审核结果:</label>
+              <div class="col-sm-8">
+                <input class="input_search" style="width:60%"  type="text"
+                       v-model="pushAuditData.f_jieguo" placeholder="报表审核结果">
+              </div>
+            </div>
+            <div class="form-group" >
+              <label class="col-sm-4 font_normal_body">报表审核时间:</label>
+              <div class="col-sm-8">
+                <datepicker id="startDate" placeholder="报表审核时间" style="width: 60%"
+                            v-model="pushAuditData.f_date"
+                            :value.sync="pushAuditData.f_date"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search" style="width: max-content" @click="uploadFiles()">上传/查看附件</button>
+        <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
+        <button class="button_search" @click="auditConfirm()" :disabled="!$v.valid">提交审核</button>
+        <button class="button_clear" @click="cancel()">取消</button>
+      </footer>
+    </modal>
+    <modal :show.sync="showFiles" styles="margin-top:50px" v-ref:showFiles backdrop="false" width="80%" >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="showFilesClose"><span class="glyphicon glyphicon-remove"></span></button>
+      </header>
+      <article slot="modal-body">
+        <upload-idcard :blodid="randomId" isremark="true" style="width:auto"
+                       fusetype="数据推送审核" v-ref:upload>
+        </upload-idcard>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <high-meter :show.sync="highMeterShow" v-if="highMeterShow" @photo-finish="newPhoto">
+    </high-meter>
   </div>
 </template>
 
@@ -143,6 +218,8 @@
     console.log(self.$login.f)
     await self.$MagLoadParams.loadParam()
     self.initParams()
+    self.getAuditor()
+    self.randomId = self.getRandomId()
     self.$refs.paged.$refs.criteria.search()
   }
   let saveFile = function * (self) {
@@ -196,6 +273,13 @@
         },
         f_filialeid: this.$login.f.orgid,
         show: false,
+        pushAuditData: {},
+        auditor: [],
+        resid: [],
+        showFiles: false,
+        highMeterShow: false,
+        pushAuditShow: false,
+        randomId: '',
       }
     },
     ready () {
@@ -206,6 +290,98 @@
       })
     },
     methods: {
+      newPhoto (ImgBase64) {
+        this.$refs.upload.newPhoto(ImgBase64)
+      },
+      uploadFiles () {
+        this.showFiles = !this.showFiles
+      },
+      uploadPictures () {
+        this.highMeterShow = !this.highMeterShow
+      },
+      showFilesClose () {
+        this.showFiles = false
+      },
+      async getAuditor () {
+        await this.$MagGetSaleParam.initinputtor()
+        this.auditor = this.$MagGetSaleParam.getAudit(this.$login.f.orgid)
+      },
+      cancel () {
+        this.pushAuditShow = false
+      },
+      getRandomId () {
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let res = Math.random() * 16 | 0
+          let v = c == 'x' ? res : (res & 0x3 | 0x8)
+          return v.toString(16)
+        })
+      },
+      auditConfirm () {
+        if (this.$refs.upload.fileInfoData.length === 0) {
+          this.$showMessage('请至少上传一张附件')
+          return
+        }
+        let fileParam = []
+        for (let row of this.$refs.upload.fileInfoData) {
+          fileParam.push({id: row.id})
+        }
+        let param = {
+          // 业务参数
+          requestParam: {
+            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,
+            type: '用气汇总报表推送',
+            ...this.pushAuditData
+          },
+          form: {
+            '业务描述': `${this.$login.f.name}对${this.pushAuditData.startDate}-${this.pushAuditData.endDate}用气汇总报表数据发起推送审核操作`,
+            '业务类型': `用气汇总报表推送审核`,
+            '报表审核人': this.pushAuditData.f_name,
+            '报表审核结果': this.pushAuditData.f_jieguo,
+            '报表审核时间': this.pushAuditData.f_date
+          },
+          // 审核人
+          f_audit_person: this.pushAuditData.f_audit_person,
+          // 描述
+          f_describe: `${this.$login.f.name}发起用气汇总报表推送审核操作`,
+          // 附件
+          fileParam: fileParam,
+          // 登录人信息
+          userBaseInfo: {
+            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
+          },
+          // 业务类型
+          type: '用气汇总报表推送',
+          f_type: '用气汇总报表推送审核',
+          f_otherparam: [],
+          logicName: 'gasSalesReportReview'
+        }
+        console.log(param, this.pushAuditData)
+        this.$resetpost('api/af-revenue/logic/commonAuditLogic', param, {
+          warnMsg: `确定要对当前查询的报表数据进行推送审核吗？`,
+          resolveMsg: `提交审核完成！！`,
+          rejectMsg: `提交审核失败！！请重试！！`
+        }).then((res) => {
+          this.pushAuditShow = false
+          this.pushAuditData.f_audit_person = ''
+          this.pushAuditData.f_name = ''
+          this.pushAuditData.f_jieguo = ''
+          this.pushAuditData.f_date = ''
+          this.randomId = this.getRandomId()
+        })
+      },
+      pushAudit () {
+        this.pushAuditShow = true
+      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -230,6 +406,9 @@
 
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
+        this.pushAuditData.startDate = this.model.params.startDate
+        this.pushAuditData.endDate = this.model.params.endDate
+        this.pushAuditData.condition = orgcondition.replace(/'/g, "''")
       },
       async getRes(condition,obj) {
         this.orgCondtionStr = condition