Merge remote-tracking branch 'origin/master'

src/components/semri/deptUserComponent/SzDeptUserModal.vue

@@ -10,6 +10,7 @@
           mode="multiple"
           :maxTagCount="3"
           style="width: 100%"
+          @update:value="handleSelectRemove"
         />
       </a-col>
       <a-col class="right">
@@ -145,6 +146,13 @@ function clearTemp() {
   tempSelectedUsers.value = [];
 }
 
+function handleSelectRemove(names: string[]) {
+  innerSelectedUsers.value = innerSelectedUsers.value.filter((u) => names.includes(u.realname));
+  const keyValue = innerSelectedUsers.value.map((u) => u[props.valueKey]).join(',');
+  emit('update:value', keyValue);
+  emit('change', keyValue);
+}
+
 function handleOk() {
   innerSelectedUsers.value = [...tempSelectedUsers.value];
   const keyValue = innerSelectedUsers.value.map((u) => u[props.valueKey]).join(',');

src/design/theme.less

@@ -4,7 +4,7 @@
 
 ::-webkit-scrollbar {
   height: 14px;
-  width: 14px;
+  width: 7px;
 }
 
 html[data-theme='light'] {

src/views/dq/inspectTask/DqInspectTaskList.vue

@@ -13,11 +13,9 @@
           <a-col :lg="6">
             <a-form-item name="measureResLeader">
               <template #label><span title="措施责任领导">措施责任</span></template>
-              <j-select-user
-                placeholder="请选择措施责任领导"
+              <SzDeptUserModal
                 v-model:value="queryParam.measureResLeader"
-                @change="(value) => handleFormJoinChange('measureResLeader', value)"
-                allow-clear
+                placeholder="请选择措施责任领导"
               />
             </a-form-item>
           </a-col>
@@ -25,7 +23,7 @@
             <a-col :lg="6">
               <a-form-item name="measureResDept">
                 <template #label><span title="措施责任部门">措施责任</span></template>
-                <j-select-dept placeholder="请选择措施责任部门" v-model:value="queryParam.measureResDept" checkStrictly allow-clear />
+                <SzSelectDept v-model:value="queryParam.measureResDept" :multiple="true" checkStrictly allow-clear />
               </a-form-item>
             </a-col>
           </template>
@@ -100,8 +98,8 @@
   import { ledgerList, deleteOne, batchDelete, getImportUrl, getExportUrl, saveOrUpdate } from './DqInspectTask.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
-  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
+  import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
   import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
   import { startProcessSchedules } from '/@/api/common/api';
   import FlowScheduleStartModal from './components/DqInspectTaskFlowScheduleStartModal.vue';