manage-client 3.2.90 → 3.2.91-aode

package/src/components/SellReport/RefundQuery.vue

@@ -0,0 +1,237 @@
+  <template>
+  <div id='app' >
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:criteria>
+        <div novalidate class="form-inline auto " partial >
+          <p class="bg-info text-center" style="padding: 8px;">>操作员退款结账报表</p>
+          <div class="flex-row auto" style="justify-content: space-between">
+            <div class="form-group" v-if="!$parent.$parent.data.f_files_path">
+            <label for="startDate">开始日期:</label>
+            <datepicker id="startDate" placeholder="开始日期"
+              v-model="model.startDate"
+              :value.sync="model.startDate"
+              :disabled-days-of-Week="[]"
+              :format="'yyyy-MM-dd 00:00:00'"
+              :show-reset-button="reset">
+            </datepicker>
+            <label for="endDate">结束日期:</label>
+            <datepicker id="endDate" placeholder="结束日期"
+              v-model="model.endDate"
+              :value.sync="model.endDate"
+              :disabled-days-of-Week="[]"
+              :format="'yyyy-MM-dd 23:59:59'"
+              :show-reset-button="reset">
+            </datepicker>
+            <label for="outlets" class="control-label">营业网点</label>
+            <v-select :value.sync="model.outlets" v-model="model.outlets" @change='$parent.$parent.outletsChange'
+                :options='$parent.$parent.outlets' placeholder='营业网点'
+            close-on-select></v-select>
+            <label for="operator" class="control-label">操作员</label>
+            <v-select :value.sync="model.operator" v-model="model.operator"
+                :options='$parent.$parent.operator' placeholder='操作员'
+            close-on-select></v-select>
+
+
+            <button class="btn btn-primary width-100" @click="search()">查询</button>
+            <button class="btn btn-success width-100" @click="$parent.$parent.confirmReport()">保存报表</button>
+            </div>
+            <span></span>
+            <div class="form-group">
+              <report-print id='bussummary' top='1cm' left='2cm' width='100%' height='100%'></report-print>
+              <report-excel id='bussummary' ></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='bussummary'>
+        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+          <thead>
+            <tr>
+              <th colspan='3' style="font-weight: normal; text-align: left;">
+                <h3 style="text-align: center">操作员退款结账报表</h3>
+              </th>
+            </tr>
+            <tr>
+              <th colspan='3' style="font-weight: normal; text-align: center;">
+                开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+                结束时间：{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
+              </th>
+            </tr>
+            <tr>
+              <th colspan='3' style="font-weight: normal; text-align: center;">
+                营业网点：{{model.model.outlets}}&nbsp;&nbsp;&nbsp;
+                操作员：{{model.model.operator[0]}}
+              </th>
+            </tr>
+          </thead>
+            <tr>
+              <td colspan='3'>
+            {{{ model.data.substring(26,model.data.length-8) }}}
+              </td>
+          </tr>
+          <tfoot>
+            <tr style="text-align: left">
+              <th colspan='1'>财务审核：</th>
+              <th colspan='1'>收款审核：</th>
+              <th colspan='1'>收款员：</th>
+            </tr>
+          </tfoot>
+        </table>
+         {{{ $parent.reportStr }}}
+       </div>
+       <!-- <div partial='list' v-el:handcollect v-if="data.f_files_path">
+
+       </div> -->
+    </criteria-paged>
+
+    <modal :show.sync="show" v-ref:modal small backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">输入文件名称</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+      </footer>
+    </modal>
+
+  </div>
+</template>
+
+<script>
+import { DataModel, HttpResetClass } from 'vue-client'
+import * as Util from '../../Util'
+import AppData from '../../stores/AppData'
+import co from 'co'
+
+let outletGen = function * (self) {
+  let http = new HttpResetClass()
+  let outlets = yield http.load('POST', '/rs/search', {source: 'tool.getChildrenOfResName($青白江博能燃气$)', userid: ''}, {resolveMsg: null, rejectMsg: null})
+  outlets.data.forEach((item, next) => {
+    let temp = {}
+    temp.label = item.name
+    temp.value = item.name
+    self.outlets.push(temp)
+  })
+  self.outlets = [{label: '全部', value: ''}, ...self.outlets]
+}
+let operatorGen = function * (self, val) {
+  if (val[0] === '') {
+    self.operator = [{label: '全部', value: ''}]
+    // self.$refs.paged.$refs.criteria.model.operator[0] = ''
+    // console.log('11111114444444', self.$refs.paged.$refs.criteria)
+  } else {
+    let operators = yield self.$resetpost('/rs/search', {source: `tool.getChildrenOfResName($${val}$)`, userid: ''}, {resolveMsg: null, rejectMsg: null})
+    operators.data.forEach((item, next) => {
+      let temp = {}
+      temp.label = item.name
+      temp.value = item.name
+      self.operator.push(temp)
+    })
+    self.operator = [{label: '全部', value: ''}, ...self.operator]
+  }
+  self.$set('$refs.paged.$refs.criteria.model.operator[0]', '')
+}
+
+let saveFile = function * (self) {
+  // 线验证文件是否重名
+  let count = yield self.$resetpost('rs/sql/manageSingleTable',
+  {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+  {resolveMsg: null, rejectMsg: null})
+  if (count.data.length > 0) {
+    self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+    return
+  }
+  let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'bus-summary',
+    f_operator: Util.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+    f_outlets: Util.f.f_parentname})
+
+    if (saveBack.data.status === 'succeed') {
+      self.show = false
+      self.filename = ''
+      // 后台保存完成，通知刷新
+      self.$dispatch('save-success', self.filename)
+    }
+}
+
+
+export default {
+  title: '操作员结账报表',
+  props: ['data'],
+  data () {
+    return {
+      model: new DataModel('rs/report/refundquery', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+      outlets: 'this.model.outlets[0]', operator: 'this.model.operator[0]', filiale: `'${Util.f.f_fengongsi}'`}),
+      reportStr: null,
+      show: false,
+      outlets: [],
+      operator: [],
+      filename: ''
+    }
+  },
+  ready () {
+    this.getOutlets()
+    if (this.data) {
+      this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.model.operator = [`${Util.f.name}`]
+      this.$refs.paged.$refs.criteria.model.outlets = [`${Util.f.f_parentname}`]
+    }
+  },
+  methods: {
+    outletsChange (val) {
+      this.operator = []
+      let operator = operatorGen(this, val)
+      return co(operator)
+    },
+    getOutlets () {
+      let outlet = outletGen(this)
+      return co(outlet)
+    },
+    // 根据文件路径获取储存的报表内容
+    getFileContent (path) {
+      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.reportStr = res.data.filecontent
+        this.model.state = '正确'
+      })
+    },
+    confirm () {
+      if (!this.filename || this.filename === '') {
+        this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+      }
+      let saveGen = saveFile(this)
+      co(saveGen)
+    },
+    close () {
+      this.show = false
+    },
+    // 将报表保存成文件
+    confirmReport () {
+      this.show = true
+      this.filename = this.data.f_report_name + Util.toStandardDateString()
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  },
+  computed: {
+    outlets () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+    },
+    operator () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+    }
+  }
+}
+</script>

