manage-client 4.0.32 → 4.0.34

package/package.json

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

package/src/filiale/WEINAN/YuShouTable.vue

@@ -0,0 +1,305 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <p class="bg-info text-center" style="padding: 8px;">预售收入日报汇总表</p>
+        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-4" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="$parent.$parent.startdate"
+                          :value.sync="$parent.$parent.startdate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="$parent.$parent.enddate"
+                          :value.sync="$parent.$parent.enddate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
+
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='user'
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='1cm' left='2' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto;border-spacing: 0px 0px;font-size:13px;"  v-if="!$parent.data.f_files_path">
+          <thead>
+          <tr>
+            <th colspan='12' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">预售收入日报汇总表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='12' style="font-weight: normal; text-align: left;">
+              <b style="text-align: left; font-size:15px;margin-left: 20px;" v-if="$parent.startDate==$parent.endDate">
+                {{$parent.startDate}}
+              </b>
+              <b style="text-align: left;font-size:15px;margin-left: 20px;" v-else>
+                {{$parent.startDate+" 至 "+$parent.endDate}}
+              </b>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='12' style="font-weight: normal; text-align: center;">
+              <div style="text-align: left;font-size:15px;margin-left: 20px;">
+                <span v-show="$parent.orgFlag">{{$parent.orgname}}</span>
+                <span v-show="$parent.depFlag">{{$parent.depname}}</span>
+                <span v-show="$parent.operFlag">{{$parent.operatorname}}</span><br>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='12'>
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='4'>部门主管：</th>
+            <th colspan='2'>出纳：</th>
+            <th colspan='2'>审核：</th>
+            <th colspan='4'>制表：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </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 } from 'vue-client'
+  import co from 'co'
+  let saveFile = function * (self) {
+    // 线验证文件是否重名
+    let count = yield self.$resetpost('api/af-revenue/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('api/af-revenue/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: 'manage-bus-summary',
+      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+      f_outlets: this.$login.f.depname})
+    if (saveBack.data.status === 'succeed') {
+      self.show = false
+      self.filename = ''
+      // 后台保存完成，通知刷新
+      self.$dispatch('save-success', self.filename)
+    }
+  }
+  export default {
+    title: '预售收入日报汇总表',
+    props: ['data'],
+    data () {
+      return {
+        depresid: [],
+        userresid: [],
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        depname: [],
+        operatorname: [],
+        orgCondtionStr: '1=1',
+        model: new DataModel('api/af-revenue/report/weinanbill', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid'}),
+        reportStr: null,
+        show: false,
+        startDate: '',
+        endDate: '',
+        startdate: '',
+        enddate: '',
+        orgFlag: false,
+        depFlag: false,
+        operFlag: false,
+      }
+    },
+    ready () {
+      this.startdate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.enddate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.startDate = this.startdate.substring(0, 10)
+      this.endDate = this.startDate.substring(0, 10)
+      console.log(this.$login.f)
+    },
+    methods: {
+      appendCondition (data) {
+        console.log('data=====>', data)
+        let stringValue = ''
+        for (var i = 0; i < data.length; i++) {
+          if (data[i]) {
+            if (i === data.length - 1) {
+              stringValue = stringValue + "'" + data[i] + "'"
+            } else {
+              stringValue = stringValue + "'" + data[i] + "',"
+            }
+          }
+        }
+        return stringValue
+      },
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        let f_dep = this.f_depid
+        let orgcondition = ` ts.f_orgid in ('${this.f_orgid}')`
+        if (f_dep[0]) {
+          orgcondition += " and ts.f_depid in('" + f_dep[0] + "'"
+          for (let i = 1; i < f_dep.length; i++) {
+            orgcondition += ",'" + f_dep[i] + "'"
+          }
+          orgcondition += ')'
+        }
+        if (this.f_operatorid[0]) {
+          const operatorIds = this.f_operatorid.map(id => `'${id}'`).join(',')
+          orgcondition += ` and ts.f_operatorid in (${operatorIds})`
+        }
+        // console.log(this.orgname,this.depname.toString(),this.operatorname)
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.search(args)
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+      },
+      getdep (obj, val) {
+        this.depname = val
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser (obj, val) {
+        this.operatorname = val
+        this.f_operatorid = obj
+      },
+
+      // 根据文件路径获取储存的报表内容
+      getFileContent (path) {
+        this.$resetpost('api/af-revenue/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 + this.$login.toStandardDateString()
+      },
+      flag() {
+        const hasOrg = !!this.orgname;
+        const hasDep = Array.isArray(this.depname) && this.depname.length > 0
+        const hasOperator = Array.isArray(this.operatorname) && this.operatorname.length > 0
+
+        this.orgFlag = hasOrg && !hasDep && !hasOperator
+        this.depFlag = hasOrg && hasDep && !hasOperator
+        this.operFlag = hasOrg && hasDep && hasOperator
+      }
+
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      },
+      'orgname'(){
+        this.flag()
+      },
+      'depname'(){
+        this.flag()
+      },
+      'operatorname'(){
+        this.flag()
+      },
+      'startdate'(val){
+        this.$refs.paged.$refs.criteria.model.startDate=this.startdate
+        this.startDate=this.startdate.substring(0,10)
+        console.log('startdate',val)
+      },
+      'enddate'(val){
+        this.$refs.paged.$refs.criteria.model.endDate=this.enddate
+        this.endDate=this.enddate.substring(0,10)
+        console.log('enddate',val)
+      }
+    },
+    computed: {
+      operator () {
+        return this.$getParams('操作员查询用', [{label: '全部', value: ''}])
+      },
+      network () {
+        return this.$getParams('网点查询用', [{label: '全部', value: ''}])
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/filiale/WEINAN/reportManage.js

@@ -15,5 +15,9 @@ export default function () {
   Vue.component('manage-company-gas-detail', (resolve) => { require(['./ManageCompanyGasDetail'], resolve) })
   // 报表展示组件（用户新增销户统计报表）
   Vue.component('manage-user-count', (resolve) => { require(['./ManageUserCount'], resolve) })
+  // 预售收入日报
+  Vue.component('yu-shou-table', (resolve) => {
+    require(['./YuShouTable'], resolve)
+  })
 }