system-clients 3.1.74-xianyang → 3.1.79-xianyang

package/src/components/equipment/PosManage.vue

@@ -1,68 +1,150 @@
-<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>
-    </div>
-    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
-      <pos-add :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
-    </div>
-  </div>
-</template>
-<script>
-
-import PosList from './PosList'
-import PosAdd from './PosAdd'
-
-export default {
-  title: 'POS终端管理',
-  components: {
-    PosList, PosAdd
-  },
-  data() {
-    return {
-      isChange: false,
-      row: null,
-
-      f_filialeids: ''
-    }
-  },
-  methods: {
-    selected(obj) {
-      this.isChange = true
-      this.row = obj.val
-    }
-  },
-  events: {
-    'search'() {
-      this.isChange = false
-      this.row = null
-      this.$refs.list.$refs.paged.$refs.cri.search()
-    },
-    'research'() {
-      console.log('重新查询')
-      this.isChange = false
-      this.row = null
-    },
-    'refresh'() {
-      this.isChange = false
-      this.row = null
-      this.$refs.list.search()
-    },
-    'error'(name, row, res) {
-      this.isChange = false
-      this.row = null
-    },
-    'close'() {
-      this.isChange = false
-      this.row = null
-      this.$refs.list.search()
-    },
-    'add'() {
-      this.row = null
-      this.isChange = true
-      this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <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: 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>
+
+  import PosList from './PosList'
+  import PosAdd from './PosAdd'
+
+  export default {
+    title: 'POS终端管理',
+    components: {
+      PosList, PosAdd
+    },
+    data () {
+      return {
+        isChange: false,
+        row: null,
+        infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
+        batchPos: false,
+        f_filialeids: ''
+      }
+    },
+    methods: {
+      // 批量操作
+      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: {
+      'search' () {
+        this.infoadd=true
+        this.isChange = false
+        this.row = null
+        this.$refs.list.$refs.paged.$refs.cri.search()
+      },
+      'research' () {
+        console.log('重新查询')
+        this.isChange = false
+        this.row = null
+      },
+      'refresh' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.search()
+      },
+      'error' (name, row, res) {
+        this.isChange = false
+        this.row = null
+      },
+      'close' () {
+        this.isChange = false
+        this.row = null
+        // this.$refs.list.search()
+      },
+      'add' (val) {
+        this.f_filialeids = val
+        this.infoadd=false
+        this.row = null
+        this.isChange = true
+        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+      }
+    }
+  }
+</script>

package/src/components/server/ResSelect.vue

@@ -1,150 +1,154 @@
-<template>
-  <v-select :options='resoptions' placeholder='请选择'
-            :value.sync="selectres"
-            :multiple="isMul"
-            search="true"
-            :close-on-select="!isMul"
-            @change="resChange"
-  >
-  </v-select>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '资源选择',
-    props: {
-
-      //资源类型
-      restype:'',
-      //资源数据
-      resObj:{},
-      isMul: {
-        type: Boolean,
-        default: true
-      },
-      //资源初始化数据
-      initresid: {
-        type: Array,
-        default() { return [] },
-      },
-      //父层id
-      parentresid: {
-        type: Array,
-        default() { return [] },
-      },
-    },
-    data () {
-      return {
-        //资源数据
-        resObj:{},
-        //资源数据列表
-        resoptions:[],
-        //选中资源数据
-        selectres: [],
-      }
-    },
-    ready () {
-      //获取资源列表
-      this.getResList()
-    },
-    methods:{
-      //树形结构变成list
-      findById(val) {
-        if(val){
-          if(this.checkidres(val)){
-            this.treetoList(val,'')
-          }else if(val.children.length>0){
-            for (let value of val.children) {
-              this.findById(value)
-            }
-          }
-        }
-      },
-      //树形结构变成list
-      treetoList(val,parentname) {
-        for (let value of val.children) {
-          this.ergodicList(value,parentname)
-        }
-      },
-      //找到跟节点
-      ergodicList (val,parentname) {
-        if(val.children.length > 0 ){
-          parentname=parentname+val.name
-          this.treetoList(val,parentname)
-        }else {
-          //截取组织机构【组织机构】
-          if(this.restype=='organization'){
-            parentname=parentname.replace("组织机构","")
-            this.resoptions.push({label: val.name+' - '+parentname, value: val.id})
-          }else{
-            this.resoptions.push({label: val.name, value: val.id})
-          }
-        }
-      },
-      //检查id是否存在
-      checkidres(val){
-        let flag=false
-        //如果没传值得话 不过滤
-        if(this.parentresid.length==0&&this.restype=='organization'){
-          flag=true
-        }
-        this.parentresid.forEach((item) => {
-          if(item==val.id){
-            flag=true
-          }
-        })
-        return flag;
-      },
-      //资源改变
-      resChange(val){
-        let orgnames=[]
-        Object.keys(this.resoptions).forEach((key) => {
-          if(this.selectres.includes(this.resoptions[key].value))
-            orgnames.push(this.resoptions[key].label)
-        })
-        console.log('资源改变。。', val, orgnames)
-        this.$dispatch('res-select', this.selectres, orgnames)
-      },
-      //获取资源数据
-      async getResList() {
-
-        let http = new HttpResetClass()
-
-        let req = await http.load('POST', '/rs/search', {data: {
-            source: `tool.getFullTree(this.getRights().where(row.getType()==$${this.restype}$))`,
-            userid: this.$login.f.id
-          }}, {resolveMsg: null, rejectMsg: '获取组织结构数据出错'})
-        this.resObj=req.data[0]
-        this.dealdata()
-      },
-      dealdata(){
-        this.resoptions=[]
-        this.findById(this.resObj);
-        //赋值资源数据
-        let arryselect=[]
-        this.resoptions.forEach((item) => {
-          if(this.initresid.length>0){
-            this.initresid.forEach((init) => {
-              if(item.value==init){
-                arryselect.push(item.value)
-              }
-            })
-          }
-        })
-        //赋值资源选中初始值
-        this.selectres=arryselect
-      }
-    },
-    watch: {
-      //监听初始化资源id
-      'initresid.length'(){
-        this.dealdata()
-      },
-      //监听初始化资源id
-      'parentresid'(){
-        this.dealdata()
-      },
-    },
-  }
-</script>
+<template>
+  <v-select :options='resoptions' placeholder='请选择'
+            :value.sync="selectres"
+            :multiple="isMul"
+            :search="search"
+            :close-on-select="!isMul"
+            @change="resChange"
+  >
+  </v-select>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '资源选择',
+    props: {
+
+      //资源类型
+      restype:'',
+      //资源数据
+      resObj:{},
+      isMul: {
+        type: Boolean,
+        default: true
+      },
+      search:{
+        type: Boolean,
+        default: true
+      },
+      //资源初始化数据
+      initresid: {
+        type: Array,
+        default() { return [] },
+      },
+      //父层id
+      parentresid: {
+        type: Array,
+        default() { return [] },
+      },
+    },
+    data () {
+      return {
+        //资源数据
+        resObj:{},
+        //资源数据列表
+        resoptions:[],
+        //选中资源数据
+        selectres: [],
+      }
+    },
+    ready () {
+      //获取资源列表
+      this.getResList()
+    },
+    methods:{
+      //树形结构变成list
+      findById(val) {
+        if(val){
+          if(this.checkidres(val)){
+            this.treetoList(val,'')
+          }else if(val.children.length>0){
+            for (let value of val.children) {
+              this.findById(value)
+            }
+          }
+        }
+      },
+      //树形结构变成list
+      treetoList(val,parentname) {
+        for (let value of val.children) {
+          this.ergodicList(value,parentname)
+        }
+      },
+      //找到跟节点
+      ergodicList (val,parentname) {
+        if(val.children.length > 0 ){
+          parentname=parentname+val.name
+          this.treetoList(val,parentname)
+        }else {
+          //截取组织机构【组织机构】
+          if(this.restype=='organization'){
+            parentname=parentname.replace("组织机构","")
+            this.resoptions.push({label: val.name+' - '+parentname, value: val.id})
+          }else{
+            this.resoptions.push({label: val.name, value: val.id})
+          }
+        }
+      },
+      //检查id是否存在
+      checkidres(val){
+        let flag=false
+        //如果没传值得话 不过滤
+        if(this.parentresid.length==0&&this.restype=='organization'){
+          flag=true
+        }
+        this.parentresid.forEach((item) => {
+          if(item==val.id){
+            flag=true
+          }
+        })
+        return flag;
+      },
+      //资源改变
+      resChange(val){
+        let orgnames=[]
+        Object.keys(this.resoptions).forEach((key) => {
+          if(this.selectres.includes(this.resoptions[key].value))
+            orgnames.push(this.resoptions[key].label)
+        })
+        console.log('资源改变。。', val, orgnames)
+        this.$dispatch('res-select', this.selectres, orgnames)
+      },
+      //获取资源数据
+      async getResList() {
+
+        let http = new HttpResetClass()
+
+        let req = await http.load('POST', '/rs/search', {data: {
+            source: `tool.getFullTree(this.getRights().where(row.getType()==$${this.restype}$))`,
+            userid: this.$login.f.id
+          }}, {resolveMsg: null, rejectMsg: '获取组织结构数据出错'})
+        this.resObj=req.data[0]
+        this.dealdata()
+      },
+      dealdata(){
+        this.resoptions=[]
+        this.findById(this.resObj);
+        //赋值资源数据
+        let arryselect=[]
+        this.resoptions.forEach((item) => {
+          if(this.initresid.length>0){
+            this.initresid.forEach((init) => {
+              if(item.value==init){
+                arryselect.push(item.value)
+              }
+            })
+          }
+        })
+        //赋值资源选中初始值
+        this.selectres=arryselect
+      }
+    },
+    watch: {
+      //监听初始化资源id
+      'initresid.length'(){
+        this.dealdata()
+      },
+      //监听初始化资源id
+      'parentresid'(){
+        this.dealdata()
+      },
+    },
+  }
+</script>