manage-client 3.1.13 → 3.1.14-ls

package/src/components/handReport/GeneraHandReport.vue

@@ -0,0 +1,235 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <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 form-group" >
+              <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 form-group" >
+              <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 form-group">
+              <label class="font_normal_body" title="分组项一">分组项</label>
+              <v-select :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1' placeholder='请选择'
+                        close-on-select></v-select>
+            </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'
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+
+            <div  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>
+        </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='8' style="font-weight: bold; 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;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' 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>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='8' style="font-weight: normal;" id="test">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='3' style="font-weight: normal; text-align: center;">
+              收款人：
+            </th><th colspan='3' style="font-weight: normal; text-align: center;">
+              审核人：
+            </th><th colspan='2' style="font-weight: normal; text-align: center;">
+              经手人：
+            </th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </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: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        f_public_group1: '',
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        group1Name: '',
+        depname: '',
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/GeneraHandReport',
+          {startDate: 'this.model.startDate',
+                  endDate: 'this.model.endDate',
+                  f_orgid: 'this.model.f_orgid',
+                  f_public_group1: 'this.model.f_public_group1[0]',
+                  group1Name: 'this.model.group1Name'
+          }
+        ),
+        reportStr: null,
+        show: false,
+        spans: ''
+      }
+    },
+    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()
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+        let orgcondition = '1 = 1'
+        if (this.f_orgid[0]) {
+          orgcondition += ' and 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 + ')'
+        }
+        let name1 = args.model.f_public_group1
+        if (name1 == null || name1 == '') {
+          this.$showMessage('请选择分组项！')
+          return
+        }
+        console.log(args.model.f_public_group1)
+        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: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      },
+      'model.data' (val) {
+        let tab = document.getElementById('test').children[0]
+        var tds = tab.getElementsByTagName('td')
+        var num = 0
+        for (let td of tds) {
+          let span = td.getAttribute('colspan')
+          num = num + ((span ? span : 1) - 0)
+        }
+        this.spans = num
+      }
+    },
+    computed: {
+      group1 () {
+        return [{label: '用户类型', value: 'f_user_type'},
+          {label: '用气性质', value: 'f_gasproperties'},
+          {label: '抄表员', value: 'f_inputtor'},
+          {label: '营业网点', value: 'f_depname'}]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/components/qinhua/BarChart.vue

@@ -4,21 +4,15 @@
 </template>
 
 <script>
-  import {HttpResetClass} from 'vue-client'
   export default {
     title: '收费',
     data() {
-      return{
-        xData : ['1', '2', '3', '4', '5', '6'],
-        yData1 : [12944, 72188, 55748, 36948, 28498, 27358],
-        yData2 : [25968, 13128, 47838, 23148, 23498, 26538],
-      }
     },
     methods: {
       init() {
-        var xData = this.xData,
-          yData1 = this.yData1,
-          yData2 = this.yData2,
+        var xData = ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
+          yData1 = [12944, 7218, 5574, 3694, 2849, 2735, 2846, 2854, 1500],
+          yData2 = [25968, 13128, 4783, 2314, 2349, 2653, 3443, 3242, 1468],
           borderData = [],
           legend = ['民用', '非民用'],
           colorArr = [{
@@ -48,10 +42,10 @@
             type: 'bar',
             stack: legend[index],
             data: item,
-            barWidth: '12px',
+            barWidth: '15%',
             itemStyle: {
               normal: {
-                barBorderRadius: [30, 30, 0, 0],
+                barBorderRadius: [30, 30, 30, 30],
                 color: {
                   type: 'linear',
                   x: 0,
@@ -62,14 +56,14 @@
                     offset: 0,
                     color: colorArr[index].start
                   },
-                    {
-                      offset: 1,
-                      color: colorArr[index].start
-                    },
-                    {
-                      offset: 1,
-                      color: colorArr[index].start
-                    }
+                  {
+                    offset: 0.7,
+                    color: colorArr[index].mid
+                  },
+                  {
+                    offset: 1,
+                    color: colorArr[index].end
+                  }
                   ],
                   globalCoord: false
                 }
@@ -81,22 +75,6 @@
         console.log(seriesData)
         // 更改柱状图位置
         let option = {
-          title:{
-            text:'用户售气量分布',
-            x:'center',
-            y:'20',
-            backgroundColor: '#002c45', //标题背景颜色，默认'rgba(0,0,0,0)'透明
-            borderColor: '#01fee8', //标题边框颜色,默认'#ccc'
-            borderWidth: 1, //标题边框线宽，单位px，默认为0（无边框）
-            padding:5,
-            textStyle: {
-              fontSize: 12,
-              fontWeight: 'normal',
-              fontFamily: 'pFBold',
-              lineHeight: 26,
-              color: '#24d4d4',
-              align: 'center'
-            }},
           backgroundColor: '#ffffff00',
           grid: {
             left: '2%',
@@ -108,10 +86,9 @@
           legend: {
             show: true,
             icon: 'rect',
-            itemWidth: 15,
-            itemHeight: 10,
-            top: '10%',
-            right:'10%',
+            itemWidth: 30,
+            itemHeight: 20,
+            top: '5%',
             textStyle: {
               color: '#fff'
             },
@@ -129,24 +106,20 @@
               return [xPos, yPos]
             },
             trigger: 'axis',
-            extraCssText: 'width:auto;height:30%;border:1px solid #015999;background:#032f53 ',
+            extraCssText: 'width:15%;height:30%;',
             formatter: function (params) {
               var str = ''
               for (var i = 0; i < params.length; i++) {
                 if (params[i].seriesName !== '') {
-                  str += `<span>${params[i].seriesName}：</span><span style="color:gold">${params[i].value}</span> <br />`
+                  str += `<span>${params[i].name}月${params[i].seriesName}</span><span style="color:gold">${params[i].value}万方</span> <br />`
                 }
               }
               return str
             }
           },
           xAxis: [{
-            name: '近6月',
+            name: '月份',
             type: 'category',
-            nameTextStyle: {
-              color: '#95bad7',
-              fontSize: 12
-            },
             data: xData,
             interval: 0,
             axisPointer: {
@@ -154,8 +127,8 @@
             },
             axisLabel: {
               textStyle: {
-                color: '#95bad7',
-                fontSize: '1vw'
+                color: normalColor,
+                fontSize: 12
               }
             },
             axisLine: {
@@ -171,20 +144,18 @@
             }
           }],
           yAxis: [{
-            name: '单位（万方）',
             type: 'value',
             nameTextStyle: {
-              color: '#95bad7',
+              color: normalColor,
               fontSize: 12
             },
-            splitNumber : 3,
             // 'min': 0,
             // 'max': 50,
             axisLabel: {
               formatter: '{value}',
               textStyle: {
-                color: '#95bad7',
-                fontSize: '1vw'
+                color: normalColor,
+                fontSize: 12
               }
             },
             axisLine: {
@@ -196,7 +167,7 @@
               show: false
             },
             splitLine: {
-              show: false,
+              show: true,
               lineStyle: {
                 type: 'dashed',
                 color: normalColor
@@ -224,26 +195,7 @@
       }
     },
     ready() {
-      let http = new HttpResetClass()
-      http.load('post', '/rs/sql/getSellSumByMonth', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
-        this.yData1 = res.data.map((item)=>item.sum1)
-        console.log(this.yData1)
-        this.yData1 =[]
-        this.yData2=[]
-        this.xData = []
-        for(let i=0;i<res.data.length;i++){
-          if(res.data[i].natures==='民用'){
-            this.xData.push(res.data[i].time)
-            this.yData1.push((res.data[i].sumgas/10000).toFixed(2))
-          }
-          if(res.data[i].natures==='非民用'){
-            this.yData2.push((res.data[i].sumgas/10000).toFixed(2))
-          }
-
-        }
-        this.init()
-
-      })
+      this.init()
     },
     props: {}
   }

package/src/components/qinhua/Style/qinhuaStyle.less

@@ -35,18 +35,7 @@
   /*position: absolute;*/
 }
 .background-content-img {
-  background-image: url('../../../../static/NewManageHome/组45.png');
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  /*width: 2304px;*/
-  /*height: 775px;*/
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  /*position: absolute;*/
-}
-.background-content-img1 {
-  background-image: url('../../../../static/NewManageHome/组43.png');
+  background-image: url('../../../../static/NewManageHome/组37.png');
   background-repeat: no-repeat;
   background-size: 100% 100%;
   /*width: 2304px;*/
@@ -85,21 +74,11 @@
   font-size: 14px;
   font-weight: normal;
   font-stretch: normal;
-  line-height: 30px;
+  line-height: 35px;
   letter-spacing: 0px;
   color: #b7cee6;
 }
-.title{
-  width: 47px;
-  height: 23px;
-  font-family: PingFangSC-Bold;
-  font-size: 24px;
-  font-weight: normal;
-  font-stretch: normal;
-  line-height: 26px;
-  letter-spacing: 0px;
-  color: #ffffff;
-}
+
 .font-title {
   font-family: PingFangSC-Medium;
   font-size: 24px;
@@ -123,7 +102,7 @@
   font-stretch: normal;
   line-height: 35px;
   letter-spacing: 0px;
-  color: #246fc0;
+  color: #b7cee6;
 }
 
 .value-font {
@@ -135,89 +114,3 @@
   letter-spacing: 0px;
   color: #00f6ff;
 }
-@font-pingfang-bold{
-  //font-family: pFBold;
-  //src:url(../../../../static/font/pingfang/PFBold_1.otf)
-}
-@font-pingfang-extralight{
-  //font-family: pFExtraLight;
-  //src:url(../../../../static/font/pingfang/PFExtraLight_1.otf)
-}
-@font-pingfang-heavy{
-  //font-family: pFHeavy;
-  //src:url(../../../../static/font/pingfang/PFHeavy_1.otf)
-}
-@font-pingfang-light{
-  //font-family: pFLight;
-  //src:url(../../../../static/font/pingfang/PFLight_1.otf)
-}
-@font-pingfang-medium{
-  //font-family: pFMedium;
-  //src:url(../../../../static/font/pingfang/PFMedium_1.otf)
-}
-@font-pingfang-regular{
-  //font-family: pFRegular;
-  //src:url(../../../../static/font/pingfang/PFRegular_1.otf)
-}
-@font-trends{
-  //font-family: tRends;
-  //src:url(../../../../static/font/pingfang/TRENDS.ttf)
-}
-.pf-title{
-  font-family: pFBold;
-  font-size: 24px;
-  font-weight: normal;
-  font-stretch: normal;
-  line-height: 26px;
-  letter-spacing: 0px;
-  color: #ffffff;
-}
-.font-14-medium{
-  color: #ffffff;
-  line-height: 18px;
-  font-size: 14px;
-  font-family: font-pingfang-medium;
-}
-.bottom-center.amap-info-contentContainer{
-  height: auto;
-  //height: 300px;
-  //width: 180px;
-  //background-color: #084a78;
-  //border: 1px solid #0389db;
-  //padding: 5px 0;
-  //border-radius: 6px;
-}
-.amap-marker-content{
-  height: auto;
-}
-.tooltip {
-  width: 200px;
-  background-color: #084a78;
-  border: 1px solid #0389db;
-  padding: 5px;
-  border-radius: 6px;
-  //text-align: center;
-  /* 定位 */
-  //position: absolute;
-  z-index: 1;
-}
-.t2 {
-  color: white;
-}
-
-.t3 {
-  color: #ffc21f;
-}
-.amap-info-content{
-  background: transparent;
-}
-.amap-info-close{
-  display: none;
-}
-.amap-info-content.amap-info-outer{
-  //display: contents;
-  display: inline;
-}
-div{
-  display: block;
-}

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

@@ -161,7 +161,7 @@
           </data-grid>
         </criteria-paged>
       </div>
-      <div class="flex" v-if="showinfo">
+      <div class="basic-main" v-if="showinfo">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>

package/src/components/sale/businessquery/BusinesQuery.vue

@@ -108,7 +108,7 @@
             </template>
             <template partial='body'>
               <td style="text-align: center;">
-                <nobr>{{row.f_userinfo_id}}</nobr>
+                <nobr>{{row.f_userinfo_code}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
@@ -154,7 +154,7 @@
           </tr>
         </table>
       </div>
-      <div class="flex" v-if="show">
+      <div class="basic-main" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>
@@ -196,7 +196,7 @@
         model: new PagedList('rs/sql/BusinesQuery', 20, {}, {f_money: 0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "操作人", "操作日期", "停用状态", "停用原因", "其他停用原因", "同步状态"],
-        bodyData: ["f_userinfo_id", "f_user_name", "f_operat_type", "f_describe", "f_operat_type", "f_operate_date", "f_state", "f_operator"],
+        bodyData: ["f_userinfo_code", "f_user_name", "f_operat_type", "f_describe", "f_operat_type", "f_operate_date", "f_state", "f_operator"],
         orgCondtionStr: '',
         show:false,
         rowdata:{},

package/src/components/sale/businessquery/BusinessManage.vue

@@ -64,9 +64,6 @@
     <tabs header="可疑用户查询" v-if="permission('可疑用户查询')">
       <suspicious-user-query v-if="show.includes('可疑用户查询')" @deal-msg="dealMsg" :data="data"></suspicious-user-query>
     </tabs>
-    <tabs header="气价变更查询" v-if="permission('气价变更查询')">
-      <price-change v-if="show.includes('气价变更查询')" @deal-msg="dealMsg" :data="data"></price-change>
-    </tabs>
     <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
     <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
     <!--      </tabs>-->

package/src/components/sale/businessquery/CancellationQuery.vue

@@ -171,7 +171,7 @@
 <!--          </tr>-->
 <!--        </table>-->
       </div>
-      <div class="flex" v-if="show">
+      <div class="basic-main" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>

package/src/components/sale/businessquery/CardHandplanQuery.vue

@@ -214,7 +214,7 @@
         <footer slot="modal-footer" class="modal-footer">
         </footer>
       </modal>
-      <div class="flex" v-if="show">
+      <div class="basic-main" v-if="show">
         <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div>

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -164,11 +164,6 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表&ensp;封&ensp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
-                         condition="f_metertitles = '{}'" placeholder='表封号'>
-                </div>
               </div>
             </div>
           </criteria>
@@ -199,9 +194,6 @@
                 <th>
                   <nobr>新表号</nobr>
                 </th>
-                <th>
-                  <nobr>表封号</nobr>
-                </th>
                 <th>
                   <nobr>旧气表品牌</nobr>
                 </th>
@@ -270,9 +262,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_metertitles}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand_old}}</nobr>
               </td>
@@ -364,7 +353,7 @@
         <!--</footer>-->
         <!--</modal>-->
       </div>
-      <div class="flex" v-if="show">
+      <div class="basic-main" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>