manage-client 3.3.87 → 3.3.89

package/package.json

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

package/src/components/SellReport/BusinessClassify.vue

@@ -46,7 +46,7 @@
             </div>
             <div class="col-sm-3 form-group" >
               <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%" v-ref:org></right-tree>
+              <manage-right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%" v-ref:org></manage-right-tree>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
@@ -226,8 +226,8 @@ let getorg = async function (self) {
         console.log('---------------->', this.reportStyle)
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
-        if (this.f_orgid[0]) {
-          orgcondition += ` and f_orgid in ('${this.f_orgid}')`
+        if (this.f_orgid) {
+          orgcondition += ` and f_orgid in (${this.f_orgid})`
         }
         orgcondition += ' and ' + args.condition
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition

package/src/components/SellReport/DepartmentPrick.vue

@@ -28,7 +28,7 @@
             </div>
             <div class="col-sm-3 form-group" >
               <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%" v-ref:org></right-tree>
+              <manage-right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%" v-ref:org></manage-right-tree>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
@@ -217,22 +217,11 @@ import {DataModel, HttpResetClass} from 'vue-client'
         this.operatorname = this.userresid.filter(x => x.value ==val).map(x=>x.label).toString()
         console.log('dep',this.operatorname )
       },
-      getParamStr (array) {
-        let stringValue = ''
-        for (let i = 0; i < array.length; i++) {
-          if (i === array.length - 1) {
-            stringValue = stringValue + "'" + array[i] + "'"
-          } else {
-            stringValue = stringValue + "'" + array[i] + "',"
-          }
-        }
-        return stringValue
-      },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid[0]) {
-          orgcondition += `  and f_orgid in (${this.getParamStr(this.f_orgid)})`
+          orgcondition += `  and f_orgid in (${this.f_orgid})`
         }
 
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition

package/src/components/SellReport/ManageHandInputtor.vue

@@ -28,26 +28,26 @@
             </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>
+              <manage-right-tree @re-res="$parent.$parent.getRes"></manage-right-tree>
             </div>
             <div class="col-sm-4">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
-              <res-select restype='department'
+              <manage-res-select restype='department'
                           is-mul="false"
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid'>
-              </res-select>
+              </manage-res-select>
 
             </div>
             <div class="col-sm-4">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
-              <res-select restype='user'
+              <manage-res-select restype='user'
                           is-mul="false"
                           @res-select="$parent.$parent.getuser"
                           :parentresid="$parent.$parent.userresid"
                           :initresid='$parent.$parent.operatorid'>
-              </res-select>
+              </manage-res-select>
             </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">抄&ensp;表&ensp;员</label>

package/src/components/SellReport/ManageSellType.vue

@@ -28,25 +28,25 @@
             </div>
             <div class="col-sm-4 form-group" >
               <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes"></right-tree>
+              <manage-right-tree id="org" @re-res="$parent.$parent.getRes"></manage-right-tree>
             </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <res-select id="dep" restype='department'
+              <manage-res-select id="dep" restype='department'
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid' >
-              </res-select>
+              </manage-res-select>
 
             </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <res-select id="oper" restype='user'
+              <manage-res-select id="oper" restype='user'
                           is-mul="false"
                           @res-select="$parent.$parent.getuser"
                           :parentresid="$parent.$parent.userresid"
                           :initresid='$parent.$parent.operatorid'>
-              </res-select>
+              </manage-res-select>
             </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">收费状态:</label>
