system-clients 3.1.96 → 3.1.97-aode

package/src/components/equipment/PosManage.vue

@@ -1,138 +1,67 @@
-<template>
-  <div class="flex-row">
-    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
-      <pos-list :row="row" @dblclick="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" :isshowless="isChange" v-ref:list ></pos-list>
-    </div>
-    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
-      <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
-    </div>
-
-<!--    <modal v-if="batchPos" :show.sync="batchPos" backdrop="false" >-->
-<!--      <header slot="modal-header" class="modal-header">-->
-<!--        <button type="button" class="close" @click="close"><span>&times;</span></button>-->
-<!--        <h4 class="modal-title">批量操作</h4>-->
-<!--      </header>-->
-<!--      <article slot="modal-body" class="modal-body">-->
-<!--        <form class="form-horizontal">-->
-<!--          <div class="row">-->
-<!--            <div>-->
-<!--              <h4>注意事项</h4>-->
-<!--              <p>1.如果需要对POS设备进行升级，批量选择的POS设备包含非正常状态，则只会对状态为正常的设备进行升级。</p>-->
-<!--              <p>2.如果POS设备处于停用状态，则可以进行启用操作。如果设备处于启用状态，则可以进行停用和升级操作。</p>-->
-<!--              <p>3.批量操作可能耗时较长，请刷新列表查看结果。</p>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </form>-->
-<!--      </article>-->
-<!--      <footer slot="modal-footer" class="modal-footer">-->
-<!--&lt;!&ndash;        <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>&ndash;&gt;-->
-<!--        <button type="button" class="button_search button_spacing" @click="batchRoot('1')">批量启用</button>-->
-<!--        <button type="button" class="button_search button_spacing" @click="batchRoot('0')">批量停用</button>-->
-<!--        <button type="button" class="button_clear button_spacing" @click='close'>退出</button>-->
-<!--      </footer>-->
-<!--    </modal>-->
-  </div>
-</template>
-<script>
-
-  import PosList from './PosList'
-  import PosAdd from './PosAdd'
-
-  export default {
-    title: 'POS终端管理',
-    components: {
-      PosList, PosAdd
-    },
-    data () {
-      return {
-        isChange: false,
-        row: null,
-        infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
-        batchPos: false,
-        f_filialeids: ''
-      }
-    },
-    methods: {
-      // 批量操作
-      // async batchRoot(val){
-      //   let arrs = []
-      //   let alertMessage=''
-      //   let selPos = this.$refs.list.selPos
-      //   if (val==='0'){
-      //     alertMessage='停用'
-      //     for (const tmp of selPos) {
-      //       if (tmp.f_state==='正常') arrs.push(tmp)
-      //     }
-      //   } else if (val==='1'){
-      //     alertMessage='启用'
-      //     for (const tmp of selPos) {
-      //       if (tmp.f_state==='停用') arrs.push(tmp)
-      //     }
-      //   } else if(val==='2'){
-      //     alertMessage='升级'
-      //     for (const tmp of selPos) {
-      //       if (tmp.f_state==='正常') arrs.push(tmp)
-      //     }
-      //   } else {
-      //     this.showAlert('出现异常，请重新进操作')
-      //     return
-      //   }
-      //
-      //   await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
-      //
-      //   // 需要提示
-      //   this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`)
-      //   this.isChange = false
-      //   this.close()
-      // },
-      close(){
-        this.batchPos = false
-      },
-      selected(obj, idx) {
-        console.log(obj)
-        if (!(obj instanceof MouseEvent)) {
-          this.isChange = true
-          this.infoadd = true
-          this.row = obj
-        } else {
-          this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
-        }
-      }
-    },
-    events: {
-      'search' () {
-        this.infoadd=true
-        this.isChange = false
-        this.row = null
-        this.$refs.list.$refs.paged.$refs.cri.search()
-      },
-      'research' () {
-        console.log('重新查询')
-        this.isChange = false
-        this.row = null
-      },
-      'refresh' () {
-        this.isChange = false
-        this.row = null
-        this.$refs.list.search()
-      },
-      'error' (name, row, res) {
-        this.isChange = false
-        this.row = null
-      },
-      'close' () {
-        this.isChange = false
-        this.row = null
-
-        // this.$refs.list.search()
-      },
-      'add' (val) {
-        this.f_filialeids = val
-        this.infoadd=false
-        this.row = null
-        this.isChange = true
-        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
-      }
-    }
-  }
-</script>
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <pos-list :row="row" @select-changed="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
+      <pos-add :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
+    </div>
+  </div>
+</template>
+<script>
+
+  import PosList from './PosList'
+  import PosAdd from './PosAdd'
+
+  export default {
+    title: 'POS终端管理',
+    components: {
+      PosList, PosAdd
+    },
+    data () {
+      return {
+        isChange: false,
+        row: null,
+
+        f_filialeids: ''
+      }
+    },
+    methods: {
+      selected (obj) {
+        this.isChange = true
+        this.row = obj.val
+      }
+    },
+    events: {
+      'search' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.$refs.paged.$refs.cri.search()
+      },
+      'research' () {
+        console.log('重新查询')
+        this.isChange = false
+        this.row = null
+      },
+      'refresh' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.search()
+      },
+      'error' (name, row, res) {
+        this.isChange = false
+        this.row = null
+      },
+      'close' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.search()
+      },
+      'add' () {
+        this.row = null
+        this.isChange = true
+        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+      }
+    }
+  }
+</script>

