system-clients 3.2.98 → 3.2.99-weinan

package/src/components/equipment/PosManage.vue

@@ -1,138 +1,138 @@
-<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">-->
-<!--&lt;!&ndash;        <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>&ndash;&gt;-->
-<!--        <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('api/af-revenue/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)) {
-          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>
+<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">-->
+<!--&lt;!&ndash;        <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>&ndash;&gt;-->
+<!--        <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)) {
+          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/equipment/PosManageBoth.vue

@@ -1,125 +1,125 @@
-<template>
-  <div class="flex-row" v-if="$login.r.includes('POS参数管理')">
-    <tab-button :button="false" :class="{'basic-main':!isChange&&!isParamChange,'binary-left':isChange||isParamChange}">
-      <tabs header="设备管理">
-        <pos-list :row="row" @dblclick="selected" style="width:auto;" :f_filialeid.sync="f_filialeids"
-                  :isshowless="isChange" v-ref:poslist></pos-list>
-      </tabs>
-      <tabs header="POS参数管理">
-        <pos-param-list @add="addParam" @close="closeParam"  v-ref:listp></pos-param-list>
-      </tabs>
-    </tab-button>
-    <div class="binary-right" style="margin-left: 5px;overflow-x: scroll" v-if="isChange||isParamChange">
-      <pos-param-add :param_id="param_id" v-ref:addp v-if="isParamChange"></pos-param-add>
-      <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-if="isChange"
-               v-ref:addbox></pos-add>
-    </div>
-  </div>
-  <pos-manage v-if="!$login.r.includes('POS参数管理')"></pos-manage>
-</template>
-
-<script>
-import TabButton from '../TabButton'
-import Tabs from '../Tabs'
-import PosList from "./PosList";
-import PosAdd from "./PosAdd";
-import PosParamList from './PosParamList'
-import PosParamAdd from './PosParamAdd'
-
-export default {
-  name: "PosManageBoth",
-  title: 'POS管理',
-  data() {
-    return {
-      show: [],
-      data: {},
-      param_id: '',
-      f_filialeids: '',
-      isChange: false,
-      isParamChange: false,
-      row: null,
-      infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
-      batchPos: false,
-    }
-  },
-  components: {Tabs, TabButton, PosList, PosAdd, PosParamList, PosParamAdd},
-  ready() {
-  },
-  methods: {
-    selected(obj, idx) {
-      console.log(obj)
-      if (!(obj instanceof MouseEvent)) {
-        this.isChange = true
-        this.infoadd = true
-        this.row = obj
-      } else {
-        this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
-      }
-    },
-    addParam() {
-      this.isParamChange = true
-      this.isChange = false
-      setTimeout(() => {
-        this.$refs.addp.initModel()
-      }, 100)
-    },
-    closeParam() {
-      this.isParamChange = false
-    }
-  },
-  events: {
-    'researchParam'() {
-      this.$refs.listp.search()
-      this.isParamChange = false
-      this.isChange = false
-    },
-    'search'() {
-      this.infoadd = true
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-      this.$refs.list.$refs.paged.$refs.cri.search()
-    },
-    'tab-changed'() {
-      console.log("tabchanged")
-      this.isParamChange = false
-      this.isChange = false
-    },
-    'refresh'() {
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-      this.$refs.poslist.search()
-    },
-    'error'(name, row, res) {
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-    },
-    'close'() {
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-    },
-    '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
-    },
-    'modify'(row) {
-      this.isChange = false
-      this.isParamChange = true
-      setTimeout(() => {
-        this.$refs.addp.curorgid = []
-        this.$refs.addp.edit(row.f_param_id)
-      }, 100)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div class="flex-row" v-if="$login.r.includes('POS参数管理')">
+    <tab-button :button="false" :class="{'basic-main':!isChange&&!isParamChange,'binary-left':isChange||isParamChange}">
+      <tabs header="设备管理">
+        <pos-list :row="row" @dblclick="selected" style="width:auto;" :f_filialeid.sync="f_filialeids"
+                  :isshowless="isChange" v-ref:poslist></pos-list>
+      </tabs>
+      <tabs header="POS参数管理">
+        <pos-param-list @add="addParam" @close="closeParam"  v-ref:listp></pos-param-list>
+      </tabs>
+    </tab-button>
+    <div class="binary-right" style="margin-left: 5px;overflow-x: scroll" v-if="isChange||isParamChange">
+      <pos-param-add :param_id="param_id" v-ref:addp v-if="isParamChange"></pos-param-add>
+      <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-if="isChange"
+               v-ref:addbox></pos-add>
+    </div>
+  </div>
+  <pos-manage v-if="!$login.r.includes('POS参数管理')"></pos-manage>
+</template>
+
+<script>
+import TabButton from '../TabButton'
+import Tabs from '../Tabs'
+import PosList from "./PosList";
+import PosAdd from "./PosAdd";
+import PosParamList from './PosParamList'
+import PosParamAdd from './PosParamAdd'
+
+export default {
+  name: "PosManageBoth",
+  title: 'POS管理',
+  data() {
+    return {
+      show: [],
+      data: {},
+      param_id: '',
+      f_filialeids: '',
+      isChange: false,
+      isParamChange: false,
+      row: null,
+      infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
+      batchPos: false,
+    }
+  },
+  components: {Tabs, TabButton, PosList, PosAdd, PosParamList, PosParamAdd},
+  ready() {
+  },
+  methods: {
+    selected(obj, idx) {
+      console.log(obj)
+      if (!(obj instanceof MouseEvent)) {
+        this.isChange = true
+        this.infoadd = true
+        this.row = obj
+      } else {
+        this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
+      }
+    },
+    addParam() {
+      this.isParamChange = true
+      this.isChange = false
+      setTimeout(() => {
+        this.$refs.addp.initModel()
+      }, 100)
+    },
+    closeParam() {
+      this.isParamChange = false
+    }
+  },
+  events: {
+    'researchParam'() {
+      this.$refs.listp.search()
+      this.isParamChange = false
+      this.isChange = false
+    },
+    'search'() {
+      this.infoadd = true
+      this.isParamChange = false
+      this.isChange = false
+      this.row = null
+      this.$refs.list.$refs.paged.$refs.cri.search()
+    },
+    'tab-changed'() {
+      console.log("tabchanged")
+      this.isParamChange = false
+      this.isChange = false
+    },
+    'refresh'() {
+      this.isParamChange = false
+      this.isChange = false
+      this.row = null
+      this.$refs.poslist.search()
+    },
+    'error'(name, row, res) {
+      this.isParamChange = false
+      this.isChange = false
+      this.row = null
+    },
+    'close'() {
+      this.isParamChange = false
+      this.isChange = false
+      this.row = null
+    },
+    '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
+    },
+    'modify'(row) {
+      this.isChange = false
+      this.isParamChange = true
+      setTimeout(() => {
+        this.$refs.addp.curorgid = []
+        this.$refs.addp.edit(row.f_param_id)
+      }, 100)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>