manage-client 3.1.10-aode → 3.1.14-aode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.10-aode",
+  "version": "3.1.14-aode",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -61,7 +61,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.22.21-aode",
+    "vue-client": "1.22.24-aode",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

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

@@ -34,11 +34,14 @@
       <tabs header="停用查询">
         <disable-query v-if="show[10]" @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></disable-query>
       </tabs>
-      <tabs header="增值业务查询">
+      <tabs header="增值业务变更记录查询">
       <valueadd-info-query v-if="show[11]" @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></valueadd-info-query>
       </tabs>
+      <tabs header="用户增值业务信息查询">
+        <valueadd-user-query v-if="show[12]" @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></valueadd-user-query>
+      </tabs>
       <tabs header="用户销户启用查询">
-        <query-userinfo-state v-if="show[12]" @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></query-userinfo-state>
+        <query-userinfo-state v-if="show[13]" @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></query-userinfo-state>
       </tabs>
       <!--<tabs header="开户查询">-->
         <!--<new-account-query v-if="show[11]" @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></new-account-query>-->

package/src/components/sale/common/TabButton.vue

@@ -1,149 +1,149 @@
-<template>
-  <div class='flex foot_tabset1'>
-    <!-- Nav tabs -->
-    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
-      <li style="margin-right: 10px"
-          :id="'vc-tabset-li-'+attach +'-'+$index"
-          v-for="r in renderData"
-          @click.prevent="handleTabListClick($index, r)"
-          :disabled="r.disabled"
-      >
-        <button class="button_new" style="width: max-content" v-bind:class="{
-            'btn-succ': ($index === active),
-            'disabled': r.disabled
-          }">
-          <slot name="header">
-            {{r.header}}
-          </slot>
-          <!-- 关闭按钮 -->
-          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close" :id="'vc-tabset-close-'+attach +'-'+$index"></span>
-        </button>
-
-      </li>
-    </ul>
-
-    <!-- Tab panes -->
-    <div class="tab-content span" v-el:tab-content>
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {remove} from 'vue-client/src/stores/Remove.js'
-
-  export default {
-    props: {
-      navStyle: {
-        type: String,
-        default: 'tabs'
-      },
-      effect: {
-        type: String,
-        default: 'fadein'
-      },
-      active: {
-        type: Number,
-        default: 0
-      },
-      close: {
-        type: Boolean,
-        default: false
-      },
-      attach: {
-        type: String,
-        default: 'vuestrap'
-      },
-      content: {}
-    },
-    ready () {
-      remove.$on('remove', (name) => {
-        console.log('tabset收$on 到的名字为：', name)
-        this.$removeTab(name)
-      })
-    },
-    data () {
-      return {
-        // 数据格式：{comp, header，disabled}
-        // - comp: 当前页签对应的tab组件
-        renderData: []
-      }
-    },
-    methods: {
-      handleTabListClick (index, el) {
-        this.$parent.show[index] = true
-        if (el.comp._scope && el.comp._scope.tab) {
-          this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
-        }
-        if (!el.disabled) this.active = index
-      },
-      // deletetab函数为自己添加
-      deletetTab (el) {
-        this.$removeTab(el.comp._scope.tab.comp.name)
-        remove.$emit('delete', el.comp._scope.tab.comp.name)
-      },
-      // 根据删除也下标，修改所有页签的下标
-      modifyAllIndex (index) {
-        let cur = this.active
-        this.$nextTick(() => {
-          // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
-          for (var i = index; i < this.renderData.length; i++) {
-            this.renderData[i].comp.index -= 1
-          }
-          // 修改激活页
-          // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
-          // 当关闭当前激活页之前（激活页向前移动一位）
-          if (this.active > index || this.active === this.renderData.length) {
-            this.active = cur - 1
-          } else if (cur === 0) {
-            this.active = 0
-          } else {
-            this.active = cur
-          }
-          if (this.active === -1) {
-            this.$dispatch('tab-changed', null)
-          }else {
-            this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
-          }
-        })
-      }
-    },
-    events: {
-      'delete' (index) {
-        this.modifyAllIndex(index)
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  ul > li > a {
-    position: relative;
-  }
-  ul > li > a > span {
-    display: none;
-  }
-  /*ul > li > a:hover > span {*/
-  /*display: initial;*/
-  /*position: absolute;*/
-  /*right: 0;*/
-  /*top: 35%;*/
-  /*border: 1px solid #EAEAEA;*/
-  /*}*/
-  /*ul > li > a:hover > span:hover {*/
-  /*border: 1px solid #EAEAEA;*/
-  /*color: #5cb95c;*/
-  /*}*/
-  ul > li > button {
-    background-color: #FFFFFF;
-    border-radius: 4px;
-    color: #999;
-    border: 1px solid #5cb95c;
-  }
-  .btn-succ{
-    background-color: #6aa6e2;
-    border-radius: 4px;
-    color: #fff;
-  }
-
-</style>
+<template>
+  <div class='flex foot_tabset1'>
+    <!-- Nav tabs -->
+    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%;width: 100%; overflow: scroll;">
+      <li style="margin-right: 10px"
+          :id="'vc-tabset-li-'+attach +'-'+$index"
+          v-for="r in renderData"
+          @click.prevent="handleTabListClick($index, r)"
+          :disabled="r.disabled"
+      >
+        <button class="button_new" style="width: max-content" v-bind:class="{
+            'btn-succ': ($index === active),
+            'disabled': r.disabled
+          }">
+          <slot name="header">
+            {{r.header}}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close" :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </button>
+
+      </li>
+    </ul>
+
+    <!-- Tab panes -->
+    <div class="tab-content span" v-el:tab-content>
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {remove} from 'vue-client/src/stores/Remove.js'
+
+  export default {
+    props: {
+      navStyle: {
+        type: String,
+        default: 'tabs'
+      },
+      effect: {
+        type: String,
+        default: 'fadein'
+      },
+      active: {
+        type: Number,
+        default: 0
+      },
+      close: {
+        type: Boolean,
+        default: false
+      },
+      attach: {
+        type: String,
+        default: 'vuestrap'
+      },
+      content: {}
+    },
+    ready () {
+      remove.$on('remove', (name) => {
+        console.log('tabset收$on 到的名字为：', name)
+        this.$removeTab(name)
+      })
+    },
+    data () {
+      return {
+        // 数据格式：{comp, header，disabled}
+        // - comp: 当前页签对应的tab组件
+        renderData: []
+      }
+    },
+    methods: {
+      handleTabListClick (index, el) {
+        this.$parent.show[index] = true
+        if (el.comp._scope && el.comp._scope.tab) {
+          this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
+        }
+        if (!el.disabled) this.active = index
+      },
+      // deletetab函数为自己添加
+      deletetTab (el) {
+        this.$removeTab(el.comp._scope.tab.comp.name)
+        remove.$emit('delete', el.comp._scope.tab.comp.name)
+      },
+      // 根据删除也下标，修改所有页签的下标
+      modifyAllIndex (index) {
+        let cur = this.active
+        this.$nextTick(() => {
+          // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
+          for (var i = index; i < this.renderData.length; i++) {
+            this.renderData[i].comp.index -= 1
+          }
+          // 修改激活页
+          // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
+          // 当关闭当前激活页之前（激活页向前移动一位）
+          if (this.active > index || this.active === this.renderData.length) {
+            this.active = cur - 1
+          } else if (cur === 0) {
+            this.active = 0
+          } else {
+            this.active = cur
+          }
+          if (this.active === -1) {
+            this.$dispatch('tab-changed', null)
+          }else {
+            this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
+          }
+        })
+      }
+    },
+    events: {
+      'delete' (index) {
+        this.modifyAllIndex(index)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  ul > li > a {
+    position: relative;
+  }
+  ul > li > a > span {
+    display: none;
+  }
+  /*ul > li > a:hover > span {*/
+  /*display: initial;*/
+  /*position: absolute;*/
+  /*right: 0;*/
+  /*top: 35%;*/
+  /*border: 1px solid #EAEAEA;*/
+  /*}*/
+  /*ul > li > a:hover > span:hover {*/
+  /*border: 1px solid #EAEAEA;*/
+  /*color: #5cb95c;*/
+  /*}*/
+  ul > li > button {
+    background-color: #FFFFFF;
+    border-radius: 4px;
+    color: #999;
+    border: 1px solid #5cb95c;
+  }
+  .btn-succ{
+    background-color: #6aa6e2;
+    border-radius: 4px;
+    color: #fff;
+  }
+
+</style>

package/src/components/sale/config/exportConfig.js

@@ -15,6 +15,11 @@ export default{
     'f_change_state':'状态','f_field_name':'增值服务类型','f_used_content':'变更前','f_new_content':'变更后','f_operator':'操作人','operator_orgname':'操作人所属公司',
     'f_orgname': '所属公司'
   },
+  valueuserinfoConfig:{
+    'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address':'客户地址','f_user_type':'用户类型','f_gasproperties':'用气性质','f_meter_classify':'气表类型',
+    'f_meternumber':'表号','itemname':'增值服务类型','ishas':'有无增值业务','startdate':'购买时间','f_operate_date':'最后操作时间',
+    'f_orgname': '所属公司'
+  },
   iotreportConfig:{
     'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_user_type':'用户类型','f_gasproperties':'用气性质',
     'f_tablebase': '本次抄表底数','f_last_tablebase':'上次抄表底数',

package/src/components/sale/report/aode/othercharge/OtherDayReport.vue

@@ -0,0 +1,50 @@
+<template>
+  <div id="unit" class="flex-row" >
+    <div class="basic-main" :style="{width:width}">
+      <other-day-report-list @getdata="getdata" @close="close" @show="show" :style="style" v-ref:list ></other-day-report-list>
+    </div>
+    <div class="binary-right" v-if="summaryshow">
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#">数据汇总</a></li>
+      </ul>
+      <other-day-report-summary :sumsmodel="sumsmodel"  v-ref:gas></other-day-report-summary>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title:'日清单(其他收费)',
+    name: "DayReport",
+    data () {
+      return {
+        width:'100%',
+        summaryshow:false,
+        style:'col-sm-2'
+      }
+    },
+    ready(){
+    },
+    methods:{
+      getdata(val){
+        console.log(val)
+        this.sumsmodel = val
+      },
+      show(){
+        this.width = '58%'
+        this.summaryshow = true
+        this.style='col-sm-3'
+      },
+      close(){
+        this.width = '100%'
+        this.summaryshow = false
+        this.style='col-sm-2'
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
+