system-clients 3.2.88 → 3.2.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.88",
+  "version": "3.2.90",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -79,7 +79,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.138",
+    "vue-client": "1.24.145-1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/Main.vue

@@ -471,7 +471,6 @@ let createWaterMark = function (userName) {
                 res.data.forEach(itre => {
                   let band = null
                   if ('f_dynamic_expire' in itre) {
-                      console.log(itre.f_dynamic_expire)
                       if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
                         let todayold =  new Date(itre.f_dynamic_expire)
                         todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
@@ -602,7 +601,10 @@ let createWaterMark = function (userName) {
             usertelephone: this.$login.f.f_user_telephone
           }
           // todo v4
-          await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
+          try {
+            await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
+          }catch(e){
+          }
           window.location.reload()
         }
       })

package/src/components/equipment/PcAdd.vue

@@ -84,8 +84,7 @@
         this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.f_orgid
         console.log('保存', this.model)
-        // todo v4
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PcList.vue

@@ -76,7 +76,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('rs/sql/equipmentQuery', 20),
+        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
         curorgid: [this.$login.f.orgid],
         f_orgid: ''
       }
@@ -93,7 +93,7 @@
       },
 
       selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_orgid like '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
+        args.condition =  `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
         this.model.search(args.condition, this.model)
       },
       add () {
@@ -102,8 +102,7 @@
       del (row) {
         console.log('要删除了', row)
         row.f_state = '已删除'
-        // todo v4
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/save_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PhoneAdd.vue

@@ -84,8 +84,7 @@ import { HttpResetClass } from 'vue-client'
         this.model.f_filialeids = this.$login.f.f_orgids
         this.model.f_orgid = this.f_orgid
         console.log('保存', this.model)
-        // todo v4
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch(() => {
           this.$dispatch('refresh')

package/src/components/equipment/PhoneList.vue

@@ -64,7 +64,7 @@
 
     data () {
       return {
-        model: new PagedList('rs/sql/equipmentQuery', 20),
+        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
         filialeNameStr: this.$login.f.f_fengongsi,
         filialeCodeStr: this.$login.f.f_orgids,
         userid:this.$login.f.id,
@@ -92,8 +92,7 @@
       del (row) {
         console.log('要删除了', row)
         row.f_state = '已删除'
-        // todo v4
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/save_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PosAdd.vue

@@ -33,7 +33,7 @@
             <label class="font_normal_body" >机器编号</label>
             <input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
           </div>
-          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required}">
+          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required || $v.f_phone.minlength || $v.f_phone.maxlength}">
             <label class="font_normal_body">联系电话</label>
             <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话"
                    v-validate:f_phone="{required: true, minlength:7, maxlength: 11}" title="手机号必须7-11位">
@@ -223,11 +223,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送停用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '停用'
               try {
-                // 测试接口
-                // 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})
+                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
               }
@@ -239,11 +235,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送启用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '正常'
               try {
-                // 测试接口
-                // 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})
+                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
               }
@@ -282,7 +274,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           this.model.f_orgstr = this.$login.f.fullids
         }
         // todo v4
-         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+         this.$resetpost('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
            this.$dispatch('refresh')
          }).catch((error) => {
            this.$dispatch('refresh')

package/src/components/equipment/PosList.vue

@@ -165,8 +165,8 @@
     data () {
       return {
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        model: new PagedList('rs/sql/equipmentQuery', 20),
-        model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
+        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
+        model2: new PagedList('api/af-system/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
         curorgid: [this.f_filialeid],
         f_orgid: '',
         f_filialeids: '',
@@ -238,8 +238,7 @@
           this.showAlert('出现异常，请重新进操作')
           return
         }
-        // todo v4
-        await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
+        await this.$resetpost('api/af-system/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
           rejectMsg: null,
           resolveMsg: null
         })
@@ -254,7 +253,6 @@
         this.infoshow = true
       },
       search () {
-        console.log("111111111111111111111111111111111111")
         this.$refs.paged.$refs.cri.search()
       },
 
@@ -279,7 +277,6 @@
       },
 
       getorg (val) {
-        console.log("====================", val)
         this.f_orgid = val[0]
         this.f_filialeid = val[0]
         // this.search()

package/src/components/equipment/PosParamAdd.vue

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

package/src/components/equipment/PosParamList.vue

@@ -73,7 +73,7 @@ export default {
   components: {},
   data() {
     return {
-      model: new PagedList('rs/sql/get_posParam', 20),
+      model: new PagedList('api/af-system/sql/get_posParam', 20),
       curorgid: [this.f_filialeid],
     }
   },
@@ -93,8 +93,7 @@ export default {
       }
     },
     async delete(row) {
-      // todo v4
-      await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
+      await this.$resetpost('api/af-system/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
       await this.search()
     },
     modify(row) {

package/src/components/parammanage/ParamPage.vue

@@ -64,10 +64,10 @@
         <template partial='body'>
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.name}}</td>
-          <td class="flex-around col-sm-3">
-            <button type="button" name="button" class="button_search" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
-            <button type="button" name="button" class="button_search" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
-            <button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
+          <td class="flex-row col-sm-5">
+            <button type="button" name="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
+            <button type="button" name="button" class="button_search button_spacing width-60" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
+            <button type="button" name="button" class="btn btn-danger button_spacing width-60" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
           </td>
         </template>
       </data-grid>
@@ -179,8 +179,8 @@
         var param2=this.params.rows[index-1]
         let http = new HttpResetClass()
         try {
-          await http.load('POST', 'rs/entity/t_paramvalue', param1, {resolveMsg: null, rejectMsg: null})
-          await http.load('POST', 'rs/entity/t_paramvalue', param2, {resolveMsg: null, rejectMsg: null})
+          await http.load('POST', 'api/af-system/logic/system_saveParamValue', param1, {resolveMsg: null, rejectMsg: null})
+          await http.load('POST', 'api/af-system/logic/system_saveParamValue', param2, {resolveMsg: null, rejectMsg: null})
           this.$showAlert('上移成功', 'success', 2000)
         }catch (e) {
           console.log(e)
@@ -198,7 +198,7 @@
       async queryParam (condition) {
         this.model.rows = []
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'api/af-system/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
       selected (val) {
@@ -207,7 +207,7 @@
       },
       async getParamValue(obj) {
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'api/af-system/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.params.rows  = res.data
       },
       filter_query (paramName,orgid) {
@@ -258,8 +258,7 @@
         if (type === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              // todo v4
-              this.$resetpost('rs/logic/deleteParam', row).then((res) => {
+              this.$resetpost('api/af-system/logic/deleteParam', row).then((res) => {
                 this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
                 this.selectItem = null
               })
@@ -268,8 +267,7 @@
         } 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.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.getParamValue(this.selectItem)
               })
             }
@@ -293,8 +291,7 @@
             //添加当前分公司
           }
           data.f_filialeids = this.modifyItem.f_filialeids
-          // todo v4
-          this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
+          this.$resetpost('api/af-system/logic/system_saveParam', data).then((res) => {
             //无id
             this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             this.show = false
@@ -313,8 +310,7 @@
               processid: this.selectItem.id
             }
           }
-          // todo v4
-          this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
+          this.$resetpost('api/af-system/logic/system_saveParamValue', data).then((res) => {
             this.show = false
             // 如果没有id，需要在数组中添加
             this.getParamValue(this.selectItem)

package/src/components/parammanage/SinglePage.vue

@@ -30,11 +30,11 @@
         <data-grid :model="model" v-ref:grid >
           <template partial='head'>
             <tr>
-              <th>序号</th>
-              <th>名称</th>
-              <th>参数值</th>
-              <th>所属</th>
-              <th>操作</th>
+              <th><nobr>序号</nobr></th>
+              <th><nobr>名称</nobr></th>
+              <th><nobr>参数值</nobr></th>
+              <th><nobr>所属</nobr></th>
+              <th><nobr>操作</nobr></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', 'rs/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'api/af-system/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
 
@@ -183,8 +183,7 @@
       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.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
           }
@@ -202,8 +201,7 @@
         this.show = true
       },
       confirm () {
-        // todo v4
-        this.$resetpost('rs/logic/system_saveSingle', this.selectItem).then((res) => {
+        this.$resetpost('api/af-system/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,8 +174,7 @@ 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}%'`}}, {
+      let getMacs = yield self.$resetpost('api/af-system/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
       }).catch(() => {
@@ -258,21 +257,6 @@ 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)
@@ -428,28 +412,24 @@ 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');
+      //     // 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)
+      //       }
+      //     }
+      //   }
+      // }
     },
     theme(){
       // var  elementList = document.querySelectorAll('body');

package/src/filiale/rizhao/Main.vue

@@ -295,7 +295,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
+          await this.$resetpost('api/af-system/user/logout', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }
       })

