system-clients 3.3.5 → 3.3.6

package/src/filiale/bayan/PosList.vue

@@ -6,12 +6,8 @@
         <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>
+              <label class="font_normal_body">公&emsp;&emsp;司 </label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
             </div>
             <div class="col-sm-3  form-group">
               <label class="font_normal_body">设备编号</label>
@@ -35,9 +31,21 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-3  form-group">
+              <label class="font_normal_body">所属部门</label>
+              <res-select restype='department'
+                          :is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid">
+              </res-select>
+            </div>
             <div class="col-sm-3  form-group">
               <label class="font_normal_body">所属人员</label>
-              <right-tree @re-res="$parent.$parent.getRes" :source="$parent.$parent.source"></right-tree>
+              <res-select restype='user'
+                          @res-select="$parent.$parent.getuser"
+                          :is-mul="false"
+                          :parentresid="$parent.$parent.userresid">
+              </res-select>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">所在地</label>
@@ -56,8 +64,14 @@
             </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_bank_name"
-                      condition="f_bank_name like '%{}%'" placeholder="所属银行">
+              <v-select id="f_charge_type"
+                        v-model="model.f_bank_name"
+                        placeholder='所属银行'
+                        :value.sync="model.f_bank_name"
+                        :options='$parent.$parent.bankAffiliation'
+                        condition="f_bank_name = '{}'"
+                        close-on-select clear-button>
+              </v-select>
             </div>
             <div class="col-sm-3  form-group">
               <label class="font_normal_body">联系电话</label>
@@ -75,15 +89,16 @@
             <th style="text-align:center;white-space:nowrap;">设备编号</th>
             <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</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>
             <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;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>
-<!--            <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
+            <!--            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</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;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
             <th style="text-align:center;white-space:nowrap;">失联状态</th>
             <th style="text-align:center;white-space:nowrap;">操作</th>
@@ -96,7 +111,7 @@
             <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
             <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>
+            <!--            <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>-->
             <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
 
@@ -104,8 +119,9 @@
             <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
-            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>
-<!--            <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
+            <!--            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>-->
+            <!--            <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
+            <td style="text-align:center;white-space:nowrap;">{{row.f_comments}}</td>
             <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
             <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
             <td style="text-align:center">
@@ -151,147 +167,175 @@
 
 <script>
 
-  import {PagedList} from 'vue-client'
+import {PagedList} from 'vue-client'
 
