system-clients 3.1.87-aode → 3.1.87-xianyang

package/src/components/equipment/PosAdd.vue

@@ -4,71 +4,137 @@
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">POS</a></li>
       </ul>
-      <form class="form-horizontal">
+      <form novalidate 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 class="col-sm-4 form-group">
+            <label class="font_normal_body">所属人员</label>
+            <right-tree @re-res="getRes" :source="source"></right-tree>
           </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 class="col-sm-4 form-group"  :class="[$v.f_terminal_number.required ? 'has-error' : '']">
+            <label class="font_normal_body">设备编号</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" v-el:f_terminal_number
+                   v-validate:f_terminal_number='{required :true}' />
           </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-6">
+          <div class="col-sm-4 form-group"  :class="[$v.f_terminal_name.required ? 'has-error' : '']">
+            <label class="font_normal_body">设备名称</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称"
+                   v-validate:f_terminal_name='{required: true}' />
+          </div>
+          <div class="col-sm-4 form-group"  :class="{'has-error': $v.f_equipment_type.required}">
+            <label class="font_normal_body">设备类型</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_equipment_type" placeholder="设备类型"
+            v-validate:f_equipment_type="{required: true}" />
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" >MAC&nbsp;号&nbsp;</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_mac_number" placeholder="MAC号" >
+          </div>
+          <div class="col-sm-4 form-group">
             <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 class="col-sm-4 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位">
+<!--            <div class="font_normal_body" v-if="$v.f_phone.minlength || $v.f_phone.maxlength"><span>手机号必须7-11位</span></div>-->
           </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 class="col-sm-4 form-group" :class="{'has-error': $v.f_address.required}">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地"
+                   v-validate:f_address="{required: true}">
           </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 class="col-sm-4 form-group" :class="{'has-error': $v.f_bank_name.required}">
+            <label class="font_normal_body">所属银行</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行"
+                   v-validate:f_bank_name="{required: true}">
           </div>
         </div>
-        <div  class="col-sm-12">
-          <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+        <div  class="col-sm-12 form-group">
+          <label  class="font_normal_body " >&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="button_search"  @click="uploadFiles()" v-if="info">上传图片</button>
+        <button class="btn btn-info" @click="upgrade()" v-if="info && data.f_state==='正常'">升级</button>
+        <button class="btn btn-success" @click="getEditState()"  v-if="model.f_state === '停用' && info" >启用</button>
+        <button class="btn btn-danger" @click="getEditState()"  v-if="model.f_state === '正常' &&  info" >停用</button>
+        <button class="btn button_search" @click="confirm()" :disabled="!$v.valid" >确认</button>
         <button class="btn button_clear " @click="cancel()" >取消</button>
       </div>
+      <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+        <article slot="modal-body">
+          <upload :blodid="model.f_userinfo_id"  :businessid="model.id" v-ref:upload  fusetype="收费" isremark="true" style="width:auto" ></upload>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+        </footer>
+      </modal>
+
+      <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false" >
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="close"><span>&times;</span></button>
+          <h4 class="modal-title">pos机升级</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <form class="form-horizontal">
+            <div class="row">
+              <div>
+                <h4>是否升级？</h4>
+              </div>
+<!--              <div class="col-sm-6 form-group">-->
+<!--                <label class="font_normal_body">参数名称</label>-->
+<!--                <input type="text" class="input_search" style="width: 60%" v-model="modifyItem.name" @keyup.enter="confirm">-->
+<!--              </div>-->
+<!--              <div class="col-sm-6 form-group" v-if="modifyItem.EntityType === 't_parameter'">-->
+<!--                <div class="checkbox">-->
+<!--                  <label>-->
+<!--                    <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局-->
+<!--                  </label>-->
+<!--                </div>-->
+<!--              </div>-->
+            </div>
+          </form>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="button_search button_spacing" @click='upgradeRoot()'>是</button>
+          <button type="button" class="button_clear button_spacing" @click='close'>否</button>
+        </footer>
+      </modal>
     </validator>
+
   </div>
 </template>
 <script>
-
-
+  import {PagedList} from 'vue-client'
   export default {
     data () {
       return {
+        checkparam: false,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
         model: {
           f_terminal_number: '',
           f_terminal_name: '',
+          f_mac_number:'',
+          // f_username:'',
           f_bank_name: '',
           f_equipment_type: 'POS',
           f_state: '正常',
-          f_machine_number:'',
+          f_machine_number: '',
           f_phone:'',
           f_comments:'',
           f_address:'',
-          f_filialeids:this.f_filialeids,
+          f_filialeids: '',
           f_orgid:''
-        }
+        },
+        showfiles: false,
+        show:false,
+        infoadd: this.infoadd,
+        isSelPop: false
       }
     },
