system-clients 3.2.4 → 3.2.5-aodeToV4

package/src/components/equipment/PosAdd.vue

@@ -1,137 +1,156 @@
-<template>
-  <div class="auto select-overspread">
-    <validator name='v'>
-      <ul class="nav nav-tabs" >
-        <li role="presentation" class="active"><a href="#">POS</a></li>
-      </ul>
-      <form class="form-horizontal">
-        <div class="row">
-          <div class="col-sm-6">
-            <label class="font_normal_body" >设备编号</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" >
-          </div>
-          <div class="col-sm-6">
-            <label class="font_normal_body" >设备名称</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称" >
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-6">
-            <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">
-            <label class="font_normal_body" >联系电话</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话" >
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-6">
-            <label class="font_normal_body" >&nbsp;&nbsp;&nbsp;所在地</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地" >
-          </div>
-          <div class="col-sm-6">
-            <label class="font_normal_body" >所属银行</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行" >
-          </div>
-        </div>
-        <div  class="col-sm-12">
-          <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
-          <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
-        </div>
-      </form>
-      <div style="text-align:right;height:auto;">
-        <button class="btn button_search " @click="confirm()"  >确认</button>
-        <button class="btn button_clear " @click="cancel()" >取消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-<script>
-
-
-  export default {
-    data () {
-      return {
-        model: {
-          f_terminal_number: '',
-          f_terminal_name: '',
-          f_bank_name: '',
-          f_equipment_type: 'POS',
-          f_state: '正常',
-          f_machine_number:'',
-          f_phone:'',
-          f_comments:'',
-          f_address:'',
-          f_filialeids:this.f_filialeids,
-          f_orgid:''
-        }
-      }
-    },
-    props: ['data', 'f_filialeids'],
-    watch: {
-      'data' (val) {
-        if (val) {
-          this.edit(val)
-        } else {
-          this.initModel()
-        }
-      }
-    },
-    ready () {
-      console.log('mac信息：', this.data)
-      if (this.data) {
-        this.edit(this.data)
-      }
-    },
-    methods: {
-      confirm () {
-       // if(this.f_filialeids!=''&&this.f_filialeids!=null){
-         this.model.f_operator = this.$login.f.name
-         this.model.f_operatorid = this.$login.f.id
-         this.model.f_filialeids = this.f_filialeids
-         this.model.f_orgid = this.$login.f.orgid
-         this.model.f_orgname = this.$login.f.orgs
-         this.model.f_depid = this.$login.f.depids
-         this.model.f_depname = this.$login.f.deps
-         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
-           this.$dispatch('refresh')
-         }).catch((error) => {
-           this.$dispatch('refresh')
-         })
-       // }else
-       // {
-       //   this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-       // }
-
-      },
-      edit (row) {
-        this.model.f_terminal_number = row.f_terminal_number
-        this.model.f_terminal_name = row.f_terminal_name
-        this.model.f_bank_name = row.f_bank_name
-        this.model.f_machine_number = row.f_machine_number
-        this.model.f_address = row.f_address
-        this.model.f_phone = row.f_phone
-        this.model.f_comments=row.f_comments
-        this.model.f_filialeids=row.f_filialeids
-        this.model.id = row.id
-        this.model.f_orgid = row.f_orgid
-      },
-      initModel () {
-        delete this.model.id
-        this.model.f_terminal_number = ''
-        this.model.f_terminal_name = ''
-        this.model.f_bank_name = ''
-        this.model.f_machine_number = ''
-        this.model.f_phone = ''
-        this.model.f_address = ''
-        this.model.f_filialeids=''
-        this.model.f_orgid=''
-        this.model.f_comments=''
-      },
-      cancel () {
-        this.$dispatch('close')
-      }
-    }
-  }
-</script>
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">{{ type }}</a></li>
+      </ul>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-6">
+            <label class="font_normal_body">使用公司</label>
+            <res-select restype='organization'
+                        is-mul="false"
+                        @res-select="getorg"
+                        :initresid="curorgid">
+            </res-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-6">
+            <label class="font_normal_body" >设备编号</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" >
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body" >设备名称</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称" >
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-6">
+            <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">
+            <label class="font_normal_body" >联系电话</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话" >
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-6">
+            <label class="font_normal_body" >&nbsp;&nbsp;&nbsp;所在地</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地" >
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body" >所属银行</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行" >
+          </div>
+        </div>
+
+        <div  class="col-sm-12">
+          <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+          <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;">
+        <button class="btn button_search " @click="confirm()"  >确认</button>
+        <button class="btn button_clear " @click="cancel()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+
+
+  export default {
+    data () {
+      return {
+        f_orgid:'',
+        f_filialeid:'',
+        curorgid: [this.f_filialeids],
+        model: {
+          f_terminal_number: '',
+          f_terminal_name: '',
+          f_bank_name: '',
+          f_equipment_type: '',
+          f_state: '正常',
+          f_machine_number:'',
+          f_phone:'',
+          f_comments:'',
+          f_address:'',
+          f_filialeids:this.f_filialeids,
+          f_orgid:''
+        }
+      }
+    },
+    props: ['data', 'f_filialeids','type'],
+    watch: {
+      'data' (val) {
+        if (val) {
+          this.edit(val)
+        } else {
+          this.initModel()
+        }
+      }
+    },
+    ready () {
+      console.log('mac信息：', this.data)
+      if (this.data) {
+        this.edit(this.data)
+      }
+    },
+    methods: {
+      getorg (val) {
+        this.f_orgid = val[0]
+        this.f_filialeids = val[0]
+      },
+      confirm () {
+       // if(this.f_filialeids!=''&&this.f_filialeids!=null){
+         this.model.f_operator = this.$login.f.name
+         this.model.f_equipment_type = this.type
+         this.model.f_operatorid = this.$login.f.id
+         this.model.f_filialeids = this.f_filialeids
+         this.model.f_orgid = this.f_filialeids
+         this.model.f_orgname = this.$login.f.orgs
+         this.model.f_depid = this.$login.f.depids
+         this.model.f_depname = this.$login.f.deps
+         this.$resetpost('api/af-system/logic/saveEquipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+           this.$dispatch('refresh')
+         }).catch((error) => {
+           this.$dispatch('refresh')
+         })
+       // }else
+       // {
+       //   this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+       // }
+
+      },
+      edit (row) {
+        this.model.f_terminal_number = row.f_terminal_number
+        this.model.f_terminal_name = row.f_terminal_name
+        this.model.f_bank_name = row.f_bank_name
+        this.model.f_machine_number = row.f_machine_number
+        this.model.f_address = row.f_address
+        this.model.f_phone = row.f_phone
+        this.model.f_comments=row.f_comments
+        this.model.f_filialeids=row.f_filialeids
+        this.model.id = row.id
+        this.model.f_orgid = row.f_orgid
+      },
+      initModel () {
+        delete this.model.id
+        this.model.f_terminal_number = ''
+        this.model.f_terminal_name = ''
+        this.model.f_bank_name = ''
+        this.model.f_machine_number = ''
+        this.model.f_phone = ''
+        this.model.f_address = ''
+        this.model.f_filialeids=''
+        this.model.f_orgid=''
+        this.model.f_comments=''
+      },
+      cancel () {
+        this.$dispatch('close')
+      }
+    }
+  }
+</script>