@@ -201,13 +201,13 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += " and f_orgid in ('" + this.f_orgid + "')"
+          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ')'
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in ('" + this.f_depid.toString() + "')"
+          this.orgCondtionStr += ' and f_depid in (' + this.f_depid.toString() + ')'
         }
         if(this.f_operatorid[0]) {
-          this.orgCondtionStr += " and f_operatorid in ('" + this.f_operatorid + "')"
+          this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ')'
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageUserCount.vue

@@ -28,26 +28,26 @@
             </div>
             <div class="col-sm-2 form-group" >
               <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
+              <manage-right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></manage-right-tree>
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <res-select id="dep" restype='department' style="width: 60%"
+              <manage-res-select id="dep" restype='department' style="width: 60%"
                           is-mul="false"
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid' >
-              </res-select>
+              </manage-res-select>
 
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <res-select id="oper" restype='user' style="width: 60%"
+              <manage-res-select id="oper" restype='user' style="width: 60%"
                           is-mul="false"
                           @res-select="$parent.$parent.getuser"
                           :parentresid="$parent.$parent.userresid"
                           :initresid='$parent.$parent.operatorid'>
-              </res-select>
+              </manage-res-select>
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">用气性质</label>
@@ -223,7 +223,7 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
+          this.orgCondtionStr += ` and f_orgid   in (${this.f_orgid})`
         }
         if (this.f_depid[0]) {
           this.orgCondtionStr += ` and  f_depid = '${this.f_depid}'`

package/src/components/SellReport/MarketMonth.vue

@@ -48,7 +48,7 @@
             </div>
             <div class="col-sm-3 form-group" >
               <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%" v-ref:org></right-tree>
+              <manage-right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%" v-ref:org></manage-right-tree>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
@@ -233,7 +233,7 @@ let getorg = async function (self) {
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid[0]) {
-          orgcondition += ` and f_orgid in ('${this.f_orgid}')`
+          orgcondition += ` and f_orgid in (${this.f_orgid})`
         }
         orgcondition += ' and ' + args.condition
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition

package/src/components/SellReport/SaleMonthReport.vue

@@ -26,7 +26,7 @@
             </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>
+              <manage-right-tree @re-res="$parent.$parent.getRes"></manage-right-tree>
             </div>
 
         </div>
@@ -121,7 +121,7 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-        let orgcondition = `f_orgid in ('${this.f_orgid}')`
+        let orgcondition = `f_orgid in (${this.f_orgid})`
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
       },

package/src/components/SellReport/UserClassify.vue

@@ -48,26 +48,26 @@
             </div>
             <div class="col-sm-3 form-group" >
               <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
+              <manage-right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></manage-right-tree>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <res-select id="dep" restype='department' style="width: 60%"
+              <manage-res-select id="dep" restype='department' style="width: 60%"
                           is-mul="false"
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid' >
-              </res-select>
+              </manage-res-select>
 
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <res-select id="oper" restype='user' style="width: 60%"
+              <manage-res-select id="oper" restype='user' style="width: 60%"
                           is-mul="false"
                           @res-select="$parent.$parent.getuser"
                           :parentresid="$parent.$parent.userresid"
                           :initresid='$parent.$parent.operatorid'>
-              </res-select>
+              </manage-res-select>
             </div>
           </div>
           <div class="span" style = "float:right;">
