system-clients 3.0.47 → 3.0.48-fanxian

package/src/components/parammanage/ParamPages.vue

@@ -4,16 +4,9 @@
       <span class="btn btn-link add-postition" @click="add('t_parameter')">新增</span>
     </p>
     <div class="form-inline auto" style="margin-bottom: 5px;">
-      <div class="row">
-        <div class="col-sm-4 form-group">
-          <label>参数名称：</label>
-          <input type="text" class="input_search"  placeholder='请输入查找的参数名' v-model="param" @keyup.enter="filterParams(param)">
-        </div>
-        <div class="col-sm-4 form-group button-range" style="float:left;">
-          <button class="btn btn-primary" @click="filterParams(param)">查询</button>
-        </div>
-      </div>
-
+      <label for="">参数名称：</label>
+      <input type="text" class="form-control"  placeholder='请输入查找的参数名' v-model="param" @keyup.enter="filterParams(param)">
+      <button class="btn btn-primary" @click="filterParams(param)">查询</button>
     </div>
     <div class="span">
       <partial-view v-ref:params-load>
@@ -69,12 +62,11 @@
         <h4 class="modal-title">参数配置</h4>
       </header>
       <article slot="modal-body" class="modal-body">
-        <div class="row">
         <div class="from-group">
           <label for="">参数名称</label>
           <input type="text" class="form-control" v-model="modifyItem.name" @keyup.enter="confirm">
         </div>
-        </div>
+
       </article>
 
       <footer slot="modal-footer" class="modal-footer">

package/src/components/parammanage/SinglePage.vue

@@ -7,7 +7,7 @@
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
         <div class="row">
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4">
             <label class="font_normal_body">使用公司</label>
             <res-select restype='organization'
                         is-mul="false"
@@ -15,11 +15,11 @@
                         @res-select="getorgCur">
             </res-select>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4">
             <label class="font_normal_body">参数名称</label>
             <input type="text" class="input_search" style="width: 60%"  placeholder='请输入查找的参数名' v-model="conditionModel.paramName" @keyup.enter="filter_query(param, f_orgid_current)">
           </div>
-          <div class="col-sm-4 form-group button-range"  style="float:left;">
+          <div class="text-right">
             <button type="button" class="button_search" @click="filter_query(conditionModel.paramName,conditionModel.f_cond_orgid)">查询</button>
           </div>
         </div>
@@ -59,18 +59,25 @@
       </header>
       <article slot="modal-body" class="modal-body">
         <form class="form-horizontal">
-          <div class="row">
-            <div class="col-sm-6 form-group">
+          <div class="form-group">
+            <div class="col-sm-6">
               <label class="font_normal_body">单值名称</label>
               <input type="text" class="input_search" style="width: 60%" v-model="selectItem.name">
             </div>
-            <div class="col-sm-6 form-group">
+            <div class="col-sm-6">
               <label  class="font_normal_body">单值内容</label>
               <input type="text" class="input_search" style="width: 60%" v-model="selectItem.value">
             </div>
           </div>
-          <div class="row">
-            <div class="col-sm-6 form-group" v-if="!selectItem.isGlobal">
+          <div class="col-sm-6">
+            <div class="checkbox">
+              <label>
+                <input type="checkbox" v-model="selectItem.isGlobal" :checked="selectItem.isGlobal">是否全局
+              </label>
+            </div>
+          </div>
+          <div class="form-group" v-if="!selectItem.isGlobal">
+            <div class="col-sm-6">
               <label class="font_normal_body">所属公司</label>
               <res-select restype='organization'
                           :initresid="[conditionModel.f_cond_orgid]"
@@ -78,11 +85,6 @@
                           @res-select="getModifyOrg">
               </res-select>
             </div>
-            <div class="checkbox col-sm-6 form-group">
-              <label>
-                <input type="checkbox" v-model="selectItem.isGlobal" :checked="selectItem.isGlobal">是否全局
-              </label>
-            </div>
           </div>
         </form>
 

package/src/components/parammanage/SinglePages.vue

@@ -5,15 +5,10 @@
       <span class="btn btn-link add-postition" @click="add()">新增</span>
     </p>
     <div class="form-inline auto" style="margin-bottom: 5px;">
