system-clients 3.1.94-aode → 3.1.96

package/src/components/equipment/PosManage.vue

@@ -1,67 +1,138 @@
-<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">-->
+<!--&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

@@ -0,0 +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>

package/src/components/equipment/PosParamAdd.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="auto select-overspread" id='posParamManage'>
+
+    <form novalidate class="form-horizontal">
+      <ul class="nav nav-tabs">
+        <li role="presentation" class="active"><a href="#">固定属性</a></li>
+      </ul>
+      <div class="row">
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">所属公司</label>
+          <res-select restype='organization'
+                      is-mul="false"
+                      @res-select="getRes"
+                      :initresid="curorgid">
+          </res-select>
+        </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="model.name"
+                 placeholder="参数名称"/>
+        </div>
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body">创&nbsp;建&nbsp;人</label>
+          <input type="text" class="input_search" style="width: 60%" v-model="model.f_operator"
+                 disabled placeholder="创建人"/>
+        </div>
+      </div>
+      <ul class="nav nav-tabs">
+        <li role="presentation" class="active">
+          <a href="#">银行属性</a>
+        </li>
+      </ul>
+      <div class="row">
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body" title="参数管理：银行属性">新增属性</label>
+          <v-select id="f_charge_type"
+                    v-model="BankTypeItem"
+                    placeholder='选择银行属性'
+                    :multiple="true"
+                    :value.sync="BankTypeItem"
+                    :options='BankTypeItems'
+                    close-on-select clear-button>
+          </v-select>
+        </div>
+        <template v-for="item in BankTypeItem">
+          <div class="form-group col-sm-6">
+            <label class="font_normal_body" v-if="item.length !== 2">{{ item }}</label>
+            <label class="font_normal_body" v-if="item.length === 2">{{ item[0] }}&emsp;&emsp;{{ item[1] }}</label>
+            <input type="text" class="input_search" @change="forceUpdate()" style="width: 60%" v-model="bankmodel[item]"
+                   :placeholder="item"/>
+          </div>
+        </template>
+      </div>
+      <ul class="nav nav-tabs">
+        <li role="presentation" class="active">
+          <a href="#">系统属性</a>
+        </li>
+      </ul>
+      <div class="row">
+        <div class="col-sm-6 form-group">
+          <label class="font_normal_body" title="参数管理：系统属性">新增属性</label>
+          <v-select id="f_charge_type"
+                    v-model="SystemTypeItem"
+                    placeholder='选择系统属性'
+                    :multiple="true"
+                    :value.sync="SystemTypeItem"
+                    :options='SystemTypeItems'
+                    close-on-select clear-button>
+          </v-select>
+        </div>
+        <template v-for="item in SystemTypeItem">
+          <div class="form-group col-sm-6">
+            <label class="font_normal_body" v-if="item.length !== 2">{{ item }}</label>
+            <label class="font_normal_body" v-if="item.length === 2">{{ item[0] }}&emsp;&emsp;{{ item[1] }}</label>
+            <input type="text" class="input_search" @change="forceUpdate()" style="width: 60%"
+                   v-model="systemmodel[item]"
+                   :placeholder="item"/>
+          </div>
+        </template>
+      </div>
+    </form>
+    <div class="row" style="text-align:right;height:auto;margin-top: 20px">
+      <button class="btn button_search" @click="confirm()" :disabled="!$v.valid">确认</button>
+      <button class="btn button_clear " @click="cancel()">取消</button>
+    </div>
+  </div>
+</template>
+<script>
+
+import {HttpResetClass} from "vue-client";
+
+export default {
+  data() {
+    return {
+      checkparam: false,
+      BankTypeItem: [],
+      BankTypeItems: this.$appdata.getParam('银行属性'),
+      SystemTypeItem: [],
+      SystemTypeItems: this.$appdata.getParam('系统属性'),
+      param_id: '',
+      curorgid: [],
+      bankmodel: {},
+      model: {
+        name: '',
+        f_orgid: '',
+        f_orgname: '',
+        f_operator: ''
+      },
+      systemmodel: {}
+    }
+  },
+  watch: {},
+  ready() {
+  },
+  methods: {
+    getRes(val, val1) {
+      this.model.f_orgid = val[0]
+      this.model.f_orgname = val1[0]
+    },
+    forceUpdate() {
+      // 仅因为生成的字段不会双向绑定渲染页面
+      this.model = JSON.parse(JSON.stringify(this.model))
+      this.systemmodel = JSON.parse(JSON.stringify(this.systemmodel))
+      this.bankmodel = JSON.parse(JSON.stringify(this.bankmodel))
+    },
+    async confirm() {
+      await this.$resetpost('rs/logic/Pos_saveParam',
+        {
+          data: {
+            model: this.model,
+            bankmodel: this.bankmodel,
+            systemmodel: this.systemmodel,
+            param_id: this.param_id
+          }
+        },
+        {rejectMsg: '保存失败', resolveMsg: '保存成功'})
+      this.$dispatch('researchParam')
+    },
+    async edit(param_id) {
+      this.param_id = param_id
+      let load = new HttpResetClass()
+      load.load("POST", 'rs/sql/singleTable',
+        {
+          data: {
+            tablename: ' t_equipment_param ',
+            condition: ` f_param_id = ${param_id} `
+          }
+        },
+        {resolveMsg: null, rejectMsg: null})
+        .then((res) => {
+          this.initModel()
+          res.data.forEach(item => {
+            if (item.f_type === 'system') {
+              this.SystemTypeItem.push(item.f_key)
+              this.systemmodel[item.f_key] = item.f_value
+            } else if (item.f_type === 'bank') {
+              this.BankTypeItem.push(item.f_key)
+              this.bankmodel[item.f_key] = item.f_value
+            } else {
+              this.model[item.f_key] = item.f_value
+            }
+            if (item.f_key === 'f_orgid') {
+              this.curorgid = [item.f_value]
+            }
+          })
+        })
+    },
+    initModel() {
+      this.SystemTypeItem = []
+      this.BankTypeItem = []
+      this.model = {
+        name: '',
+        f_orgid: '',
+        f_orgname: '',
+        f_operator: this.$login.f.name
+      }
+      this.curorgid = [this.$login.f.orgid]
+      this.systemmodel = {}
+      this.bankmodel = {}
+    },
+    cancel() {
+      this.$dispatch('close')
+    }
+  }
+}
+</script>
+<style lang="less">
+#posParamManage {
+  #addboxmap {
+    height: 300px;
+  }
+
+  .glyphicon-map-marker:hover {
+    color: red;
+  }
+
+  .glyphicon-map-marker {
+    color: blue;
+    cursor: pointer;
+  }
+
+  .col-sm-6 {
+    .font_normal_body {
+      width: 73px;
+      overflow: auto;
+      white-space: nowrap;
+      // 指滚动条两边的按钮
+      &::-webkit-scrollbar-button {
+        display: none;
+      }
+
+      // 滚动条的宽度
+      &::-webkit-scrollbar {
+        width: 5px !important;
+        height: 5px !important;
+      }
+
+      // 滚动条的设置
+      &::-webkit-scrollbar-thumb {
+        background-color: #ddd;
+        background-clip: padding-box;
+      }
+
+      &::-webkit-scrollbar-thumb:hover {
+        background-color: #bbb;
+      }
+
+      &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        background: #ededed;
+      }
+    }
+  }
+}
+</style>