@@ -192,12 +192,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in(' + this.f_orgid + ')'
+        let orgcondition = ` f_orgid in( ${this.f_orgid})`
         if (this.f_depid[0]) {
-          orgcondition += ` and f_depid  in ('${this.f_depid}')`
+          orgcondition += ` and f_depid  in (${this.f_depid})`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ` and f_operatorid  in ('${this.f_operatorid}')`
+          orgcondition += ` and f_operatorid  in (${this.f_operatorid})`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

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

@@ -0,0 +1,155 @@
+<template>
+  <v-select :options='resoptions' placeholder='请选择'
+            :value.sync="selectres"
+            :multiple="isMul"
+            search="true"
+            :disabled="mustselect"
+            :close-on-select="!isMul"
+            @change="resChange"
+  >
+  </v-select>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '资源选择',
+    props: {
+
+      //资源类型
+      restype:'',
+      //资源数据
+      resObj:{},
+      isMul: {
+        type: Boolean,
+        default: true
+      },
+      //资源初始化数据
+      initresid: {
+        type: Array,
+        default() { return [] },
+      },
+      //父层id
+      parentresid: {
+        type: Array,
+        default() { return [] },
+      },
+      mustselect: {
+        type: Boolean,
+        default: false
+      },
+    },
+    data () {
+      return {
+        //资源数据
+        resObj:{},
+        //资源数据列表
+        resoptions:[],
+        //选中资源数据
+        selectres: [],
+      }
+    },
+    ready () {
+      //获取资源列表
+      this.getResList()
+    },
+    methods:{
+      //树形结构变成list
+      findById(val) {
+        if(val){
+          if(this.checkidres(val)){
+            this.treetoList(val,'')
+          }else if(val.children.length>0){
+            for (let value of val.children) {
+              this.findById(value)
+            }
+          }
+        }
+      },
+      //树形结构变成list
+      treetoList(val,parentname) {
+        for (let value of val.children) {
+          this.ergodicList(value,parentname)
+        }
+      },
+      //找到跟节点
+      ergodicList (val,parentname) {
+        if(val.children.length > 0 ){
+          parentname=parentname+val.name
+          this.treetoList(val,parentname)
+        }else {
+          //截取组织机构【组织机构】
+          if(this.restype=='organization'){
+            parentname=parentname.replace("组织机构","")
+            this.resoptions.push({label: val.name+' - '+parentname, value: `'${ val.id}'`})
+          }else{
+            this.resoptions.push({label: val.name, value: `'${ val.id}'`})
+          }
+        }
+      },
+      //检查id是否存在
+      checkidres(val){
+        let flag=false
+        //如果没传值得话 不过滤
+        if(this.parentresid.length==0&&this.restype=='organization'){
+          flag=true
+        }
+        this.parentresid.forEach((item) => {
+          if(item==val.id){
+            flag=true
+          }
+        })
+        return flag;
+      },
+      //资源改变
+      resChange(val){
+        let orgnames=[]
+        Object.keys(this.resoptions).forEach((key) => {
+          if(this.selectres.includes(this.resoptions[key].value))
+            orgnames.push(this.resoptions[key].label)
+        })
+        console.log('资源改变。。', val, orgnames)
+        this.$dispatch('res-select', this.selectres, orgnames)
+      },
+      //获取资源数据
+      async getResList() {
+
+        let http = new HttpResetClass()
+
+        let req = await http.load('POST', '/rs/search', {data: {
+            source: `tool.getFullTree(this.getRights().where(row.getType()==$${this.restype}$))`,
+            userid: this.$login.f.id
+          }}, {resolveMsg: null, rejectMsg: '获取组织结构数据出错'})
+        this.resObj=req.data[0]
+        this.dealdata()
+      },
+      dealdata(){
+        this.resoptions=[]
+        this.findById(this.resObj);
+        //赋值资源数据
+        let arryselect=[]
+        this.resoptions.forEach((item) => {
+          if(this.initresid.length>0){
+            this.initresid.forEach((init) => {
+              if(item.value==init){
+                arryselect.push(item.value)
+              }
+            })
+          }
+        })
+        //赋值资源选中初始值
+        this.selectres=arryselect
+      }
+    },
+    watch: {
+      //监听初始化资源id
+      'initresid.length'(){
+        this.dealdata()
+      },
+      //监听初始化资源id
+      'parentresid'(){
+        this.dealdata()
+      },
+    },
+  }
+</script>

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