package/src/components/SellReport/ReportItems.vue

@@ -1,246 +1,39 @@
 <template>
   <div class="flex">
-        <div class="row" style="height: 5%">
-          <div class="col-sm-10">
-            <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='请选择'
-                      @keyup.enter="chaxun()"
-            ></v-select>
+    <partial-view v-ref:pv>
+      <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 class="col-sm-2">
-            <button class="button_search left"   @click="chaxun()">查询</button>
-            &nbsp;&nbsp;
-          </div>
-        </div>
-    <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"  >报表类型
-          <button class="button_search-3 button_spacing border-right"  v-if="this.$login.r.includes('报表配置权限')" @click="saveReport()">新增</button></p>
-        <div style="height: 87%;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,'0')"
-               :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}}、
-                <span @click="changecolor(index,type,'1')" title="点击报表名称可对该报表配置进行修改！注：需要权限【报表配置权限】">{{type.f_report_name}}</span></div>
-            </div>
         </div>
-
-      </div>
-      <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">
-          <!--true新增，false修改-->
-          {{saveflag?'新增报表':'修改报表配置'}}
-        </p>
-        <div style="height: 94%;overflow: auto;width: 104%">
-          <table style="border-style: none;width: 95%;">
-
-            <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="clear(true)">清空</button></td>
-              <!--修改的保存-->
-              <td style="text-align: right;width: 25%;" v-if="!saveflag"><button class="button_clear  button_spacing"  @click="saveOrUpdate(1)">保存</button></td>
-              <!--新增的保存-->
-              <td style="text-align: left;width: 25%;" v-if="saveflag"><button class="button_search button_spacing" @click="saveOrUpdate(2)">保存</button></td>
-              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="goback">返回</button></td>
-            </tr>
-          </table>
-        </div>
-
       </div>
     </partial-view>
   </div>
 </template>
 
 <script>
