@zscreate/zhxy-app-component 1.0.78 → 1.0.80

package/components/evan-form-item/evan-form-item.vue

@@ -417,6 +417,24 @@
       </view>
     </view>
 
+    <!-- userSelectorByRole  -->
+    <view v-else-if="widget.type ==='userSelectorByRole'" @click.native="isClickByUser = true"
+          class="evan-form-item-container" :class="'evan-form-item-container--' + labelPosition"
+          :style="{borderWidth:border?'1upx':0}">
+      <view class="evan-form-item-container__label"
+            :class="{showAsteriskRect:hasRequiredAsterisk,isRequired:showRequiredAsterisk}" :style="mLabelStyle">
+        {{ widget.name }}
+      </view>
+      <view class="evan-form-item-container__main" :style="mContentStyle"
+            @click.stop="selectUserByRole(widget.options.multiple)">
+        <user-select-by-role ref="userSelectByRole" @ok="handleSelectRoleUserOk"/>
+        <!-- <input class="form-input" placeholder-class="form-input-placeholder" v-model="dataModelShow"
+          :placeholder="widget.options.placeholder" :disabled="widget.options.disabled" /> -->
+        <view class="form-input">{{ dataModelShow ? dataModelShow : widget.options.placeholder }}</view>
+      </view>
+    </view>
+
+
     <!-- deptSelector  -->
     <view v-else-if="widget.type ==='deptSelector'" class="evan-form-item-container"
           :class="'evan-form-item-container--' + labelPosition" :style="{borderWidth:border?'1upx':0}">
