system-clients 3.1.94 → 3.1.96-aode

package/src/system.js

@@ -75,19 +75,9 @@ export default function (val) {
   Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
   // pos端控制
   Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
-  // pos管理
-  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
-  // pos参数管理
-  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
 
   // 材料字典
   Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
   Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
-  // 图片查看器
-  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
-  // 测试图片查看器
-  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
 
-  //省市区、街道、小区、楼栋级联查询
-  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
 }

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-

package/src/components/TabButton.vue

@@ -1,201 +0,0 @@
-<template>
-  <div class='flex foot_tabset1'>
-    <!-- Nav tabs -->
-    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
-      <li style="margin-right: 10px;height: 100%"
-          :id="'vc-tabset-li-'+attach +'-'+$index"
-          v-for="r in renderData"
-          @click.prevent="handleTabListClick($index, r)"
-          :disabled="r.disabled"
-      >
-        <button v-if="button" class="button_new" style="width: max-content" v-bind:class="{
-            'btn-succ': ($index === active),
-            'disabled': r.disabled
-          }">
-          <slot name="header">
-            {{ r.header }}
-          </slot>
-          <!-- 关闭按钮 -->
-          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
-                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
-        </button>
-        <span v-if="!button" v-bind:class="{
-            'span-active': ($index === active),
-            'span-disable': ($index !== active)
-          }">
-          <slot name="header">
-            {{ r.header }}
-          </slot>
-          <!-- 关闭按钮 -->
-          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
-                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
-        </span>
-
-      </li>
-    </ul>
-
-    <!-- Tab panes -->
-    <div class="tab-content span" v-el:tab-content>
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-import {remove} from 'vue-client/src/stores/Remove.js'
-
-export default {
-  props: {
-    navStyle: {
-      type: String,
-      default: 'tabs'
-    },
-    effect: {
-      type: String,
-      default: 'fadein'
-    },
-    active: {
-      type: Number,
-      default: 0
-    },
-    close: {
-      type: Boolean,
-      default: false
-    },
-    button: {
-      type: Boolean,
-      default: true
-    },
-    attach: {
-      type: String,
-      default: 'vuestrap'
-    },
-    content: {}
-  },
-  ready() {
-    remove.$on('remove', (name) => {
-      console.log('tabset收$on 到的名字为：', name)
-      this.$removeTab(name)
-    })
-  },
-  data() {
-    return {
-      // 数据格式：{comp, header，disabled}
-      // - comp: 当前页签对应的tab组件
-      renderData: []
-    }
-  },
-  methods: {
-    handleTabListClick(index, el) {
-      // 没有打开过, 则添加显示
-      this.$dispatch('tab-changed')
-      if (!this.$parent.show.includes(el.header)) {
-        this.$parent.show.push(el.header)
-      }
-      if (el.comp._scope && el.comp._scope.tab) {
-        this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
-      }
-      if (!el.disabled) this.active = index
-    },
-    // deletetab函数为自己添加
-    deletetTab(el) {
-      this.$removeTab(el.comp._scope.tab.comp.name)
-      remove.$emit('delete', el.comp._scope.tab.comp.name)
-    },
-    // 根据删除也下标，修改所有页签的下标
-    modifyAllIndex(index) {
-      let cur = this.active
-      this.$nextTick(() => {
-        // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
-        for (var i = index; i < this.renderData.length; i++) {
-          this.renderData[i].comp.index -= 1
-        }
-        // 修改激活页
-        // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
-        // 当关闭当前激活页之前（激活页向前移动一位）
-        if (this.active > index || this.active === this.renderData.length) {
-          this.active = cur - 1
-        } else if (cur === 0) {
-          this.active = 0
-        } else {
-          this.active = cur
-        }
-        if (this.active === -1) {
-          this.$dispatch('tab-changed', null)
-        } else {
-          this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
-        }
-      })
-    }
-  },
-  events: {
-    'delete'(index) {
-      this.modifyAllIndex(index)
-    }
-  }
-}
-</script>
-
-<style scoped>
-ul > li > a {
-  position: relative;
-}
-
-ul > li > a > span {
-  display: none;
-}
-
-.span-active {
-  width: max-content;
-  border-bottom: 3px solid #5ac0d9;
-  height: 100%;
-  display: inline-block;
-  font-size: 1.5rem;
-  color: #666;
-  font-weight: 550;
-  padding: 0px 10px;
-  padding-top: 3px;
-  vertical-align: bottom;
-}
-
-.span-disable {
-  width: max-content;
-  height: 100%;
-  display: inline-block;
-  font-size: 1.5rem;
-  color: #666;
-  font-weight: 550;
-  padding: 0px 10px;
-  padding-top: 3px;
-  vertical-align: bottom;
-}
-
-/*ul > li > a:hover > span {*/
-/*display: initial;*/
-/*position: absolute;*/
-/*right: 0;*/
-/*top: 35%;*/
-/*border: 1px solid #EAEAEA;*/
-/*}*/
-/*ul > li > a:hover > span:hover {*/
-/*border: 1px solid #EAEAEA;*/
-/*color: #5cb95c;*/
-/*}*/
-ul > li > button {
-  background-color: #FFFFFF;
-  border-radius: 4px;
-  color: #999;
-  border: 1px solid #5cb95c;
-}
-
-.btn-succ {
-  background-color: #6aa6e2;
-  border-radius: 4px;
-  color: #fff;
-}
-
-.foot_tabset1 > .nav {
-  /*overflow-x: scroll;*/
-  white-space: nowrap;
-}
-</style>

package/src/components/Tabs.vue

@@ -1,67 +0,0 @@
-<template>
-  <div role="tabpanel" class="tab-pane"
-       v-bind:class="{hide:!show}"
-       v-show="show"
-       :transition="transition"
-  >
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-  import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
-
-  export default {
-    props: {
-      header: {
-        type: String
-      },
-      disabled: {
-        type: Boolean,
-        coerce: coerceBoolean,
-        default: false
-      }
-    },
-    data () {
-      return {
-        index: 0,
-        show: false
-      }
-    },
-    watch: {
-      'header' (val) {
-        // header变化时，通知tabset
-        let data = this.$parent.renderData.find((v) => v.comp === this)
-        data.header = val
-      }
-    },
-    computed: {
-      show () {
-        return (this.$parent.active === this.index)
-      },
-      transition () {
-        return this.$parent.effect
-      }
-    },
-    created () {
-      this.$parent.renderData.push({
-        comp: this,
-        header: this.header,
-        disabled: this.disabled
-      })
-    },
-    ready () {
-      // 找到当前tab的索引
-      this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
-    },
-    beforeDestroy () {
-      this.$parent.renderData.splice(this.index, 1)
-    }
-  }
-</script>
-
-<style scoped>
-  .tab-content > .tab-pane {
-    display: block;
-  }
-</style>

package/src/components/equipment/PosManageBoth.vue

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

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