@@ -0,0 +1,348 @@
+<template>
+  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
+    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown" :disabled="mustselect">
+      <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ orgnames }}</span>
+      <span class="caret"></span>
+    </button>
+    <div  class="dropdown-menu auto" style="width:auto;max-height: 500px;overflow: auto" >
+      <input type="text" placeholder="Search"
+             placeholder='请输入'
+             slot="dropdown-menu"
+             v-model="searchText"
+             class="form-control" autocomplete="off"
+             @keydown.enter="buluer(searchText)">
+      <tree :filter="strsign" :model='model' v-ref:tree  :is-click="false"  role="menu">
+          <span  partial>
+            <span class="glyphicon glyphicon-chevron-down" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
+            <span class="glyphicon glyphicon-chevron-right" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
+            <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
+            <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
+            <span class="glyphicon glyphicon-ok " v-if="$parent.$parent.$parent.isSelect(row.data.id)" style="color:balck;"></span>
+          </span>
+      </tree>
+    </div>
+
+  </dropdown>
+  <v-select v-if="islist"
+            placeholder='请选择'
+            :options='childrenOptions'
+            :disabled="mustselect"
+            @change="selectclick"
+            :value-single="true"
+            close-on-select></v-select>
+</template>
+<script>
+import Vue from 'vue';
+import co from 'co'
+import { PagedList, HttpResetClass } from 'vue-client'
+import * as ldapHelper from '../../../plugins/LdapHelper'
+let saveGen = function * (self) {
+  //获取分公司树
+  let data = {
+    source: self.source,
+    userid: self.userid
+  }
+  // if(self.$treeorg==null || (self.$treeorg!=null&&self.$treeorg.length==0)){
+  let http = new HttpResetClass()
+  let ret = yield http.load('POST', `${self.Url}/rs/search`, data, {resolveMsg: null, rejectMsg: null})
+  // 去掉前面的两层节点
+  ret.data[0].children[0].children.forEach((item) => {
+    self.model.push(item)
+  })
+  Vue.$treeorg = Vue.prototype.$treeorg = self.model;
+  // }
+  //if(self.$treeorg!=null){
+  //  self.model = self.$treeorg;
+  //}
+  // 给资源添加父关系
+  ldapHelper.procParent(self.model)
+  // 树转列
+  // if (self.islist) {
+  //   self.treetoList(self.model)
+  // }
+  if(self.initresid.length>0){
+    if(self.initresid[0] == ''){
+      self.initresid[0] = self.$login.f.orgid;
+    }
+  }else{
+    self.initresid = [];
+    self.initresid[0] = self.$login.f.orgid;
+  }
+  if(self.initresid&&self.initresid.length>0){
+    self.isselect = false;
+    self.initTreetoList(self.model)
+    self.initregion(self.childrenOptions)
+    self.childrenOptions.forEach((item) => {
+      if(item.id == null && item.value !=null ){
+        item = item.value
+      }
+      if(item.id==self.initresid[0]){
+        //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+        if(self.orgids==item.id){
+          self.initdataone(item);
+          return;
+        }
+        self.selectclick(item);
+        self.isselect = true;
+        return;
+      }
+    })
+    //如果没有找到公司，说明是选择的是大区
+    if(!self.isselect){
+      self.childrenregionOption.forEach((item) => {
+        if(item.id == null && item.value !=null ){
+          item = item.value;
+        }
+        if(item.id==self.initresid[0]){
+          //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+          if(self.orgids==item.id){
+            self.initdataone(item);
+            return;
+          }
+          self.selectclick(item);
+          return;
+        }
+      })
+    }
+  }
+  //self.selectRes()
+}
+export default {
+  title: '资源树',
+  props: {
+    searchText:'',
+    strsign:'',
+    source: {
+      type: String,
+      require: true,
+      default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
+    },
+    //资源初始化数据
+    initresid: {
+      type: Array,
+      default() { return [] },
+    },
+    resid: {
+    },
+    islist: {
+      type: Boolean,
+      default: false
+    },
+    //是否有查看上级的权限
+    Url:{
+      type: String,
+      default:''
+    },
+    mustselect: {
+      type: Boolean,
+      default: false
+    },
+    width:{
+      type:String,
+      default:'60%'
+    }
+  },
+  data () {
+    return {
+      resobj:{res:this.$login.f.orgs, resids:this.$login.f.orgid},
+      userid: this.$login.f.id,
+      resname:[this.$login.f.orgs],
+      orgnames : "请选择",
+      //单选点击 返回所有子
+      orgids : null,
+      orgobj:null,
+      model: [
+
+      ],
+      childrenOptions: [],
+      childrenregionOption:[],
+      isselect: false
+    }
+  },
+  methods: {
+    selectRes () {
+      let newobj={
+        "res": [this.resname],
+        "resids": [this.orgids],
+      }
+      this.$emit('re-res', newobj)
+    },
+    //树形结构变成list
+    initTreetoList(val) {
+      for (let value of val) {
+        this.initErgodicList(value)
+      }
+    },
+    //找到跟节点
+    initErgodicList (val) {
+      if(val.children.length > 0){
+        this.childrenOptions.push(val)
+        this.treetoList(val.children)
+      }else{
+        this.childrenOptions.push(val)
+      }
+    },
+    initregion(val){
+      if(val ==null ) return;
+      val.forEach((item)=>{
+        if(item.name != null){
+          if(item.name.includes("公司")){
+            return;
+          }else{
+            this.initregion(item.children)
+            this.childrenregionOption.push({label:"",value:item})
+            //return item;
+          }
+        }else{
+          return;
+        }
+      })
+
+    },
+    async buluer (val) {
+      this.strsign=val
+      await new Promise(resolve => {
+        this.$nextTick(() => {
+          resolve()
+        })
+      })
+    },
+    //点击资源的方法
+    selectclick (row) {
+      if(this.orgids==row.id){
+        //取消点击
+        this.orgnames="请选择"
+        this.orgids=null
+        this.orgobj=null
+        let newobj={
+          "res": [],
+          "resids": [],
+          "orgobj": [],
+        }
+        this.$emit('re-res', newobj)
+      }else{
+        //点中点击
+        this.orgnames=row.name
+        this.orgids=row.id
+        this.orgobj=row
+        let objs=[]
+        let objids=[]
+        let objnames=[]
+        this.addResChild(row,objs)
+        objs.forEach((item) => {
+          objids.push(`'${item.id}'`)
+          objnames.push(item.name)
+        })
+        let newobj={
+          "res": objnames,
+          "resids": objids,
+          "orgobj": objs,
+        }
+        this.$emit('re-res', newobj)
+      }
+    },
+    initdataone(row){
+      //点中点击
+      this.orgnames=row.name
+      this.orgids=row.id
+      this.orgobj=row
+      let objs=[]
+      let objids=[]
+      let objnames=[]
+      this.addResChild(row,objs)
+      objs.forEach((item) => {
+        objids.push(`'${item.id}'`)
+        objnames.push(item.name)
+      })
+      let newobj={
+        "res": objnames,
+        "resids": objids,
+        "orgobj": objs,
+      }
+      this.$emit('re-res', newobj)
+    },
+    addResChild(val,objs){
+      objs.push(val)
+      if(val.children && val.children.length>0){
+        Object.keys(val.children).forEach((key) => {
+          this.addResChild(val.children[key],objs)
+        })
+      }
+      return objs
+    },
+    //检查是否显示对勾
+    isSelect(val) {
+      if(this.orgids==val){
+        return true
+      }else{
+        return false
+      }
+    },
+    //树形结构变成list
+    treetoList(val) {
+      for (let value of val) {
+        this.ergodicList(value)
+      }
+    },
+    //找到跟节点
+    ergodicList (val) {
+      val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+    },
+    //处理显示默认值
+    dealResObj (val) {
+      try{
+        var arr=val.res.split(".")
+        //截取最后一个分公司名字
+        this.resname=arr[arr.length-1].toString()
+        this.orgnames=arr[arr.length-1].toString()
+        this.resid = val.resids
+        this.orgids = val.resids
+      }catch (e){
+        this.resname='请选择组织'
+      }
+    },
+    judgBoundary(){
+      //判断是否超出边界，超出移动
+      if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+        this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+      }
+    }
+  },
+  events: {
+
+  },
+  ready () {
+    this.dealResObj (this.resobj)
+    let gen = saveGen(this)
+    return co(gen)
+  },
+  watch: {
+  }
+}
+</script>
+<style lang="less">
+#res-tree {
+  .list-group-item {
+    background-color: #FFF;
+    color: #000;
+    padding: 5px 10px;
+    border:0px;
+    white-space: nowrap;
+  }
+}
+#res-tree .list-group {
+  width: auto;
+  min-width: 100%;
+}
+.hide-text-overflow{
+  overflow: hidden;
+  text-overflow: ellipsis
+}
+.select-style {
+  border: 0px;
+  /*border-bottom: 2px solid #C9CCCF;*/
+  border: 1px solid #93B2D3;
+  border-radius: 0px;
+  color: #555;
+}
+</style>

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

