manage-client 3.2.49 → 3.2.50-aode

package/src/components/SellReport/ReportHistory.vue

@@ -1,80 +1,80 @@
-<template>
-  <div style="height: 70%;">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' v-ref:criteria @condition-changed="search">
-        <div novalidate class="form-inline" partial>
-          <p class="bg-info text-center" style="padding: 8px;">报表历史纪录</p>
-          <div class="form-group">
-            <input type="text" class="form-control" v-model="model.f_files_name"
-  					condition="f_files_name like '%{}%'" placeholder='报表名'>
-          </div>
-          <div class="form-group">
-            <v-select :value.sync="model.f_files_type" v-model='model.f_files_type'
-                :options='$parent.$parent.types' placeholder='报表类型'
-                close-on-select
-                condition="f_files_type = '{}'" ></v-select>
-          </div>
-          <div class="form-group">
-            <v-select :value.sync="model.f_operator" v-model='model.f_operator'
-                :options='$parent.$parent.operatores' placeholder='保存操作人'
-                close-on-select
-                condition="f_operator = '{}'" ></v-select>
-          </div>
-          <button class="btn btn-success width-100" @click="search()">查询</button>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid id="test" >
-        <template partial='head'>
-          <tr>
-            <th>表名</th>
-            <th>保存人</th>
-            <th>保存时间</th>
-            <th>操作</th>
-          </tr>
-        </template>
-        <template partial='body' >
-          <td>{{row.f_files_name}}</td>
-          <td>{{row.f_operator}}</td>
-          <td>{{row.f_operate_date}}</td>
-          <td><button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.delete(row)">删除</button></td>
-        </template>
-      </data-grid>
-     </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import AppData from '../../stores/AppData'
-
-export default {
-  title: '历史报表数据',
-  data () {
-    return {
-      model: new PagedList('rs/sql/manageSingleTable_OrderBy', 50, {items: '"*"', tablename: '"t_report_record"', orderitem: '"f_operate_date desc"'})
-    }
-  },
-  ready () {
-    this.model.search('1=1')
-  },
-  methods: {
-    search () {
-      this.$refs.paged.$refs.criteria.search()
-    },
-    delete (row) {
-      this.$resetdelete('rs/entity/t_report_record', row, ).then(() => {
-        this.$dispatch('delect-report', '删除计划', row )
-        this.search()
-      })
-    }
-  },
-  computed: {
-    operatores () {
-      return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
-    },
-    types () {
-      return [{label: '全部', value: ''}, ...AppData.getParam('报表类型')]
-    }
-  },
-}
-</script>
+<template>
+  <div style="height: 70%;">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' v-ref:criteria @condition-changed="search">
+        <div novalidate class="form-inline" partial>
+          <p class="bg-info text-center" style="padding: 8px;">报表历史纪录</p>
+          <div class="form-group">
+            <input type="text" class="form-control" v-model="model.f_files_name"
+  					condition="f_files_name like '%{}%'" placeholder='报表名'>
+          </div>
+          <div class="form-group">
+            <v-select :value.sync="model.f_files_type" v-model='model.f_files_type'
+                :options='$parent.$parent.types' placeholder='报表类型'
+                close-on-select
+                condition="f_files_type = '{}'" ></v-select>
+          </div>
+          <div class="form-group">
+            <v-select :value.sync="model.f_operator" v-model='model.f_operator'
+                :options='$parent.$parent.operatores' placeholder='保存操作人'
+                close-on-select
+                condition="f_operator = '{}'" ></v-select>
+          </div>
+          <button class="btn btn-success width-100" @click="search()">查询</button>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid id="test" >
+        <template partial='head'>
+          <tr>
+            <th>表名</th>
+            <th>保存人</th>
+            <th>保存时间</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <td>{{row.f_files_name}}</td>
+          <td>{{row.f_operator}}</td>
+          <td>{{row.f_operate_date}}</td>
+          <td><button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.delete(row)">删除</button></td>
+        </template>
+      </data-grid>
+     </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import AppData from '../../stores/AppData'
+
+export default {
+  title: '历史报表数据',
+  data () {
+    return {
+      model: new PagedList('rs/sql/manageSingleTable_OrderBy', 50, {items: '"*"', tablename: '"t_report_record"', orderitem: '"f_operate_date desc"'})
+    }
+  },
+  ready () {
+    this.model.search('1=1')
+  },
+  methods: {
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    delete (row) {
+      this.$resetdelete('rs/entity/t_report_record', row, ).then(() => {
+        this.$dispatch('delect-report', '删除计划', row )
+        this.search()
+      })
+    }
+  },
+  computed: {
+    operatores () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+    },
+    types () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('报表类型')]
+    }
+  },
+}
+</script>

