manage-client 3.2.140 → 3.2.144

package/build/dev-server.js

@@ -13,9 +13,9 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://192.168.50.4:8400'
+var bendi = 'http://127.0.0.1:8090'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://192.168.50.4:8400'
+var fuwu = 'http://121.36.106.17:8400'
 // var fuwu = 'http://203.57.101.233:9001'
 var system = 'http://192.168.50.4:8400'
 //192.168.

package/package.json

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

package/src/components/SellReport/Cardapplysgas.vue

@@ -0,0 +1,274 @@
+<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="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-4" >
+              <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-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 class="col-sm-4 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_meter_classify" multiple
+                        :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
+                        condition="f_meter_classify in {}"
+                        close-on-select></v-select>
+            </div>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' 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"  v-if="!$parent.data.f_files_path">
+          <thead>
+          <tr>
+            <th colspan='9' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">卡表抄表气价报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='9' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}<br>
+              结束时间：{{ model.model.endDate }}<br>
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='9' 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='9'>
+              {{{ 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='3'>收款员：</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('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: '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 {
+      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/Cardapplysgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false,
+    }
+  },
+  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'
+    // this.$refs.paged.$refs.criteria.search()
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      console.log("condition:" + args.condition)
+      let orgcondition = '1=1'
+      if (this.f_orgid[0]) {
+        orgcondition += ' and s.f_orgid in (' + this.f_orgid + ')'
+      }
+      let  deps = ''
+      let i = 0
+      let depss = ''
+      if (this.f_depid[0]) {
+        for ( i; i< this.f_depid.length; i++ )
+          deps += `'${this.f_depid[i]}',`
+        depss = deps.toString().substring(1,deps.length-2)
+        orgcondition +=  " and s.f_depid in ( '" + depss + "' ) "
+      }else {
+        depss = ''
+      }
+      console.log("所选部门:" + depss)
+
+      let opes = ''
+      let j = 0
+      let opess = ''
+      if(this.f_operatorid[0]) {
+        for ( j; j< this.f_operatorid.length; j++ )
+          opes += `'${this.f_operatorid[j]}',`
+        opess = opes.toString().substring(1,opes.length-2)
+        orgcondition += "and s.f_operatorid in ( '" + opess + "' ) "
+      }else {
+        opess = ''
+      }
+      console.log("所选人员:" + opess)
+
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + " and " + args.condition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+      this.userresid = 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('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 + this.$login.toStandardDateString()
+    },
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  },
+  computed: {
+    metertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表品牌')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/SellReport/LeftChart.vue

@@ -0,0 +1,132 @@
+<template>
+  <div :id="id" style="height:50%"></div>
+</template>
+<script>
+import * as echarts from "echarts";
+export default {
+  name: "LineEchart",
+  props: {
+    title: {
+      type: String,
+    },
+    id: {
+      type: String,
+      default: "main",
+    },
+    type: {
+      type: String,
+      default: "line",
+    },
+    color: {
+      type: Array,
+      default: function () {
+        return ["#9E87FF", '#73DDFF', '#fe9a8b', '#F56948', '#9E87FF',"#005aff", "pink", "#08b551", "red", "#f0b551", "black"];
+      },
+    },
+    param: {
+      type: Object,
+      default: function () {
+        return {
+          width: "1",
+          legendData: ["Email", "Union Ads", "Video Ads"],
+          xData: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+          yData: [
+            [120, 132, 101, 134, 90, 230, 210],
+            [220, 232, 301, 434, 290, 230, 210],
+            [920, 832, 501, 234, 590, 230, 210],
+          ],
+        };
+      },
+    },
+  },
+  data() {
+    return {};
+  },
+
+  ready() {
+    // this.initData();
+  },
+  watch:{
+    'param'(val){
+      if(val){
+        this.initData();
+      }
+    }
+  },
+  methods: {
+    //组织单个Series
+    getSeries(name, width, color, data) {
+      return {
+        name: name,
+        type: "line",
+        lineStyle: {
+          width: width,
+          type: "line",
+        },
+        data: data,
+      };
+    },
+    setSeries() {
+      let arr = [];
+      for (let i = 0; i < this.param.yData.length; i++) {
+        let serie = this.getSeries(
+          this.param.legendData[i],
+          this.param.width,
+          this.color[i],
+          this.param.yData[i]
+        );
+        arr.push(serie);
+      }
+      return arr;
+    },
+    initData() {
+      var chartDom = document.getElementById(this.id);
+      var myChart = echarts.init(chartDom);
+      this.option = {
+        title: {
+          text: this.title,
+        },
+        tooltip: {
+          trigger: "axis",
+          position: function (pos, params, dom, rect, size) {
+            let yPos = '20%'
+            let xPos = 0
+            if (pos[0] < size.viewSize[0] / 2) {
+              xPos = pos[0] + 10
+            } else {
+              xPos = pos[0] - dom.offsetWidth - 10
+            }
+            return [xPos, yPos]
+          },
+          trigger: 'axis',
+          extraCssText: 'width:auto;height:auto;border:1px solid #015999;background:#032f53 ',
+        },
+        legend: {
+          data: this.param.legendData,
+          bottom: '0%',
+          left: 'center',
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "13%",
+          containLabel: true,
+        },
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: this.param.xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        series: this.setSeries(),
+      };
+
+      this.option && myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+
+<style scoped></style>

package/src/components/SellReport/MarketMonthChart.vue

@@ -0,0 +1,162 @@
+
+<template>
+  <div col="col-sm-12">
+    <div class="col-sm-6">
+     <left-chart :param="param" id="leftchart" title="用气量情况"></left-chart>
+    </div>
+    <div class="col-sm-6">
+      <left-chart :param="param1" id="leftchart2" title="用气比例"></left-chart>
+    </div>
+  </div>
+</template>
+
+<script>
+import  {HttpResetClass} from "vue-client";
+export default {
+    props: ['condition'],
+    data() {
+      return {
+        dataLength: 0,
+        xData: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
+        param:[],
+        param1:[],
+        name:[],
+        yData: [],
+        yData2:[],
+      }
+    },
+    methods: {
+     getParams (params) {
+       this.name = []
+       this.yData = []
+       this.yData2 = []
+       let http  = new HttpResetClass()
+       http.load('post','rs/sql/gasbai_body',{data: params}).then((res)=>{
+         console.log(res.data)
+         this.dataLength = res.data.length
+         let sumgas1 = 0
+         let sumgas2 = 0
+         let sumgas3 = 0
+         let sumgas4 = 0
+         let sumgas5 = 0
+         let sumgas6 = 0
+         let sumgas7 = 0
+         let sumgas8 = 0
+         let sumgas9 = 0
+         let sumgas10 = 0
+         let sumgas11 = 0
+         let sumgas12 = 0
+         for (let i = 0; i < res.data.length; i++) {
+           sumgas1 += res.data[i].f_gas1
+           sumgas2 += res.data[i].f_gas2
+           sumgas3 += res.data[i].f_gas3
+           sumgas4 += res.data[i].f_gas4
+           sumgas5 += res.data[i].f_gas5
+           sumgas6 += res.data[i].f_gas6
+           sumgas7 += res.data[i].f_gas7
+           sumgas8 += res.data[i].f_gas8
+           sumgas9 += res.data[i].f_gas9
+           sumgas10 += res.data[i].f_gas10
+           sumgas11 += res.data[i].f_gas11
+           sumgas12 += res.data[i].f_gas12
+         }
+         for (let i = 0; i < res.data.length; i++) {
+           this.name.push(res.data[i].f_gastype)
+           let arr2 = []
+           let arr1 = []
+           arr1.push(res.data[i].f_gas1)
+           arr1.push(res.data[i].f_gas2)
+           arr1.push(res.data[i].f_gas3)
+           arr1.push(res.data[i].f_gas4)
+           arr1.push(res.data[i].f_gas5)
+           arr1.push(res.data[i].f_gas6)
+           arr1.push(res.data[i].f_gas7)
+           arr1.push(res.data[i].f_gas8)
+           arr1.push(res.data[i].f_gas9)
+           arr1.push(res.data[i].f_gas10)
+           arr1.push(res.data[i].f_gas11)
+           arr1.push(res.data[i].f_gas12)
+           if (sumgas1 > 0 ) {
+             arr2.push((res.data[i].f_gas1*100/sumgas1).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas2 > 0 ) {
+             arr2.push((res.data[i].f_gas2*100/sumgas2).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas3 > 0 ) {
+             arr2.push((res.data[i].f_gas3*100/sumgas3).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas4 > 0 ) {
+             arr2.push((res.data[i].f_gas4*100/sumgas4).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas5 > 0 ) {
+             arr2.push((res.data[i].f_gas5*100/sumgas5).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas6 > 0 ) {
+             arr2.push((res.data[i].f_gas6*100/sumgas6).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas7 > 0 ) {
+             arr2.push((res.data[i].f_gas7*100/sumgas7).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas8 > 0 ) {
+             arr2.push((res.data[i].f_gas8*100/sumgas8).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas9 > 0 ) {
+             arr2.push((res.data[i].f_gas9*100/sumgas9).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas10 > 0 ) {
+             arr2.push((res.data[i].f_gas10*100/sumgas10).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas11 > 0 ) {
+             arr2.push((res.data[i].f_gas11*100/sumgas11).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas12 > 0 ) {
+             arr2.push((res.data[i].f_gas12*100/sumgas12).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           this.yData.push(arr1)
+           this.yData2.push(arr2)
+         }
+         this.param = {
+           legendData:this.name,
+           xData :this.xData,
+           yData:this.yData,
+         }
+         this.param1 = {
+           legendData:this.name,
+           xData :this.xData,
+           yData:this.yData2,
+         }
+       })
+     }
+    },
+    watch: {
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/SellReport/MarketMonthgas.vue

@@ -118,8 +118,11 @@
           </tfoot>
         </table>
         {{{ $parent.reportStr}}}
+        <market-month-chart v-ref:getChart >
+        </market-month-chart>
       </div>
     </criteria-paged>
+
   </div>
 </template>
 
@@ -142,6 +145,7 @@ export default {
       depid: [],
       orgname: '',
       depname: '',
+      condition:null,
       criteriaShow: false,
       operatorname: '',
       orgCondtionStr: '1=1',
@@ -187,7 +191,10 @@ export default {
                 orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
               }*/
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.condition =  this.$refs.paged.model.params
       this.$refs.paged.search(args)
+      console.log(this.$refs.paged)
+      this.$refs.paged.$refs.getchart.getParams(this.$refs.paged.model.params)
     },
 
     hidden() {

package/src/components/SellReport/UserFillmoney.vue

@@ -91,7 +91,7 @@
                   <nobr>应收金额</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <th>
                   <nobr>本期结余</nobr>

package/src/components/sale/businessquery/AccountQuery/AccountListManage.vue

@@ -7,8 +7,8 @@
     <tabs header="气费预收款情况汇总" v-if="permission('气费预收款情况汇总')">
       <pre-gas-list v-if="show.includes('气费预收款情况汇总')"></pre-gas-list>
     </tabs>
-    <tabs header="滞纳金情况汇总" v-if="permission('滞纳金情况汇总')">
-      <overdue-list v-if="show.includes('滞纳金情况汇总')"></overdue-list>
+    <tabs header="违约金情况汇总" v-if="permission('违约金情况汇总')">
+      <overdue-list v-if="show.includes('违约金情况汇总')"></overdue-list>
     </tabs>
     <tabs header="气费收款情况汇总" v-if="permission('气费收款情况汇总')">
       <sellinggas-list v-if="show.includes('气费收款情况汇总')"></sellinggas-list>

package/src/components/sale/businessquery/AccountQuery/OverdueList.vue

@@ -49,11 +49,11 @@
                                 :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile"
                                 sql-name="getOverdueList"
-                                template-name='滞纳金情况导出'
+                                template-name='违约金情况导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                                :defaultfield="$parent.$parent.defaultfield"
-                              titletable="滞纳金情况"
+                              titletable="违约金情况"
                               :sumsmodel="$parent.$parent.sumsmodel"></print-data>
 
                   <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
@@ -81,7 +81,7 @@
               <tr><th rowspan=2><nobr>月份</nobr></th>
                 <th rowspan=2><nobr>期初余额</nobr></th>
                 <th rowspan=2><nobr>本期发生额</nobr></th>
-                <th colspan="4"><nobr>本期实收滞纳金额</nobr></th>
+                <th colspan="4"><nobr>本期实收违约金额</nobr></th>
                 <th rowspan=2>
                   <nobr>小计</nobr>
                 </th>
@@ -190,7 +190,7 @@
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
   }
   export default {
-    title: '滞纳金情况汇总',
+    title: '违约金情况汇总',
     data() {
       return {
         data: {},