-    props: ['data', 'f_filialeids'],
+    props: ['data', 'f_filialeids','info'],
+
     watch: {
       'data' (val) {
         if (val) {
@@ -83,26 +149,118 @@
       if (this.data) {
         this.edit(this.data)
       }
+      console.log('查看是否隐藏', this.info)
     },
+
     methods: {
+      recursiveSelOrg(val, flag){
+        if(val.parent){
+          if(val.parent.resourcetype===flag){
+            return {id: val.parent.id, name: val.parent.name}
+          } else {
+            return this.recursiveSelOrg(val.parent,flag)
+          }
+        } else {
+          return {id: '', name: ''}
+        }
+      },
+      getRes(val){
+        console.log('====================', val)
+        if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
+
+          let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
+          this.model.f_user_orgid=org.id
+          this.model.f_user_orgname=org.name
+          let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
+          this.model.f_user_depid=dep.id
+          this.model.f_user_depname=dep.name
+
+          this.model.f_user_operatorid = val.orgobj[0].userid
+          this.model.f_user_operator=val.orgobj[0].name
+          this.isSelPop = true
+        } else {
+          // 不可提交
+          this.isSelPop = false
+        }
+      },
+      close () {
+        this.show = false
+      },
+      uploadFiles(){
+        this.showfiles= !this.showfiles
+      },
+      getEditState () {
+        if (this.model.f_state === '正常') {
+          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认停用该设备？`, ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              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) => {})
+                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
+              } catch (error) {
+                this.search()
+              }
+            }
+          })
+        } else if (this.model.f_state === '停用'){
+          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认启用该设备？`, ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              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) => {})
+                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
+              } catch (error) {
+                this.search()
+              }
+            }
+          })
+        }
+      },
+      editBeizhu  (val) {
+        this.editshow = true
+        this.posBase = val
+      },
+
+      //升级
+      upgrade(){
+        this.show=true
+      },
+      upgradeRoot() {
+        this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
+        this.$dispatch('refresh')
+        // this.$resetpost('rs/logic/t_equipment', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        //   this.$dispatch('refresh')
+        // }).catch((error) => {
+        //   this.$dispatch('refresh')
+        // })
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
       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
+        // 如果是修改的话，只修改页面上用户填写的信息
+        if (!this.info) {
+          this.model.f_online = '离线'
+          this.model.f_operator = this.$login.f.name
+          this.model.f_orgid = this.$login.f.orgid
+          this.model.f_filialeids = this.$login.f.orgid
+          this.model.f_operatorid = this.$login.f.id
+          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.model.f_orgstr = this.$login.f.fullids
+        }
          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) {
@@ -110,11 +268,14 @@
         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_mac_number = row.f_mac_number
         this.model.f_address = row.f_address
         this.model.f_phone = row.f_phone
+        this.model.f_state = row.f_state
         this.model.f_comments=row.f_comments
-        this.model.f_filialeids=row.f_filialeids
+        // this.model.f_username=row.f_username
         this.model.id = row.id
+        this.model.f_filialeids=row.f_filialeids
         this.model.f_orgid = row.f_orgid
       },
       initModel () {
@@ -123,6 +284,7 @@
         this.model.f_terminal_name = ''
         this.model.f_bank_name = ''
         this.model.f_machine_number = ''
+        this.model.f_state = '正常'
         this.model.f_phone = ''
         this.model.f_address = ''
         this.model.f_filialeids=''

package/src/components/equipment/PosList.vue

@@ -5,153 +5,243 @@
       <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>
+            <div class="col-sm-3  form-group">
+              <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</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">
+            <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="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 class="col-sm-3  form-group">
+              <label class="font_normal_body">所属人员</label>
+              <right-tree @re-res="$parent.$parent.getRes" :source="$parent.$parent.source"></right-tree>
             </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>
+              <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>
+            <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_address"
                       condition="f_address like '%{}%'" placeholder="所在地">
             </div>
-            <div class="col-sm-3">
+            <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_name"
                       condition="f_terminal_name like '%{}%'" placeholder="设备名称">
             </div>
-            <div class="col-sm-3">
+            <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_machine_number"
                       condition="f_machine_number like '%{}%'" placeholder="机器编号">
             </div>
-            <div class="col-sm-3">
+            <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_bank_name"
                       condition="f_bank_name 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_phone"
+                      condition="f_phone 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>
+            <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></th>
+            <th style="text-align:center;white-space:nowrap;">序号</th>
+            <th style="text-align:center;white-space:nowrap;">设备编号</th>
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
+            <th style="text-align:center;white-space:nowrap;">设备名称</th>
+            <th style="text-align:center;white-space:nowrap;">所属公司</th>
+            <th style="text-align:center;white-space:nowrap;">所属部门</th>
+            <th style="text-align:center;white-space:nowrap;">所属人员</th>
+            <th style="text-align:center;white-space:nowrap;">状态</th>
+            <th style="text-align:center;white-space:nowrap;">机器编号</th>
+            <th style="text-align:center;white-space:nowrap;">联系电话</th>
+            <th style="text-align:center;white-space:nowrap;">所在地</th>
+            <th style="text-align:center;white-space:nowrap;">所属银行</th>
+            <th style="text-align:center;white-space:nowrap;">电池电量</th>
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">是否登录</th>
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">更新时间</th>
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">软件版本</th>
+<!--            <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
+            <th style="text-align:center;white-space:nowrap;">失联状态</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>
+            <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
+            <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
+            <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
+
+            <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_machine_number}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_battery_level}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_is_login}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_hybrid_version}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operate_date}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>
+<!--            <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
+            <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
           </tr>
         </template>
       </data-grid>
     </criteria-paged>
   </div>
