system-clients 3.1.94 → 3.1.96-aode

package/src/components/server/Login.vue

@@ -1,26 +1,16 @@
 <template>
   <div class="syslogin">
     <div class="login-title" >
-      <div class="row auto">
-        <marquee style="width:80%;margin-top:25px"><span  style="font-size: 1.8rem;color: white;">{{notice}}</span></marquee>
-        <div class="login-title-chi" style="white-space: nowrap;margin-right:-5%">
-          <img src="../../../static/newStyle/login-info.png"/>
-          <span @click="showus=true">关于我们</span>
-<!--          <img src="../../../static/newStyle/login-con.png"/>-->
-<!--          <span>联系我们</span>-->
-        </div>
+      <div class="login-title-chi" style="white-space: nowrap">
+        <img src="../../../static/newStyle/login-info.png"/>
+        <span>关于我们</span>
+        <img src="../../../static/newStyle/login-con.png"/>
+        <span>联系我们</span>
       </div>
     </div>
-
-    <modal :show.sync="showus"  backdrop="true" width="50%" style="width:auto;">
-      <article slot="modal-body" class="modal-body" >
-        <img style="height:100%;width:100%" src="../../../static/newStyle/about-us.png"/>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
-
-
+    <div class="logopic"  >
+      <div  class="aodelogo"></div>
+    </div>
     <div class="logoew" v-if="logoandroid" >
       <div v-if="logoandroid" class="imglogo"></div>
       <p class="logocontent">燃气客服系统Android版</p>
@@ -32,9 +22,9 @@
       <div class="loginmain-left">
         <img  class="loginmain-left-img" src="../../../static/newStyle/login-left.png">
       </div>
-      <div class="loginmain-right">
+      <div class="loginmain-right" style="width:45%">
 
-        <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
+        <p @click="theme()" style="white-space: nowrap">燃气客服系统</p>
 
         <form v-show="!login">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
@@ -91,6 +81,12 @@
                 <p class="form-control-static">{{$login.f.name}}</p>
               </div>
             </div>
+            <div class="col-sm-12 form-group">
+              <label class="col-sm-5 control-label">组&nbsp;织&nbsp;编&nbsp;码</label>
+              <div class="col-sm-7">
+                <p class="form-control-static">{{$login.f.number}}</p>
+              </div>
+            </div>
             <div class="col-sm-12 form-group">
               <label class="col-sm-5 control-label">所在销售点</label>
               <div class="col-sm-7">
