system-clients 3.1.99 → 3.1.100-aode

package/src/components/equipment/EquipmentManage.vue

@@ -4,7 +4,7 @@
       <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
         <div class="row">
           <div class="col-sm-2 form-group">
-            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
+            <label class="font_normal_body">终端类型</label>
             <v-select id="f_charge_type"
                       v-model="model.f_equipment_type"
                       placeholder='终端类型'

package/src/components/equipment/PcAdd.vue

@@ -1,23 +1,23 @@
 <template>
-  <div class="row select-overspread">
+  <div class="auto select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
       </ul>
       <form class="form-horizontal">
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用人员</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">所属地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">mac地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用公司</label>
 
               <res-select restype='organization'

package/src/components/equipment/PcList.vue

@@ -4,7 +4,7 @@
       <criteria partial='criteria' @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">
+          <div class="col-sm-3">
             <label class="font_normal_body">使用公司</label>
             <res-select restype='organization'
                         is-mul="false"
@@ -13,12 +13,12 @@
             </res-select>
           </div>
 
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">使用人员</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
                     condition="f_username like '%{}%'" placeholder="使用人员">
           </div>
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">所属地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_outlets"
                     condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
@@ -31,7 +31,7 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">MAC地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
                     condition="f_mac_number like '%{}%'" placeholder="MAC地址">
@@ -58,7 +58,7 @@
             <td style="text-align:center">{{row.f_mac_outlets}}</td>
             <td style="text-align:center">{{row.f_mac_number}}</td>
             <td style="text-align:center">
-              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>

package/src/components/equipment/PhoneAdd.vue

@@ -1,20 +1,20 @@
 <template>
-  <div class="row select-overspread">
+  <div class="auto select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
       </ul>
       <form class="form-horizontal">
 
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用人员</label>
             <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">设备号</label>
             <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用公司</label>
               <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
           </div>

package/src/components/equipment/PhoneList.vue

@@ -4,17 +4,17 @@
       <criteria partial='criteria' @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">
+          <div class="col-sm-3">
             <label class="font_normal_body">使用公司</label>
             <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>
           </div>
 
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">使用人员</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
                     condition="f_username like '%{}%'" placeholder="使用人员">
           </div>
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">设备号</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
                     condition="f_terminal_number like '%{}%'" placeholder="设备号">
@@ -41,7 +41,7 @@
             <td style="text-align:center">{{row.f_username}}</td>
             <td style="text-align:center">{{row.f_terminal_number}}</td>
             <td style="text-align:center">
-              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>

package/src/components/equipment/PosAdd.vue

@@ -4,148 +4,71 @@
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">POS</a></li>
       </ul>
-      <form novalidate class="form-horizontal" >
+      <form class="form-horizontal">
         <div class="row">
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">所属人员</label>
-            <right-tree @re-res="getRes" :source="source"></right-tree>
+          <div class="col-sm-6">
+            <label class="font_normal_body" >设备编号</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" >
           </div>
-          <div class="col-sm-6 form-group"  :class="[$v.f_terminal_number.required ? 'has-error' : '']">
-            <label class="font_normal_body">设备编号</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" v-el:f_terminal_number
-                   v-validate:f_terminal_number='{required :true}' />
+          <div class="col-sm-6">
+            <label class="font_normal_body" >设备名称</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称" >
           </div>
-          <div class="col-sm-6 form-group"  :class="[$v.f_terminal_name.required ? 'has-error' : '']">
-            <label class="font_normal_body">设备名称</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称"
-                   v-validate:f_terminal_name='{required: true}' />
-          </div>
-          <div class="col-sm-6 form-group"  :class="{'has-error': $v.f_equipment_type.required}">
-            <label class="font_normal_body">设备类型</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_equipment_type" placeholder="设备类型"
-            v-validate:f_equipment_type="{required: true}" />
-          </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body" >MAC&nbsp;号&nbsp;</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_mac_number" placeholder="MAC号" >
-          </div>
-          <div class="col-sm-6 form-group">
+        </div>
+        <div class="row">
+          <div class="col-sm-6">
             <label class="font_normal_body" >机器编号</label>
             <input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
           </div>
-          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required}">
-            <label class="font_normal_body">联系电话</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话"
-                   v-validate:f_phone="{required: true, minlength:7, maxlength: 11}" title="手机号必须7-11位">
-<!--            <div class="font_normal_body" v-if="$v.f_phone.minlength || $v.f_phone.maxlength"><span>手机号必须7-11位</span></div>-->
+          <div class="col-sm-6">
+            <label class="font_normal_body" >联系电话</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话" >
           </div>