-      <div class="row">
-        <div class="col-sm-4 form-group">
-          <label>参数名称：</label>
-          <input type="text" class="input_search"  placeholder='请输入查找的参数名' v-model="param" @keyup.enter="filterParams(param)">
-        </div>
-        <div class="col-sm-4 form-group button-range"  style="float:left;">
-          <button class="btn btn-primary" @click="filterParams(param)">查询</button>
-        </div>
-      </div>
+      <label for="">参数名称：</label>
+      <input type="text" class="form-control"  placeholder='请输入查找的参数名' v-model="param" @keyup.enter="filterParams(param)">
+
+      <button class="btn btn-primary" @click="filterParams(param)">查询</button>
     </div>
     <div class="span">
       <partial-view v-ref:single-load>
@@ -52,16 +47,15 @@
         <h4 class="modal-title">单值配置</h4>
       </header>
       <article slot="modal-body" class="modal-body">
-        <div class="row">
-        <div class="col-sm-6 from-group">
+        <div class="from-group">
           <label for="">单值名称</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="selectItem.name">
+          <input type="text" class="form-control" v-model="selectItem.name">
         </div>
-        <div class="col-sm-6 from-group">
+        <div class="from-group">
           <label for="">单值内容</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="selectItem.value">
-        </div>
+          <input type="text" class="form-control" v-model="selectItem.value">
         </div>
+
       </article>
 
       <footer slot="modal-footer" class="modal-footer">

package/src/components/server/Login.vue

@@ -66,20 +66,19 @@
       </header>
       <article slot="modal-body" class="modal-body">
         <form class="form-horizontal">
-          <div class="row">
-          <div class="col-sm-12 form-group">
+
+          <div class="form-group">
             <label class="col-sm-5 control-label">当前登录人</label>
             <div class="col-sm-7">
               <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">所在销售点</label>
+          <div class="form-group">
+            <label class="col-sm-5 control-label">所在的销售点</label>
             <div class="col-sm-7">
               <p class="form-control-static">{{$login.f.deps}}</p>
             </div>
           </div>
-          </div>
         </form>
       </article>
       <footer  slot="modal-footer" class="modal-footer">
@@ -150,6 +149,8 @@
         msg = ret.data
       } else if (ret.status === 710) {
         msg = ret.data
+      } else if (ret.status === 555) {
+        msg = ret.data
       }
       self.createCode()
       self.picLyanzhengma = ''

package/src/components/server/ModifyPw.vue

@@ -64,12 +64,31 @@
     let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {
-      self.deliver.password = ''
-      self.deliver.newpassword = ''
-      self.deliver.affirmpassword = ''
-      self.show = false
+      console.log("修改密码返回：" , res.data)
+      // 兼容旧版ldao，旧版不返回code
+      if (res.data.code === 200) {
+        self.deliver.password = ''
+        self.deliver.newpassword = ''
+        self.deliver.affirmpassword = ''
+        self.show = false
+        self.$showAlert("修改密码成功", 'success', 2000)
+      } else {
+        // 兼容旧版ldao，旧版不返回code
+        self.deliver.password = ''
+        self.deliver.newpassword = ''
+        self.deliver.affirmpassword = ''
+        self.show = false
+        self.$showAlert("修改密码成功", 'success', 2000)
+      }
+    } else {
+      if (res.data.code) {
+        self.$showAlert("修改密码失败，原因：" + res.data.msg, 'warning', 2000)
+      } else {
+        self.$showMessage(res.data)
+      }
     }
   }