@@ -116,7 +112,6 @@
   import co from 'co'
   import $ from 'jquery'
   import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
 
   let saveGen = function *(self) {
     try {
@@ -204,19 +199,7 @@
   }
   export default {
     title: '登录',
-    async ready () {
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: '获取通知出错！！'})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-
+    ready () {
       if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
         this.model.ename = this.$login.getUrlCompileParames('name')
         this.model.password = this.$login.getUrlCompileParames('password')
@@ -242,8 +225,7 @@
         config: {
           isMac: false,
           depPrompt: false,
-          weakPassword: false,
-          title: '燃气客服系统'
+          weakPassword: true
         },
         login: false,
         depPromptShow: false,
@@ -254,9 +236,7 @@
         picLyanzhengma: '',
         // 修改密码弹框展示
         modifyPwShow: false,
-        logoandroid:false,
-        showus:false,
-        notice:''
+        logoandroid:true
       }
     },
     methods: {
@@ -351,21 +331,20 @@
     box-sizing: border-box;
     margin: 0;
     padding: 0;
-    font-weight: 400;
-    outline: none;
+    font-weight: 300;
   }
 
   body {
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body ::-webkit-input-placeholder {
     /* WebKit browsers */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body :-moz-placeholder {
@@ -373,7 +352,7 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body ::-moz-placeholder {
@@ -381,14 +360,14 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body :-ms-input-placeholder {
     /* Internet Explorer 10+ */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   .wrapper {
@@ -457,7 +436,7 @@
     color: white;
     -webkit-transition-duration: 0.25s;
     transition-duration: 0.25s;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   .form input:hover {
@@ -681,10 +660,17 @@
     width:150px;
     margin: 3px -15px;
   }
+  .aodelogo {
+    background:url(../../../static/aodelogo.png);
+    background-size:100%;
+    background-repeat: no-repeat;
+  }
   .imglogo {
-    background:url(../../../static/logo.png);
+    background:url(../../../static/ewmlogo.png);
     background-size:100%;
+    background-repeat: no-repeat;
   }
+
   .logoew {
     width:120px;
     height:120px;
@@ -693,6 +679,14 @@
     margin-top:10px;
   }
 
+  .logopic{
+    width: 23%;
+    height: 100px;
+    float:left;
+    margin-left:3.5%;
+    margin-top:10px;
+  }
+
   @-webkit-keyframes square {
     0% {
       -webkit-transform: translateY(0);

package/src/components/server/ResSelect.vue

@@ -3,7 +3,6 @@
             :value.sync="selectres"
             :multiple="isMul"
             search="true"
-            :disabled="mustselect"
             :close-on-select="!isMul"
             @change="resChange"
   >
@@ -34,10 +33,6 @@
         type: Array,
         default() { return [] },
       },
-      mustselect: {
-        type: Boolean,
-        default: false
-      },
     },
     data () {
       return {

package/src/components/server/ResSelectGroup.vue

@@ -1,196 +1,159 @@
-<template>
-  <div :class="style" v-show="companyshow">
-    <label class="font_normal_body">公&emsp;&emsp;司</label>
-    <right-tree @re-res="getorg"
-                :mustselect="mustselect"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style" v-show="departmentshow">
-    <label class="font_normal_body">部&emsp;&emsp;门</label>
-    <res-select restype='department' v-ref:department
-                @res-select="getdep"
-                :parentresid="depresid"
-                :initresid='initres.dep'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && (!cascade)">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="depresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && cascade">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " v-if="sliceareashow" >
-    <label class="font_normal_body">片&emsp;&emsp;区</label>
-    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
-              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-              close-on-select v-ref:slice>
-    </v-select>
-  </div>
-</template>
-<script>
-import plugin from '../../plugins/GetLoginInfoService'
-import { HttpResetClass } from 'vue-client'
-export default {
-  title: '资源选择测试',
-  props: {
-    style: {
-      type: String,
-      default: 'col-sm-2 form-group'
-    },
-    mul: {
-      type: Boolean,
-      default: true
-    },
-    //初始值
-    initres: {
-      type: Object,
-      default: null,
-    },
-    showComponent:{
-      default:['company','department','operator','slicearea']
-    },
-    //人员是否和部门关联
-    cascade: {
-      type: Boolean,
-      default: true
-    },
-    selectin: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      orgresid:[this.$login.f.orgid],
-      depresid:[],
-      userresid:[],
-      sliceArea: [],
-      slice_area:[],
-      companyshow:false,
-      departmentshow:false,
-      operatorshow:false,
-      sliceareashow:false,
-      mustselect:false,
-      obj:{
-        orgnames:[],
-        depnames:[],
-        operatornames:[]
-      }
-    }
-  },
-  ready () {
-    if(this.$login.r.includes('部门默认选中')&& this.selectin){
-      this.initres.dep = [this.$login.f.depids]
-    }
-    if(this.$login.r.includes('人员默认选中')&& this.selectin){
-      this.initres.user = [this.$login.f.id]
-      if(this.$login.r.includes('人员强制选中')){
-        this.mustselect = true
-      }
-    }
-    this.initComponent();
-    this.initAreas(this.$login.f.orgid)
-  },
-  methods:{
-    initComponent(){
-      let self=this;
-      this.showComponent.find((item)=>{
-        switch(item){
-          case 'company': self.companyshow=true; break;
-          case 'department': self.departmentshow=true; break;
-          case 'operator': self.operatorshow=true; break;
-          case 'slicearea': self.sliceareashow=true; break;
-        }
-      })
-    },
-    // 初始化片区
-    async initAreas (val) {
-      if (val) {
-        let http = new HttpResetClass()
-        let getAllArea = await http.load('POST', '/rs/search', {
-          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-          userid: this.$login.f.id
-        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-        let arr = getAllArea.data.filter((res) => {
-          return res.parentid == val
-        })
-        this.sliceArea = []
-        this.slice_area = []
-        arr.forEach((res) => {
-          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-        })
-      }
-    },
-    returnOrg(ids){
-      let limit = this.$login.r.includes('数据授权限定')
-
-      let condition;
-      if(this.depresid.length > 0)
-        condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
-      else
-        condition = " and f_orgid = " + this.$login.f.orgid;
-      if(this.userresid.length > 0){
-        condition += " and f_depid in " + plugin.convertToIn(this.userresid);
-      } else {
-        if (limit) {
-          let depids = []
-          for (let row of this.$refs.department.resoptions) {
-            depids.push(row.value)
-          }
-          let depid = depids.length ? plugin.convertToIn(depids) : ('')
-          condition += " and f_depid in " + depid;
-        }
-      }
-      if(ids && ids.length > 0){
-        condition += " and f_operatorid in " + plugin.convertToIn(ids);
-      }
-      if(this.slice_area.length>0){
-        condition += " and f_zones = '" + this.slice_area[0].name+"'"
-      }
-      this.$dispatch('re-res',condition,this.obj)
-    },
-    getorg (obj) {
-      this.depresid=obj.resids
-      this.obj.orgnames = obj.res
-      this.initAreas(obj.resids)
-      this.returnOrg();
-    },
-    getdep(obj,val) {
-      this.obj.depnames = val
-      this.userresid=obj
-      this.returnOrg();
-    },
-    getuser(obj) {
-      this.obj.operatornames = obj
-      this.returnOrg(obj);
-    },
-    getarea(val) {
-      this.slice_area=val
-      if(this.obj.operatornames){
-        this.returnOrg(this.obj.operatornames);
-      }else{
-        this.returnOrg();
-      }
-    }
-  },
-  watch: {
-
-  }
-}
-</script>
+<template>
+  <div :class="style" v-show="companyshow">
+    <label class="font_normal_body">公&emsp;&emsp;司</label>
+    <right-tree @re-res="getorg"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style" v-show="departmentshow">
+    <label class="font_normal_body">部&emsp;&emsp;门</label>
+    <res-select restype='department'
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initres.dep'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="depresid"
+                :initresid='initres.user'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " v-show="sliceareashow" >
+    <label class="font_normal_body">片&emsp;&emsp;区</label>
+    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
+              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+              close-on-select v-ref:slice>
+    </v-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  import { HttpResetClass } from 'vue-client'
+  export default {
+    title: '资源选择测试',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+      mul: {
+        type: Boolean,
+        default: true
+      },
+      //初始值
+      initres: {
+        type: Object,
+        default: null,
+      },
+      showComponent:{
+        default:['company','department','operator','slicearea']
+      }
+    },
+    data () {
+      return {
+        orgresid:[this.$login.f.orgid],
+        depresid:[],
+        userresid:[],
+        sliceArea: [],
+        slice_area:[],
+        companyshow:false,
+        departmentshow:false,
+        operatorshow:false,
+        sliceareashow:false,
+        obj:{
+          orgnames:[],
+          depnames:[],
+          operatornames:[]
+        }
+      }
+    },
+    ready () {
+      console.log('开始获取组织结构。。。')
+      this.initComponent();
+      this.initAreas(this.$login.f.orgid)
+    },
+    methods:{
+      initComponent(){
+        let self=this;
+        this.showComponent.find((item)=>{
+          switch(item){
+            case 'company': self.companyshow=true; break;
+            case 'department': self.departmentshow=true; break;
+            case 'operator': self.operatorshow=true; break;
+            case 'slicearea': self.sliceareashow=true; break;
+          }
+        })
+      },
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let http = new HttpResetClass()
+          let getAllArea = await http.load('POST', '/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+          })
+        }
+      },
+      returnOrg(ids){
+
+        let condition;
+        if(this.depresid.length > 0)
+          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+        else
+          condition = " and f_orgid = " + this.$login.f.orgid;
+        if(this.userresid.length > 0){
+          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+        }
+        if(ids && ids.length > 0){
+          condition += " and f_operatorid in " + plugin.convertToIn(ids);
+        }
+        if(this.slice_area.length>0){
+          condition += " and f_zones = '" + this.slice_area[0].name+"'"
+        }
+        this.$dispatch('re-res',condition,this.obj)
+      },
+      getorg (obj) {
+        console.log("选中公司的数据11",obj.resids)
+        this.depresid=obj.resids
+        this.obj.orgnames = obj.res
+        this.initAreas(obj.resids)
+        this.returnOrg();
+      },
+      getdep(obj,val) {
+        console.log("选中部门的数据22",obj)
+        this.obj.depnames = val
+        this.userresid=obj
+        this.returnOrg();
+      },
+      getuser(obj) {
+        this.obj.operatornames = obj
+        console.log("选中用户的数据33",obj)
+        this.returnOrg(obj);
+      },
+      getarea(val) {
+        this.slice_area=val
+        console.log("选中的大区",val)
+        if(this.obj.operatornames){
+          this.returnOrg(this.obj.operatornames);
+        }else{
+          this.returnOrg();
+        }
+      }
+    },
+    watch: {
+
+    }
+  }
+</script>