-  export default {
-    title: '终端控制',
-    components: {},
-    data () {
-      return {
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        model: new PagedList('rs/sql/equipmentQuery', 20),
-        model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
-        curorgid: [this.f_filialeid],
-        f_orgid: '',
-        f_filialeids: '',
-        criteriaShow: false,
-        infoadd: false,
-        selPos: [],
-        isSelAll: false,  // 默认不全选
-        infoshow: false
+export default {
+  title: '终端控制',
+  components: {},
+  data () {
+    return {
+      depresid: [this.$login.f.depids],
+      depid: [this.$login.f.depids],
+      f_orgid: this.$login.f.orgid,
+      f_depid: '',
+      f_operatorid: '',
+      mul: false,
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      userresid: [this.$login.f.id],
+      operatorid: [this.$login.f.id],
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+      model: new PagedList('rs/sql/equipmentQuery', 20),
+      model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
+      curorgid: [this.f_filialeid],
+      f_filialeids: '',
+      criteriaShow: false,
+      infoadd: false,
+      selPos: [],
+      bankAffiliation: this.$appdata.getParam('所属银行'),
+      isSelAll: false,  // 默认不全选
+      infoshow: false
+    }
+  },
+  props: ['f_filialeid','isshowless'],
+  ready () {
+    this.search()
+  },
+  watch:{
+    // 'selPos'(val){
+    //   console.log(val)
+    // },
+    'isSelAll'(val){
+      console.log('-------', val)
+      if (val) {
+        // 对当前页面全选
+        this.selPos = []
+        for (const sel of this.model.rows) {
+          //  if (this.selPos.indexOf(sel.id) < 0){
+          this.selPos.push(sel)
+          // }
+        }
+      } else {
+        // 取消全选
+        this.selPos = []
       }
+    }
+  },
+  methods: {
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+      this.userresid = obj.resids
     },
-    props: ['f_filialeid','isshowless'],
-    ready () {
-      this.search()
+    getdep (obj, val) {
+      this.depname = val
+      // this.userresid = obj
+      this.f_depid = obj
     },
-    watch:{
-      // 'selPos'(val){
-      //   console.log(val)
-      // },
-      'isSelAll'(val){
-        console.log('-------', val)
-        if (val) {
-          // 对当前页面全选
-          this.selPos = []
-          for (const sel of this.model.rows) {
-            //  if (this.selPos.indexOf(sel.id) < 0){
-            this.selPos.push(sel)
-            // }
-          }
-        } else {
-          // 取消全选
-          this.selPos = []
-        }
-      }
+    getuser (obj, val) {
+      this.operatorname = val
+      this.f_operatorid = obj
+    },
+    infoclose(){
+      this.infoshow=false
     },
-    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 batchRoot(val) {
+      let arrs = []
+      let alertMessage = ''
+      let selPos = this.selPos
+      if (val === '0') {
+        alertMessage = '停用'
+        for (const tmp of selPos) {
+          if (tmp.f_state === '正常') arrs.push(tmp)
         }
-      },
-      infoclose(){
-        this.infoshow=false
-      },
-      // 批量操作
-      async batchRoot(val) {
-        let arrs = []
-        let alertMessage = ''
-        let selPos = this.selPos
-        if (val === '0') {
-          alertMessage = '停用'
-          for (const tmp of selPos) {
-            if (tmp.f_state === '正常') arrs.push(tmp)
-          }
-        } else if (val === '1') {
-          alertMessage = '启用'
-          for (const tmp of selPos) {
-            if (tmp.f_state === '停用') arrs.push(tmp)
-          }
-        } else if (val === '2') {
-          alertMessage = '升级'
-          for (const tmp of selPos) {
-            if (tmp.f_state === '正常') arrs.push(tmp)
-          }
-        } else {
-          this.showAlert('出现异常，请重新进操作')
-          return
+      } else if (val === '1') {
+        alertMessage = '启用'
+        for (const tmp of selPos) {
+          if (tmp.f_state === '停用') arrs.push(tmp)
         }
-        await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
-          rejectMsg: null,
-          resolveMsg: null
-        })
-        // 需要提示
-        this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`,'success', 2500)
-        this.$dispatch('close')
-      },
-      abcd (row) {
-        console.log("chakan",row)
-        let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
-        this.model2.search(condition)
-        this.infoshow = true
-      },
-      search () {
-        console.log("111111111111111111111111111111111111")
-        this.$refs.paged.$refs.cri.search()
-      },
-
-      selfSearch (args) {
-        console.log(args)
-        if (args.model.f_user_operatorid && args.model.f_user_operator){
-          args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
-           and f_user_operator = '${args.model.f_user_operator}'`
+      } else if (val === '2') {
+        alertMessage = '升级'
+        for (const tmp of selPos) {
+          if (tmp.f_state === '正常') arrs.push(tmp)
         }
-        args.condition =  `${args.condition} and f_equipment_type = 'POS' and f_state != '已删除' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
-        this.model.search(args.condition, this.model)
-        this.$dispatch('research')
-      },
+      } else {
+        this.showAlert('出现异常，请重新进操作')
+        return
+      }
+      await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
+        rejectMsg: null,
+        resolveMsg: null
+      })
+      // 需要提示
+      this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`,'success', 2500)
+      this.$dispatch('close')
+    },
+    abcd (row) {
+      console.log("chakan",row)
+      let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
+      this.model2.search(condition)
+      this.infoshow = true
+    },
+    search () {
+      console.log("111111111111111111111111111111111111")
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch (args) {
+      console.log(args)
+      if (args.model.f_user_operatorid && args.model.f_user_operator){
+        args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
+           and f_user_operator = '${args.model.f_user_operator}'`
+      }
 
-      add () {
-        this.infoadd=false
-        // if (this.f_filialeid) {
-        this.$dispatch('add', this.f_filialeid)
-        // } else {
-        //   this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        // }
-      },
-      del (row) {
-        console.log('要删除了', row)
-        row.f_state = '已删除'
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          this.$dispatch('refresh')
-        }).catch((error) => {
-          this.$dispatch('refresh')
-        })
-      },
+      if (args.model.f_user_operatorid && args.model.f_user_operator) {
+        args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
+                     and f_user_operator = '${args.model.f_user_operator}'`;
+      }
 
-      getorg (val) {
-        console.log("====================", val)
-        this.f_orgid = val[0]
-        this.f_filialeid = val[0]
-        // this.search()
-      },
-      hidden(){
-        this.criteriaShow = !this.criteriaShow
+      // 添加设备类型和状态条件
+      args.condition = `${args.condition} and f_equipment_type = 'POS' and f_state != '已删除'`;
+      // 添加公司、部门、员工条件
+      if (this.f_orgid && this.f_orgid.length > 0) {
+        args.condition += ` and f_orgid = '${this.f_orgid}'`;
       }
+
+      if (this.f_depid && this.f_depid.length > 0) {
+        args.condition += ` and f_depid = '${this.f_depid}'`; // 或者使用合适的条件处理
+      }
+
+      if (this.f_operatorid && this.f_operatorid.length > 0) {
+        args.condition += ` and f_operatorid = '${this.f_operatorid}'`; // 或者使用合适的条件处理
+      }
+      this.model.search(args.condition, this.model)
+      this.$dispatch('research')
     },
-    computed: {
 
+    add () {
+      this.infoadd=false
+      // if (this.f_filialeid) {
+      this.$dispatch('add', this.f_filialeid)
+      // } else {
+      //   this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+      // }
+    },
+    del (row) {
+      console.log('要删除了', row)
+      row.f_state = '已删除'
+      this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch('refresh')
+      }).catch((error) => {
+        this.$dispatch('refresh')
+      })
+    },
+    hidden(){
+      this.criteriaShow = !this.criteriaShow
     }
+  },
+  computed: {
+
   }
+}
 </script>