-          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_address.required}">
-            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地"
-                   v-validate:f_address="{required: true}">
-          </div>
-          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_bank_name.required}">
-            <label class="font_normal_body">所属银行</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行"
-                   v-validate:f_bank_name="{required: true}">
+        </div>
+        <div class="row">
+          <div class="col-sm-6">
+            <label class="font_normal_body" >&nbsp;&nbsp;&nbsp;所在地</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地" >
           </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">所属参数</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_param_id"
-                      placeholder='所属参数'
-                      :value.sync="model.f_param_id"
-                      :options='ParamTypeItems'
-                      close-on-select clear-button>
-            </v-select>
+          <div class="col-sm-6">
+            <label class="font_normal_body" >所属银行</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行" >
           </div>
         </div>
-        <div  class="col-sm-12 form-group">
-          <label  class="font_normal_body " >&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+        <div  class="col-sm-12">
+          <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
           <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
         </div>
       </form>
       <div style="text-align:right;height:auto;">
-        <button class="button_search"  @click="uploadFiles()" v-if="info">上传图片</button>
-        <button class="btn btn-info" @click="upgrade()" v-if="info && data.f_state==='正常'">升级</button>
-        <button class="btn btn-success" @click="getEditState()"  v-if="model.f_state === '停用' && info" >启用</button>
-        <button class="btn btn-danger" @click="getEditState()"  v-if="model.f_state === '正常' &&  info" >停用</button>
-        <button class="btn button_search" @click="confirm()" :disabled="!$v.valid" >确认</button>
+        <button class="btn button_search " @click="confirm()"  >确认</button>
         <button class="btn button_clear " @click="cancel()" >取消</button>
       </div>
-      <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
-        <article slot="modal-body" style="height: 500px">
-          <upload v-show="showfiles" :businessid="model.id" v-ref:upload  fusetype="POS" isremark="true" style="width:auto" ></upload>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-        </footer>
-      </modal>
-      <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false" >
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="close"><span>&times;</span></button>
-          <h4 class="modal-title">pos机升级</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <form class="form-horizontal">
-            <div class="row">
-              <div>
-                <h4>是否升级？</h4>
-              </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="modifyItem.name" @keyup.enter="confirm">-->
-<!--              </div>-->
-<!--              <div class="col-sm-6 form-group" v-if="modifyItem.EntityType === 't_parameter'">-->
-<!--                <div class="checkbox">-->
-<!--                  <label>-->
-<!--                    <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局-->
-<!--                  </label>-->
-<!--                </div>-->
-<!--              </div>-->
-            </div>
-          </form>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="button_search button_spacing" @click='upgradeRoot()'>是</button>
-          <button type="button" class="button_clear button_spacing" @click='close'>否</button>
-        </footer>
-      </modal>
     </validator>
-
   </div>
 </template>
 <script>
-import {HttpResetClass, PagedList} from 'vue-client'
+
+
   export default {
     data () {
       return {
-        checkparam: false,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
         model: {
           f_terminal_number: '',
           f_terminal_name: '',
-          f_mac_number:'',
-          // f_username:'',
           f_bank_name: '',
           f_equipment_type: 'POS',
           f_state: '正常',
-          f_machine_number: '',
+          f_machine_number:'',
           f_phone:'',
           f_comments:'',
           f_address:'',
-          f_filialeids: '',
-          f_orgid:'',
-          f_param_id:''
-        },
-      ParamTypeItems:[],
-      showfiles: false,
-        show:false,
-        infoadd: this.infoadd,
-        isSelPop: false
+          f_filialeids:this.f_filialeids,
+          f_orgid:''
+        }
       }
     },
-    props: ['data', 'f_filialeids','info'],
-
+    props: ['data', 'f_filialeids'],
     watch: {
       'data' (val) {
         if (val) {
@@ -155,134 +78,31 @@ import {HttpResetClass, PagedList} from 'vue-client'
         }
       }
     },
-    async ready () {
+    ready () {
       console.log('mac信息：', this.data)
       if (this.data) {
         this.edit(this.data)
       }
-      console.log('查看是否隐藏', this.info)
-      try {
-        // 获取参数
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/get_posParam', {data: {condition : ' 1 = 1 '}}, {
-          resolveMsg: null,
-          rejectMsg: '获取参数出错！！'
-        })
-        this.ParamTypeItems = res.data.map(item=>{
-          return {
-            label:item.name,
-            value:item.f_param_id
-          }
-        })
-      } catch (e) {
-        console.log(e)
-      }
     },