+
   export default {
     title: '系统管理-密码修改',
     data () {

package/src/components/server/ResSelectGroup.vue

@@ -1,140 +1,140 @@
-<template>
-  <div :class="style">
-    <label class="font_normal_body">公&emsp;&emsp;司</label>
-    <right-tree @re-res="getorg"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style">
-    <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">
-    <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 " >
-    <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'
-  export default {
-    title: '资源选择测试',
-    props: {
-      style: {
-        type: String,
-        default: 'col-sm-2'
-      },
-      mul: {
-        type: Boolean,
-        default: true
-      },
-      //初始值
-      initres: {
-        type: Object,
-        default: null,
-      },
-    },
-    data () {
-      return {
-        orgresid:[this.$login.f.orgid],
-        depresid:[],
-        userresid:[],
-        sliceArea: [],
-        slice_area:[],
-
-        obj:{
-          orgnames:[],
-          depnames:[],
-          operatornames:[]
-        }
-      }
-    },
-    ready () {
-      console.log('开始获取组织结构。。。')
-      this.initAreas(this.$login.f.orgid)
-    },
-    methods:{
-
-      // 初始化片区
-      async initAreas (val) {
-        if (val) {
-          let getAllArea = await this.$resetpost('/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>
+<template>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+    <right-tree @re-res="getorg"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='department'
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initres.dep'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " >
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</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'
+  export default {
+    title: '资源选择测试',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2'
+      },
+      mul: {
+        type: Boolean,
+        default: true
+      },
+      //初始值
+      initres: {
+        type: Object,
+        default: null,
+      },
+    },
+    data () {
+      return {
+        orgresid:[this.$login.f.orgid],
+        depresid:[],
+        userresid:[],
+        sliceArea: [],
+        slice_area:[],
+
+        obj:{
+          orgnames:[],
+          depnames:[],
+          operatornames:[]
+        }
+      }
+    },
+    ready () {
+      console.log('开始获取组织结构。。。')
+      this.initAreas(this.$login.f.orgid)
+    },
+    methods:{
+
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/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>

package/src/components/server/TestResSelect.vue

@@ -1,58 +1,58 @@
-<template>
-  <div class="auto col-sm-12 form-group form-input-group" style="width: 20%">
-    <label>公司：</label>
-    <res-select :restype='orgrestype'
-                @res-select="getorg"
-                :parentresid="orgresid"
-                :initresid='orgresid1'>
-    </res-select>
-    <label>部门：</label>
-    <res-select :restype='deprestype'
-                @res-select="getdep"
-                :parentresid="depresid"
-                :initresid='initresid'>
-    </res-select>
-    <label>人员：</label>
-    <res-select :restype='userrestype'
-                @res-select="getuser"
-                :parentresid="depresid"
-                :initresid='initresid'>
-    </res-select>
-  </div>
-</template>
-<script>
-  export default {
-    title: '资源选择测试',
-    props: {
-    },
-    data () {
-      return {
-        orgrestype:'organization',
-        orgresid:[this.$login.f.orgid],
-        orgresid1:["114"],
-        deprestype:'department',
-        depresid:[],
-        userrestype:'user',
-        userresid:[],
-      }
-    },
-    ready () {
-    },
-    methods:{
-      getorg (obj) {
-        console.log("选中组织的数据",obj)
-        this.depresid=obj
-      },
-      getdep(obj) {
-        console.log("选中部门的数据",obj)
-        this.userresid=obj
-      },
-      getuser(obj) {
-        console.log("选中用户的数据",obj)
-      },
-    },
-    watch: {
-
-    },
-  }
-</script>
+<template>
+  <div class="auto col-sm-12 form-group form-input-group" style="width: 20%">
+    <label>公司：</label>
+    <res-select :restype='orgrestype'
+                @res-select="getorg"
+                :parentresid="orgresid"
+                :initresid='orgresid1'>
+    </res-select>
+    <label>部门：</label>
+    <res-select :restype='deprestype'
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initresid'>
+    </res-select>
+    <label>人员：</label>
+    <res-select :restype='userrestype'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initresid'>
+    </res-select>
+  </div>
+</template>
+<script>
+  export default {
+    title: '资源选择测试',
+    props: {
+    },
+    data () {
+      return {
+        orgrestype:'organization',
+        orgresid:[this.$login.f.orgid],
+        orgresid1:["114"],
+        deprestype:'department',
+        depresid:[],
+        userrestype:'user',
+        userresid:[],
+      }
+    },
+    ready () {
+    },
+    methods:{
+      getorg (obj) {
+        console.log("选中组织的数据",obj)
+        this.depresid=obj
+      },
+      getdep(obj) {
+        console.log("选中部门的数据",obj)
+        this.userresid=obj
+      },
+      getuser(obj) {
+        console.log("选中用户的数据",obj)
+      },
+    },
+    watch: {
+
+    },
+  }
+</script>