system-clients 3.2.95-ruihua → 3.2.95-temp

package/src/components/parammanage/SinglePage.vue

@@ -30,11 +30,11 @@
         <data-grid :model="model" v-ref:grid >
           <template partial='head'>
             <tr>
-              <th><nobr>序号</nobr></th>
-              <th><nobr>名称</nobr></th>
-              <th><nobr>参数值</nobr></th>
-              <th><nobr>所属</nobr></th>
-              <th><nobr>操作</nobr></th>
+              <th>序号</th>
+              <th>名称</th>
+              <th>参数值</th>
+              <th>所属</th>
+              <th>操作</th>
             </tr>
           </template>
           <template partial='body'>
@@ -149,7 +149,7 @@
       async queryParam (condition) {
         this.model.rows = []
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-system/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'rs/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
 
@@ -183,7 +183,7 @@
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
+            this.$resetpost('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
           }
@@ -201,7 +201,7 @@
         this.show = true
       },
       confirm () {
-        this.$resetpost('api/af-system/logic/system_saveSingle', this.selectItem).then((res) => {
+        this.$resetpost('rs/logic/system_saveSingle', this.selectItem).then((res) => {
           // 如果没有id，需要在数组中添加
           this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
           this.show = false

package/src/components/server/Login.vue

@@ -174,7 +174,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      let getMacs = yield self.$resetpost('api/af-system/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+      let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
       }).catch(() => {
@@ -239,7 +239,7 @@ let saveGen = function *(self) {
       msg = ret.data
     } else if (ret.status === 710) {
       msg = ret.data
-    } else {
+    } else if (ret.status === 555) {
       msg = ret.data
     }
     self.createCode()
@@ -257,6 +257,21 @@ export default {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
     window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
     this.vTime = this.format(new Date(window.versionTime));
+    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)
@@ -412,24 +427,27 @@ export default {
       }else {
         console.log("待办提醒全局关闭。")
       }
+
+
+
+
     },
 
     async loginother(){
-      // if (this.config.distanceLogin) {
-      //   if (this.$login && this.$login.getUrlParames('name') ) {
-      //     let ename = this.$login.getUrlParames('name');
-      //     // todo v4
-      //     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)
-      //       }
-      //     }
-      //   }
-      // }
+      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');

package/src/components/server/ModifyPw.vue

@@ -62,7 +62,6 @@
     // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
     // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
     //  Util.f.password = self.deliver.newpassword
-    // todo v4
     let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {

package/src/components/server/PcdBuildingSelect.vue

@@ -155,7 +155,6 @@
       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`
-        // todo v4
         let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_street',
@@ -193,7 +192,6 @@
         }else{
           condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
         }
-        // todo v4
         let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_building',

package/src/components/server/ResSelect.vue

@@ -1,169 +1,175 @@
-<template>
-  <v-select :options='resoptions' placeholder='请选择'
-            :value.sync="selectres"
-            :multiple="isMul"
-            search="true"
-            :disabled="mustselect"
-            :close-on-select="!isMul"
-            @change="resChange"
-  >
-  </v-select>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '资源选择',
-    props: {
-
-      //资源类型
-      restype:'',
-      //是否只查询营业厅
-      specialquery: {
-        type: Boolean,
-        default: false
-      },
-      //资源数据
-      resObj:{},
-      isMul: {
-        type: Boolean,
-        default: true
-      },
-      //资源初始化数据
-      initresid: {
-        type: Array,
-        default() { return [] },
-      },
-      //父层id
-      parentresid: {
-        type: Array,
-        default() { return [] },
-      },
-      mustselect: {
-        type: Boolean,
-        default: false
-      },
-    },
-    data () {
-      return {
-        //资源数据
-        resObj:{},
-        //资源数据列表
-        resoptions:[],
-        //选中资源数据
-        selectres: [],
-      }
-    },
-    ready () {
-      //获取资源列表
-      this.getResList()
-    },
-    methods:{
-      //树形结构变成list
-      findById(val) {
-        if(val){
-          if(this.checkidres(val)){
-            this.treetoList(val,'')
-          }else if(val.children.length>0){
-            for (let value of val.children) {
-              this.findById(value)
-            }
-          }
-        }
-      },
-      //树形结构变成list
-      treetoList(val,parentname) {
-        for (let value of val.children) {
-          this.ergodicList(value,parentname)
-        }
-      },
-      //找到跟节点
-      ergodicList (val,parentname) {
-        if(val.children.length > 0 ){
-          if (val.name !== '组织机构'){
-            this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
-          }
-          parentname=parentname+val.name
-          this.treetoList(val,parentname)
-        }else {
-          //截取组织机构【组织机构】
-          if(this.restype=='organization'){
-            parentname=parentname.replace("组织机构","")
-            this.resoptions.push({label: val.name+' - '+parentname, value: val.id})
-          }else{
-            if (this.specialquery && this.restype == 'department') {
-              if (val.f_dep_type === '营业厅') {
-                this.resoptions.push({label: val.name, value: val.id})
-              }
-            }else {
-              this.resoptions.push({label: val.name, value: val.id})
-            }
-          }
-        }
-      },
-      //检查id是否存在
-      checkidres(val){
-        let flag=false
-        //如果没传值得话 不过滤
-        if(this.parentresid.length==0&&this.restype=='organization'){
-          flag=true
-        }
-        this.parentresid.forEach((item) => {
-          if(item==val.id){
-            flag=true
-          }
-        })
-        return flag;
-      },
-      //资源改变
-      resChange(val){
-        let orgnames=[]
-        Object.keys(this.resoptions).forEach((key) => {
-          if(this.selectres.includes(this.resoptions[key].value))
-            orgnames.push(this.resoptions[key].label)
-        })
-        console.log('资源改变。。', val, orgnames)
-        this.$dispatch('res-select', this.selectres, orgnames)
-      },
-      //获取资源数据
-      async getResList() {
-
-        let http = new HttpResetClass()
-
-        let req = await http.load('POST', '/rs/search', {data: {
-            source: `tool.getFullTree(this.getRights().where(row.getType()==$${this.restype}$))`,
-            userid: this.$login.f.id
-          }}, {resolveMsg: null, rejectMsg: '获取组织结构数据出错'})
-        this.resObj=req.data[0]
-        this.dealdata()
-      },
-      dealdata(){
-        this.resoptions=[]
-        this.findById(this.resObj);
-        //赋值资源数据
-        let arryselect=[]
-        this.resoptions.forEach((item) => {
-          if(this.initresid.length>0){
-            this.initresid.forEach((init) => {
-              if(item.value==init){
-                arryselect.push(item.value)
-              }
-            })
-          }
-        })
-        //赋值资源选中初始值
-        this.selectres=arryselect
-      }
-    },
-    watch: {
-      //监听初始化资源id
-      'initresid.length'(){
-        this.dealdata()
-      },
-      //监听初始化资源id
-      'parentresid'(){
-        this.dealdata()
-      },
-    },
-  }
-</script>
+<template>
+  <v-select :options='resoptions' placeholder='请选择'
+            :value.sync="selectres"
+            :multiple="isMul"
+            search="true"
+            :disabled="mustselect"
+            :close-on-select="!isMul"
+            @change="resChange"
+  >
+  </v-select>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '资源选择',
+    props: {
+
+      //资源类型
+      restype:'',
+      //是否只查询营业厅
+      specialquery: {
+        type: Boolean,
+        default: false
+      },
+      //资源数据
+      resObj:{},
+      isMul: {
+        type: Boolean,
+        default: true
+      },
+      //资源初始化数据
+      initresid: {
+        type: Array,
+        default() { return [] },
+      },
+      //父层id
+      parentresid: {
+        type: Array,
+        default() { return [] },
+      },
+      mustselect: {
+        type: Boolean,
+        default: false
+      },
+    },
+    data () {
+      return {
+        //资源数据
+        resObj:{},
+        //资源数据列表
+        resoptions:[],
+        //选中资源数据
+        selectres: [],
+      }
+    },
+    ready () {
+      //获取资源列表
+      this.getResList()
+    },
+    methods:{
+      //树形结构变成list
+      findById(val) {
+        if(val){
+          if(this.checkidres(val)){
+            this.treetoList(val,'')
+          }else if(val.children.length>0){
+            for (let value of val.children) {
+              this.findById(value)
+            }
+          }
+        }
+      },
+      //树形结构变成list
+      treetoList(val,parentname) {
+        for (let value of val.children) {
+          this.ergodicList(value,parentname)
+        }
+      },
+      //找到跟节点
+      ergodicList (val,parentname) {
+        if(val.children.length > 0 ){
+          parentname=parentname+val.name
+          this.treetoList(val,parentname)
+        }else {
+          //截取组织机构【组织机构】
+          if(this.restype=='organization'){
+            parentname=parentname.replace("组织机构","")
+            this.resoptions.push({label: val.name+' - '+parentname, value: val.id})
+          }else{
+            if (this.specialquery && this.restype == 'department') {
+              if (val.f_dep_type === '营业厅') {
+                this.resoptions.push({label: val.name, value: val.id})
+              }
+            }else {
+              this.resoptions.push({label: val.name, value: val.id})
+            }
+          }
+        }
+      },
+      //检查id是否存在
+      checkidres(val){
+        let flag=false
+        //如果没传值得话 不过滤
+        if(this.parentresid.length==0&&this.restype=='organization'){
+          flag=true
+        }
+        this.parentresid.forEach((item) => {
+          if(item==val.id){
+            flag=true
+          }
+        })
+        return flag;
+      },
+      //资源改变
+      resChange(val){
+        let orgnames=[]
+        Object.keys(this.resoptions).forEach((key) => {
+          if(this.selectres.includes(this.resoptions[key].value))
+            orgnames.push(this.resoptions[key].label)
+        })
+        console.log('资源改变。。', val, orgnames)
+        this.$dispatch('res-select', this.selectres, orgnames)
+      },
+      //获取资源数据
+      async getResList() {
+
+        let http = new HttpResetClass()
+
+        let req = await http.load('POST', '/rs/search', {data: {
+            source: `tool.getFullTree(this.getRights().where(row.getType()==$${this.restype}$))`,
+            userid: this.$login.f.id
+          }}, {resolveMsg: null, rejectMsg: '获取组织结构数据出错'})
+        this.resObj=req.data[0]
+        this.dealdata()
+      },
+      dealdata(){
+        this.resoptions=[]
+        this.findById(this.resObj);
+        //赋值资源数据
+        let arryselect=[]
+        this.resoptions.forEach((item) => {
+          if(this.initresid.length>0){
+            this.initresid.forEach((init) => {
+              if(item.value==init){
+                arryselect.push(item.value)
+              }
+            })
+          }
+        })
+        //赋值资源选中初始值
+        this.selectres=arryselect
+      }
+    },
+    watch: {
+      //监听初始化资源id
+      'initresid.length'(){
+        this.dealdata()
+      },
+      //监听初始化资源id
+      'parentresid'(){
+        this.dealdata()
+      },
+      initresid: {
+        handler(newVal, oldVal) {
+          // 避免重复触发
+          if (JSON.stringify(newVal) === JSON.stringify(oldVal)) {
+            return;
+          }
+          this.dealdata();
+        },
+      }
+    },
+  }
+</script>

package/src/components/server/ResSelectGroup.vue

@@ -167,7 +167,7 @@ export default {
           for (let row of this.$refs.department.resoptions) {
             depids.push(row.value)
           }
-          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
+          let depid = depids.length ? plugin.convertToIn(depids) : ('')
           condition += " and f_depid in " + depid;
         }
       }

package/src/components/server/RoleSelector.vue

@@ -51,7 +51,6 @@
       }
     },
     ready() {
-      // todo v4
       this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
         .then(res => {
           console.log('res-->' + JSON.stringify(res))
@@ -66,7 +65,7 @@
         this.$dispatch('re-res',obj)
       },
       filterUser(resids) {
-        // 处理第一次进入页面值异常问题
+        // 处理第一次进入页面值异常问题 
         if(resids.length > 0 && typeof resids[0] == "object"){
           resids = resids[0]
         }
@@ -87,4 +86,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/src/filiale/baole/Login.vue

@@ -175,7 +175,6 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -440,7 +439,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           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){