system-clients 3.2.88 → 3.2.89-temp

package/src/components/equipment/PhoneManage.vue

@@ -1,61 +1,61 @@
-<template>
-  <div class="flex-row">
-    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
-    <phone-list :row="row" @select-changed="selected"  style="width:auto;" v-ref:list ></phone-list>
-    </div>
-    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
-      <phone-add :data="row" :users="users" v-ref:addbox></phone-add>
-    </div>
-  </div>
-</template>
-<script>
-
-  import PhoneList from './PhoneList'
-  import PhoneAdd from './PhoneAdd'
-
-  export default {
-    title: 'PC终端管理',
-    components: {
-      PhoneList, PhoneAdd
-    },
-    props:['users'],
-    data () {
-      return {
-        isChange: false,
-        row: null
-      }
-    },
-    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()
-      },
-      '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>
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+    <phone-list :row="row" @select-changed="selected"  style="width:auto;" v-ref:list ></phone-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
+      <phone-add :data="row" :users="users" v-ref:addbox></phone-add>
+    </div>
+  </div>
+</template>
+<script>
+
+  import PhoneList from './PhoneList'
+  import PhoneAdd from './PhoneAdd'
+
+  export default {
+    title: 'PC终端管理',
+    components: {
+      PhoneList, PhoneAdd
+    },
+    props:['users'],
+    data () {
+      return {
+        isChange: false,
+        row: null
+      }
+    },
+    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()
+      },
+      '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/equipment/PosAdd.vue

@@ -226,7 +226,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
                 // 测试接口
                 // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
                 //   .then((res) => {})
-                // todo v4
                 this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
@@ -242,7 +241,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
                 // 测试接口
                 // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
                 //   .then((res) => {})
-                // todo v4
                 this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
@@ -261,7 +259,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
         this.show=true
       },
       upgradeRoot() {
-        // todo v4
         this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
         this.$dispatch('refresh')
       },
@@ -281,7 +278,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
           this.model.f_depname = this.$login.f.deps
           this.model.f_orgstr = this.$login.f.fullids
         }
-        // todo v4
          this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
            this.$dispatch('refresh')
          }).catch((error) => {

package/src/components/equipment/PosList.vue

@@ -238,7 +238,6 @@
           this.showAlert('出现异常，请重新进操作')
           return
         }
-        // todo v4
         await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
           rejectMsg: null,
           resolveMsg: null

package/src/components/equipment/PosParamAdd.vue

@@ -124,7 +124,6 @@ export default {
       this.bankmodel = JSON.parse(JSON.stringify(this.bankmodel))
     },
     async confirm() {
-      // todo v4
       await this.$resetpost('rs/logic/Pos_saveParam',
         {
           data: {

package/src/components/equipment/PosParamList.vue

@@ -93,7 +93,6 @@ export default {
       }
     },
     async delete(row) {
-      // todo v4
       await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
       await this.search()
     },

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

@@ -161,6 +161,9 @@
       'parentresid'(){
         this.dealdata()
       },
+      'initresid'(){
+        this.dealdata()
+      }
     },
   }
 </script>