@@ -1114,6 +1114,77 @@ export default{
   enterpriseGasConfig: {
     'f_userinfo_code': '燃气户号', 'f_paper_name': '企业名称', 'f_taxpayer_id': '统一社会信用代码', 'f_orgname': '燃气公司标志',
     'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_whether_pay': '是否缴费', 'f_input_date': '抄表日期'
+  },
+  gasDeviceConfig: {
+    'f_residential_area': '小区名称',
+    'f_user_name': '户主姓名',
+    'f_idnumber': '身份证号',
+    'f_address': '客户地址',
+    'f_user_phone': '联系电话',
+
+    'f_meter_brand': '品牌',
+    'f_meternumber': '表号',
+    'f_meter_type': '类型',
+    'f_meter_style': '型号',
+    'f_aroundmeter': '表向',
+    'f_position': '生产年月',
+
+    'f_createfile_date': '建档日期',
+    'f_contract_id': '供用气合同编号',
+    'f_gas_date': '通气日期',
+    'f_gas_person': '通气人员',
+    'ventilation_years': '通气年限',
+    'f_defendcard': '防盗卡号',
+
+    'f_icgd_brand': '独立式可燃气体探测器品牌',
+    'f_conn_model': '接头型号',
+    'f_icgd_prdate': '生产日期',
+    'f_gssv_brand': '燃气切断电磁阀品牌',
+    'f_gssv_prdate': '生产日期',
+
+    'zaoju_brand': '品牌',
+    'zaoju_make_date': '生产日期',
+
+    'zaoju_pipe_material': '材质',
+    'zaoju_pipe_length': '长度(米)',
+    'zaoju_pipe_prdate': '生产日期',
+
+    'reshui_brand': '品牌',
+    'reshui_filing_date': '备案日期',
+    'reshui_make_date': '生产日期',
+
+    'reshui_pipe_material': '材质',
+    'reshui_pipe_length': '长度(米)',
+    'reshui_pipe_prdate': '生产日期',
+
+    'bigua_brand': '品牌',
+    'bigua_filing_date': '备案日期',
+    'bigua_make_date': '生产日期',
+
+    'bigua_pipe_material': '材质',
+    'bigua_pipe_length': '长度(米)',
+    'bigua_pipe_prdate': '生产日期',
+
+    'f_fee_type': '类型',
+    'f_money': '金额(元)',
+    'fee_operate_date': '日期',
+
+    'f_min_operate_date': '充值时间',
+    'f_preamount': '金额(元)',
+
+    'yeartimes': '充值时间',
+    'f_preamount_all': '金额(元)',
+
+    'f_upload_date': '安检日期',
+    'f_checker_name': '安检人员',
+    'f_total_gas': '用气总量',
+    'f_total_fee': '总充值额',
+    'f_balance_gas': '剩余气量',
+    'f_defect_content': '发现问题',
+    'f_repair_date': '整改日期',
+
+    'f_comments': '备注'
+
   }
 }
 

package/src/components/sale/filesquery/GasDeviceQuery.vue

@@ -45,7 +45,10 @@
                   <div class="span" style="float:right;">
                     <button class="button_search button_spacing" @click="search()">查询</button>
                     <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                    <button  class="button_clear button_spacing"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="$parent.$parent.downloadFiles()">导出</button>
+                    <export-excel :data="$parent.$parent.getCondition"
+                                  :field="$parent.$parent.getExportField"
+                                  sqlurl="rs/easyExcel/gasDeviceExport" sql-name="myGasDeviceQuery" template-name='民用用气设备查询'
+                                  :choose-col="true"></export-excel>
                     <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>
                   </div>
                 </div>
@@ -302,7 +305,7 @@
                   <nobr>{{row.f_gssv_brand}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_icgd_prdate}}</nobr>
+                  <nobr>{{row.f_gssv_prdate}}</nobr>
                 </td>
                 <td style="text-align: center;" :class="$parent.$parent.$parent.formatTime(row.alarm_exp_date).indexOf('已过期')!==-1? 'back-red' : 'back-blue'">
                   <nobr>{{$parent.$parent.$parent.formatTime(row.alarm_exp_date)}}</nobr>
@@ -911,7 +914,7 @@
       },
 
       getCondition() {
-        return {condition: this.condition2,orderitem:this.orderitem}
+        return {condition: this.condition2,orderitem: 'f_userfiles_id desc'}
       },
       getfield() {
         let data = {}
@@ -931,7 +934,7 @@
         return data
       },
       getExportField() {
-        return exportConfig.userConfig
+        return exportConfig.gasDeviceConfig
       },
       addressstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]