package/src/components/equipment/PosList.vue

@@ -1,164 +1,164 @@
-<template>
-  <div class="flex">
-    <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">
-              <label class="font_normal_body">使用公司</label>
-              <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>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
-                      condition="f_terminal_number 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_phone"
-                      condition="f_phone like '%{}%'" placeholder="联系电话">
-            </div>
-
-            <div class="span" style="float:right;">
-              <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
-              <button type="button" class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
-              <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                   @click="$parent.$parent.hidden()"></div>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-3">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_address"
-                      condition="f_address 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_name"
-                      condition="f_terminal_name 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_machine_number"
-                      condition="f_machine_number 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_bank_name"
-                      condition="f_bank_name like '%{}%'" placeholder="所属银行">
-            </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>
-            <th>联系电话</th>
-            <th>所在地</th>
-            <th>所属银行</th>
-            <th>电池电量</th>
-            <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_terminal_number}}</td>
-            <td style="text-align:center">{{row.f_terminal_name}}</td>
-            <td style="text-align:center">{{row.f_machine_number}}</td>
-            <td style="text-align:center">{{row.f_phone}}</td>
-            <td style="text-align:center">{{row.f_address}}</td>
-            <td style="text-align:center">{{row.f_bank_name}}</td>
-            <td style="text-align:center">{{row.f_battery_level}}</td>
-            <td style="text-align:center">{{row.f_is_login}}</td>
-            <td style="text-align:center">{{row.f_hybrid_version}}</td>
-            <td style="text-align:center">{{row.f_appVer}}</td>
-            <td style="text-align:center">
-              <button class="btn btn-link"  @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: '终端控制',
-    components: {},
-    data () {
-      return {
-        model: new PagedList('rs/sql/equipmentQuery', 20),
-        curorgid: [this.f_filialeid],
-        f_orgid: '',
-        f_filialeids:'',
-        criteriaShow: false
-      }
-    },
-    props: ['f_filialeid'],
-    ready () {
-      this.search()
-    },
-    methods: {
-
-      search () {
-        console.log("111111111111111111111111111111111111")
-        this.$refs.paged.$refs.cri.search()
-      },
-
-      selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_filialeids = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
-        this.model.search(args.condition, this.model)
-        this.$dispatch('research')
-      },
-
-      add () {
-        if (this.f_filialeid) {
-          this.$parent.f_filialeid=this.f_filialeid
-          this.$dispatch('add')
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-
-      },
-
-      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')
-        })
-      },
-
-      getorg (val) {
-        this.f_orgid = val[0]
-        this.f_filialeid = val[0]
-        this.search()
-      },
-      hidden(){
-        this.criteriaShow = !this.criteriaShow
-      }
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex">
+    <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">
+              <label class="font_normal_body">使用公司</label>
+              <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>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
+                      condition="f_terminal_number 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_phone"
+                      condition="f_phone like '%{}%'" placeholder="联系电话">
+            </div>
+
+            <div class="span" style="float:right;">
+              <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
+              <button type="button" class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
+              <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                   @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-3">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                      condition="f_address 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_name"
+                      condition="f_terminal_name 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_machine_number"
+                      condition="f_machine_number 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_bank_name"
+                      condition="f_bank_name like '%{}%'" placeholder="所属银行">
+            </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>
+            <th>联系电话</th>
+            <th>所在地</th>
+            <th>所属银行</th>
+<!--            <th>电池电量</th>-->
+<!--            <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_terminal_number}}</td>
+            <td style="text-align:center">{{row.f_terminal_name}}</td>
+            <td style="text-align:center">{{row.f_machine_number}}</td>
+            <td style="text-align:center">{{row.f_phone}}</td>
+            <td style="text-align:center">{{row.f_address}}</td>
+            <td style="text-align:center">{{row.f_bank_name}}</td>
+<!--            <td style="text-align:center">{{row.f_battery_level}}</td>-->
+<!--            <td style="text-align:center">{{row.f_is_login}}</td>-->
+<!--            <td style="text-align:center">{{row.f_hybrid_version}}</td>-->
+<!--            <td style="text-align:center">{{row.f_appVer}}</td>-->
+            <td style="text-align:center">
+              <button class="btn btn-link"  @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: '终端控制',
+    components: {},
+    data () {
+      return {
+        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
+        curorgid: [this.$login.f.orgid],
+        f_filialeid: this.$login.f.orgid,
+        f_orgid: this.$login.f.orgid,
+        criteriaShow: false
+      }
+    },
+    props: ['f_filialeid','type'],
+    ready () {
+      this.search()
+    },
+    methods: {
+
+      search () {
+        console.log("111111111111111111111111111111111111")
+        this.$refs.paged.$refs.cri.search()
+      },
+
+      selfSearch (args) {
+        args.condition =  `${args.condition} and f_equipment_type = '${this.type}' and f_state = '正常' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
+        this.model.search(args.condition, this.model)
+        this.$dispatch('research')
+      },
+
+      add () {
+        if (this.f_filialeid) {
+          this.$parent.f_filialeid=this.f_filialeid
+          this.$dispatch('add')
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+
+      },
+
+      del (row) {
+        console.log('要删除了', row)
+        row.f_state = '已删除'
+        this.$resetpost('api/af-system/logic/saveEquipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch((error) => {
+          this.$dispatch('refresh')
+        })
+      },
+
+      getorg (val) {
+        this.f_orgid = val[0]
+        this.f_filialeid = val[0]
+        this.search()
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      }
+    },
+    computed: {
+
+    }
+  }
+</script>