system-clients 3.2.88 → 3.2.89-fix

package/src/components/parammanage/ParamPage.vue

@@ -258,7 +258,6 @@
         if (type === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              // todo v4
               this.$resetpost('rs/logic/deleteParam', row).then((res) => {
                 this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
                 this.selectItem = null
@@ -268,7 +267,6 @@
         } else if (type === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              // todo v4
               this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.getParamValue(this.selectItem)
               })
@@ -293,7 +291,6 @@
             //添加当前分公司
           }
           data.f_filialeids = this.modifyItem.f_filialeids
-          // todo v4
           this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
             //无id
             this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
@@ -313,7 +310,6 @@
               processid: this.selectItem.id
             }
           }
-          // todo v4
           this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
             this.show = false
             // 如果没有id，需要在数组中添加

package/src/components/parammanage/SinglePage.vue

@@ -183,7 +183,6 @@
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            // todo v4
             this.$resetpost('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
@@ -202,7 +201,6 @@
         this.show = true
       },
       confirm () {
-        // todo v4
         this.$resetpost('rs/logic/system_saveSingle', this.selectItem).then((res) => {
           // 如果没有id，需要在数组中添加
           this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)

package/src/components/server/LeftTree.vue

@@ -31,19 +31,13 @@ export default {
       }
         console.log(row.data.navigate)
         if (row.data.navigate) {
-
-            let isExist = false
-        this.tbcg.forEach((tab) => {
-            if(tab.comp.name == row.data.link) {
-            isExist = true
-          }
-        })
-        if (!isExist){
-          this.$goto('embbed-page', {domainName: row.data.navigate, title: row.data.name, compName: row.data.link, login: Vue.$login, param: Vue.$appdata}, 'main')
-        }else {
-            console.log(isExist,'aa')
-          this.$emit('isnodo',row.data.link)
-        }
+          this.$goto('embbed-page', {
+            domainName: row.data.navigate,
+            title: row.data.name,
+            compName: row.data.link,
+            login: Vue.$login,
+            param: Vue.$appdata
+          }, 'main')
       } else if (row.data.link) {
         let isExist = false
         this.tbcg.forEach((tab) => {

package/src/components/server/Login.vue

@@ -174,7 +174,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
@@ -240,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()
@@ -438,7 +437,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){

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/ResSelectGroup.vue

@@ -1,211 +1,211 @@
-<template>
-  <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' v-ref:department
-                @res-select="getdep"
-                :parentresid="depresid"
-                :specialquery="specialquery"
-                :initresid='initres.dep'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && (!cascade)">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="depresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && cascade">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " v-if="sliceareashow" >
-    <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'
-import { HttpResetClass } from 'vue-client'
-export default {
-  title: '资源选择测试',
-  props: {
-    style: {
-      type: String,
-      default: 'col-sm-2 form-group'
-    },
-    mul: {
-      type: Boolean,
-      default: true
-    },
-    //是否只查询营业厅
-    specialquery: {
-      type: Boolean,
-      default: false
-    },
-    //初始值
-    initres: {
-      type: Object,
-      default: null,
-    },
-    showComponent:{
-      default:['company','department','operator','slicearea']
-    },
-    //人员是否和部门关联
-    cascade: {
-      type: Boolean,
-      default: true
-    },
-    selectin: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data () {
-    return {
-      orgresid:[this.$login.f.orgid],
-      depresid:[],
-      userresid:[],
-      operatorsid: [],
-      sliceArea: [],
-      slice_area:[],
-      companyshow:false,
-      departmentshow:false,
-      operatorshow:false,
-      sliceareashow:false,
-      mustselect:false,
-      obj:{
-        orgnames:[],
-        depnames:[],
-        operatornames:[]
-      }
-    }
-  },
-  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)
-  },
-  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) => {
-          if(Array.isArray(val)){
-            for (let i = 0; i <val.length ; i++) {
-              if(res.parentid == val[i]){
-                return true
-              }
-            }
-          }
-          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){
-      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);
-      } 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)
-    },
-    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,val) {
-      this.obj.operatornames = val
-      this.operatorsid = obj
-      this.returnOrg(obj);
-    },
-    getarea(val) {
-      this.slice_area=val
-      if(this.operatorsid){
-        this.returnOrg(this.operatorsid);
-      }else{
-        this.returnOrg();
-      }
-    }
-  },
-  watch: {
-
-  }
-}
-</script>
+<template>
+  <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' v-ref:department
+                @res-select="getdep"
+                :parentresid="depresid"
+                :specialquery="specialquery"
+                :initresid='initres.dep'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && (!cascade)">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="depresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && cascade">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " v-if="sliceareashow" >
+    <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'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '资源选择测试',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //是否只查询营业厅
+    specialquery: {
+      type: Boolean,
+      default: false
+    },
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
+    },
+    showComponent:{
+      default:['company','department','operator','slicearea']
+    },
+    //人员是否和部门关联
+    cascade: {
+      type: Boolean,
+      default: true
+    },
+    selectin: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      orgresid:[this.$login.f.orgid],
+      depresid:[],
+      userresid:[],
+      operatorsid: [],
+      sliceArea: [],
+      slice_area:[],
+      companyshow:false,
+      departmentshow:false,
+      operatorshow:false,
+      sliceareashow:false,
+      mustselect:false,
+      obj:{
+        orgnames:[],
+        depnames:[],
+        operatornames:[]
+      }
+    }
+  },
+  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)
+  },
+  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) => {
+          if(Array.isArray(val)){
+            for (let i = 0; i <val.length ; i++) {
+              if(res.parentid == val[i]){
+                return true
+              }
+            }
+          }
+          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){
+      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);
+      } 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)
+    },
+    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,val) {
+      this.obj.operatornames = val
+      this.operatorsid = obj
+      this.returnOrg(obj);
+    },
+    getarea(val) {
+      this.slice_area=val
+      if(this.operatorsid){
+        this.returnOrg(this.operatorsid);
+      }else{
+        this.returnOrg();
+      }
+    }
+  },
+  watch: {
+
+  }
+}
+</script>

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){

package/src/filiale/chengtou/Login.vue

@@ -173,7 +173,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
@@ -438,7 +437,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){

package/src/filiale/dongguan/Login.vue

@@ -179,7 +179,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
@@ -429,7 +428,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){

package/src/filiale/dongguan/Main.vue

@@ -97,7 +97,6 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -393,7 +392,6 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }