system-clients 3.1.86 → 3.1.87-xianyang

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.1.86",
+  "version": "3.1.87-xianyang",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -85,7 +85,7 @@
                 <!-- <li>{{name}}</li> -->
                 <li>{{date}}</li>
                 <li @click="show=true">修改密码</li>
-                <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
+                <li @click="AddChangeMsgShow=true">系统版本:{{$login.version?$login.version:'1.0.0'}}</li>
               </ul>
 
             </dropdown>

package/src/components/equipment/EquipmentManage.vue

@@ -1,65 +1,68 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <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">终端类型</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_equipment_type"
-                      placeholder='终端类型'
-                      :value.sync="model.f_equipment_type"
-                      :options='equipmentType'
-                      close-on-select clear-button>
-            </v-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <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>
-    <div v-if="model.f_equipment_type[0] === 'PHONE'">
-      <phone-manage></phone-manage>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    title: '终端控制',
-    data () {
-      return {
-        filialeNameStr: this.$login.f.f_fengongsi,
-        filialeCodeStr: this.$login.f.orgid,
-        userid:this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        equipmentType: this.$appdata.getParam('终端类型'),
-        model: {
-            f_equipment_type: []
-        }
-      }
-    },
-    ready () {
-      console.log('看看终端类型',  this.equipmentType)
-      this.model.f_equipment_type = [this.equipmentType[0].value]
-    },
-    methods: {
-      del (row) {
-          console.log('要删除了', row)
-      },
-
-      getRes (obj) {
-        this.filialeNameStr = obj.res
-        this.filialeCodeStr = obj.resids
-      },
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <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">终端类型</label>
+            <v-select id="f_charge_type"
+                      v-model="model.f_equipment_type"
+                      placeholder='终端类型'
+                      :value.sync="model.f_equipment_type"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <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>
+    <div v-if="model.f_equipment_type[0] === 'PHONE'">
+      <phone-manage></phone-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === '圈存机'">
+      <qc-manage></qc-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title: '终端控制',
+    data () {
+      return {
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.orgid,
+        userid:this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        equipmentType: this.$appdata.getParam('终端类型'),
+        model: {
+            f_equipment_type: []
+        }
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.model.f_equipment_type = [this.equipmentType[0].value]
+    },
+    methods: {
+      del (row) {
+          console.log('要删除了', row)
+      },
+
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>

package/src/components/equipment/PcAdd.vue

@@ -1,23 +1,23 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="row 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">
+          <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">
+          <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_mac_outlets" placeholder="所属地址" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <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">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">使用公司</label>
 
               <res-select restype='organization'

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">
+          <div class="col-sm-3 form-group">
             <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" >
+          <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" >
+          <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_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" >
+          <div class="col-sm-3 form-group" >
             <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-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>

package/src/components/equipment/PhoneAdd.vue

@@ -1,20 +1,20 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="row 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">
+          <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">
+          <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">
+          <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>
           </div>

package/src/components/equipment/PhoneList.vue

@@ -4,17 +4,17 @@
       <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">
+          <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>
           </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_username"
                     condition="f_username 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_number"
                     condition="f_terminal_number like '%{}%'" placeholder="设备号">
@@ -41,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-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>

package/src/components/equipment/PosAdd.vue

@@ -4,94 +4,65 @@
       <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-4">
-            <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-4">
-            <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 class="col-sm-4">
-            <label class="font_normal_body" >设备类型</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_equipment_type" placeholder="设备类型" >
+          <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>
-        <div class="row">
-          <div class="col-sm-4">
-            <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="机器编号" >
+          <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">
+          <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-4">
-            <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-4">
-            <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-4">
-            <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_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-4">
-            <label class="font_normal_body" >使用人员</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_username" 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="button_search"  @click="uploadFiles()" v-if="info">上传图片</button>
-          <button class="btn btn-info" @click="upgrade()" v-if="info">升级</button>
-          <button class="btn btn-info" @click="abcd(row)" v-if="info">历史</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()"  >确认</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 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>
       <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>
@@ -100,7 +71,7 @@
         </footer>
       </modal>
 
-      <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false">
+      <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>
@@ -126,7 +97,7 @@
           </form>
         </article>
         <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="button_search button_spacing" @click='confirm'>是</button>
+          <button type="button" class="button_search button_spacing" @click='upgradeRoot()'>是</button>
           <button type="button" class="button_clear button_spacing" @click='close'>否</button>
         </footer>
       </modal>
@@ -139,28 +110,27 @@
   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_username:'',
           f_bank_name: '',
           f_equipment_type: 'POS',
-          f_state: '',
-          f_machine_number:'',
+          f_state: '正常',
+          f_machine_number: '',
           f_phone:'',
           f_comments:'',
           f_address:'',
-          f_filialeids:this.f_filialeids,
+          f_filialeids: '',
           f_orgid:''
         },
-        model2: new PagedList('rs/sql/getPosUpdate', 30, {orderitem: '`id DESC`'}),
-        infoshow: false,
         showfiles: false,
         show:false,
-        info:true,
-        infoadd:this.infoadd
-
+        infoadd: this.infoadd,
+        isSelPop: false
       }
     },
     props: ['data', 'f_filialeids','info'],
@@ -179,13 +149,42 @@
       if (this.data) {
         this.edit(this.data)
       }
-      console.log("查看是否隐藏",this.info)
+      console.log('查看是否隐藏', this.info)
     },
+
     methods: {
-      close () {
+      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'){
 
-        this.show = false
+          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
@@ -194,24 +193,28 @@
         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', 2000)
-              this.model.f_state = "停用"
+              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: '停用'}}, {}, 0).then((res) => {
-                })
+                // 测试接口
+                // 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 === '停用'){
+        } 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', 2000)
-              this.model.f_state = "正常"
+              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: '正常'}}, {}, 0).then((res) => {
-                })
+                // 测试接口
+                // 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()
               }
@@ -223,42 +226,41 @@
         this.editshow = true
         this.posBase = val
       },
-      infoclose(){
-        this.infoshow=false
-      },
-      abcd (row) {
-        console.log("chakan",row)
-        console.log("chakan",this.model)
-        let condition = `f_machine_number = '${this.model.f_machine_number}'`
-        this.model2.search(condition)
-        this.infoshow = true
-        console.log("进方法了么？",this.infoshow)
-      },
+
       //升级
       upgrade(){
-         this.show=true
+        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) {
@@ -266,12 +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 () {