system-clients 3.2.5 → 3.2.6

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>

package/src/components/equipment/PosParamList.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' style="background-color: white" @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  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  form-group">
+              <label class="font_normal_body">参数名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_param_name"
+                     condition="name like '%{}%'" placeholder="参数名称">
+            </div>
+            <div class="span" style="float:right;margin-top: 6px">
+              <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
+              <button type="button" class="button_search" @click="$parent.$parent.add() " v-el:cx>新增</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th style="text-align:center;white-space:nowrap;">参数id</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>
+          </tr>
+        </template>
+        <template partial='body' :model="model">
+          <tr>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_param_id }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.name }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_orgname }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_bank_name }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_operator }}</td>
+            <td style="text-align:center;white-space:nowrap;">
+              <div class="col-sm-1"></div>
+              <div class="col-sm-4">
+                <button type="button" class="btn button_new" v-if="!row.sum||row.sum ===0 "
+                        @click.stop="$parent.$parent.$parent.delete(row)">删除
+                </button>
+              </div>
+              <div class="col-sm-1"></div>
+              <div class="col-sm-4">
+                <button type="button" class="btn button_new"
+                        @click.stop="$parent.$parent.$parent.modify(row)">修改
+                </button>
+              </div>
+              <div class="col-sm-1"></div>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '终端控制',
+  components: {},
+  data() {
+    return {
+      model: new PagedList('rs/sql/get_posParam', 20),
+      curorgid: [this.f_filialeid],
+    }
+  },
+  props: [],
+  ready() {
+    this.search()
+  },
+  watch: {},
+  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 = ''
+      }
+    },
+    async delete(row) {
+      await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
+      await this.search()
+    },
+    modify(row) {
+      this.$dispatch('modify', row)
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      if (this.f_orgid) {
+        args.condition += ` and f_orgid = ${this.f_orgid} `
+      }
+      this.model.search(args.condition, this.model)
+    },
+    add() {
+      this.$dispatch('add', this.f_filialeid)
+    },
+    getorg(val) {
+      this.f_orgid = val[0]
+      this.f_filialeid = val[0]
+    }
+  },
+  computed: {}
+}
+</script>

package/src/components/equipment/PosParamManage.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <pos-param-list v-ref:list></pos-param-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
+      <pos-param-add :param_id="param_id" v-ref:add></pos-param-add>
+    </div>
+  </div>
+</template>
+<script>
+
+import PosParamList from './PosParamList'
+import PosParamAdd from './PosParamAdd'
+
+export default {
+  title: 'POS终端管理',
+  components: {
+    PosParamList, PosParamAdd
+  },
+  data() {
+    return {
+      isChange: false,
+      param_id: ''
+    }
+  },
+  methods: {},
+  events: {
+    'add'() {
+      this.isChange = true
+      setTimeout(() => {
+        this.$refs.add.initModel()
+      }, 100)
+    },
+    'close'() {
+      this.isChange = false
+    },
+    'research'() {
+      this.$refs.list.search()
+      this.isChange = false
+    },
+    'modify'(row) {
+      this.isChange = true
+      setTimeout(() => {
+        this.$refs.add.curorgid = []
+        this.$refs.add.edit(row.f_param_id)
+      }, 100)
+    }
+  }
+}
+</script>

package/src/components/parammanage/ParamManage.vue

@@ -1,9 +1,9 @@
 <template>
-  <div id="unit" class="flex-row">
+  <div id="unit" class="flex-row" :style="{width: messlist==='mess' ? '50%' : '100%'}">
     <div class="binary-left">
       <param-page></param-page>
     </div>
-    <div class="binary-right">
+    <div class="binary-right" :style="{width: messlist==='mess' ? '50%' : '60%'}">
       <single-page></single-page>
     </div>
   </div>

package/src/components/parammanage/ParamPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex">
     <p class="bg-info text-center" style="padding: 8px;">参数管理
-      <span class="btn btn-link add-postition" @click="add('t_parameter')">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_parameter')" style="float:right">新增</button>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -25,7 +25,7 @@
       </form>
     </div>
     <div class="span">
-      <data-grid :model="model" v-ref:params @select-changed="selected" class="list_area table_sy">
+      <data-grid :model="model" v-ref:params @select-changed="selected">
         <template partial='head'>
           <tr>
             <th>序号</th>
@@ -39,9 +39,9 @@
           <td style="text-align:center">{{row.name}}</td>
           <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
           <td class="flex-around">
-            <button type="button" name="button" class="btn btn-link"
+            <button type="button" name="button" class="button_search button_spacing width-60"
                     @click.stop="$parent.$parent.modifyParam(row, 't_parameter')">修改</button>
-            <button type="button" name="button" class="btn btn-link"
+            <button type="button" name="button" class="btn btn-danger"
                     @click.stop="$parent.$parent.deleteParam(row, 't_parameter')">删除</button>
           </td>
         </template>
@@ -50,7 +50,7 @@
 
     <p v-if="selectItem" class="bg-info text-center" style="padding: 8px;margin: 8px 0px;">
       {{selectItem.name}}
