manage-client 3.1.19 → 3.1.20

package/build/dev-server.js

@@ -1,174 +1,174 @@
-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')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// 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://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:7857', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://192.168.50.4:8400'
-var system = 'http://192.168.50.4:8400'
-//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: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: fuwu
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var 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) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var 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'
-//   })u
-// })
-
-// 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(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+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')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// 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://119.146.1.106:8300/'
+var qtx='http://36.103.222.144:6300/'
+var bendi = 'http://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
+var fuwu = 'http://192.168.50.4:8400'
+var system = 'http://192.168.50.4:8400'
+//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: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: fuwu
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var 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) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var 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(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.19",
+  "version": "3.1.20",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/ReportItems.vue

@@ -1,241 +1,241 @@
-<template>
-  <div class="flex">
-    <partial-view v-ref:pv>
-      <div class="span" v-show="!filtrate">
-        <p class="bg-info text-center" style="padding: 8px;background: #5ac0d9;color: white;border-radius:10px 10px 0 0" title="选中报表后双击查看报表的配置信息" @dblclick="filtrate=!filtrate">报表类型</p>
-        <div style="height: 94%;overflow: auto;width: 104%">
-            <div style="padding:3px" :style="{background: index===row ? '#dfedfb' : 'white'}" :class="styles=='2'?'col-sm-6 auto':'col-sm-12 auto'" v-for="(index,type) in types"
-                 @click="$dispatch('select-type',index, type),changecolor(index,type)"
-               :id="'div-'+index">
-              <div class="row auto"><img :src="type.f_image_path" alt="图片加载失败" class="img-rounded" style="width: 60px;"></div>
-              <div style="height:40px" class="row auto">{{index+1}}、{{type.f_report_name}}</div>
-            </div>
-        </div>
-
-      </div>
-      <div class="span" v-show="filtrate">
-        <p class="bg-info text-center" style="padding: 8px;" @dblclick="filtrate=!filtrate">相关配置</p>
-        <div style="height: 94%;overflow: auto;width: 104%">
-          <table style="border-style: none;width: 95%;">
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: left">
-                <label class="font_normal_body">报表名称:</label>
-                <v-select multiple
-                  :value.sync="modelinfo.f_report_name"
-                  class="select_list select"
-                  v-model="modelinfo.f_report_name"
-                  :options='reportNames' placeholder='请选择'
-                  close-on-select></v-select>
-              </td>
-            </tr>
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: left">
-                <label class="font_normal_body">报表类型:</label>
-                <v-select
-                  :value.sync="modelinfo.f_report_type"
-                  :search="false"
-                  class="select_list select"
-                  v-model="modelinfo.f_report_type"
-                  :options='reportTypes' placeholder='请选择'
-                  close-on-select></v-select>
-              </td>
-            </tr>
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: left">
-                <label class="font_normal_body">报表状态:</label>
-                <v-select
-                  :value.sync="modelinfo.f_rank"
-                  :search="false"
-                  class="select_list select"
-                  v-model="modelinfo.f_rank"
-                  :options='reportState' placeholder='请选择'
-                  close-on-select></v-select>
-              </td>
-            </tr>
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: right;width: 50%;"><button class="button_clear  button_spacing" @click="filtrate=!filtrate">返回</button></td>
-              <td style="text-align: right;width: 25%;"><button class="button_clear  button_spacing" @click="clear()">清空</button></td>
-              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="chaxun()">查询</button></td>
-            </tr>
-            <tr style="display:block;margin:15px 0;" v-for="(key,value) in infos">
-              <td style="text-align: left;">
-                <label class="font_normal_body" style="text-align: right;">{{key}}:</label>
-                <input type="text" style="width: 70%;" class="input_search" v-model="value" v-bind:title="[key =='报表状态'?'1表示显示其他表示不显示':'']"/>
-              </td>
-            </tr>
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: right;width: 50%;"><button class="button_clear  button_spacing" @click="saveOrUpdate(1)">修改</button></td>
-              <td style="text-align: right;width: 25%;"><button class="button_clear  button_spacing" @click="clear(true)">清空</button></td>
-              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="saveOrUpdate(2)">保存</button></td>
-            </tr>
-          </table>
-        </div>
-
-      </div>
-    </partial-view>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from "vue-client";
-
-export default {
-  title: '报表选项',
-  props: {
-    inindex:{}
-  },
-  data () {
-    return {
-      types: [],
-      row:null,
-      infos: {
-        '报表名称': '',
-        '连接页面': '',
-        '报表类型': '',
-        '图片路径': '',
-        '添  加  人': '',
-        '报表状态': ''
-      },
-      styles:this.$appdata.getSingleValue('报表样式')?this.$appdata.getSingleValue('报表样式'):'2',
-      saveinfo:{},
-      filtrate:false,
-      modelinfo: {
-        f_report_name: '',
-        f_report_type: '',
-        f_rank: '1'
-      },
-      config:{
-        f_report_name: '报表名称',
-        f_report_path: '连接页面',
-        f_report_type: '报表类型',
-        f_image_path: '图片路径',
-        f_operator: '添  加  人',
-        f_rank: '报表状态'
-      },
-      conditionStr:'1=1',
-      reportNames: [],
-      reportTypes: [],
-      reportState : [{label: '全部', value: ''},{label: '显示', value: '1'},{label: '未显示', value: 'null'},],
-      tablename: 't_report_type'
-    }
-  },
-  ready (){
-    // 获取所有报表类型
-    this.getReportInfo(null,'1=1 and f_rank=1')
-    this.getReportName()
-    this.getReportType()
-  },
-  methods: {
-    getReportInfo(tname,cond){
-      this.$refs.pv.load('rs/sql/manageSingleTable', {
-        data: {
-          tablename: tname ? tname:this.tablename,
-          condition: cond ? cond:this.conditionStr
-        }
-      }).then((res) => {
-        this.types = res.data
-      }).catch((error) => {
-
-      })
-    },
-    chaxun(){
-      this.getReportInfo()
-      this.filtrate = !this.filtrate
-    },
-    changecolor(index,type){
-      this.row=index
-    },
-    async getReportName(){
-      let HttpReset = new HttpResetClass()
-      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
-        data: {
-          condition: this.conditionStr,
-          tablename: this.tablename,
-          groupitem: 'f_report_name',
-          orderitem: 'f_report_name',
-          items: 'f_report_name'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取报表名称失败!'})
-      let nameArr = [{label: '全部', value: ''}]
-      for (let row of data.data){
-        nameArr.push({label: row.f_report_name, value: row.f_report_name})
-      }
-      this.reportNames = nameArr
-    },
-    clear(val){
-      if(val){
-        for (let key in this.infos) {
-          this.infos[key] =''
-        }
-      }else{
-        for (let key in this.modelinfo) {
-          this.modelinfo[key] =[]
-        }
-      }
-    },
-    async getReportType(){
-      let HttpReset = new HttpResetClass()
-      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
-        data: {
-          condition: this.conditionStr,
-          tablename: this.tablename,
-          groupitem: 'f_report_type',
-          orderitem: 'f_report_type',
-          items: 'f_report_type'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取报表类型失败!'})
-      let typeArr = [{label: '全部', value: ''}]
-      for (let row of data.data){
-        typeArr.push({label: row.f_report_type, value: row.f_report_type})
-      }
-      this.reportTypes = typeArr
-    },
-    saveOrUpdate(val){
-      // let sv={}
-      for(let [key, value] of Object.entries(this.config)){
-        let vl=this.infos[value]
-        this.saveinfo[key]=vl
-      }
-      this.saveinfo['type']=val
-
-      this.$resetpost('rs/logic/saveReport', this.saveinfo, {resolveMsg: '恭喜！提交成功！', rejectMsg: '提交错误！'}).then((res) => {
-        this.$showAlert('保存成功', 'success', 3000)
-        this.getReportInfo(null,'1=1 and f_rank=1')
-        this.filtrate=!this.filtrate
-      })
-      console.log('this.saveinfo+++++',this.saveinfo)
-    }
-  },
-  watch :{
-    'modelinfo': {
-      deep: true,
-      handler(val) {
-        let c='1=1 '
-        for (let [key, value] of Object.entries(val)) {
-          if (value && value!='') {
-            if(key=='f_rank' && value=='null'){
-              c+='and '+ key + " is " + value +' or '+ key +" = ''"
-            }else{
-              c+='and '+ key + " in ('" + value.toString().replace(new RegExp(',','g'),"','") + "') "
-            }
-
-          }
-        }
-        this.conditionStr = c
-      }
-    },
-    'inindex' (val){
-      this.infos={}
-      this.saveinfo=this.types[val]
-      let flag={}
-      for(let [key, value] of Object.entries(this.saveinfo)){
-        let name=this.config[key]
-        if (name!=null){
-          flag[name]=value
-        }
-      }
-      this.infos=flag
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex">
+    <partial-view v-ref:pv>
+      <div class="span" v-show="!filtrate">
+        <p class="bg-info text-center" style="padding: 8px;background: #5ac0d9;color: white;border-radius:10px 10px 0 0" title="选中报表后双击查看报表的配置信息" @dblclick="filtrate=!filtrate">报表类型</p>
+        <div style="height: 94%;overflow: auto;width: 104%">
+            <div style="padding:3px" :style="{background: index===row ? '#dfedfb' : 'white'}" :class="styles=='2'?'col-sm-6 auto':'col-sm-12 auto'" v-for="(index,type) in types"
+                 @click="$dispatch('select-type',index, type),changecolor(index,type)"
+               :id="'div-'+index">
+              <div class="row auto"><img :src="type.f_image_path" alt="图片加载失败" class="img-rounded" style="width: 60px;"></div>
+              <div style="height:40px" class="row auto">{{index+1}}、{{type.f_report_name}}</div>
+            </div>
+        </div>
+
+      </div>
+      <div class="span" v-show="filtrate">
+        <p class="bg-info text-center" style="padding: 8px;" @dblclick="filtrate=!filtrate">相关配置</p>
+        <div style="height: 94%;overflow: auto;width: 104%">
+          <table style="border-style: none;width: 95%;">
+            <tr style="display:block;margin:15px 0;">
+              <td style="text-align: left">
+                <label class="font_normal_body">报表名称:</label>
+                <v-select multiple
+                  :value.sync="modelinfo.f_report_name"
+                  class="select_list select"
+                  v-model="modelinfo.f_report_name"
+                  :options='reportNames' placeholder='请选择'
+                  close-on-select></v-select>
+              </td>
+            </tr>
+            <tr style="display:block;margin:15px 0;">
+              <td style="text-align: left">
+                <label class="font_normal_body">报表类型:</label>
+                <v-select
+                  :value.sync="modelinfo.f_report_type"
+                  :search="false"
+                  class="select_list select"
+                  v-model="modelinfo.f_report_type"
+                  :options='reportTypes' placeholder='请选择'
+                  close-on-select></v-select>
+              </td>
+            </tr>
+            <tr style="display:block;margin:15px 0;">
+              <td style="text-align: left">
+                <label class="font_normal_body">报表状态:</label>
+                <v-select
+                  :value.sync="modelinfo.f_rank"
+                  :search="false"
+                  class="select_list select"
+                  v-model="modelinfo.f_rank"
+                  :options='reportState' placeholder='请选择'
+                  close-on-select></v-select>
+              </td>
+            </tr>
+            <tr style="display:block;margin:15px 0;">
+              <td style="text-align: right;width: 50%;"><button class="button_clear  button_spacing" @click="filtrate=!filtrate">返回</button></td>
+              <td style="text-align: right;width: 25%;"><button class="button_clear  button_spacing" @click="clear()">清空</button></td>
+              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="chaxun()">查询</button></td>
+            </tr>
+            <tr style="display:block;margin:15px 0;" v-for="(key,value) in infos">
+              <td style="text-align: left;">
+                <label class="font_normal_body" style="text-align: right;">{{key}}:</label>
+                <input type="text" style="width: 70%;" class="input_search" v-model="value" v-bind:title="[key =='报表状态'?'1表示显示其他表示不显示':'']"/>
+              </td>
+            </tr>
+            <tr style="display:block;margin:15px 0;">
+              <td style="text-align: right;width: 50%;"><button class="button_clear  button_spacing" @click="saveOrUpdate(1)">修改</button></td>
+              <td style="text-align: right;width: 25%;"><button class="button_clear  button_spacing" @click="clear(true)">清空</button></td>
+              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="saveOrUpdate(2)">保存</button></td>
+            </tr>
+          </table>
+        </div>
+
+      </div>
+    </partial-view>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  title: '报表选项',
+  props: {
+    inindex:{}
+  },
+  data () {
+    return {
+      types: [],
+      row:null,
+      infos: {
+        '报表名称': '',
+        '连接页面': '',
+        '报表类型': '',
+        '图片路径': '',
+        '添  加  人': '',
+        '报表状态': ''
+      },
+      styles:this.$appdata.getSingleValue('报表样式')?this.$appdata.getSingleValue('报表样式'):'2',
+      saveinfo:{},
+      filtrate:false,
+      modelinfo: {
+        f_report_name: '',
+        f_report_type: '',
+        f_rank: '1'
+      },
+      config:{
+        f_report_name: '报表名称',
+        f_report_path: '连接页面',
+        f_report_type: '报表类型',
+        f_image_path: '图片路径',
+        f_operator: '添  加  人',
+        f_rank: '报表状态'
+      },
+      conditionStr:'1=1',
+      reportNames: [],
+      reportTypes: [],
+      reportState : [{label: '全部', value: ''},{label: '显示', value: '1'},{label: '未显示', value: 'null'},],
+      tablename: 't_report_type'
+    }
+  },
+  ready (){
+    // 获取所有报表类型
+    this.getReportInfo(null,'1=1 and f_rank=1')
+    this.getReportName()
+    this.getReportType()
+  },
+  methods: {
+    getReportInfo(tname,cond){
+      this.$refs.pv.load('rs/sql/manageSingleTable', {
+        data: {
+          tablename: tname ? tname:this.tablename,
+          condition: cond ? cond:this.conditionStr
+        }
+      }).then((res) => {
+        this.types = res.data
+      }).catch((error) => {
+
+      })
+    },
+    chaxun(){
+      this.getReportInfo()
+      this.filtrate = !this.filtrate
+    },
+    changecolor(index,type){
+      this.row=index
+    },
+    async getReportName(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: this.conditionStr,
+          tablename: this.tablename,
+          groupitem: 'f_report_name',
+          orderitem: 'f_report_name',
+          items: 'f_report_name'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取报表名称失败!'})
+      let nameArr = [{label: '全部', value: ''}]
+      for (let row of data.data){
+        nameArr.push({label: row.f_report_name, value: row.f_report_name})
+      }
+      this.reportNames = nameArr
+    },
+    clear(val){
+      if(val){
+        for (let key in this.infos) {
+          this.infos[key] =''
+        }
+      }else{
+        for (let key in this.modelinfo) {
+          this.modelinfo[key] =[]
+        }
+      }
+    },
+    async getReportType(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: this.conditionStr,
+          tablename: this.tablename,
+          groupitem: 'f_report_type',
+          orderitem: 'f_report_type',
+          items: 'f_report_type'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取报表类型失败!'})
+      let typeArr = [{label: '全部', value: ''}]
+      for (let row of data.data){
+        typeArr.push({label: row.f_report_type, value: row.f_report_type})
+      }
+      this.reportTypes = typeArr
+    },
+    saveOrUpdate(val){
+      // let sv={}
+      for(let [key, value] of Object.entries(this.config)){
+        let vl=this.infos[value]
+        this.saveinfo[key]=vl
+      }
+      this.saveinfo['type']=val
+
+      this.$resetpost('rs/logic/saveReport', this.saveinfo, {resolveMsg: '恭喜！提交成功！', rejectMsg: '提交错误！'}).then((res) => {
+        this.$showAlert('保存成功', 'success', 3000)
+        this.getReportInfo(null,'1=1 and f_rank=1')
+        this.filtrate=!this.filtrate
+      })
+      console.log('this.saveinfo+++++',this.saveinfo)
+    }
+  },
+  watch :{
+    'modelinfo': {
+      deep: true,
+      handler(val) {
+        let c='1=1 '
+        for (let [key, value] of Object.entries(val)) {
+          if (value && value!='') {
+            if(key=='f_rank' && value=='null'){
+              c+='and '+ key + " is " + value +' or '+ key +" = ''"
+            }else{
+              c+='and '+ key + " in ('" + value.toString().replace(new RegExp(',','g'),"','") + "') "
+            }
+
+          }
+        }
+        this.conditionStr = c
+      }
+    },
+    'inindex' (val){
+      this.infos={}
+      this.saveinfo=this.types[val]
+      let flag={}
+      for(let [key, value] of Object.entries(this.saveinfo)){
+        let name=this.config[key]
+        if (name!=null){
+          flag[name]=value
+        }
+      }
+      this.infos=flag
+    }
+  }
+}
+</script>

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-