system-clients 3.2.6 → 3.2.7-aodeToV4

package/src/components/equipment/EquipmentManage.vue

@@ -4,7 +4,7 @@
       <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
         <div class="row">
           <div class="col-sm-2 form-group">
-            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
+            <label class="font_normal_body">终端类型</label>
             <v-select id="f_charge_type"
                       v-model="model.f_equipment_type"
                       placeholder='终端类型'
@@ -19,8 +19,8 @@
     <div v-if="model.f_equipment_type[0] === 'PC'">
       <pc-manage></pc-manage>
     </div>
-    <div v-if="model.f_equipment_type[0] === 'POS'">
-      <pos-manage></pos-manage>
+    <div v-if="model.f_equipment_type[0] === 'POS'||model.f_equipment_type[0] === '自助写卡机'||model.f_equipment_type[0] === '手持POS'">
+      <pos-manage :type="model.f_equipment_type[0]"></pos-manage>
     </div>
     <div v-if="model.f_equipment_type[0] === 'PHONE'">
       <phone-manage></phone-manage>
@@ -46,7 +46,7 @@
     },
     ready () {
       console.log('看看终端类型',  this.equipmentType)
-      this.model.f_equipment_type = [this.equipmentType[0].value]
+      this.model.f_equipment_type = ['POS']
     },
     methods: {
       del (row) {

package/src/components/equipment/PcAdd.vue

@@ -1,23 +1,23 @@
 <template>
-  <div class="row select-overspread">
+  <div class="auto select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
       </ul>
       <form class="form-horizontal">
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用人员</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">所属地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">mac地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用公司</label>
 
               <res-select restype='organization'
@@ -74,7 +74,7 @@
         this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.f_orgid
         console.log('保存', this.model)
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/saveEquipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PcList.vue

@@ -4,7 +4,7 @@
       <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">
+          <div class="col-sm-3">
             <label class="font_normal_body">使用公司</label>
             <res-select restype='organization'
                         is-mul="false"
@@ -13,12 +13,12 @@
             </res-select>
           </div>
 
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <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" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">所属地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_outlets"
                     condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
@@ -31,7 +31,7 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">MAC地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
                     condition="f_mac_number like '%{}%'" placeholder="MAC地址">
@@ -58,7 +58,7 @@
             <td style="text-align:center">{{row.f_mac_outlets}}</td>
             <td style="text-align:center">{{row.f_mac_number}}</td>
             <td style="text-align:center">
-              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>
@@ -76,9 +76,10 @@
     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: ''
+        f_filialeid: this.$login.f.orgid,
+        f_orgid: this.$login.f.orgid
       }
     },
     ready () {
@@ -102,7 +103,7 @@
       del (row) {
         console.log('要删除了', row)
         row.f_state = '已删除'
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/saveEquipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')

package/src/components/equipment/PhoneAdd.vue

@@ -1,28 +1,23 @@
 <template>
-  <div class="row select-overspread">
+  <div class="auto select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
       </ul>
       <form class="form-horizontal">
 
-        <div class="col-sm-6 form-group">
-          <label class="font_normal_body">使用人员</label>
-          <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
-        </div>
-        <div class="col-sm-6 form-group">
-          <label class="font_normal_body">设备号</label>
-          <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
-        </div>
-        <div class="col-sm-6 form-group">
-          <label class="font_normal_body">使用公司</label>
-          <!--<right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>-->
-          <res-select restype='organization'
-                      is-mul="false"
-                      @res-select="getorg"
-                      :initresid="curorgid">
-          </res-select>
-        </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">使用人员</label>
+            <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">设备号</label>
+            <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">使用公司</label>
+              <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
+          </div>
 
       </form>
       <div style="text-align:right;height:auto;">
@@ -47,8 +42,6 @@
         filialeCodeStr: this.$login.f.f_orgids,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        curorgid: this.$login.f.orgid,
-        f_orgid: ''
       }
     },
     props: ['data'],
@@ -71,9 +64,8 @@
       confirm () {
         this.model.f_operator = this.$login.f.name
         this.model.f_filialeids = this.filialeCodeStr
-        this.model.f_orgid = this.f_orgid
         console.log('保存', this.model)
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/saveEquipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch(() => {
           this.$dispatch('refresh')
@@ -85,8 +77,6 @@
         this.model.f_terminal_number = row.f_terminal_number
         this.model.id = row.id
         this.filialeCodeStr = row.f_filialeids
-        this.f_orgid = row.f_orgid
-        this.curorgid= [row.f_orgid]
       },
       initModel () {
         delete this.model.id
@@ -99,9 +89,6 @@
       getRes(obj) {
         this.filialeCodeStr = obj.resids
       },
-      getorg (val) {
-        this.f_orgid = val[0]
-      }
     }
   }
 </script>

package/src/components/equipment/PhoneList.vue

@@ -4,32 +4,27 @@
       <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">
+            <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>
+          </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 class="col-sm-3" >
+            <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" >
+            <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'>
@@ -46,7 +41,7 @@
             <td style="text-align:center">{{row.f_username}}</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>
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>
@@ -63,13 +58,11 @@
     components: {},
     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,
-        curorgid: [this.$login.f.orgid],
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        f_orgid:''
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
       }
     },
     ready () {
@@ -82,7 +75,7 @@
       },
 
       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}'`
+        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid like '${this.filialeCodeStr}%'`
         this.model.search(args.condition, this.model)
       },
       add () {
@@ -91,7 +84,7 @@
       del (row) {
         console.log('要删除了', row)
         row.f_state = '已删除'
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetpost('api/af-system/logic/saveEquipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {
           this.$dispatch('refresh')
@@ -101,9 +94,6 @@
         this.filialeNameStr = obj.res
         this.filialeCodeStr = obj.resids
       },
-      getorg (val) {
-        this.f_orgid = val[0]
-      }
     },
     computed: {