system-clients 3.2.95-ruihua1 → 3.2.95-temp-1

package/src/components/parammanage/SinglePage.vue

@@ -30,11 +30,11 @@
         <data-grid :model="model" v-ref:grid >
           <template partial='head'>
             <tr>
-              <th><nobr>序号</nobr></th>
-              <th><nobr>名称</nobr></th>
-              <th><nobr>参数值</nobr></th>
-              <th><nobr>所属</nobr></th>
-              <th><nobr>操作</nobr></th>
+              <th>序号</th>
+              <th>名称</th>
+              <th>参数值</th>
+              <th>所属</th>
+              <th>操作</th>
             </tr>
           </template>
           <template partial='body'>
@@ -149,7 +149,7 @@
       async queryParam (condition) {
         this.model.rows = []
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-system/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'rs/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
 
@@ -183,7 +183,7 @@
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
+            this.$resetpost('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
           }
@@ -201,7 +201,7 @@
         this.show = true
       },
       confirm () {
-        this.$resetpost('api/af-system/logic/system_saveSingle', this.selectItem).then((res) => {
+        this.$resetpost('rs/logic/system_saveSingle', this.selectItem).then((res) => {
           // 如果没有id，需要在数组中添加
           this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
           this.show = false

package/src/components/server/Login.vue

@@ -174,7 +174,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      let getMacs = yield self.$resetpost('api/af-system/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+      let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
       }).catch(() => {
@@ -239,7 +239,7 @@ let saveGen = function *(self) {
       msg = ret.data
     } else if (ret.status === 710) {
       msg = ret.data
-    } else {
+    } else if (ret.status === 555) {
       msg = ret.data
     }
     self.createCode()
@@ -257,6 +257,21 @@ export default {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
     window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
     this.vTime = this.format(new Date(window.versionTime));
+    try{
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/singleTable',
+        {data:{
+            tablename: 't_changedeclare',
+            condition: ` f_type ='变更通知' `
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+      if(res.data.length>0){
+        console.log("---------------获取通知",res.data[0].f_change_message)
+        this.notice=res.data[0].f_change_message
+      }
+    }catch(e){}
+
+    this.loginother();
     $('#login-button').click(function (event) {
       event.preventDefault()
       $('form').fadeOut(500)
@@ -412,24 +427,27 @@ export default {
       }else {
         console.log("待办提醒全局关闭。")
       }
+
+
+
+
     },
 
     async loginother(){
-      // if (this.config.distanceLogin) {
-      //   if (this.$login && this.$login.getUrlParames('name') ) {
-      //     let ename = this.$login.getUrlParames('name');
-      //     // todo v4
-      //     let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
-      //     if(logininfo.data){
-      //       if(logininfo.data.ename && logininfo.data.password){
-      //         this.model.ename = logininfo.data.ename
-      //         this.model.password =logininfo.data.password
-      //         let gen = saveGen(this)
-      //         return co(gen)
-      //       }
-      //     }
-      //   }
-      // }
+      if (this.config.distanceLogin) {
+        if (this.$login && this.$login.getUrlParames('name') ) {
+          let ename = this.$login.getUrlParames('name');
+          let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
+          if(logininfo.data){
+            if(logininfo.data.ename && logininfo.data.password){
+              this.model.ename = logininfo.data.ename
+              this.model.password =logininfo.data.password
+              let gen = saveGen(this)
+              return co(gen)
+            }
+          }
+        }
+      }
     },
     theme(){
       // var  elementList = document.querySelectorAll('body');

package/src/components/server/ModifyPw.vue

@@ -62,7 +62,6 @@
     // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
     // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
     //  Util.f.password = self.deliver.newpassword
-    // todo v4
     let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {

package/src/components/server/PcdBuildingSelect.vue

@@ -155,7 +155,6 @@
       async pcdChange(){
         this.arrays.street=[{label:'全部',value:''}]
         var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
-        // todo v4
         let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_street',
@@ -193,7 +192,6 @@
         }else{
           condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
         }
-        // todo v4
         let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_building',

package/src/components/server/ResSelect.vue

@@ -80,9 +80,6 @@
       //找到跟节点
       ergodicList (val,parentname) {
         if(val.children.length > 0 ){
-          if (val.name !== '组织机构'){
-            this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
-          }
           parentname=parentname+val.name
           this.treetoList(val,parentname)
         }else {
@@ -164,6 +161,15 @@
       'parentresid'(){
         this.dealdata()
       },
+      initresid: {
+        handler(newVal, oldVal) {
+          // 避免重复触发
+          if (JSON.stringify(newVal) === JSON.stringify(oldVal)) {
+            return;
+          }
+          this.dealdata();
+        },
+      }
     },
   }
 </script>

package/src/components/server/ResSelectGroup.vue

@@ -167,7 +167,7 @@ export default {
           for (let row of this.$refs.department.resoptions) {
             depids.push(row.value)
           }
-          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
+          let depid = depids.length ? plugin.convertToIn(depids) : ('')
           condition += " and f_depid in " + depid;
         }
       }

package/src/components/server/RoleSelector.vue

@@ -51,7 +51,6 @@
       }
     },
     ready() {
-      // todo v4
       this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
         .then(res => {
           console.log('res-->' + JSON.stringify(res))
@@ -66,7 +65,7 @@
         this.$dispatch('re-res',obj)
       },
       filterUser(resids) {
-        // 处理第一次进入页面值异常问题
+        // 处理第一次进入页面值异常问题 
         if(resids.length > 0 && typeof resids[0] == "object"){
           resids = resids[0]
         }
@@ -87,4 +86,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/src/filiale/baole/Login.vue

@@ -175,7 +175,6 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -440,7 +439,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/bayan/PosAdd.vue

@@ -0,0 +1,369 @@
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">POS</a></li>
+      </ul>
+      <form novalidate class="form-horizontal" >
+        <div class="row">
+          <div class="col-sm-6  form-group">
+            <label class="font_normal_body">&ensp;公&emsp;&emsp;司&ensp;</label>
+            <right-tree @re-res="getRes1"></right-tree>
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">设备负责人</label>
+            <right-tree @re-res="getRes" :source="source"></right-tree>
+          </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>
+          <div class="col-sm-6 form-group"  :class="[$v.f_terminal_name.required ? 'has-error' : '']">
+            <label class="font_normal_body">&ensp;设备名称&ensp;</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" >&ensp;MAC&nbsp;号&nbsp;&ensp;</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">
+            <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">&ensp;联系电话&ensp;</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>
+          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_bank_name.required}">
+            <label class="font_normal_body">所属银行</label>
+            <v-select id="f_charge_type"
+                      v-model="model.f_bank_name"
+                      placeholder='所属银行'
+                      :value.sync="model.f_bank_name"
+                      :options='bankAffiliation'
+                      :value-single="true"
+                      v-validate:f_bank_name="{ required: true }"
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">&ensp;所属参数&ensp;</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>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">所属部门</label>
+            <res-select restype='department'
+                        :is-mul="false"
+                        @res-select="getdep"
+                        :parentresid="depresid"
+                        :initresid="initresid">
+            </res-select>
+          </div>
+
+        </div>
+        <div class="col-sm-12 form-group" :class="{'has-error': $v.f_address.required}">
+          <label class="font_normal_body">&ensp;放置地点&ensp;</label>
+          <textarea  class="input_textarea" style="width: 80%" v-model="model.f_address" placeholder="所在地"
+                     v-validate:f_address="{required: true}" rows="2"></textarea>
+        </div>
+        <div  class="col-sm-12 form-group">
+          <label  class="font_normal_body " >&ensp;&nbsp;&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;&ensp;</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_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 {
+      depname: '',
+      f_depid: '',
+      orgname: '',
+      initresid: [], // 用于存放初始化选中的部门 ID
+      depresid: [this.$login.f.depids],
+      depid: [this.f_depid],
+      f_orgid: this.$login.f.orgid,
+      userresid: [this.$login.f.id],
+      checkparam: false,
+      bankAffiliation: this.$appdata.getParam('所属银行'),
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+      userid: this.$login.f.id,
+      model: {
+        f_terminal_number: '',
+        f_terminal_name: '',
+        f_depname: '',
+        f_mac_number:'',
+        // f_username:'',
+        f_bank_name: '微信',
+        f_equipment_type: 'POS',
+        f_state: '正常',
+        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
+    }
+  },
+  props: ['data', 'f_filialeids','info'],
+
+  watch: {
+    'data' (val) {
+      if (val) {
+        this.edit(val)
+      } else {
+        this.initModel()
+      }
+    }
+  },
+  async 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: {
+    getRes1 (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+      this.userresid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val
+      // this.userresid = obj
+      this.f_depid = obj
+    },
+    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_orgid=org.id
+        this.model.f_orgname=org.name
+        let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
+        this.model.f_depid=dep.id
+        this.model.f_depname=dep.name
+
+        this.model.f_operatorid = val.orgobj[0].userid
+        this.model.f_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 () {
+      // 如果是修改的话，只修改页面上用户填写的信息
+      this.model.f_depname = this.depname[0]
+      this.model.f_depid = this.f_depid[0]
+      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_depname=this.depname[0]
+        this.model.f_orgstr = this.$login.f.fullids
+      }
+      this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+        this.$dispatch('refresh')
+      }).catch((error) => {
+        this.$dispatch('refresh')
+      })
+
+    },
+    edit (row) {
+      this.model.f_terminal_number = row.f_terminal_number
+      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.f_orgid = row.f_orgid
+      this.model.f_depname = row.f_depname
+      this.initresid = [row.f_depid]
+    },
+    initModel() {
+      delete this.model.id
+      this.model.f_terminal_number = ''
+      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 = ''
+      this.model.f_comments = ''
+    },
+    cancel() {
+      this.$dispatch('close')
+    }
+  }
+}
+</script>