package/src/components/parammanage/ParamManage.vue

@@ -1,9 +1,9 @@
 <template>
-  <div id="unit" class="flex-row" :style="{width: messlist==='mess' ? '50%' : '100%'}">
+  <div id="unit" class="flex-row">
     <div class="binary-left">
       <param-page></param-page>
     </div>
-    <div class="binary-right" :style="{width: messlist==='mess' ? '50%' : '60%'}">
+    <div class="binary-right">
       <single-page></single-page>
     </div>
   </div>

package/src/components/parammanage/ParamPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex">
     <p class="bg-info text-center" style="padding: 8px;">参数管理
-      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_parameter')" style="float:right">新增</button>
+      <span class="btn btn-link add-postition" @click="add('t_parameter')">新增</span>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -25,7 +25,7 @@
       </form>
     </div>
     <div class="span">
-      <data-grid :model="model" v-ref:params @select-changed="selected">
+      <data-grid :model="model" v-ref:params @select-changed="selected" class="list_area table_sy">
         <template partial='head'>
           <tr>
             <th>序号</th>
@@ -39,9 +39,9 @@
           <td style="text-align:center">{{row.name}}</td>
           <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
           <td class="flex-around">
-            <button type="button" name="button" class="button_search button_spacing width-60"
+            <button type="button" name="button" class="btn btn-link"
                     @click.stop="$parent.$parent.modifyParam(row, 't_parameter')">修改</button>
-            <button type="button" name="button" class="btn btn-danger"
+            <button type="button" name="button" class="btn btn-link"
                     @click.stop="$parent.$parent.deleteParam(row, 't_parameter')">删除</button>
           </td>
         </template>
@@ -50,7 +50,7 @@
 
     <p v-if="selectItem" class="bg-info text-center" style="padding: 8px;margin: 8px 0px;">
       {{selectItem.name}}
-      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_paramvalue')" style="float:right">新增</button>
+      <span class="btn btn-link add-postition" @click="add('t_paramvalue')">新增</span>
     </p>
     <div v-if="selectItem" class="span">
       <data-grid :model="params" v-ref:selects >
@@ -65,8 +65,8 @@
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.name}}</td>
           <td class="flex-around">
-            <button type="button" name="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
-            <button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
+            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
+            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
           </td>
         </template>
       </data-grid>

package/src/components/parammanage/SinglePage.vue

@@ -2,7 +2,7 @@
   <div class="flex">
     <p  class="bg-info text-center" style="padding: 8px;">
       单值管理
-      <button type="button" name="button" class="button_search button_spacing width-60 " @click="add()" style="float:right">新增</button>
+      <span class="btn btn-link add-postition" @click="add()">新增</span>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -27,7 +27,7 @@
     </div>
     <div class="span">
       <partial-view v-ref:single-load>
-        <data-grid :model="model" v-ref:grid >
+        <data-grid :model="model" v-ref:grid class="list_area table_sy">
           <template partial='head'>
             <tr>
               <th>序号</th>
@@ -43,9 +43,9 @@
             <td style="text-align:center">{{row.value}}</td>
             <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
             <td class="flex-around">
-              <button type="button" name="button" class="button_search button_spacing width-60"
+              <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.modifyParam(row)">修改</button>
-              <button type="button" name="button" class="btn btn-danger"
+              <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.deleteItem(row)">删除</button>
             </td>
           </template>

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,9 +112,6 @@
   import co from 'co'
   import $ from 'jquery'
   import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-
-
 
   let saveGen = function *(self) {
     try {
@@ -206,21 +199,12 @@
   }
   export default {
     title: '登录',
-    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();
+    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()
+      }
       $('#login-button').click(function (event) {
         event.preventDefault()
         $('form').fadeOut(500)
@@ -241,9 +225,7 @@
         config: {
           isMac: false,
           depPrompt: false,
-          weakPassword: false,
-          title: '燃气客服系统',
-          distanceLogin: false
+          weakPassword: true
         },
         login: false,
         depPromptShow: false,
@@ -254,29 +236,10 @@
         picLyanzhengma: '',
         // 修改密码弹框展示
         modifyPwShow: false,
-        logoandroid:false,
-        showus:false,
-        notice:'',
-        loginotherflag :true
+        logoandroid: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)
@@ -368,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 {
@@ -390,7 +352,7 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body ::-moz-placeholder {
@@ -398,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 {
@@ -474,7 +436,7 @@
     color: white;
     -webkit-transition-duration: 0.25s;
     transition-duration: 0.25s;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   .form input:hover {
@@ -698,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;
@@ -710,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 {