system-clients 3.2.93 → 3.2.94-temp

package/src/components/equipment/PhoneList.vue

@@ -1,113 +1,113 @@
-<template>
-  <div class="flex" style="flex:1; ">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body">使用公司</label>
-              <!--<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>-->
-              <res-select restype='organization'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getorg"
-                          :initresid="$parent.$parent.curorgid">
-              </res-select>
-            </div>
-
-            <div class="col-sm-3 form-group" >
-              <label class="font_normal_body">使用人员</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
-                      condition="f_username like '%{}%'" placeholder="使用人员">
-            </div>
-            <div class="col-sm-3 form-group" >
-              <label class="font_normal_body">设备号</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
-                      condition="f_terminal_number like '%{}%'" placeholder="设备号">
-            </div>
-            <div class="span" style="float:right;">
-              <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
-              <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid >
-        <template partial='head'>
-          <tr>
-            <th>序号</th>
-            <th>使用人员</th>
-            <th>设备号</th>
-            <th>操作</th>
-          </tr>
-        </template>
-        <template partial='body':model="model">
-          <tr>
-            <td style="text-align:center">{{$index+1}}</td>
-            <td style="text-align:center">{{row.f_user_operator}}</td>
-            <td style="text-align:center">{{row.f_terminal_number}}</td>
-            <td style="text-align:center">
-              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-
-  export default {
-    title: 'PC',
-    components: {},
-
-    data () {
-      return {
-        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,
-        curorgid: [this.$login.f.orgid],
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        f_orgid:''
-      }
-    },
-    ready () {
-      console.log('看看终端类型',  this.equipmentType)
-      this.search()
-    },
-    methods: {
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-
-      selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
-        this.model.search(args.condition, this.model)
-      },
-      add () {
-        this.$dispatch('add')
-      },
-      del (row) {
-        console.log('要删除了', row)
-        row.f_state = '已删除'
-        this.$resetpost('api/af-system/logic/save_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          this.$dispatch('refresh')
-        }).catch((error) => {
-          this.$dispatch('refresh')
-        })
-      },
-      getRes (obj) {
-        this.filialeNameStr = obj.res
-        this.filialeCodeStr = obj.resids
-      },
-      getorg (val) {
-        this.f_orgid = val[0]
-      }
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex" style="flex:1; ">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">使用公司</label>
+              <!--<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>-->
+              <res-select restype='organization'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getorg"
+                          :initresid="$parent.$parent.curorgid">
+              </res-select>
+            </div>
+
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">使用人员</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
+                      condition="f_username like '%{}%'" placeholder="使用人员">
+            </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">设备号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
+                      condition="f_terminal_number like '%{}%'" placeholder="设备号">
+            </div>
+            <div class="span" style="float:right;">
+              <button class="button_search" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>使用人员</th>
+            <th>设备号</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body':model="model">
+          <tr>
+            <td style="text-align:center">{{$index+1}}</td>
+            <td style="text-align:center">{{row.f_user_operator}}</td>
+            <td style="text-align:center">{{row.f_terminal_number}}</td>
+            <td style="text-align:center">
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: 'PC',
+    components: {},
+
+    data () {
+      return {
+        model: new PagedList('rs/sql/equipmentQuery', 20),
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.f_orgids,
+        userid:this.$login.f.id,
+        curorgid: [this.$login.f.orgid],
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        f_orgid:''
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.search()
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+
+      selfSearch (args) {
+        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
+        this.model.search(args.condition, this.model)
+      },
+      add () {
+        this.$dispatch('add')
+      },
+      del (row) {
+        console.log('要删除了', row)
+        row.f_state = '已删除'
+        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch((error) => {
+          this.$dispatch('refresh')
+        })
+      },
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+      getorg (val) {
+        this.f_orgid = val[0]
+      }
+    },
+    computed: {
+
+    }
+  }
+</script>

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

@@ -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 || $v.f_phone.minlength || $v.f_phone.maxlength}">
+          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required}">
             <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,7 +223,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送停用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '停用'
               try {
-                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
+                // 测试接口
+                // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
+                //   .then((res) => {})
+                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
               }
@@ -235,7 +238,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送启用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '正常'
               try {
-                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
+                // 测试接口
+                // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
+                //   .then((res) => {})
+                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
               }
@@ -253,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')
       },
@@ -273,8 +278,7 @@ 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('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+         this.$resetpost('rs/entity/t_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('api/af-system/sql/equipmentQuery', 20),
-        model2: new PagedList('api/af-system/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
+        model: new PagedList('rs/sql/equipmentQuery', 20),
+        model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
         curorgid: [this.f_filialeid],
         f_orgid: '',
         f_filialeids: '',
@@ -238,7 +238,7 @@
           this.showAlert('出现异常，请重新进操作')
           return
         }
-        await this.$resetpost('api/af-system/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
+        await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
           rejectMsg: null,
           resolveMsg: null
         })
@@ -253,6 +253,7 @@
         this.infoshow = true
       },
       search () {
+        console.log("111111111111111111111111111111111111")
         this.$refs.paged.$refs.cri.search()
       },
 
@@ -277,6 +278,7 @@
       },
 
       getorg (val) {
+        console.log("====================", val)
         this.f_orgid = val[0]
         this.f_filialeid = val[0]
         // this.search()

package/src/components/equipment/PosParamAdd.vue

@@ -124,7 +124,7 @@ export default {
       this.bankmodel = JSON.parse(JSON.stringify(this.bankmodel))
     },
     async confirm() {
-      await this.$resetpost('api/af-system/logic/Pos_saveParam',
+      await this.$resetpost('rs/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('api/af-system/sql/get_posParam', 20),
+      model: new PagedList('rs/sql/get_posParam', 20),
       curorgid: [this.f_filialeid],
     }
   },
@@ -93,7 +93,7 @@ export default {
       }
     },
     async delete(row) {
-      await this.$resetpost('api/af-system/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
+      await this.$resetpost('rs/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-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 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>
         </template>
       </data-grid>
@@ -179,8 +179,8 @@
         var param2=this.params.rows[index-1]
         let http = new HttpResetClass()
         try {
-          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})
+          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})
           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', 'api/af-system/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'rs/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', 'api/af-system/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'rs/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.params.rows  = res.data
       },
       filter_query (paramName,orgid) {
@@ -258,7 +258,7 @@
         if (type === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('api/af-system/logic/deleteParam', row).then((res) => {
+              this.$resetpost('rs/logic/deleteParam', row).then((res) => {
                 this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
                 this.selectItem = null
               })
@@ -267,7 +267,7 @@
         } else if (type === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
+              this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.getParamValue(this.selectItem)
               })
             }
@@ -291,7 +291,7 @@
             //添加当前分公司
           }
           data.f_filialeids = this.modifyItem.f_filialeids
-          this.$resetpost('api/af-system/logic/system_saveParam', data).then((res) => {
+          this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
             //无id
             this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             this.show = false
@@ -310,7 +310,7 @@
               processid: this.selectItem.id
             }
           }
-          this.$resetpost('api/af-system/logic/system_saveParamValue', data).then((res) => {
+          this.$resetpost('rs/entity/t_paramvalue', 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><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