提交

fhKeeper/formulahousekeeper/timesheet/src/components/selectPersonnel.vue

@@ -1,7 +1,7 @@
 <template>
   <el-select v-model="selectPersonnelValue" filterable @visible-change="toggleSelectPrefix" remote
     :remote-method="userListRemotemethod" :multiple="multiple" @focus="userFocus" :size="size" collapse-tags
-    @change="updateValue" clearable :ref="`select${timeRef}`" :style="`width: ${width}`" :class="`custom-select ${user.userNameNeedTranslate == 1 && selectPrefixFlg ? 'setUpInput' : ''}`">
+    @change="updateValue" clearable :ref="`select${timeRef}`" :style="`width: ${width}`" :class="`custom-select ${user.userNameNeedTranslate == 1 && selectPrefixFlg ? 'setUpInput' : ''}`" :disabled="disabled">
     <template #prefix>
       <div style="height: 100%;display: flex;align-items: center;">
         <!-- 单选 -->
@@ -74,6 +74,10 @@ export default {
     width: { // 宽度
       type: String,
       default: '200px'
+    },
+    disabled: {
+      type: Boolean,
+      default: () => false
     }
   },
   data() {

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -77,7 +77,8 @@
                                         <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
                                     </el-option>
                                 </el-select>
-                                <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :filterable="true" :subject="users" :subjectId="executorItem.executorId" :distinction="'1'" @selectCal="selectCal" :index="executorItem.indexList" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)"></selectCat>
+                                <!-- <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :filterable="true" :subject="users" :subjectId="executorItem.executorId" :distinction="'1'" @selectCal="selectCal" :index="executorItem.indexList" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)"></selectCat> -->
+                                <selectPersonnel v-if="user.userNameNeedTranslate == 1" v-model="executorItem.executorId" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)"  @change="$forceUpdate()" :key="executorItem.indexList" />
                             </div>
                             <!-- 项目服务 -->
                             <div v-if="user.companyId==3092">
@@ -637,6 +638,7 @@
 
 <script>
 import selectCat from "@/components/select.vue"
+import selectPersonnel from "@/components/selectPersonnel.vue"
 // 富文本样式
 import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
@@ -659,6 +661,7 @@ export default {
   components: {
     quillEditor, // 富文本
     selectCat,
+    selectPersonnel
   },
   data() {
     return {
@@ -882,6 +885,7 @@ export default {
         newList.forEach((item, index) => {
             item.indexList = index
         })
+        console.log(newList.slice(this.startNum, this.endNum), '<==== newList')
         return newList.slice(this.startNum, this.endNum)
     },
     containerHeight() {