safecheck-client 3.0.30-49 → 3.0.30-50

package/src/filiale/wensu/pc/RoleSelector.vue

@@ -1,147 +1,150 @@
-<template>
-    <div style="width: 100%;height: 100%">
-        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-            <label class="font_normal_body">公&emsp;&emsp;司</label>
-            <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
-        </div>
-        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-            <label class="font_normal_body">{{roleLable}}</label>
-            <v-select :value="selVal" v-model='selVal'
-                      :value-single="!valueMultiple"
-                      class="select_list select"
-                      :options='users' :placeholder='roleName'
-                      close-on-select
-                      :multiple="valueMultiple"
-                      :width="rightWidth"
-                      @change="valuechange">
-            </v-select>
-        </div>
-    </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-  export default {
-    name: "RoleSelector",
-    props: {
-      valueMultiple: {
-        type: Boolean,
-        default: false
-      },
-      roleName: {
-        type: String,
-        default: '安检员'
-      },
-      roleLable: {
-        type: String,
-        default: '安检员'
-      },
-      leftWidth: {
-        type: String,
-        default: '60%'
-      },
-      rightWidth: {
-        type: String,
-        default: '60%'
-      },
-      value: {
-        default: ''
-      },
-      resobjprop: {
-        default: {}
-      }
-    },
-    data() {
-      return {
-        source: `tool.getChildrenOfResName($${this.roleName}$)`,
-        // source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`,
-        allUsers: [],
-        users: [],
-        selVal:'',
-        resids: [],
-        changeval: ''
-      }
-    },
-    watch: {
-      'value' (val) {
-        console.log("969696",val)
-        if (val) {
-          if(this.valueMultiple){
-
-          }else{
-            this.selVal = val
-          }
-
-        }
-      }
-    },
-    ready () {
-      let http = new HttpResetClass()
-      http.load('POST', '/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
-        .then(res => {
-          //tag)
-          this.allUsers = res.data
-          this.filterUser(this.resids)
-         })
-    },
-    methods: {
-      valuechange (val) {
-        console.log(`val instanceof Array======${!val instanceof Array}`)
-        if((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)){
-          return
-        }
-        if (this.valueMultiple && Array.isArray(val)){
-          if (val && val.length > 0) {
-            let valuesele = `(`
-            for (let i = 0;i < val.length ;i++) {
-              valuesele += `'${val[i]}',`
-            }
-            this.value =  valuesele.substring(0,valuesele.length -1 ) + ')'
-          }else{
-            this.value =  ''
-          }
-        }else{
-           this.value = val
-        }
-        // this.changeval = val
-      },
-      getRes(obj) {
-        this.resids = obj.resids
-        //tag
-        this.filterUser(this.resids)
-        this.$dispatch('re-res',obj)
-      },
-      filterUser(resids) {
-        // 处理第一次进入页面值异常问题
-        if(resids.length > 0 && typeof resids[0] == "object"){
-          resids = resids[0]
-        }
-        this.users = []
-        this.allUsers.forEach(user => {
-          // if (resids.indexOf(user.orgid) != -1) {
-          //   if (typeof user.name == "string"){
-              this.users.push({label: user.name, value: user.name})
-          //   }
-          // }
-        })
-        if(this.users.length > 0){
-          this.users = [{label: '全部', value: ''},...this.users]
-        }
-        let temp = []
-        this.users = this.users.filter(item=>{
-          if (!temp.includes(item.label)){
-            temp.push(item.label)
-            return true
-          }
-          return false
-        })
-        this.$emit('alluser',this.allUsers)
-        //tag
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+    <div style="width: 100%;height: 100%">
+        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+            <label class="font_normal_body">公&emsp;&emsp;司</label>
+            <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
+        </div>
+        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+            <label class="font_normal_body">{{roleLable}}</label>
+            <v-select :value="selVal" v-model='selVal'
+                      :value-single="!valueMultiple"
+                      class="select_list select"
+                      :options='users' :placeholder='roleName'
+                      close-on-select
+                      :multiple="valueMultiple"
+                      :width="rightWidth"
+                      @change="valuechange">
+            </v-select>
+        </div>
+    </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      },
+      resobjprop: {
+        default: {}
+      }
+    },
+    data() {
+      return {
+        source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        // source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`,
+        allUsers: [],
+        users: [],
+        selVal:'',
+        resids: [],
+        changeval: ''
+      }
+    },
+    watch: {
+      'value' (val) {
+        console.log("969696",val)
+        if (val) {
+          if(this.valueMultiple){
+
+          }else{
+            this.selVal = val
+          }
+
+        }
+      }
+    },
+    ready () {
+      let http = new HttpResetClass()
+      http.load('POST', '/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
+        .then(res => {
+          //tag)
+          this.allUsers = res.data
+          this.filterUser(this.resids)
+         })
+    },
+    methods: {
+      valuechange (val) {
+        console.log(`val instanceof Array======${!val instanceof Array}`)
+        if((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)){
+          return
+        }
+        if (this.valueMultiple && Array.isArray(val)){
+          if (val && val.length > 0) {
+            let valuesele = `(`
+            for (let i = 0;i < val.length ;i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value =  valuesele.substring(0,valuesele.length -1 ) + ')'
+          }else{
+            this.value =  ''
+          }
+        }else{
+           this.value = val
+        }
+        // this.changeval = val
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        //tag
+        this.filterUser(this.resids)
+        this.$dispatch('re-res',obj)
+      },
+      filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if(resids.length > 0 && typeof resids[0] == "object"){
+          resids = resids[0]
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+          // if (resids.indexOf(user.orgid) != -1) {
+          //   if (typeof user.name == "string"){
+          if(user.state == '在职'){
+            this.users.push({label: user.name, value: user.name})
+          }
+
+          //   }
+          // }
+        })
+        if(this.users.length > 0){
+          this.users = [{label: '全部', value: ''},...this.users]
+        }
+        let temp = []
+        this.users = this.users.filter(item=>{
+          if (!temp.includes(item.label)){
+            temp.push(item.label)
+            return true
+          }
+          return false
+        })
+        this.$emit('alluser',this.allUsers)
+        //tag
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/wensu/pc.js

@@ -1,19 +1,19 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
-  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
-  'check-detail': (resolve) => { require(['./pc/CheckDetail'], resolve) },
-  'print-material-bill': (resolve) => { require(['./pc/PrintMaterialBill'], resolve) },
-  'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
-  'defect-main-new2': (resolve) => {require(['./pc/DefectMainNew'], resolve)},
-  'role-selector-safe': (resolve) => {require(['./pc/RoleSelector'], resolve)},
-  'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)}
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  'check-detail': (resolve) => { require(['./pc/CheckDetail'], resolve) },
+  'print-material-bill': (resolve) => { require(['./pc/PrintMaterialBill'], resolve) },
+  'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
+  'defect-main-new2': (resolve) => {require(['./pc/DefectMainNew'], resolve)},
+  'role-selector-safe': (resolve) => {require(['./pc/RoleSelector'], resolve)},
+  'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)}
+}
+exports.specialComp = specialComp
+
+
+
+