-import {HttpResetClass} from "vue-client";
-
 export default {
   title: '报表选项',
-  props: {
-    inindex:{}
-  },
   data () {
     return {
-      saveflag: false,
-      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) => {
-        console.log('sssss:',res.data)
-        this.types = res.data
-      }).catch((error) => {
-
-      })
-    },
-    // 返回
-    goback(){
-      this.chaxun()
-    },
-    // 保存
-    saveReport(){
-      for (let key in this.infos) {
-        this.infos[key] =''
-      }
-      this.saveflag = true
-      this.filtrate = true
-    },
-    // 查询
-    chaxun(){
-      this.getReportInfo()
-      this.filtrate = false
-    },
-    changecolor(index,type,int){
-      this.row=index
-
-      if (this.$login.r.includes('报表配置权限') && int === '1') {
-        this.saveflag = false
-        this.filtrate=!this.filtrate
-      }
-    },
-    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
-    }
+    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) => {
+
+    })
   }
 }
 </script>

package/src/components/SellReport/ReportPool.vue

@@ -1,19 +1,19 @@
 <template>
   <div id="unit" class="flex-row binary">
-    <div class="three-left" :style="{width:'18%'}">
+    <div class="three-left" :style="{width:'23%'}">
     <div class="flex">
-      <report-items @select-type="showReportType" :inindex="index"></report-items>
+      <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:'82%'}">
+    <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>
+      <route v-ref:route @save-success="$refs.history.search" v-show="!($refs.route.cards.length === 0)"></route>
     </div>
   </div>
 </template>
@@ -23,8 +23,7 @@ export default {
   title: '报表汇总',
   data () {
     return {
-      comp: [],
-      index:''
+      comp: []
     }
   },
   methods: {
@@ -33,28 +32,9 @@ export default {
       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
+    showReportType (row) {
       this.$refs.route.init(row.f_report_path, {data: row})
     }
   }
 }
 </script>
-<style>
-. mystyle{
-  background-color: #05c3c7;
-}
-</style>

package/src/components/SellReport/Selling.vue

@@ -35,7 +35,7 @@
             </div>
             <span></span>
             <div class="form-group">
-              <report-print id='selling' top='1cm' left='2cm' width='100%' height='100%' :preview="true"></report-print>
+              <report-print id='selling' top='1cm' left='2cm' width='100%' height='100%'></report-print>
               <report-excel id='selling' ></report-excel>
             </div>
           </div>

package/src/components/SellReport/SiteManager.vue

@@ -11,6 +11,7 @@ import echarts from 'echarts'
 import {HttpResetClass } from 'vue-client'
 
 let getData = function * (self) {
+
   let load = new HttpResetClass()
   load.load('POST','rs/sql/sellinggasvalue',
   {data: {startDate: self.startdate, endDate: self.enddate,key: 'f_depname',f_orgid: self.orgid}},
@@ -129,7 +130,10 @@ export default {
    }
  },
  ready () {
-   this.searchdata()
+    if (this.orgid) {
+      this.searchdata()
+    }
+
  },
  watch: {
    'startdate' (val) {

package/src/components/SellReport/UsertypePie.vue

@@ -4,8 +4,6 @@
   </div>
 </template>
 
-
-
 <script>
 import * as Util from '../../Util'
 import co from 'co'