system-clients 3.1.89-17 → 3.1.89-20-rongchuang-1

package/src/components/parammanage/ParamPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex">
     <p class="bg-info text-center" style="padding: 8px;">参数管理
-      <span class="btn btn-link add-postition" @click="add('t_parameter')">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_parameter')" style="float:right">新增</button>
     </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" class="list_area table_sy">
+      <data-grid :model="model" v-ref:params @select-changed="selected">
         <template partial='head'>
           <tr>
             <th>序号</th>
@@ -50,7 +50,7 @@
 
     <p v-if="selectItem" class="bg-info text-center" style="padding: 8px;margin: 8px 0px;">
       {{selectItem.name}}
-      <span class="btn btn-link add-postition" @click="add('t_paramvalue')">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_paramvalue')" style="float:right">新增</button>
     </p>
     <div v-if="selectItem" class="span">
       <data-grid :model="params" v-ref:selects >

package/src/components/parammanage/SinglePage.vue

@@ -2,7 +2,7 @@
   <div class="flex">
     <p  class="bg-info text-center" style="padding: 8px;">
       单值管理
-      <span class="btn btn-link add-postition" @click="add()">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60 " @click="add()" style="float:right">新增</button>
     </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 class="list_area table_sy">
+        <data-grid :model="model" v-ref:grid >
           <template partial='head'>
             <tr>
               <th>序号</th>

package/src/components/server/Login.vue

@@ -1,17 +1,30 @@
 <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">
+          <img src="../../../static/newStyle/login-info.png"/>
+          <span @click="showus=true">关于我们</span>
+          <img src="../../../static/newStyle/login-con.png"/>
+          <span>联系我们</span>
+        </div>
       </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>
-        <p  class="logofooter">(仅浏览器扫描)</p>
+      <p class="logocontent">燃气客服系统Android版</p>
+      <p  class="logofooter">(仅浏览器扫描)</p>
     </div>
     <!--输入框-->
     <div class="loginmain">
@@ -103,6 +116,7 @@
   import co from 'co'
   import $ from 'jquery'
   import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
 
   let saveGen = function *(self) {
     try {
@@ -190,7 +204,19 @@
   }
   export default {
     title: '登录',
-    ready () {
+    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
+      }
+
       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')
@@ -228,7 +254,9 @@
         picLyanzhengma: '',
         // 修改密码弹框展示
         modifyPwShow: false,
-        logoandroid:false
+        logoandroid:false,
+        showus:false,
+        notice:''
       }
     },
     methods: {

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 {

package/src/components/server/ResSelectGroup.vue

@@ -2,14 +2,16 @@
   <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'
+    <res-select restype='department' v-ref:department
                 @res-select="getdep"
                 :parentresid="depresid"
                 :initresid='initres.dep'
+                :mustselect="mustselect"
                 :is-mul="mul">
     </res-select>
   </div>
@@ -19,6 +21,7 @@
                 @res-select="getuser"
                 :parentresid="depresid"
                 :initresid='initres.user'
+                :mustselect="mustselect"
                 :is-mul="mul">
     </res-select>
   </div>
@@ -28,6 +31,7 @@
                 @res-select="getuser"
                 :parentresid="userresid"
                 :initresid='initres.user'
+                :mustselect="mustselect"
                 :is-mul="mul">
     </res-select>
   </div>
@@ -40,135 +44,153 @@
   </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: false
-      }
+import plugin from '../../plugins/GetLoginInfoService'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '资源选择测试',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
     },
-    data () {
-      return {
-        orgresid:[this.$login.f.orgid],
-        depresid:[],
-        userresid:[],
-        sliceArea: [],
-        slice_area:[],
-        companyshow:false,
-        departmentshow:false,
-        operatorshow:false,
-        sliceareashow:false,
-        obj:{
-          orgnames:[],
-          depnames:[],
-          operatornames:[]
-        }
-      }
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
     },
-    ready () {
-      if(this.$login.r.includes('部门默认选中')){
-        this.initres.dep = [this.$login.f.depids]
+    showComponent:{
+      default:['company','department','operator','slicearea']
+    },
+    //人员是否和部门关联
+    cascade: {
+      type: Boolean,
+      default: false
+    },
+    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:[]
       }
-      if(this.$login.r.includes('人员默认选中')){
-        this.initres.user = [this.$login.f.id]
+    }
+  },
+  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)
+    }
+    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;
+        }
+      })
     },
-    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
         })
-      },
-      // 初始化片区
-      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){
+        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);
-        }
-        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();
+      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)
     },
-    watch: {
-
+    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>

package/src/components/server/RightTree.vue

@@ -26,6 +26,7 @@
   <v-select v-if="islist"
             placeholder='请选择'
             :options='childrenOptions'
+            :disabled="mustselect"
             @change="selectclick"
             :value-single="true"
             close-on-select></v-select>
@@ -132,6 +133,10 @@ export default {
       type: String,
       default:''
     },
+    mustselect: {
+      type: Boolean,
+      default: false
+    },
     width:{
       type:String,
       default:'60%'