-
     methods: {
-      recursiveSelOrg(val, flag){
-        if(val.parent){
-          if(val.parent.resourcetype===flag){
-            return {id: val.parent.id, name: val.parent.name}
-          } else {
-            return this.recursiveSelOrg(val.parent,flag)
-          }
-        } else {
-          return {id: '', name: ''}
-        }
-      },
-      getRes(val){
-        console.log('====================', val)
-        if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
-
-          let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
-          this.model.f_user_orgid=org.id
-          this.model.f_user_orgname=org.name
-          let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
-          this.model.f_user_depid=dep.id
-          this.model.f_user_depname=dep.name
-
-          this.model.f_user_operatorid = val.orgobj[0].userid
-          this.model.f_user_operator=val.orgobj[0].name
-          this.isSelPop = true
-        } else {
-          // 不可提交
-          this.isSelPop = false
-        }
-      },
-      close () {
-        this.show = false
-      },
-      uploadFiles(){
-        this.showfiles= !this.showfiles
-      },
-      getEditState () {
-        if (this.model.f_state === '正常') {
-          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认停用该设备？`, ['confirm', 'cancel']).then((res) => {
-            if (res === 'confirm') {
-              this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送停用指令，请稍后查看执行结果！`, 'success', 2500)
-              this.model.f_state = '停用'
-              try {
-                // 测试接口
-                // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
-                //   .then((res) => {})
-                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
-              } catch (error) {
-                this.search()
-              }
-            }
-          })
-        } else if (this.model.f_state === '停用'){
-          this.$showMessage(`当前设备号： ${this.model.f_terminal_number} ,确认启用该设备？`, ['confirm', 'cancel']).then((res) => {
-            if (res === 'confirm') {
-              this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送启用指令，请稍后查看执行结果！`, 'success', 2500)
-              this.model.f_state = '正常'
-              try {
-                // 测试接口
-                // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
-                //   .then((res) => {})
-                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
-              } catch (error) {
-                this.search()
-              }
-            }
-          })
-        }
-      },
-      editBeizhu  (val) {
-        this.editshow = true
-        this.posBase = val
-      },
-
-      //升级
-      upgrade(){
-        this.show=true
-      },
-      upgradeRoot() {
-        this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
-        this.$dispatch('refresh')
-      },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
       confirm () {
-        // 如果是修改的话，只修改页面上用户填写的信息
-        if (!this.info) {
-          this.model.f_online = '离线'
-          this.model.f_operator = this.$login.f.name
-          this.model.f_orgid = this.$login.f.orgid
-          this.model.f_filialeids = this.$login.f.orgid
-          this.model.f_operatorid = this.$login.f.id
-          this.model.f_orgname = this.$login.f.orgs
-          this.model.f_depid = this.$login.f.depids
-          this.model.f_depname = this.$login.f.deps
-          this.model.f_orgstr = this.$login.f.fullids
-        }
+       // if(this.f_filialeids!=''&&this.f_filialeids!=null){
+         this.model.f_operator = this.$login.f.name
+         this.model.f_operatorid = this.$login.f.id
+         this.model.f_filialeids = this.f_filialeids
+         this.model.f_orgid = this.$login.f.orgid
+         this.model.f_orgname = this.$login.f.orgs
+         this.model.f_depid = this.$login.f.depids
+         this.model.f_depname = this.$login.f.deps
          this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
            this.$dispatch('refresh')
          }).catch((error) => {
            this.$dispatch('refresh')
          })
+       // }else
+       // {
+       //   this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+       // }
 
       },
       edit (row) {
@@ -290,15 +110,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
         this.model.f_terminal_name = row.f_terminal_name
         this.model.f_bank_name = row.f_bank_name
         this.model.f_machine_number = row.f_machine_number
-        this.model.f_mac_number = row.f_mac_number
         this.model.f_address = row.f_address
         this.model.f_phone = row.f_phone
-        this.model.f_state = row.f_state
         this.model.f_comments=row.f_comments
-        this.model.f_param_id=row.f_param_id
-        // this.model.f_username=row.f_username
-        this.model.id = row.id
         this.model.f_filialeids=row.f_filialeids
+        this.model.id = row.id
         this.model.f_orgid = row.f_orgid
       },
       initModel () {
@@ -307,9 +123,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         this.model.f_terminal_name = ''
         this.model.f_bank_name = ''
         this.model.f_machine_number = ''
-        this.model.f_state = '正常'
         this.model.f_phone = ''
-        this.model.f_param_id = ''
         this.model.f_address = ''
         this.model.f_filialeids=''
         this.model.f_orgid=''