-      <span class="btn btn-link add-postition" @click="add('t_paramvalue')">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60" @click="add('t_paramvalue')" style="float:right">新增</button>
     </p>
     <div v-if="selectItem" class="span">
       <data-grid :model="params" v-ref:selects >
@@ -64,9 +64,10 @@
         <template partial='body'>
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.name}}</td>
-          <td class="flex-around">
-            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
-            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
+          <td class="flex-around col-sm-3">
+            <button type="button" name="button" class="button_search" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
+            <button type="button" name="button" class="button_search" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
+            <button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
           </td>
         </template>
       </data-grid>
@@ -164,6 +165,27 @@
       }
     },
     methods: {
+      async move(row,index){
+        var temp=Object.assign({}, row)
+        row.name=this.params.rows[index-1].name
+        row.code=this.params.rows[index-1].code
+        row.processid=this.params.rows[index-1].processid
+        var param1=row
+
+        this.params.rows[index-1].name=temp.name
+        this.params.rows[index-1].code=temp.code
+        this.params.rows[index-1].processid=temp.processid
+        var param2=this.params.rows[index-1]
+        let http = new HttpResetClass()
+        try {
+          await http.load('POST', 'rs/entity/t_paramvalue', param1, {resolveMsg: null, rejectMsg: null})
+          await http.load('POST', 'rs/entity/t_paramvalue', param2, {resolveMsg: null, rejectMsg: null})
+          this.$showAlert('上移成功', 'success', 2000)
+        }catch (e) {
+          console.log(e)
+          this.$showAlert('上移失败', 'warning', 2000)
+        }
+      },
       // 加载全部参数
       loadParams () {
         let param = {

package/src/components/parammanage/SinglePage.vue

@@ -2,7 +2,7 @@
   <div class="flex">
     <p  class="bg-info text-center" style="padding: 8px;">
       单值管理
-      <span class="btn btn-link add-postition" @click="add()">新增</span>
+      <button type="button" name="button" class="button_search button_spacing width-60 " @click="add()" style="float:right">新增</button>
     </p>
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
@@ -27,7 +27,7 @@
     </div>
     <div class="span">
       <partial-view v-ref:single-load>
-        <data-grid :model="model" v-ref:grid class="list_area table_sy">
+        <data-grid :model="model" v-ref:grid >
           <template partial='head'>
             <tr>
               <th>序号</th>
@@ -43,9 +43,9 @@
             <td style="text-align:center">{{row.value}}</td>
             <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
             <td class="flex-around">
-              <button type="button" name="button" class="btn btn-link"
+              <button type="button" name="button" class="button_search button_spacing width-60"
                       @click.stop="$parent.$parent.$parent.modifyParam(row)">修改</button>
-              <button type="button" name="button" class="btn btn-link"
+              <button type="button" name="button" class="btn btn-danger"
                       @click.stop="$parent.$parent.$parent.deleteItem(row)">删除</button>
             </td>
           </template>

package/src/components/server/ImageVieweTest.vue

@@ -0,0 +1,56 @@
+<template>
+    <div id="app">
+      <!-- 图片放大镜,需要自定义图片的宽高在这里传入,组件有设置默认的宽高,不传也可以 -->
+      <h4>这是父组件</h4>
+      <h4>安检总体照片</h4>
+     <!-- <button @click="show">显示</button>-->
+      <!--<img :src="src" @click="show" style="width: 80px;height: 80px" >-->
+      <div style="width: 500px; height: 500px;">
+        <button class="btn-default btn" @click="show_p">查看图片</button>
+      <image-viewer :src="src" :show="show_msg" @clone_f="clone_p" alt="总体安检照片"></image-viewer>
+      <h4>用户签名</h4>
+      <h4>用户签名</h4>
+      </div>
+     </div>
+
+</template>
+<script>
+  export default {
+    name: 'app',
+    title: '图片测试',
+    data () {
+      return {
+        show_msg: false,
+        src: [],
+        src1: [
+          {url: 'http://139.9.137.3:8400/rs/image/file/cfdf411d77df828301a56731df655f28-f_overall_path.jpg'},
+          {url: 'http://mp.ofweek.com/Upload/News/Img/member645/201711/17170046839337.jpg'}
+        ],
+        src2: [
+          {url: 'http://image.buy.ccb.com/merchant/201703/904919627/1522929521661_4.jpg'}
+        ],
+        src3: [
+          {url: 'http://d.ifengimg.com/w600/p0.ifengimg.com/pmop/2017/1213/A4037864F6728F006B67AAEC51EC8A485F320FD2_size93_w1024_h734.jpeg'}
+        ]
+      }
+    },
+    methods: {
+      show_p () {
+        console.log('调用图片查看器')
+        // 传要查看的图片
+        this.src = this.src1
+        console.log(this.src)
+        // 显示组件
+        this.show_msg = true
+      },
+      clone_p () {
+        // 关闭组件
+        this.show_msg = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>