package/src/components/SellReport/ReportItems.vue

@@ -1,241 +1,39 @@
 <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 class="span">
+        <p class="bg-info text-center" style="padding: 8px;">报表类型</p>
+        <div class="col-sm-4 auto" v-for="type in types" style="padding: 5px">
+          <div class="thumbnail auto" style="margin-bottom: 0px; cursor: pointer;" @click="$dispatch('select-type', type)">
+            <img :src="type.f_image_path" alt="图片加载失败" class="img-rounded" style="width: 60px;">
+            <p class="flex-row" style="justify-content: space-around;margin: 0px;">
+              {{type.f_report_name}}
+            </p>
+          </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'
+      types: []
     }
   },
   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.$refs.pv.load('rs/sql/manageSingleTable', {data: {tablename: 't_report_type', condition: '1=1'}}).then((res) => {
+      this.types = res.data
+      // for (var i = 0; i < 30; i++) {
+      //   this.types.push(res.data[0])
+      // }
+    }).catch((error) => {
 
-          }
-        }
-        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/src/components/SellReport/ReportPool.vue

@@ -1,60 +1,40 @@
-<template>
-  <div id="unit" class="flex-row binary">
-    <div class="three-left" :style="{width:'18%'}">
-    <div class="flex">
-      <report-items @select-type="showReportType" :inindex="index"></report-items>
-      <!--<report-history @select-changed="showReport" v-ref:history></report-history>-->
-    </div>
-    </div>
-    <!-- 使用动态页签
-    <dynamic :comps='[]' name='report'></dynamic> -->
-    <!-- 使用路由切换 -->
-    <div :style="{width:'82%'}">
-      <div class="flex" v-if="$refs.route.cards.length === 0">
-        <echarts-box></echarts-box>
-      </div>
-      <route  v-ref:route @save-success="$refs.history.search" v-show="!($refs.route.cards.length === 0)"></route>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '报表汇总',
-  data () {
-    return {
-      comp: [],
-      index:''
-    }
-  },
-  methods: {
-    // 根据选择的数据直接显示保存的报表
-    showReport (row) {
-      this.$refs.route.init(row.val.f_component_name, {data: row.val})
-    },
-    // 根据报表的类型选择显示报表
-    showReportType (index,row) {
-      let m=document.getElementsByName('style')
-      console.log(m.length)
-      for(let i=0; i < m.length; i++){
-        m[i].style.backgroundColor="#ffffff"
-        m[i].style.borderColor="#000000"
-        m[i].style.color="#000000"
-
-        if(i==index){
-          m[i].style.backgroundColor="#0688ce"
-          m[i].style.borderColor="#0688ce"
-          m[i].style.color="#ffffff"
-        }
-      }
-      this.index=index
-      this.$refs.route.init(row.f_report_path, {data: row})
-    }
-  }
-}
-</script>
-<style>
-. mystyle{
-  background-color: #05c3c7;
-}
-</style>
+<template>
+  <div id="unit" class="flex-row binary">
+    <div class="three-left" :style="{width:'23%'}">
+    <div class="flex">
+      <report-items @select-type="showReportType"></report-items>
+      <!--<report-history @select-changed="showReport" v-ref:history></report-history>-->
+    </div>
+    </div>
+    <!-- 使用动态页签
+    <dynamic :comps='[]' name='report'></dynamic> -->
+    <!-- 使用路由切换 -->
+    <div :style="{width:'78%'}">
+      <div class="flex" v-if="$refs.route.cards.length === 0">
+        <echarts-box></echarts-box>
+      </div>
+      <route v-ref:route @save-success="$refs.history.search" v-show="!($refs.route.cards.length === 0)"></route>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '报表汇总',
+  data () {
+    return {
+      comp: []
+    }
+  },
+  methods: {
+    // 根据选择的数据直接显示保存的报表
+    showReport (row) {
+      this.$refs.route.init(row.val.f_component_name, {data: row.val})
+    },
+    // 根据报表的类型选择显示报表
+    showReportType (row) {
+      this.$refs.route.init(row.f_report_path, {data: row})
+    }
+  }
+}
+</script>