system-clients 3.1.86 → 3.1.87-xianyang

package/src/components/equipment/PosList.vue

@@ -5,23 +5,22 @@
       <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;">
@@ -32,75 +31,120 @@
             </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>操作时间</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_equipment_type}}</td>
-            <td style="text-align:center">{{row.f_terminal_name}}</td>
-            <td style="text-align:center">{{row.f_state}}</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_operate_date}}</td>
-            <td style="text-align:center">{{row.f_appVer}}</td>
-            <td style="text-align:center">{{row.f_username}}</td>
-            <td style="text-align:center">{{row.f_operator}}</td>
-            <td style="text-align:center">{{row.aaa}}</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>
@@ -112,26 +156,73 @@
     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:'',
+        f_filialeids: '',
         criteriaShow: false,
-        infoadd: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) {
+        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')
@@ -139,25 +230,18 @@
 
       add () {
         this.infoadd=false
-        if (this.f_filialeid) {
-          this.$parent.f_filialeid=this.f_filialeid
-          this.$dispatch('add')
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-        // f_update_state
-
+        // 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

package/src/components/equipment/PosManage.vue

@@ -1,11 +1,36 @@
 <template>
   <div class="flex-row">
     <div :class="{'basic-main':!isChange,'binary-left':isChange}">
-      <pos-list :row="row" @select-changed="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
+      <pos-list :row="row" @dblclick="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" :isshowless="isChange" v-ref:list ></pos-list>
     </div>
-    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
+    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
       <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
     </div>
+
+    <modal v-if="batchPos" :show.sync="batchPos" backdrop="false" >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close"><span>&times;</span></button>
+        <h4 class="modal-title">批量操作</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <form class="form-horizontal">
+          <div class="row">
+            <div>
+              <h4>注意事项</h4>
+              <p>1.如果需要对POS设备进行升级，批量选择的POS设备包含非正常状态，则只会对状态为正常的设备进行升级。</p>
+              <p>2.如果POS设备处于停用状态，则可以进行启用操作。如果设备处于启用状态，则可以进行停用和升级操作。</p>
+              <p>3.批量操作可能耗时较长，请刷新列表查看结果。</p>
+            </div>
+          </div>
+        </form>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>
+        <button type="button" class="button_search button_spacing" @click="batchRoot('1')">批量启用</button>
+        <button type="button" class="button_search button_spacing" @click="batchRoot('0')">批量停用</button>
+        <button type="button" class="button_clear button_spacing" @click='close'>退出</button>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -22,16 +47,69 @@
       return {
         isChange: false,
         row: null,
-        infoadd:true,
-
+        infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
+        batchPos: false,
         f_filialeids: ''
       }
     },
     methods: {
-      selected (obj) {
-        this.isChange = true
-        this.infoadd= true
-        this.row = obj.val
+      // 批量操作
+      async batchRoot(val){
+        let arrs = []
+        let alertMessage=''
+        let selPos = this.$refs.list.selPos
+        if (val==='0'){
+          alertMessage='停用'
+          for (const tmp of selPos) {
+            if (tmp.f_state==='正常') arrs.push(tmp)
+          }
+        } else if (val==='1'){
+          alertMessage='启用'
+          for (const tmp of selPos) {
+            if (tmp.f_state==='停用') arrs.push(tmp)
+          }
+        } else if(val==='2'){
+          alertMessage='升级'
+          for (const tmp of selPos) {
+            if (tmp.f_state==='正常') arrs.push(tmp)
+          }
+        } else {
+          this.showAlert('出现异常，请重新进操作')
+          return
+        }
+
+        await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
+
+        // 需要提示
+        this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`)
+        this.isChange = false
+        this.close()
+      },
+      close(){
+        this.batchPos = false
+      },
+      selected (obj, idx) {
+        console.log(obj)
+        if (!(obj instanceof MouseEvent)) {
+          if (this.$refs.list.selPos.length > 0){
+            this.$showMessage(`系统检测到您进行了多选，是否进行批量操作？`, ['confirm', 'cancel']).then((res) => {
+              if (res==='confirm'){
+                this.batchPos = true
+              } else {
+                this.isChange = true
+                this.infoadd = true
+                this.row = obj
+              }
+            })
+
+          }else {
+            this.isChange = true
+            this.infoadd = true
+            this.row = obj
+          }
+        } else {
+          this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
+        }
       }
     },
     events: {
@@ -58,9 +136,10 @@
       'close' () {
         this.isChange = false
         this.row = null
-        this.$refs.list.search()
+        // this.$refs.list.search()
       },
-      'add' () {
+      'add' (val) {
+        this.f_filialeids = val
         this.infoadd=false
         this.row = null
         this.isChange = true