+  <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
+    <article slot="modal-body" class="modal-body">
+      <criteria-paged :model="model2" v-ref:paged2>
+        <data-grid :model="model2" v-ref:grid2  partial='list'>
+          <template partial='head'>
+            <tr>
+              <!--<th style="padding: 0;border: 0">
+                <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
+                       @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
+              </th>-->
+              <th><nobr>序号</nobr></th>
+              <th><nobr>终端号</nobr></th>
+              <th><nobr>上次上报时间</nobr></th>
+              <th><nobr>本次上报时间</nobr></th>
+              <th><nobr><b>状态</b></nobr></th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <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_update_date}}</td>
+            <td style="text-align: center;">{{row.f_update_date }}</td>
+            <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
+    </footer>
+  </modal>
 </template>
 
 <script>
 
-  import { PagedList } from 'vue-client'
+  import {PagedList} from 'vue-client'
 
   export default {
     title: '终端控制',
     components: {},
     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`'}),
         curorgid: [this.f_filialeid],
         f_orgid: '',
-        f_filialeids:'',
-        criteriaShow: false
+        f_filialeids: '',
+        criteriaShow: false,
+        infoadd: false,
+        selPos: [],
+        isSelAll: false,  // 默认不全选
+        infoshow: false
       }
     },
-    props: ['f_filialeid'],
+    props: ['f_filialeid','isshowless'],
     ready () {
       this.search()
     },
+    watch:{
+      // 'selPos'(val){
+      //   console.log(val)
+      // },
+      'isSelAll'(val){
+        console.log('-------', val)
+        if (val) {
+          // 对当前页面全选
+          this.selPos = []
+          for (const sel of this.model.rows) {
+            //  if (this.selPos.indexOf(sel.id) < 0){
+            this.selPos.push(sel)
+            // }
+          }
+        } else {
+          // 取消全选
+          this.selPos = []
+        }
+      }
+    },
     methods: {
-
+      getRes(val){
+        if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
+          this.$refs.paged.$refs.cri.model.f_user_operatorid=val.orgobj[0].userid
+          this.$refs.paged.$refs.cri.model.f_user_operator=val.orgobj[0].name
+        } else {
+          this.$refs.paged.$refs.cri.model.f_user_operatorid=''
+          this.$refs.paged.$refs.cri.model.f_user_operator=''
+        }
+      },
+      infoclose(){
+        this.infoshow=false
+      },
+      abcd (row) {
+        console.log("chakan",row)
+        let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
+        this.model2.search(condition)
+        this.infoshow = true
+      },
       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_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
+        console.log(args)
+        if (args.model.f_user_operatorid && args.model.f_user_operator){
+          args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
+           and f_user_operator = '${args.model.f_user_operator}'`
+        }
+        args.condition =  `${args.condition} and f_equipment_type = 'POS' 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('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          this.$dispatch('refresh')
-        }).catch((error) => {
-          this.$dispatch('refresh')
-        })
+        this.infoadd=false
+        // if (this.f_filialeid) {
+        this.$dispatch('add', this.f_filialeid)
+        // } else {
+        //   this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        // }
       },
 
       getorg (val) {
+        console.log("====================", val)
         this.f_orgid = val[0]
         this.f_filialeid = val[0]
-        this.search()
+        // this.search()
       },
       hidden(){
         this.criteriaShow = !this.criteriaShow