manage-client 3.2.72 → 3.2.74-aode

package/src/components/SellReport/VolumeStatistics.vue

@@ -0,0 +1,226 @@
+  <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>
+            <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/statistics', {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+      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/YuShou.vue

@@ -0,0 +1,185 @@
+  <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 HH:mm:ss'"
+              :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 HH:mm:ss'"
+              :show-reset-button="reset">
+            </datepicker>
+            <label for="f_outlets">营业网点:</label>
+           <v-select :value.sync="model.outlets" v-model='model.outlets'
+                 :options='$parent.$parent.outlets' placeholder='营业网点'
+                 close-on-select v-el:cc></v-select>
+           <label for="f_inputtor">操作员:</label>
+           <v-select :value.sync="model.operator" v-model='model.operator'
+                       :options='$parent.$parent.operator' placeholder='操作员'
+                       close-on-select v-el:cc></v-select>
+            <button class="btn btn-success 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='yushou' top='1cm' left='2cm' width='100%' height='100%'></report-print>
+              <report-excel id='yushou' ></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='yushou'>
+        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+          <thead>
+            <tr>
+              <th colspan='8' style="font-weight: normal; text-align: left;">
+                <h3 style="text-align: center">预售款金额统计表</h3>
+              </th>
+            </tr>
+            <tr>
+              <th colspan='8' style="font-weight: normal; text-align: center;">
+                开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+                结束时间：{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
+                营业网点：{{model.model.outlets}}&nbsp;&nbsp;&nbsp;
+                操作员：{{model.model.operator}}
+              </th>
+            </tr>
+          </thead>
+            <tr>
+              <td colspan='8'>
+            {{{ model.data.substring(26,model.data.length-8) }}}
+              </td>
+          </tr>
+          <tfoot>
+            <tr style="text-align: left">
+              <th colspan='3'>财务审核：</th>
+              <th colspan='3'>收款审核：</th>
+              <th colspan='2'>收款员：</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 } from 'vue-client'
+import * as Util from '../../Util'
+import AppData from '../../stores/AppData'
+import co from 'co'
+
+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: 'yushou-bill',
+    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/yushou_bill', {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,
+      filename: ''
+    }
+  },
+  ready () {
+    if (this.data) {
+    }
+  },
+  methods: {
+    // 根据文件路径获取储存的报表内容
+    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()
+    }
+  },
+  computed: {
+    outlets () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+    },
+    operator () {
+      return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      }else {
+        this.reportStr = null
+      }
+    }
+  }
+}
+</script>

package/src/components/SellReport/jingwei/CardCharge.vue

@@ -36,6 +36,7 @@
             <div class="col-sm-2">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
               <res-select restype='department'
+                          is-mul="false"
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid'>
@@ -44,12 +45,12 @@
         </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-             <report-print id='cardgasprice' top='3cm' left='0' width='100%' height='100%'></report-print>
-             <report-excel id='cardgasprice'></report-excel>
+             <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%'></report-print>
+             <report-excel id='gasprice'></report-excel>
           </div>
         </div>
     </criteria>
-    <div  partial='list' v-el:handcollect id='cardgasprice' style="height: 98%;overflow-y: scroll">
+    <div  partial='list' v-el:handcollect id='gasprice' style="height: 98%;overflow-y: scroll">
       <table class='tableprint' style="margin: 0px auto"  v-if="true">
         <thead>
         <tr>
@@ -115,10 +116,9 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = `f_orgid in (${this.f_orgid})` //'s.f_orgid = ' + this.f_orgid
+        let orgcondition = 'f_orgid = ' + this.f_orgid
         if (this.f_depid[0]) {
-          // orgcondition += ' and s.f_depid = ' + this.f_depid
-          orgcondition += ` and f_depid in (${this.f_depid})`
+          orgcondition += ' and f_depid = ' + this.f_depid
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/jingwei/MachineCharge.vue

@@ -36,6 +36,7 @@
             <div class="col-sm-2">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
               <res-select restype='department'
+                          is-mul="false"
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid'>
@@ -44,12 +45,12 @@
           </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-            <report-print id='machinegasprice' top='3cm' left='0' width='100%' height='100%'></report-print>
-            <report-excel id='machinegasprice'></report-excel>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%'></report-print>
+            <report-excel id='gasprice'></report-excel>
           </div>
         </div>
       </criteria>
-      <div  partial='list' v-el:handcollect id='machinegasprice' style="height: 98%;overflow-y: scroll">
+      <div  partial='list' v-el:handcollect id='gasprice' style="height: 98%;overflow-y: scroll">
         <table class='tableprint' style="margin: 0px auto"  v-if="true">
           <thead>
           <tr>
@@ -114,10 +115,9 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = `s.f_orgid in (${this.f_orgid})` //'s.f_orgid = ' + this.f_orgid
+        let orgcondition = 's.f_orgid = ' + this.f_orgid
         if (this.f_depid[0]) {
-          // orgcondition += ' and s.f_depid = ' + this.f_depid
-          orgcondition += ` and s.f_depid in (${this.f_depid})`
+          orgcondition += ' and s.f_depid = ' + this.f_depid
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)