@@ -478,10 +496,12 @@ import {
 import {
   getMode
 } from './utilForForm'
+import UserSelectByRole from "../userSelectByRole/userSelectByRole";
 
 export default {
   mixins: [computedMixin, validateFormMixin, pubSubMixin, valueChangeMixin],
   components: {
+    UserSelectByRole,
     UniRate,
     tColorPicker,
     unploadFile,
@@ -775,7 +795,7 @@ export default {
     },
     //rate value chage
     showFormData() {
-      if (this.widget.type === 'userSelector' || this.widget.type == 'relateSub') {
+      if (['userSelector', 'relateSub', 'userSelectorByRole'].includes(this.widget.type)) {
         this.updateUserSelectorModal()
       }
       if (this.widget.type === 'deptSelector') {
@@ -1009,6 +1029,7 @@ export default {
       let that = this;
       let str = ''
       arr.forEach(item => {
+        if (!this.dataModel) return
         if (item.dictValue == this.dataModel || this.dataModel.includes(item.dictValue)) {
           str += ',' + item.dictLabel
         } else if (item.value == this.dataModel || this.dataModel.includes(item.value)) {
@@ -1099,6 +1120,25 @@ export default {
             .stringify(this.dataModel ? this.dataModel : [])
       });
     },
+
+    selectUserByRole() {
+      if (this.widget.options.disabled) return
+      this.isClickByUser = true
+      this.$refs.userSelectByRole.init(this.widget, this.dataModel)
+    },
+    handleSelectRoleUserOk(value) {
+      this.dataModelShow = ""
+      if (value && value.length > 0) {
+        value.forEach((item, index) => {
+          this.dataModelShow += "," + item.realname;
+        });
+        this.dataModelShow = this.dataModelShow.substring(1);
+        this.dataModel = value;
+      } else {
+        this.dataModelShow = "";
+        this.dataModel = [];
+      }
+    },
     // select报修人员
     handleSeclet(flag) {
       // uni.hideKeyboard()

package/components/userSelectByRole/userSelectByRole.vue

@@ -0,0 +1,190 @@
+<template>
+  <u-popup v-model="roleSelectShow"  width="100%">
+    <view style="padding: 20rpx">
+      <view>角色选择</view>
+      <u-radio-group v-model="roleChecked" >
+        <u-radio
+            @change="roleChange"
+            v-for="(item, index) in rolesList" :key="index"
+            :name="item.id"
+        >
+          {{item.roleName}}
+        </u-radio>
+      </u-radio-group>
+      <view style="margin-top: 20rpx; display: flex; flex-wrap: wrap">
+        <view>已选：</view>
+        <u-tag style="margin-right: 5px" v-for="val in currValue" :text="val.realname" closeable @close="removeClick(val)" :key="val.id" />
+      </view>
+      <view style="margin-top: 20rpx">
+        <u-table>
+          <u-tr>
+            <u-th width="50px" style="box-sizing: border-box">
+              <view v-if="multiple">
+                <u-checkbox :value="isAllCheck" @change="roleCheckAll">
+                </u-checkbox>
+              </view>
+            </u-th>
+            <u-th>姓名</u-th>
+            <u-th>所属部门</u-th>
+          </u-tr>
+          <u-tr v-for="user in roleUserList" :key="user.id">
+            <u-td width="50px" >
+              <view>
+                <u-checkbox v-model="user.checked" @change="handleCheck" :name="user.id">
+                </u-checkbox>
+              </view>
+            </u-td>
+            <u-td><view>{{ user.realname }}</view></u-td>
+            <u-td style="word-break: break-all; white-space: nowrap;  overflow: hidden; text-overflow: ellipsis;"><view>{{ user.departName }}</view></u-td>
+          </u-tr>
+        </u-table>
+
+      </view>
+
+      <view style="display: flex; justify-content: space-between; margin-top: 20rpx">
+        <u-button type="primary" size="medium" @click="handleSelectRoleUserOk">确定</u-button>
+        <u-button size="medium" @click="roleSelectShow = false">取消</u-button>
+      </view>
+    </view>
+
+
+  </u-popup>
+</template>
+
+<script>
+import {cloneObj} from "../../utils/util";
+
+export default {
+  name: "userSelectByRole",
+  props: {
+
+  },
+  data() {
+    return {
+      roleSelectShow: false,
+      rolesList: [],
+      roleUserList: [],
+      currValue: [],
+      role: '',
+      multiple: false,
+      depId: '',
+      roleChecked: '',
+    }
+  },
+  computed: {
+    checkIds() {
+      return this.currValue.map(item => item.id)
+    },
+    isAllCheck() {
+      if (this.roleUserList.length === 0) return false
+      return this.roleUserList.every(item => item.checked)
+    },
+  },
+  methods: {
+    init(widget, value) {
+      this.roleSelectShow = true
+
+      if (widget.options.departRelation) {
+        const userInfo = uni.getStorageSync('userinfo')
+        console.log("userInfo: ", userInfo)
+        this.depId = userInfo.departId || userInfo.depart_id
+      }
+      this.role = widget.options.role
+      this.multiple = widget.options.multiple
+      this.currValue = value || []
+      this.$u.get('/sys/role/list', {
+        pageNo: 1,
+        pageSize: 100000,
+      }).then(res => {
+        this.rolesList = res.result.records.filter((item) => {
+          return this.role.includes(item.id);
+        });
+      })
+      this.currValue = cloneObj(value)
+    },
+    removeClick(val) {
+      this.currValue = this.currValue.filter(item => item.id !== val.id)
+      const len = this.roleUserList
+      this.roleUserList.checked =  this.roleUserList.filter((item, idx) => {
+        if (val.id === item.id) this.$set(item, 'checked', false )
+        return item.checked
+      }).length === len
+    },
+    handleCheck({value , name}) {
+      console.log(value, name)
+      if (!this.multiple) {
+        this.currValue = []
+        this.roleUserList = this.roleUserList.map((item, idx) => {
+          item.checked = false
+          return item
+        })
+      }
+      if (!value) {
+        this.currValue = this.currValue.filter(item => item.id != name)
+      }
+      const len = this.roleUserList
+      this.roleUserList.checked =  this.roleUserList.filter((item, idx) => {
+        if (item.id === name) {
+          if (value && !this.checkIds.includes(item.id)) {
+            this.currValue.push(item)
+          }
+          this.$set(item, 'checked', value)
+          return value
+        }
+        return item.checked
+      }).length === len
+      console.log(this.currValue)
+    },
+
+    handleSelectRoleUserOk() {
+      this.roleSelectShow = false
+      //   let checked  = this.roleUserList.filter(item => {
+      //     if (item.checked) return item
+      //   })
+      //
+      // let ids = []
+      // checked = checked.concat(this.currValue).filter(item => {
+      //   if (ids[item.id]) return false
+      //   ids[item.id] = true
+      //   return item
+      // })
+
+      this.$emit("ok", this.currValue)
+    },
+    roleCheckAll({value}) {
+      this.roleUserList.checked != this.roleUserList.checked
+      if (value) {
+        this.roleUserList.forEach(item => {
+          if (!this.checkIds.includes(item.id)) {
+            this.currValue.push(item)
+          }
+          this.$set(item, 'checked',  value)
+        })
+      }
+      if (!value) {
+        this.roleUserList.forEach(item => {
+          this.currValue = this.currValue.filter(curr => curr.id !== item.id)
+        })
+      }
+    },
+    roleChange(roleId) {
+      this.$u.get('/formApi/listFormUserByRole', {
+        pageNo: 1,
+        pageSize: 100000,
+        depId: this.depId,
+        roleId
+      }).then(res => {
+        this.roleUserList = res.result.records.filter(item => {
+          item.checked = this.checkIds.includes(item.id)
+          return item
+        })
+      })
+
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.78",
+	"version": "1.0.80",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",