package/src/filiale/tongchuan/GasPrice.vue

@@ -26,26 +26,26 @@
             </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>
+              <manage-right-tree @re-res="$parent.$parent.getRes"></manage-right-tree>
             </div>
             <div class="col-sm-4">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='department'
+              <manage-res-select restype='department'
                           is-mul="false"
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
                           :initresid='$parent.$parent.depid'>
-              </res-select>
+              </manage-res-select>
 
             </div>
             <div class="col-sm-4">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='user'
+              <manage-res-select restype='user'
                           is-mul="false"
                           @res-select="$parent.$parent.getuser"
                           :parentresid="$parent.$parent.userresid"
                           :initresid='$parent.$parent.operatorid'>
-              </res-select>
+              </manage-res-select>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="oper1">格式一</label>
@@ -167,13 +167,13 @@ import {DataModel, HttpResetClass} from 'vue-client'
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         if (this.f_orgid && this.f_orgid[0]) {
-          orgcondition += `  and f_orgid in ('${this.f_orgid}')`
+          orgcondition += `  and f_orgid in (${this.f_orgid})`
         }
         if (this.f_depid && this.f_depid[0]) {
-          orgcondition += ` and f_depid  in ('${this.f_depid}')`
+          orgcondition += ` and f_depid  in (${this.f_depid})`
         }
         if (this.f_operatorid && this.f_operatorid[0]) {
-          orgcondition += ` and f_operatorid  in ('${this.f_operatorid}')`
+          orgcondition += ` and f_operatorid  in (${this.f_operatorid})`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         if (this.reportStyle == '1') {

package/src/filiale/tongchuan/ManageBusSummary.vue

@@ -26,7 +26,7 @@
             </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" style="width: 60%"></right-tree>
+              <manage-right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></manage-right-tree>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
@@ -189,7 +189,7 @@ export default {
       this.printTime = this.$login.toStandardTimeString()
       let orgcondition = ''
       if (this.f_orgid[0]) {
-        orgcondition += `  and f_orgid in (${this.getParamStr(this.f_orgid)})`
+        orgcondition += `  and f_orgid in (${this.f_orgid})`
       }
       if(this.f_state && this.f_state[0]) {
         orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
@@ -201,17 +201,6 @@ export default {
     hidden() {
       this.criteriaShow = !this.criteriaShow
     },
-    getParamStr (array) {
-      let stringValue = ''
-      for (let i = 0; i < array.length; i++) {
-        if (i === array.length - 1) {
-          stringValue = stringValue + "'" + array[i] + "'"
-        } else {
-          stringValue = stringValue + "'" + array[i] + "',"
-        }
-      }
-      return stringValue
-    },
     getRes (obj) {
       this.orgname = obj.res[0]
       this.f_orgid = obj.resids

package/src/filiale/wenxi/GasDeviceQuery.vue

@@ -190,7 +190,7 @@
                   <th colspan="6"><nobr>燃气灶具连接管</nobr></th>
                   <th colspan="5"><nobr>燃气热水器</nobr></th>
                   <th colspan="5"><nobr>燃气壁挂炉</nobr></th>
-                  <th colspan="4"><nobr>燃气保险信息</nobr></th>
+                  <th colspan="5"><nobr>燃气保险信息</nobr></th>
                   <th colspan="2"><nobr>初次充值信息</nobr></th>
 <!--                  <th colspan="2"><nobr>每年充值</nobr></th>-->
                   <th colspan="7"><nobr>安检信息</nobr></th>

package/src/filiale/wenxi/HandplanQuery.vue

@@ -741,6 +741,7 @@
    // self.loadMeterBooks()
     self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
     // self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
     // self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
 
@@ -825,6 +826,7 @@
         inputtores:[{label: '全部',value: ''}],  //抄表员
         //表册片区
         bookSlice:[{label: '全部',value: ''}],
+        metertypes:[{label: '机表',value: '机表'}],
         imgshow:false,
         imgfilename:'',
         percent:0,
@@ -1226,9 +1228,6 @@
     },
     computed: {
 
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
       banklist() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('银行名称')]
       },

package/src/plugins/LdapHelper.js

@@ -0,0 +1,75 @@
+/**
+ * 获得给定资源的名称全路径
+ * @param res: 资源
+ * @param name: 全路径字段
+ */
+export function getFullName (res, name) {
+  let result = ''
+  while (res != null) {
+    if (result === '') {
+      result = res[name]
+    } else {
+      result = res[name] + '.' + result
+    }
+    res = res.parent
+  }
+  return result
+}
+
+/**
+ * 给拿到的资源添加父关系
+ * @param res
+ */
+export function procParent (reses) {
+  for (let value of reses) {
+    procInnerParent(value)
+  }
+}
+
+// 给资源res的所有子，添加父关系
+function procInnerParent (res) {
+  for (let value of res.children) {
+    value.parent = res
+    procInnerParent(value)
+  }
+}
+
+/**
+ * 从给定一批资源中，递归找到给定号码的资源
+ * @param model：给定的一批资源
+ * @param id：要查找的资源id串
+ */
+export function find (model, id) {
+  // 返回最后一个id信息
+  let index = id.lastIndexOf('.')
+  if (index !== -1) {
+    id = id.substr(index + 1)
+  }
+
+  // 子中有，返回子里的
+  for (let value of model) {
+    let ret = getInnerResourceById(value, id)
+    if (ret) {
+      return ret
+    }
+  }
+
+  return null
+}
+
+// 根据id号取资源，自己不是，递归从子中找
+function getInnerResourceById (res, id) {
+  if (res.id === id) {
+    return res
+  }
+
+  // 子中有，返回子里的
+  for (let value of res.children) {
+    let ret = getInnerResourceById(value, id)
+    if (ret) {
+      return ret
+    }
+  }
+
+  return null
+}

package/src/saleManage.js

@@ -65,6 +65,12 @@ export default function () {
   Vue.component('print-table-self', (resolve) => {
     require(['./components/sale/common/PrintTableSelf'], resolve)
   })
+  Vue.component('manage-res-select', (resolve) => {
+    require(['./components/sale/common/ResSelect'], resolve)
+  })
+  Vue.component('manage-right-tree', (resolve) => {
+    require(['./components/sale/common/RightTree'], resolve)
+  })
 
   // 统计查询
   Vue.component('tongji-manage', (resolve) => {