system-clients 3.3.5 → 3.3.6

package/src/components/server/ResSelect.vue

@@ -164,6 +164,9 @@
       'parentresid'(){
         this.dealdata()
       },
+      'initresid'(){
+        this.dealdata()
+      }
     },
   }
 </script>

package/src/filiale/bayan/PosAdd.vue

@@ -23,7 +23,7 @@
           <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}" />
+                   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>
@@ -37,12 +37,19 @@
             <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 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>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行"
-                   v-validate:f_bank_name="{required: true}">
+            <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>
@@ -54,6 +61,19 @@
                       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 class="col-sm-6  form-group" v-show="false">
+            <label class="font_normal_body">公&emsp;&emsp;司 </label>
+            <right-tree @re-res="getRes1"></right-tree>
+          </div>
           <div class="col-sm-12 form-group" :class="{'has-error': $v.f_address.required}">
             <label class="font_normal_body">&ensp;放置地点&ensp;</label>
             <input type="text" class="input_search" style="width: 80%" v-model="model.f_address" placeholder="所在地"
@@ -91,17 +111,17 @@
               <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 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>
@@ -116,208 +136,233 @@
 </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_phone:'',
-          f_comments:'',
-          f_address:'',
-          f_filialeids: '',
-          f_orgid:'',
-          f_param_id:''
-        },
+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
+      show:false,
+      infoadd: this.infoadd,
+      isSelPop: false
+    }
+  },
+  props: ['data', 'f_filialeids','info'],
+
+  watch: {
+    'data' (val) {
+      if (val) {
+        this.edit(val)
+      } else {
+        this.initModel()
       }
-    },
-    props: ['data', 'f_filialeids','info'],
+    }
+  },
+  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)
+    }
+  },
 
-    watch: {
-      'data' (val) {
-        if (val) {
-          this.edit(val)
+  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 {
-          this.initModel()
+          return this.recursiveSelOrg(val.parent,flag)
         }
+      } else {
+        return {id: '', name: ''}
       }
     },
-    async ready () {
-      console.log('mac信息：', this.data)
-      if (this.data) {
-        this.edit(this.data)
+    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
       }
-      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: '获取参数出错！！'
+    },
+    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()
+            }
+          }
         })
-        this.ParamTypeItems = res.data.map(item=>{
-          return {
-            label:item.name,
-            value:item.f_param_id
+      } 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()
+            }
           }
         })
-      } catch (e) {
-        console.log(e)
       }
     },
+    editBeizhu  (val) {
+      this.editshow = true
+      this.posBase = val
+    },
 
-    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})
+    //升级
+    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')
-      },
-      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
-        }
-         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
-           this.$dispatch('refresh')
-         }).catch((error) => {
-           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
-      },
-      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')
-      }
+    },
+    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>