package/src/filiale/tongchuan/Main.vue

@@ -568,7 +568,6 @@ let createWaterMark = function (userName) {
                 res.data.forEach(itre => {
                   let band = null
                   if ('f_dynamic_expire' in itre) {
-                      console.log(itre.f_dynamic_expire)
                       if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
                         let todayold =  new Date(itre.f_dynamic_expire)
                         todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))

package/src/filiale/weinan/Main.vue

@@ -471,7 +471,6 @@ export default {
               res.data.forEach(itre => {
                 let band = null
                 if ('f_dynamic_expire' in itre) {
-                  console.log(itre.f_dynamic_expire)
                   if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
                     let todayold =  new Date(itre.f_dynamic_expire)
                     todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))

package/src/plugins/GetLoginInfoService.js

@@ -7,12 +7,12 @@ let loginGen = async function (username, password, cue) {
   const getLogin = await Vue.resetpost('/api/af-auth/login', data,
     {resolveMsg: null, rejectMsg: null,headerConfig:{'Content-type': "application/json"}
   })
-  if (getLogin.data.code === 200) {
+  if (getLogin.data) {
     //获取jwt
-    Vue.$login.jwt = getLogin.data.jwt
+    Vue.$login.jwt = getLogin.data.resources.data.id
     Vue.$login.jwtNew = getLogin.data.access_token
     // 调用远程登录服务，获取所有有权访问的功能
-    Vue.$login.f =  getLogin.data.data.resources.data
+    Vue.$login.f =  getLogin.data.resources.data
     // 把登录用户添加到cookie里
     Vue.cookie.set('loginId', Vue.$login.f.id)
     try {

package/src/stores/AppData.js

@@ -9,7 +9,7 @@ let GetAppDataService = {
 
   // 开启卡监听
   load () {
-    return Vue.resetpost('rs/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    return Vue.resetpost('api/af-system/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
         res.data.singleValues.forEach((item) => {
           this.singleValues[item.name] = item.value
         })