manage-client 3.2.156 → 3.2.158

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "manage-client",
-  "version": "3.2.156",
+  "version": "3.2.158",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
     "test": "test"
   },
-  "dependencies": {},
+  "dependencies": {
+    "swiper": "^5.4.5"
+  },
   "devDependencies": {
     "axios": "0.15.3",
     "babel-core": "^6.0.0",

package/src/components/SellReport/chaostyle.vue

@@ -0,0 +1,493 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model"  v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <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-2 form-group">
+                  <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-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='user'
+                              is-mul="false"
+                              @res-select="$parent.$parent.getuser"
+                              :parentresid="$parent.$parent.userresid"
+                              :initresid='$parent.$parent.operatorid'>
+                  </res-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="chaostyle"
+                                template-name='抄表划价查询明细'
+                                :choose-col="true"></export-excel>
+                  <print-data-self :model="$parent.model" :field="$parent.$parent.getfield"
+                                   :defaultfield="$parent.$parent.defaultfield" printName="营业厅明细"
+                                   :sumsmodel="$parent.$parent.sumsmodel" :sum-field="$parent.$parent.sumField" :page-sum="$parent.$parent.pageSum"
+                                   :start-date="$parent.$parent.startDate" :end-date="$parent.$parent.endDate"
+                  ></print-data-self>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>序号</nobr>
+                </th>
+                <th>
+                  <nobr>用户号</nobr>
+                </th>
+                <th>
+                  <nobr>用户名</nobr>
+                </th>
+                <th>
+                  <nobr>用户地址</nobr>
+                </th>
+                <th>
+                  <nobr>起方</nobr>
+                </th>
+                <th>
+                  <nobr>止方</nobr>
+                </th>
+                <th>
+                  <nobr>气量</nobr>
+                </th>
+                <th>
+                  <nobr>单价</nobr>
+                </th>
+                <th>
+                  <nobr>金额</nobr>
+                </th>
+                <th>
+                  <nobr>下账状态</nobr>
+                </th>
+                <th>
+                  <nobr>抄表册</nobr>
+                </th>
+                <th>
+                  <nobr>抄表员</nobr>
+                </th>
+                <th>
+                  <nobr>录入员</nobr>
+                </th>
+                <th>
+                  <nobr>审核人</nobr>
+                </th>
+                <th>
+                  <nobr>审核日期</nobr>
+                </th>
+                <th>
+                  <nobr>抄表状态</nobr>
+                </th>
+                <th>
+                  <nobr>表单状态</nobr>
+                </th>
+                <th>
+                  <nobr>客户类型</nobr>
+                </th>
+                <th>
+                  <nobr>用气性质</nobr>
+                </th>
+                <th>
+                  <nobr>气价编号</nobr>
+                </th>
+
+                <th>
+                  <nobr>气价名称</nobr>
+                </th>
+
+                <th>
+                  <nobr>气表分类</nobr>
+                </th>
+
+                <th>
+                  <nobr>截止日期</nobr>
+                </th>
+
+                <th>
+                  <nobr>备注</nobr>
+                </th>
+                <th>
+                  <nobr>气表型号</nobr>
+                </th>
+                <th>
+                  <nobr>结算方式</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align:center">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_userinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_last_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_accounts_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_book_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_inputtor}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operatorr}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_audit_person}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_audit_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_id}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_classify}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_accounting_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.beizhu}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_calculation}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold" >
+              报表统计时间
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-if="startDate==endDate">
+              {{startDate}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-else>
+              {{startDate+" 至 "+endDate}}
+            </td>
+          </tr>
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              气量汇总:&emsp;{{sumsmodel.gas.toFixed(2)}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              金额汇总:&emsp;{{sumsmodel.f_money.toFixed(2)}}
+            </td>
+
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import defaultPrint from '../sale/config/DefaultPrint'
+import exportConfig from '../sale/config/exportConfig'
+import PrintDataSelf from '../sale/common/PrintDataSelf'
+
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+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',
+      data: {},
+      other:[],
+      footer:[],
+      model: new PagedList('rs/sql/chaostyle', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},{
+        gas:0,
+        f_money:0
+      }),
+      gasproperties:[],
+      show:false,
+      rowdata:{},
+      residentialArea: [],
+      modelval: [],
+      startDate:"",
+      endDate:"",
+      inputtouPerson: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+
+      // 下拉框
+
+      //合计数据
+      sumsmodel: {},
+      sumField: {
+        'gas': '气量汇总', 'f_money': '金额汇总'
+      },
+      pageSum: {
+        'gas': '0.00',
+        'f_money': '0.00'
+      },
+      defaultfield: [],
+      config: {
+        defaultPrint: ['f_userinfo_code', 'f_user_name']
+      },
+      batchmoneyShow:false
+    }
+  },
+  ready() {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    getotherfooter(){
+      // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+      // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+      this.other=[];
+      this.footer=[];
+      let exportdata = this.getCondition;
+      let otherInData=[];
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+      let footerData=[],exportfield=this.getfield;
+      footerData.push("合计");
+      let self =this;
+      for(var field in self.sumsmodel){
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+      }
+      this.footer.push(footerData);
+      this.other.push(otherInData);
+    },
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      if (this.f_depid[0]) {
+        orgcondition += " and f_depid in("+this.f_depid.toString()+')'
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+      }
+      this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
+      this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
+      this.orgCondtionStr=orgcondition
+      this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
+      this.model.search(args.f_orgid, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+    },
+    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[0]
+      this.f_operatorid = obj
+    },
+    stamp() {
+      this.all = false
+      //默认选择要打印的列
+      this.modelval = defaultPrint.config
+      this.fields = this.getfield
+      console.log('所有打印字段', this.fields)
+      this.printshow = true
+      this.put()
+    },
+    put() {
+      // 对Modelval进行排序
+      this.sortModelval()
+      this.thead = `<tr><th colspan=${this.modelval.length}>收费查询统计报表</th></tr><tr>`
+      for (let key of this.modelval) {
+        this.thead += '<th>' + this.fields[key] + '</th>'
+      }
+      this.thead += '</tr>'
+    },
+    print() {
+      this.$refs.print.PrintAsFile()
+      this.printshow = false
+    },
+    dealmsg(val) {
+      console.log('---------------dealmsg')
+      this.rowdata=val
+      this.show=true
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    close() {
+      this.printshow = false
+      this.all = false
+    },
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
+        }
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    },
+    userTypeChange () {
+      this.gasproperties=[]
+      if(this.$refs.paged.$refs.criteria.model !==null) {
+        this.$refs.paged.$refs.criteria.model.f_gasproperties=''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
+    },
+  },
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
+        this.put()
+      }
+    },
+    'modelval.length'() {
+      this.put()
+    },
+    sumsmodel:{
+      handler: function(val) {
+        this.getotherfooter();
+      },
+      deep: true
+    }
+  },
+  computed: {
+    getCondition() {
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        f_orgid: this.orgCondtionStr
+
+      }
+
+    },
+    getfield() {
+      return exportConfig.chaostyle
+    },
+    whetherpaies () {
+      return [
+        {label: '全部', value: ''},
+        {label: '已缴费', value: '是'},
+        {label: '未缴费', value: '否'}
+      ]
+    },
+    usertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+
+  }
+}
+</script>

package/src/components/SellReport/charge_handfee.vue

@@ -0,0 +1,176 @@
+<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>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2">
+              <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-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'>
+              </res-select>
+
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='user'
+                          is-mul="false"
+                          @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='
+' left='0' width='100%' height='100%'></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">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">气价自动划价表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}<br/>
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+export default {
+  title: '气价自动划价表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      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('rs/report/charge_handfee', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      spans: 0,
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+      if (this.f_depid[0]) {
+        orgcondition += ' and f_depid in (' + this.f_depid + ')'
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+      }
+      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[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>