system-clients 3.1.94-aode → 3.1.96

package/src/components/server/Login.vue

@@ -1,16 +1,26 @@
 <template>
   <div class="syslogin">
     <div class="login-title" >
-      <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 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>
     </div>
-    <div class="logopic"  >
-      <div  class="aodelogo"></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="logoew" v-if="logoandroid" >
       <div v-if="logoandroid" class="imglogo"></div>
       <p class="logocontent">燃气客服系统Android版</p>
@@ -22,9 +32,9 @@
       <div class="loginmain-left">
         <img  class="loginmain-left-img" src="../../../static/newStyle/login-left.png">
       </div>
-      <div class="loginmain-right" style="width:45%">
+      <div class="loginmain-right">
 
-        <p @click="theme()" style="white-space: nowrap">燃气客服系统</p>
+        <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
 
         <form v-show="!login">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
@@ -81,12 +91,6 @@
                 <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">
@@ -112,6 +116,9 @@
   import co from 'co'
   import $ from 'jquery'
   import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+
+
 
   let saveGen = function *(self) {
     try {
@@ -199,12 +206,21 @@
   }
   export default {
     title: '登录',
-    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')
-        this.confirm()
-      }
+    async ready () {
+      try{
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/singleTable',
+          {data:{
+              tablename: 't_changedeclare',
+              condition: ` f_type ='变更通知' `
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+        if(res.data.length>0){
+          console.log("---------------获取通知",res.data[0].f_change_message)
+          this.notice=res.data[0].f_change_message
+        }
+      }catch(e){}
+      this.loginother();
       $('#login-button').click(function (event) {
         event.preventDefault()
         $('form').fadeOut(500)
@@ -225,7 +241,9 @@
         config: {
           isMac: false,
           depPrompt: false,
-          weakPassword: true
+          weakPassword: false,
+          title: '燃气客服系统',
+          distanceLogin: false
         },
         login: false,
         depPromptShow: false,
@@ -236,10 +254,29 @@
         picLyanzhengma: '',
         // 修改密码弹框展示
         modifyPwShow: false,
-        logoandroid:true
+        logoandroid:false,
+        showus:false,
+        notice:'',
+        loginotherflag :true
       }
     },
     methods: {
+      async loginother(){
+        if (this.config.distanceLogin) {
+          if (this.$login && this.$login.getUrlParames('name') ) {
+            let ename = this.$login.getUrlParames('name');
+            let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
+            if(logininfo.data){
+              if(logininfo.data.ename && logininfo.data.password){
+                this.model.ename = logininfo.data.ename
+                this.model.password =logininfo.data.password
+                let gen = saveGen(this)
+                return co(gen)
+              }
+            }
+          }
+        }
+      },
       theme(){
         // var  elementList = document.querySelectorAll('body');
         //   console.log(elementList)
@@ -331,20 +368,21 @@
     box-sizing: border-box;
     margin: 0;
     padding: 0;
-    font-weight: 300;
+    font-weight: 400;
+    outline: none;
   }
 
   body {
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body ::-webkit-input-placeholder {
     /* WebKit browsers */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body :-moz-placeholder {
@@ -352,7 +390,7 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body ::-moz-placeholder {
@@ -360,14 +398,14 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body :-ms-input-placeholder {
     /* Internet Explorer 10+ */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   .wrapper {
@@ -436,7 +474,7 @@
     color: white;
     -webkit-transition-duration: 0.25s;
     transition-duration: 0.25s;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   .form input:hover {
@@ -660,17 +698,10 @@
     width:150px;
     margin: 3px -15px;
   }
-  .aodelogo {
-    background:url(../../../static/aodelogo.png);
-    background-size:100%;
-    background-repeat: no-repeat;
-  }
   .imglogo {
-    background:url(../../../static/ewmlogo.png);
+    background:url(../../../static/logo.png);
     background-size:100%;
-    background-repeat: no-repeat;
   }
-
   .logoew {
     width:120px;
     height:120px;
@@ -679,14 +710,6 @@
     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/PcdBuildingSelect.vue

@@ -0,0 +1,241 @@
+<template>
+  <div :class="style" v-show="show.pcdShow">
+    <label class="font_normal_body">省&nbsp;市&nbsp;区&nbsp;</label>
+    <v-select :value.sync="model.f_pcd"
+              class="select_list select"
+              enter-push
+              v-model="model.f_pcd"
+              style="width: 60%"
+              :multiple="mul"
+              @change="pcdChange"
+              :options='arrays.pcd' placeholder='选择省市区'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.streetShow">
+    <label class="font_normal_body">街&emsp;&emsp;道</label>
+    <v-select :value.sync="model.f_street"
+              class="select_list select"
+              enter-push
+              v-model="model.f_street"
+              @change="streetChange"
+              style="width: 60%"
+              :multiple="mul"
+              :options='arrays.street' placeholder='选择街道'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.areaShow">
+    <label class="font_normal_body">小&ensp;&ensp;&ensp;&ensp;区</label>
+    <v-select :value.sync="model.f_residential_area"
+              class="select_list select"
+              enter-push
+              v-model="model.f_residential_area"
+              style="width: 60%"
+              :multiple="mul"
+              @change="areaChange()"
+              :options='arrays.area' placeholder='选择小区'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.buildingShow">
+    <label class="font_normal_body">楼&emsp;&emsp;栋</label>
+    <v-select :value.sync="model.f_building"
+              class="select_list select"
+              enter-push
+              v-model="model.f_building"
+              style="width: 60%"
+              :multiple="mul"
+              :options='arrays.building' placeholder='选择楼栋'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  import { HttpResetClass } from 'vue-client'
+  let readyGen = async function (self) {
+    self.showComponent.find((item)=>{
+      switch(item){
+        case 'pcd': self.show.pcdShow=true; break;
+        case 'street': self.show.streetShow=true; break;
+        case 'area': self.show.areaShow=true; break;
+        case 'building': self.show.buildingShow=true; break;
+      }
+    })
+    self.arrays.pcd=[{label:'全部',value:''}]
+    if(self.show.pcdShow){
+      let HttpReset = new HttpResetClass()
+      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_pcd',
+          tablename: 't_pcd',
+          condition: `f_pcd is not null group by f_pcd`,
+          orderitem: 'f_pcd'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
+      for(var i=0;i<pcd.data.length;i++){
+        self.arrays.pcd.push({label:pcd.data[i].f_pcd,value:pcd.data[i].f_pcd})
+      }
+    }else if(self.show.streetShow){
+      console.log("------------查街道")
+      let HttpReset = new HttpResetClass()
+      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_street',
+          tablename: 't_street',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_street is not null group by f_street`,
+          orderitem: 'f_street'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取街道出错!'})
+      for(var i=0;i<street.data.length;i++){
+        self.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
+      }
+    }else if(self.show.areaShow){
+      let HttpReset = new HttpResetClass()
+      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_residential_area',
+          tablename: 't_area',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_residential_area is not null group by f_residential_area`,
+          orderitem: 'f_residential_area'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区出错!'})
+      for(var i=0;i<area.data.length;i++){
+        self.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
+      }
+    }
+
+
+  }
+  export default {
+    title: '省市区级联选择',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+      mul: {
+        type: Boolean,
+        default: false
+      },
+      showComponent:{
+        default:['pcd','street','area','building']
+      }
+
+    },
+    data () {
+      return {
+        condition:'',
+        show:{
+          pcdShow:false,
+          streetShow:false,
+          areaShow:false,
+          buildingShow:false
+        },
+        arrays:{
+          pcd:[{label: '全部', value: ''}],
+          street:[{label: '全部', value: ''}],
+          area:[{label: '全部', value: ''}],
+          building:[{label: '全部', value: ''}]
+        },
+        model:{
+          f_pcd:[],
+          f_street:[],
+          f_residential_area:[],
+          f_building:[]
+        }
+
+      }
+    },
+    ready () {
+      readyGen(this)
+    },
+    methods:{
+      async pcdChange(){
+        this.arrays.street=[{label:'全部',value:''}]
+        var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
+        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_street',
+            tablename: 't_street',
+            condition: condition,
+            orderitem: 'f_street'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取街道出错'})
+        for(var i=0;i<street.data.length;i++){
+          this.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
+        }
+        this.returnCondition()
+      },
+      async streetChange(){
+        this.arrays.area=[{label:'全部',value:''}]
+        var condition = `f_street = '${this.model.f_street?this.model.f_street:null}' and f_residential_area is not null group by f_residential_area`
+        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_residential_area',
+            tablename: 't_area',
+            condition: condition,
+            orderitem: 'f_residential_area'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区出错'})
+        for(var i=0;i<area.data.length;i++){
+          this.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
+        }
+        this.returnCondition()
+      },
+      async areaChange(){
+        this.building = [{label:'全部',value:''}]
+        var condition=''
+        if(this.show.areaShow){
+          condition = `f_residential_area = '${this.model.f_residential_area?this.model.f_residential_area:null}' and f_building is not null group by f_building`
+        }else{
+          condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
+        }
+        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_building',
+            tablename: 't_user_address',
+            condition: condition,
+            orderitem: 'f_building'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
+        for(var i=0;i<build.data.length;i++){
+          this.arrays.building.push({label:build.data[i].f_building,value:build.data[i].f_building})
+        }
+        this.returnCondition()
+      },
+
+      returnCondition(){
+        this.condition=''
+        if(this.model.f_pcd){
+          if(this.model.f_pcd.length>0){
+            this.condition+=` and f_pcd = '${this.model.f_pcd[0]}'`
+          }
+        }
+        if(this.model.f_street) {
+          if (this.model.f_street.length > 0) {
+            this.condition += ` and f_street = '${this.model.f_street[0]}'`
+          }
+        }
+        if(this.model.f_area) {
+          if (this.model.f_area.length > 0) {
+            this.condition += ` and f_area = '${this.model.f_area[0]}'`
+          }
+        }
+        if(this.model.f_building) {
+          if (this.model.f_building.length > 0) {
+            this.condition += ` and f_building = '${this.model.f_building[0]}'`
+          }
+        }
+        // this.$parent.setCon(this.condition)
+        this.$dispatch('setcon',this.condition)
+      }
+    },
+    watch: {
+      // 'condition'(val){
+      //
+      // }
+    }
+  }
+</script>

package/src/components/server/ResSelect.vue

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