Merge branch 'test-dev'

package.json

@@ -20,12 +20,14 @@
         "lint:fix": "eslint . --fix"
     },
     "dependencies": {
+        "@iconify-json/hugeicons": "^1.2.16",
+        "@iconify/iconify": "^3.1.1",
         "axios": "^1.7.7",
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.13",
         "echarts": "^5.5.1",
         "element-plus": "^2.8.7",
-        "hc-vue3-ui": "^4.9.3",
+        "hc-vue3-ui": "^4.9.9",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.7",
         "js-md5": "^0.8.3",

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20250927155558"
+  "value": "20251010171452"
 }

src/api/modules/data-fill/wbs.js

@@ -595,7 +595,7 @@ export default {
             data: form,
         })
     },
-        //搜索
+    //搜索
     async getQueryValueByType(form) {
         return HcApi({
             url: '/api/blade-manager/wbsTree/getQueryValueByType',

src/api/modules/tasks/flow.js

@@ -4,7 +4,7 @@ export default {
     //分页数据
     async getPageData(form) {
         return HcApi({
-            url: '/api/blade-business/fixedFlow/page',
+            url: '/api/blade-business/fixedFlow/getFixedFlowPage',
             method: 'get',
             params: form,
         })
@@ -28,7 +28,7 @@ export default {
     //详情
     async queryFixedFlowDetail(form) {
         return HcApi({
-            url: '/api/blade-business/fixedFlow/detail',
+            url: '/api/blade-business/fixedFlow/getFixedFlow',
             method: 'get',
             params: form,
         })
@@ -44,7 +44,7 @@ export default {
     //修改
     async updateFixedFlowData(form) {
         return HcApi({
-            url: '/api/blade-business/fixedFlow/update',
+            url: '/api/blade-business/fixedFlow/updateFixedFlow',
             method: 'post',
             data: form,
         })
@@ -52,7 +52,7 @@ export default {
     //删除
     async removeFixedFlowData(form) {
         return HcApi({
-            url: '/api/blade-business/fixedFlow/remove',
+            url: '/api/blade-business/fixedFlow/deleteFixedFlow',
             method: 'post',
             params: form,
         })
@@ -67,4 +67,20 @@ export default {
             },
         })
     },
+    //复制流程
+    async copyFixedFlowData(form) {
+        return HcApi({
+            url: '/api/blade-business/fixedFlow/copy',
+            method: 'post',
+            params: form,
+        })
+    },
+    //新增流程新的/blade-business/fixedFlow/saveFixedFlow
+    async saveFixedFlow(form) {
+        return HcApi({
+            url: '/api/blade-business/fixedFlow/saveFixedFlow',
+            method: 'post',
+            data: form,
+        })
+    },
 }

src/api/modules/tentative/detect/test.js

@@ -266,7 +266,7 @@ export default {
             data: form,
         })
     },
-        //试验自建列表排序    //保存表单
+    //试验自建列表排序    //保存表单
     async updateSort(form) {
         return HcApi({
             url: '/api/blade-business/detection/self/updateSort',

src/global/components/hc-sms-auth/index.vue

@@ -65,9 +65,11 @@ const emit = defineEmits(['cancel', 'confirm'])
 //变量
 const userStore = useAppStore()
 const userInfo = ref(userStore.getUserInfo)
+const projectId = ref(userStore.getProjectId)
+
 const phoneVal = ref(config.smsPhone + '' || userInfo.value.phone + '')
 const showModal = ref(props.show)
-const projectId = ref(userStore.getProjectId)
+
 
 //Ukey是否存在
 const isUKey = ref(userStore.getIsUKey)

src/global/components/hc-tasks-user/user-modal.vue

@@ -160,14 +160,14 @@ const signUserList = ref([])
 const getAllRoleList = async () => {
     signUserLoading.value = true
     const { contractId } = getObjValue(dataInfo.value)
-    const { data } = await mainApi.queryAllRoleList({ contractId })
+    const { data } = await mainApi.queryAllRoleList({ contractId, type:1 })
     signUserList.value = getArrValue(data)
     signUserLoading.value = false
 }
 
 //角色被点击
 const roleItem = ref({})
-const roleItemClick = async(item) => {
+const roleItemClick = async (item) => {
 
     
     //roleItem.value = item
@@ -207,7 +207,7 @@ const positionSearch = () => {
 
 //岗位被点击
 const positionItem = ref({})
-const positionItemClick = async(item) => {
+const positionItemClick = async (item) => {
 
     // positionItem.value = item
     // setSignPfxUser(item.signPfxFileList)

src/layout/index.vue

@@ -249,8 +249,7 @@ const cascaderSend = async ({ projectId, contractId }) => {
     socket = new HcSocket({ projectId, contractId, userId: userId.value }, (res) => {
         socketData(res?.data)
     })
-    console.log(socket, 'socket')
-
+ 
 }
 
 //长链接消息

src/styles/data-fill/wbs.scss

@@ -241,7 +241,7 @@
                 .hc-tree-box {
                     position: relative;
                     padding: 15px 20px;
-                    height: calc(100% - 220px);
+                    height: calc(100% - 200px);
               
                     .hc-tree-back-to {
                         font-size: 12px;

src/utils/btn-auth.js

@@ -11,7 +11,7 @@ const store = useAppStore(pinia)
 export const btnAuth = (key) => {
     try {
         const info = store.getButtonsVal(key)
-        console.log(info)
+       
         return !!getObjVal(info)
     } catch {
         return false

src/views/data-fill/collapse-form/index.vue

@@ -2206,7 +2206,8 @@ const uploadFileClickSave = ()=>{
               renewData()
         },
         error: (file, res) => {
-          const { msg, code } = res
+            // window.$message.error('文件上传失败')
+             const { msg, code } = res
            if (code === 400) {
              window.$message.error(msg)
            } else {

src/views/data-fill/collapse-form/test-file-cy.vue

@@ -78,6 +78,7 @@ const props = defineProps({
     tenantId: [String, Number],
     wbsType: [String, Number],
     treeId: [String, Number],
+    tableFileType: [String, Number], // 新增属性，用于传递附件类型
   
 })
 
@@ -88,6 +89,7 @@ const wbsTempId = ref(props.wbsId)
 const tenant_id = ref(props.tenantId)
 const wbs_type = ref(props.wbsType)
 const isPrimaryKeyId = ref(props.treeId)
+const tableFileType = ref(props.tableFileType)
 const treeProps = {
     label: 'name',
     children: 'children',
@@ -108,14 +110,16 @@ watch(() => [
     props.tenantId,
     props.wbsType,
     props.treeId,
+    props.tableFileType,
  
-], ([pid, cid, wbs_id, tid, type, treeId]) => {
+], ([pid, cid, wbs_id, tid, type, treeId, tftype]) => {
     projectId.value = pid
     contractId.value = cid
     wbsTempId.value = wbs_id
     tenant_id.value = tid
     wbs_type.value = type
     isPrimaryKeyId.value = treeId
+    tableFileType.value = tftype
    
 })
 
@@ -306,6 +310,7 @@ const savesubmitRelationFile = async (ids) => {
         nodeId: isPrimaryKeyId.value,
         type: fileModalradio.value === 'test' ? 11 : fileModalradio.value === 1 ? 12 : 13,
         ids,
+        tableFileType: tableFileType.value,
 
            
     })

src/views/data-fill/collapse-form/test-file.vue

@@ -111,6 +111,7 @@ const props = defineProps({
     tenantId: [String, Number],
     wbsType: [String, Number],
     treeId: [String, Number],
+    tableFileType: [String, Number], // 新增属性，用于传递附件类型
 })
 
 const projectId = ref(props.projectId)
@@ -120,6 +121,7 @@ const wbsTempId = ref(props.wbsId)
 const tenant_id = ref(props.tenantId)
 const wbs_type = ref(props.wbsType)
 const isPrimaryKeyId = ref(props.treeId)
+const tableFileType = ref(props.tableFileType)
 
 //监听
 watch(() => [
@@ -129,13 +131,15 @@ watch(() => [
     props.tenantId,
     props.wbsType,
     props.treeId,
-], ([pid, cid, wbs_id, tid, type, treeId]) => {
+    props.tableFileType,
+], ([pid, cid, wbs_id, tid, type, treeId, tftype]) => {
     projectId.value = pid
     contractId.value = cid
     wbsTempId.value = wbs_id
     tenant_id.value = tid
     wbs_type.value = type
     isPrimaryKeyId.value = treeId
+    tableFileType.value = tftype
 })
 
 const CTDTreeAutoExpandKeys = ref([])
@@ -366,6 +370,7 @@ const savesubmitRelationFile = async (ids) => {
         nodeId: isPrimaryKeyId.value,
         type: fileModalradio.value,
         ids,
+        tableFileType: tableFileType.value,
     })
     if (!error && code === 200) {
         window?.$message?.success('操作成功')

src/views/data-fill/components/JumpTreeDialog.vue

@@ -171,7 +171,8 @@ const moveModal = defineModel('modelValue', {
 watch(() => moveModal.value, (val) => {
     if (val && primaryKeyId.value) {
         getSameLevelsTreeData()
-         checkedCities.value = [primaryKeyId.value]
+        checkedCities.value = [primaryKeyId.value]
+        
     }
 })
 const closeModal = ()=>{

src/views/data-fill/components/divisionDialog.vue

@@ -93,6 +93,7 @@
                                 is-type
                                 :auto-expand-keys="treeAutoExpandKeys"
                                 default-expand-all
+                                @node-tap="wbsElTreeClick"
                             />
                         </hc-body>
                     </div>

src/views/data-fill/query.vue

@@ -112,8 +112,6 @@
                             </el-button>
                         </HcTooltip>
                         <el-button :disabled="tableCheckedKeys.length <= 0" :loading="signLoading" hc-btn type="primary" @click="resignClick">  <HcIcon name="repeat" />re-sign</el-button>
-                        
-                      
                         <HcTooltip keys="data-query-once-agin">
                             <el-button 
                                 v-if="userInfo.dept_id === '1536982621165592577'"
@@ -126,7 +124,6 @@
                                 一键重签
                             </el-button>
                         </HcTooltip>
-                    
                         <HcTooltip keys="save_agin">
                             <el-button
                                 :disabled="tableCheckedKeys.length <= 0" :loading="saveAginLoading" hc-btn
@@ -1218,7 +1215,7 @@ const changeRuleClick = async ()=>{
          
             wbsId:item.wbsId,
             projectId:projectId.value,
-             id:item.id,
+            id:item.id,
 
            
         }
@@ -1314,7 +1311,7 @@ const batchSetRule = async ()=>{
         arr.push({
             wbsId:item.wbsId,
             nameRule:item.rule.join('-'),
-            id:item.id,
+             id:item.id,
         })
    })
    let afterArr = await getRuleValue(arr)
@@ -1359,8 +1356,7 @@ const ruleChange = async (ele) => {
         wbsId: ele.wbsId,
         nameRule: str,
         projectId: projectId.value,
-        id: ele.id,
-
+        id:ele.id,
       
     }]
     
@@ -1430,8 +1426,7 @@ const resignClick1 = ()=>{
         window.$message?.warning('勾选错误！只能操作待审批和已审批数据')
         return
     }
- 
-    //获取任务id
+        //获取任务id
     const taskIds = arrToKey(rows, 'taskId')
     const idsArr = taskIds.split(',')
     let isCan = idsArr.some(ele=>!ele)
@@ -1440,6 +1435,7 @@ const resignClick1 = ()=>{
         window.$message?.warning('勾选错误！只能操作待审批和已审批数据')
         return
     }
+    
 
     resignModal1.value = true
 }
@@ -1456,6 +1452,7 @@ const signClick1 = async () => {
     //获取任务id
        const ids = arrToId(rows)
 
+
        if (resignModalRadio1.value === 1) {
             if (checkTaskUserIds.value.length === 0) { 
                 return window.$message?.warning('请选择用户')

src/views/ledger/components/table-form.vue

@@ -944,7 +944,7 @@ const uploadFileClick = () => {
                     tableFormData.value = res.data
                     const formIndex = formLogIndex.value
                     const formLog = formLogDataList.value
-                    const defaultData = setFormDefaultData(formLog[formIndex])
+                    const defaultData = setFormDefaultData()
                         formLogDataList.value[formIndex] = {
                             ...defaultData,
                             ...tableFormData.value,

src/views/other-file/image-data.vue

@@ -270,7 +270,6 @@ const getImageListData = async () => {
         imageListData.value = []
     }
 }
-
 const betweenTime = ref(null)
 
 //日期时间被选择

src/views/other/hide-data.vue

@@ -1,166 +1,198 @@
 <template>
     <div class="h-full">
-        <div v-if="wbsTypeTabKey === 'tree'" class="hc-layout-box" element-loading-text="批量保存数据中...">
-            <div
-                id="wbs-left-tree" :class="[isWbsTreeShow ? 'show' : '', isMouseTree ? 'on-transition' : '']"
-                :style="`width:${isWbsTreeShow ? leftWidth : 0}px; ${isWbsTreeShow ? '' : 'display: none'}`"
-                class="hc-layout-left-box bg-white"
-            >
-                <div class="hc-project-box">
-                    <div class="hc-project-icon-box">
-                        <HcIcon name="stack" />
-                    </div>
-                    <div class="project-name-box ml-2">
-                        <div class="project-alias">{{ projectInfo.projectName }}</div>
-                    </div>
-                </div>
-                <div class="hc-tree-box">
-                    <div class="hc-tree-back-to">
-                        <HcTooltip keys="hide-data-show">
-                            <el-button type="primary" hc-btn keys="hide-data-show" :loading="showTreeNodeLoad" @click="showTreeNode">显示</el-button>
-                        </HcTooltip>
+        <hc-page-split v-if="wbsTypeTabKey === 'tree'" ref="pageSplitRef">
+            <template #left>
+                <div class="left-box-container bg-white">
+                    <div class="hc-project-box">
+                        <div class="hc-project-icon-box">
+                            <HcIcon name="stack" />
+                        </div>
+                        <div class="project-name-box ml-2">
+                            <div class="project-alias">{{ projectInfo.projectName }}</div>
+                        </div>
                     </div>
-                    <div class="hc-search-tree-val">
-                        <el-input v-model="searchTreeVal" clearable block placeholder="请输入名称关键词检索" @keyup="searchTreeKeyUp">
-                            <template #suffix>
-                                <HcIcon name="search-2" ui="text-xl iscusor" @click="searchTreeClick" />
-                            </template>
-                        </el-input>
-                    </div>
-                    <div v-if="isShowLeft" id="hc-tree-scrollbar" v-loading="treeLoading" class="hc-tree-scrollbar" element-loading-text="获取数据中...">
-                        <el-scrollbar v-show="isSearchTree" class="scroll-bar-right-16">
-                            <HcDataTree
-
-                                :datas="searchTreeData"
-                                :is-mark="TreeMark"
-
-                                is-counts
-                                is-type
-                                :auto-expand-keys="TreeAutoExpandKeys"
-                                default-expand-all
-                                @node-tap="wbsElTreeClick"
+                    <div class="hc-tree-box hc-tree-box1" :style="{ height: 'calc(100% - 154px)' }">
+                        <div class="hc-search-tree-val">
+                            <el-input
+                                v-model="searchTreeVal"
+                                clearable
+                                block
+                                placeholder="请输入名称关键词检索"
+                                @keyup="searchTreeKeyUp"
                             >
-                                <template #default="{ node, data, level }">
-                                    <div class="data-custom-tree-node">
-                                        <!-- 树组件，节点名称 -->
-                                        <div :class="node.level === 1 ? 'level-name' : ''" class="label">
-                                            <span v-if="(data.type > 0 && data.majorDataType > 0) || (data.type > 0 && data.majorDataType <= 0)" class="hc-tree-node-type">
-                                                {{ getTreeNodeType(data.type, data.majorDataType) }}
-                                            </span>
-
-                                            <span :class="data.isBussShow === '2' ? 'text-red' : ''">
-                                                {{ node.label }}
-                                            </span>
-                                        </div>
-                                        <!-- 树组件，统计数量 -->
-                                        <div class="submit-counts text-blue">【{{ data.submitCounts ?? 0 }}】</div>
-
-
-                                        <!-- 树组件，操作菜单 END -->
-                                    </div>
+                                <template #suffix>
+                                    <HcIcon
+                                        name="search-2"
+                                        ui="text-xl iscusor"
+                                        @click="searchTreeClick"
+                                    />
                                 </template>
-                            </HcDataTree>
-                        </el-scrollbar>
-                        <el-scrollbar v-show="!isSearchTree" class="scroll-bar-right-16">
-                            <HcLazyTree
-                                ref="wbstree"
-                                :auto-expand-keys="TreeAutoExpandKeys"
-                                :is-mark="TreeMark"
-                                is-counts
-                                is-type
-                                show-checkbox
-                                check-strictly
-                                @load="treeLoadNode"
-
-                                @node-loading="ElTreeNodeLoading"
-                                @node-tap="wbsElTreeClick"
-                                @check="ElTreeNodeCheck"
+                            </el-input>
+                        </div>
+                        <div
+                            v-if="isShowLeft"
+                            id="hc-tree-scrollbar"
+                            v-loading="treeLoading"
+                            class="hc-tree-scrollbar"
+                            element-loading-text="获取数据中..."
+                        >
+                            <el-scrollbar
+                                v-show="isSearchTree"
+                                class="scroll-bar-right-16"
                             >
-                                <template #default="{ node, data, level }">
-                                    <div class="data-custom-tree-node">
-                                        <!-- 树组件，节点名称 -->
-                                        <div :class="node.level === 1 ? 'level-name' : ''" class="label">
-                                            <span v-if="(data.type > 0 && data.majorDataType > 0) || (data.type > 0 && data.majorDataType <= 0)" class="hc-tree-node-type">
-                                                {{ getTreeNodeType(data.type, data.majorDataType) }}
-                                            </span>
-
-                                            <span :class="data.isBussShow === '2' ? 'text-red' : ''">
-                                                {{ node.label }}
-                                            </span>
-                                        </div>
-                                        <!-- 树组件，统计数量 -->
-                                        <div class="submit-counts text-blue">【{{ data.submitCounts ?? 0 }}】</div>
-
-
+                                <HcDataTree
+                                 
+                                    :is-show-collect="true"
+                                    :is-show-eye="true"
+                                    :datas="searchTreeData"
+                                    :is-mark="TreeMark"
+                                    :menus="ElTreeMenu"
+                                   
+
+                                    is-type
+                                    :auto-expand-keys="TreeAutoExpandKeys"
+                                    
+                                    is-counts default-expand-all is-form-date 
+                                    :is-show-sync="userInfo?.role_id?.split(',').includes('1123598816738675201')"
+                                    @node-tap="wbsElTreeClick"
+                                    @menu-tap="ElTreeMenuClick"
+                                />
+                            </el-scrollbar>
+                            <el-scrollbar
+                                v-show="!isSearchTree"
+                                class="scroll-bar-right-16"
+                            >
+                                <HcLazyTree
+                                    ref="wbstree"
+                                 
+                                
+                                    :is-show-sync="userInfo?.role_id?.split(',').includes('1123598816738675201')"
+                                    is-form-date
+                               
+                                    :auto-expand-keys="TreeAutoExpandKeys"
+                                    :is-mark="TreeMark"
+                                    :menus="ElTreeMenu"
+                                    is-counts
+                                    is-type
+                                  
+                                    check-strictly
+                                    @load="treeLoadNode"
+                                    @menu-tap="ElTreeMenuClick"
+                                    @node-loading="ElTreeNodeLoading"
+                                    @node-tap="wbsElTreeClick"
+                                >
+                                    <template #default="{ node, data, level }">
+                                        <div 
+                                            class="data-custom-tree-node" 
+                                            @mouseenter="handleNodeEnter(node, data)"
+                                            @mouseleave="handleNodeLeave(node, data)"
+                                        >
+                                            <!-- 树组件，节点名称 -->
+                                            <div :class="node.level === 1 ? 'level-name' : ''" class="label">
+                                                <span v-if="(data.type > 0 && data.majorDataType > 0) || (data.type > 0 && data.majorDataType <= 0)" class="hc-tree-node-type">
+                                                    {{ getTreeNodeType(data.type, data.majorDataType) }}
+                                                </span>
+
+                                                <span :class="data.isBussShow === '2' ? 'text-red' : ''">
+                                                    {{ node.label }}
+                                                </span>
+                                            </div>
+                                       
+                                            <div v-if="node.level !== 1 && data.isBussShow === '2' && showIcons[data.id]" class="tree-node-icons">
+                                                <el-tooltip 
+                                                    class="box-item"
+                                                    effect="light"
+                                                    content="点击显示节点"
+                                                    placement="top"
+                                                >
+                                                    <HcIcon name="eye" ui="text-xl" @click.prevent.stop="handleEye(data)" />
+                                                </el-tooltip>
+                                            </div>
+                                            <div class="submit-counts text-blue">【{{ data.submitCounts ?? 0 }}】</div>
+
+                                           
                                         <!-- 树组件，操作菜单 END -->
-                                    </div>
-                                </template>
-                            </HcLazyTree>
-                        </el-scrollbar>
+                                        </div>
+                                    </template>
+                                </HcLazyTree>
+                            </el-scrollbar>
+                        </div>
+                    </div>
+                    <div class="hc-tree-foot-tip-box">
+                        <div class="dot-view red">已隐藏</div>
+                        <div class="dot-view black">未隐藏</div>
                     </div>
                 </div>
-                <div class="hc-tree-foot-tip-box">
-                    <div class="dot-view red">已隐藏</div>
-                    <div class="dot-view black">未隐藏</div>
-                </div>
-                <!-- 左右拖动 -->
-                <div class="horizontal-drag-line" @mousedown="onmousedown" />
-            </div>
-            <div id="wbs-content-box" v-loading="ListItemLoading" class="hc-layout-content-box">
-                <!---展开收缩树 -->
-                <div class="hc-expansion-contraction-tree" @click="setWbsTreeShow">
-                    <HcIcon v-show="isWbsTreeShow" name="arrow-left-s" />
-                    <HcIcon v-show="!isWbsTreeShow" name="arrow-right-s" />
-                </div>
-                <hc-tab-card :tabs="authBtnTabdata" :tab-key="authBtnTabKey" @change="authBtnTabClick">
-                    <el-scrollbar v-if="ListItemDatas.length > 0" ref="ListItemScrollRef">
-                        <CollapseForm
-                            ref="ListItemRef"
-                            :tree-auto-expand-keys="TreeAutoExpandKeys"
-                            :classify="authBtnTabKey"
-                            :contract-id="contractId"
-                            :datas="ListItemDatas"
-                            :draw-type="!isDrawType"
-                            :primary-key-id="primaryKeyId"
-                            :status="NodeStatus"
-                            :tenant-id="userInfo?.tenant_id"
-                            :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
-                            :wbs-type="2"
-                            :treenode-data-info="nodeDataInfo"
-                            :newlistdata="newlistdata"
-                            @offset-top="ListItemOffsetTop"
-                            @renew="getTableDataAll"
-                            @get-list="searchNodeAllTable1"
-                        />
-                    </el-scrollbar>
-                    <hc-empty v-else title="暂无表单" />
-                </hc-tab-card>
-            </div>
-        </div>
+            </template>
+   
+            <hc-tab-card
+                :tabs="authBtnTabdata"
+                :tab-key="authBtnTabKey"
+                @change="authBtnTabClick"
+            >
+                <el-scrollbar
+                    v-if="ListItemDatas.length > 0"
+                    ref="ListItemScrollRef"
+                >
+                    <CollapseForm
+                        ref="ListItemRef"
+                        :tree-auto-expand-keys="TreeAutoExpandKeys"
+                        :classify="authBtnTabKey"
+                        :contract-id="contractId"
+                        :datas="ListItemDatas"
+                        :draw-type="!isDrawType"
+                        :primary-key-id="primaryKeyId"
+                        :status="NodeStatus"
+                        :tenant-id="userInfo?.tenant_id"
+                        :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
+                        :wbs-type="2"
+                        :treenode-data-info="nodeDataInfo"
+                        :newlistdata="newlistdata"
+                        @offset-top="ListItemOffsetTop"
+                        @renew="getTableDataAll"
+                        @get-list="searchNodeAllTable1"
+                    />
+                </el-scrollbar>
+                <hc-empty v-else title="暂无表单" />
+            </hc-tab-card>
+        </hc-page-split>
     </div>
 </template>
 
 <script setup>
-import { nextTick, onActivated, onMounted, ref, watch } from 'vue'
+import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useAppStore } from '~src/store'
-import { HcIsButton } from '~src/plugins/IsButtons'
+
 import CollapseForm from './collapse-form/index.vue'
-import NodeTree from './components/nodeTree/index.vue'
 
-import { getTreeNodeType } from 'hc-vue3-ui'
+
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
+import { getTreeNodeType } from 'hc-vue3-ui'
+
 import {
     arrToKey,
+    deepClone,
+
     getArrValue,
+
     getObjValue,
     isNullES,
+
 } from 'js-fast-way'
-import { getDictionary } from '~api/other'
+import {
+ 
+    userConfigSave,
+} from '~api/other'
 import wbsApi from '~api/data-fill/wbs'
 import queryApi from '~api/data-fill/query'
+import nodeBaseApi from '~api/data-fill/nodebaseinfo'
+import { useClick } from 'hc-vue3-ui'
 
+import { HcDelMsg, NewDelMsg } from 'hc-vue3-ui'
 
+import { toPdfPage } from '~uti/btn-auth'
+import website from '~src/config'
 
 
 //初始变量
@@ -175,6 +207,9 @@ const projectInfo = ref(useAppState.projectInfo)
 const contractInfo = ref(useAppState.contractInfo)
 const isCollapse = ref(useAppState.getCollapse)
 const userInfo = ref(useAppState.getUserInfo)
+const isLayout = ref(useAppState.isLayout)
+const leftWidth = ref(440)
+
 //路由参数
 const routerQuery = useRoutes?.query
 // const typeName = routerQuery?.type || 'map'
@@ -183,72 +218,102 @@ const typeName = routerQuery?.type || 'tree'
 const isDrawType = ref(true)
 //自动展开缓存
 const TreeAutoExpandKeys = ref(getStoreValue('wbsTreeExpandKeys') || [])
+ const showIcons = ref({})
+ const treeNodeKey = ref('id')
+ // 鼠标移入节点时显示图标
+const handleNodeEnter = (node, data) => {
+  showIcons.value[data[treeNodeKey.value]] = true
+}
 
+// 鼠标移出节点时隐藏图标
+const handleNodeLeave = (node, data) => {
+  showIcons.value[data[treeNodeKey.value]] = false
+}
 //树搜索
 const isSearchTree = ref(false)
-
 const searchTreeHeight = ref()
-const getSearchTreeData = async () => {
+const getSearchTreeData = async (type) => {
     treeLoading.value = true
-    const { error, code, data } = await queryApi.getTreeNodeByQueryValueAndContractId({
-        contractId: contractId.value,
-        queryValue: searchTreeVal.value,
-        tableOwner:authBtnTabKey.value,
-        description: 1,
-    })
-    //判断状态
-    if (!error && code === 200) {
-        let treedata = getArrValue(data)
-        searchTreeData.value = treedata
-        treeLoading.value = false
-
-    } else {
-        treeLoading.value = false
-
-        searchTreeData.value = []
-    }
+        let response
+      
+            response = await queryApi.getTreeNodeByQueryValueAndContractId({
+                contractId: contractId.value,
+                tableOwner: authBtnTabKey.value,
+               queryValue: searchTreeVal.value,
+                 description: 1,
+            })
+        
+
+        const { error, code, data } = response
+             if (!error && code === 200) {
+                let treedata = getArrValue(data)
+                searchTreeData.value = treedata
+                treeLoading.value = false
+            } else {
+                treeLoading.value = false
+
+                searchTreeData.value = []
+            }
 }
 
 //监听
 const searchTreeVal = ref('')
-watch(() => [
-    useAppState.getCollapse, searchTreeVal.value,
-], ([Collapse, search]) => {
-    isCollapse.value = Collapse
-    if (search.length == 0) {
-        isSearchTree.value = false
-    }
-
-})
+watch(
+    () => [useAppState.getCollapse, searchTreeVal.value],
+    ([Collapse, search]) => {
+        isCollapse.value = Collapse
+        if (search.length == 0) {
+            isSearchTree.value = false
+        }
+    },
+)
 
 //加载树需要的classType
 const classType = ref('')
-watch(() => [
-    classType.value,
-], ([classify]) => {
- if (classify) {
-      //重新加载左边树
-      isShowLeft.value = false
-        setTimeout(()=>{
-            isShowLeft.value = true
-        }, 500)
- }
+watch(
+    () => [classType.value, useAppState.isLayout],
+    ([classify, isLay]) => {
+        isLayout.value = isLay || ''
+        if (classify) {
+            //重新加载左边树
+            isShowLeft.value = false
+            setTimeout(() => {
+                isShowLeft.value = true
+            }, 500)
+        }
+    },
+)
+const pageSplitRef = ref(null)
+
+watch(() => pageSplitRef.value?.leftPanelWidth, (newWidth) => {
 
+    
+    leftWidth.value = newWidth
+    setUserConfig(newWidth)
+   
 })
 //渲染完成
 onMounted(() => {
     console.log(projectInfo.value)
     treeLoading.value = typeName === 'tree'
+    const treeWidth = useAppState.getTreeWidth
+  
+    
+    leftWidth.value = isNullES(treeWidth) || treeWidth <= 0 ? 440 : treeWidth
     setContractType(contractInfo.value?.contractType)
-    getDictionaryApi()
-})
-onActivated(()=>{
-    //重新加载左边树
-    isShowLeft.value = false
-        setTimeout(()=>{
-            isShowLeft.value = true
-        }, 500)
+ 
+
+
+
+
+     
+      nextTick(() => {
+       pageSplitRef.value?.setLeftWidth(leftWidth.value)
+    })
+     
+    
 })
+
 //身份按钮切换数据
 const authBtnTabKey = ref('1')
 
@@ -256,13 +321,15 @@ const authBtnTabKey = ref('1')
 const wbstree = ref(null)
 const isShowLeft = ref(true)
 const authBtnTabClick = (val) => {
+      
     if (!primaryKeyId.value) {
         window?.$message?.warning('请先在左侧项目树选择一个节点')
     } else if (val['key'] !== authBtnTabKey.value) {
         authBtnTabKey.value = val['key']
+    
         //重新加载左边树
         isShowLeft.value = false
-        setTimeout(()=>{
+        setTimeout(() => {
             isShowLeft.value = true
         }, 500)
         getTableDataAll()
@@ -280,18 +347,13 @@ const setContractType = (contractType) => {
         authBtnTabKey.value = contractType + ''
         classType.value = contractType + ''
     }
-
+  
 }
 
 const getTableDataAll = async (key) => {
     await searchNodeAllTable()
     await queryNodeStatus()
-//     wbstree.value.resetNode().then((res)=>{
-//         if(res){
-//             searchNodeAllTable()
-//             queryNodeStatus()
-//         }
-//  })
+ 
     //保存后自动展开到当前表单
     if (!isNullES(key)) {
         console.log(key)
@@ -303,45 +365,18 @@ const getTableDataAll = async (key) => {
 
 //结构类型tab数据和相关处理
 const wbsTypeTabKey = ref(typeName)
-const wbsTypeTab = ref([
-    { key: 'map', name: '导图结构填报' },
-    { key: 'tree', name: '树形结构填报' },
-])
+
 const authBtnTabdata = ref([
     { key: '1', name: '施工质检' },
     { key: '2', name: '监理质检' },
 ])
-const wbsTypeTabChange = (item) => {
-    wbsTypeTabKey.value = item?.key
-    ListItemDatas.value = []
-    isDrawer.value = false
-    treeLoading.value = typeName === 'tree'
-    setStoreValue('classifyType', classType.value)
-    setStoreValue('tableOwner', authBtnTabKey.value)
-    //路由跳转
-    router.push({
-        path: useRoutes.path,
-        query: {
-            type: item?.key,
-            classifyType:classType.value,
-            tableOwner:authBtnTabKey.value,
-        },
-    })
-    getSearchTreeData()
-}
-
-
-
 
 
 
 
 
-
-const NodeTreeAccordion = ref(true)
-
 //设置树菜单数据
-
+const ElTreeMenu = ref([])
 const TreeMark = ref(false)
 
 
@@ -350,8 +385,6 @@ const primaryKeyId = ref('')
 const nodeItemInfo = ref({})
 const nodeDataInfo = ref({})
 
-
-
 const searchTreeData = ref([])
 
 //回车
@@ -361,15 +394,16 @@ const searchTreeKeyUp = (e) => {
     }
 }
 
-
 const treeLoading = ref(true)
 
 const searchTreeClick = async () => {
     if (searchTreeVal.value) {
-        searchTreeHeight.value = document.getElementById('hc-tree-scrollbar').offsetHeight
+        searchTreeHeight.value
+            = document.getElementById('hc-tree-scrollbar').offsetHeight
         isSearchTree.value = true
         //treeLoading.value = true
         getSearchTreeData()
+      
     } else {
         isSearchTree.value = false
     }
@@ -377,7 +411,9 @@ const searchTreeClick = async () => {
 
 //懒加载的数据
 const treeLoadNode = async ({ node, item, level }, resolve) => {
-    let contractIdRelation = '', parentId = '', primaryKeyId = ''
+    let contractIdRelation = '',
+        parentId = '',
+        primaryKeyId = ''
     if (level !== 0) {
         const nodeData = getObjValue(item)
         contractIdRelation = nodeData?.contractIdRelation || ''
@@ -390,10 +426,9 @@ const treeLoadNode = async ({ node, item, level }, resolve) => {
         contractIdRelation,
         primaryKeyId,
         parentId,
-        // classifyType: authBtnTabKey.value,
+          description: 1,
         classifyType: classType.value,
-        tableOwner:authBtnTabKey.value,
-        description: 1,
+        tableOwner: authBtnTabKey.value,
         dataTime:new Date(),
     })
     treeLoading.value = false
@@ -409,16 +444,17 @@ const wbsElTreeClick = ({ node, data, keys }) => {
     const { notExsitChild } = data
     const { hasChildren } = data
     if (notExsitChild || !hasChildren) {
-
+      
         getTableDataAll()
     } else {
-
+     
         ListItemDatas.value = []
         NodeStatus.value = '1'
     }
     setStoreValue('wbsTreeExpandKeys', keys)
     TreeAutoExpandKeys.value = keys || []
 
+  
     // getTableDataAll()
 }
 //树加载完成
@@ -427,54 +463,13 @@ const ElTreeNodeLoading = () => {
 }
 
 
-
-//导图结构数据
-const NodeTreeRef = ref(null)
-
-//鼠标左键单击事件
-const NodeTreeClick = ({ keys }) => {
-    setStoreValue('wbsTreeExpandKeys', keys)
-    TreeAutoExpandKeys.value = keys || []
-}
-
-//双击事件
-const isDrawer = ref(false)
-const NodeTreeDblClick = ({ node, data }) => {
+//树菜单被点击
+const ElTreeMenuClick = async ({ key, node, data, keys }) => {
     nodeItemInfo.value = node
     nodeDataInfo.value = data
-    primaryKeyId.value = data?.primaryKeyId || ''
-    isDrawer.value = true
-    getTableDataAll()
-}
-const drawerClose = () => {
-    isDrawer.value = false
-    ListItemDatas.value = []
-}
-
-
-
-
-
-
-
-
-
-//获取节点类型
-const nodeTypeData = ref([])
-const getDictionaryApi = async () => {
-    const { data } = await getDictionary({
-        code: 'wbs_node_type',
-    })
-    //处理数据
-    let newArr = []
-    const newData = getArrValue(data)
-    for (let i = 0; i < newData.length; i++) {
-        newArr.push({
-            label: newData[i]['dictValue'],
-            value: Number(newData[i]['dictKey']),
-        })
-    }
-    nodeTypeData.value = newArr
+    setStoreValue('wbsTreeExpandKeys', keys)
+    TreeAutoExpandKeys.value = keys || []
+    
 }
 
 
@@ -484,32 +479,6 @@ const getDictionaryApi = async () => {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //设置滚动条位置
 const ListItemScrollRef = ref(null)
 const ListItemOffsetTop = (offsetTop) => {
@@ -536,12 +505,15 @@ const searchNodeAllTable = async () => {
         type: authBtnTabKey.value,
     })
     ListItemDatas.value = getArrValue(data)
+ 
     ListItemLoading.value = false
 }
+//获取文件题名
+
 
 const newlistdata = ref([])
 const searchNodeAllTable1 = async () => {
-  console.log('重新获取表单列表')
+    console.log('重新获取表单列表')
     const info = nodeDataInfo.value
     const { data } = await wbsApi.searchNodeAllTable({
         projectId: projectId.value,
@@ -584,7 +556,6 @@ const queryNodeStatus = async () => {
 }
 
 
-
 //表单变量
 const ListItemRef = ref(null)
 const ListItemsRef = ref(null)
@@ -604,65 +575,34 @@ const ListItemsRef = ref(null)
 
 
 
-//划分变更
-const divisionClick = () => {
-    router.push({
-        path: '/data-fill/division',
-    })
-}
-
-//树展开和收起
-const isWbsTreeShow = ref(true)
-const setWbsTreeShow = () => {
-    isWbsTreeShow.value = !isWbsTreeShow.value
-}
 
 
+//更新配置
+watch(
+    () => leftWidth.value,
+    (diffVal) => {
+        setUserConfig(diffVal)
+    },
+)
+const setUserConfig = async (data) => {
 
-//左右拖动，改变树形结构宽度
-const leftWidth = ref(382)
-const isMouseTree = ref(false)
-const onmousedown = () => {
-    const leftNum = isCollapse.value ? 142 : 272
-    isMouseTree.value = true
-    document.onmousemove = (ve) => {
-        let diffVal = ve.clientX - leftNum
-        if (diffVal >= 310 && diffVal <= 900) {
-            leftWidth.value = diffVal
-        }
-    }
-    document.onmouseup = () => {
-        document.onmousemove = null
-        document.onmouseup = null
-        isMouseTree.value = false
+    if (data > 0) {
+         await useClick()
+        useAppState.setTreeWidth(data)
+        await userConfigSave({ treeWidth: data })
     }
-}
-
-
-
+   
 
-
-
-//树节点被选中
-const treeSelectNode = ref([])
-
-const treeSelectdata = ref([])
-const ElTreeNodeCheck = (_, { checkedKeys, checkedNodes }) => {
-    console.log(checkedNodes, 'checkedNodes')
-    treeSelectNode.value = getArrValue(checkedKeys)
-    treeSelectdata.value = getArrValue(checkedNodes)
 }
+//显示节点
+
 const showTreeNodeLoad = ref(false)
-const showTreeNode = async ()=>{
-    const keys = arrToKey(treeSelectdata.value, 'pKeyId', ',')
-    if (keys.length <= 0) {
-        window?.$message?.warning('请先在左侧项目树选择节点')
-        return
-    }
+const handleEye = async (data)=>{
+ 
     //发起请求
     showTreeNodeLoad.value = true
     const { error, code, msg } = await wbsApi.updateNodeStates({
-        ids: keys,
+        ids: data.primaryKeyId,
         status:1,
 
     }, false)
@@ -681,6 +621,42 @@ const showTreeNode = async ()=>{
 
 <style lang="scss" scoped>
 @import "../../styles/data-fill/wbs.scss";
+
+.back-button {
+  /* 确保按钮有足够的空间来展示放大效果 */
+  padding: 4px;
+  /* 过渡效果：所有属性变化在300ms内完成，使用ease-out缓动函数 */
+  transition: all 300ms ease-out;
+  /* 防止放大时内容溢出 */
+  overflow: hidden;
+}
+
+/* 缩放状态的样式 */
+.back-button.scaling {
+  /* 放大到1.2倍 */
+  transform: scale(1.2);
+}
+.hc-project-box{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    // font-size:20px;
+ 
+}
+.title-input{
+    height: 30px;
+    padding: 10px;
+    border: 1px solid #dcdfe6;
+    background-color: #dcdfe6;
+    line-height: 13px;
+    border-radius: 5px;
+    font-weight: 500;
+    margin-left: 4px;
+    max-width: 300px;
+    overflow-x: auto;
+    overflow-y: hidden;
+
+}
 .hc-add-node-modal-foot-box {
     position: relative;
     display: flex;
@@ -721,21 +697,32 @@ const showTreeNode = async ()=>{
     bottom: 77px;
     width: 100%;
 }
+.data-fill-wbs-hide-btn {
+    background: #fff;
+    color: #ffffff;
+}
+
+html.dark .data-fill-wbs-hide-btn {
+    background: #141414;
+    color: #141414;
+}
+
 html.theme-dark {
     .bg-svg-xml {
         background-color: initial;
         background-image: initial;
     }
-    .hc-layout-box .hc-layout-content-box .hc-card-max-h-box.node-tree .hc-tree-foot-tip-box {
+    .hc-layout-box
+        .hc-layout-content-box
+        .hc-card-max-h-box.node-tree
+        .hc-tree-foot-tip-box {
         border-top: 1px solid #303030;
-
     }
-
 }
 </style>
 
 <style lang="scss">
-.hc-tree-box .el-tree-node {
+.hc-tree-box1 .el-tree-node {
     .el-checkbox {
         margin-right: 0;
         .el-checkbox__inner {
@@ -825,7 +812,8 @@ html.theme-dark {
     background-color: #f1f5f8;
     display: inline;
     vertical-align: middle;
-    box-shadow: -2px 0 10px 0 rgba(32, 37, 50, 0.03), 0 10px 21px 20px rgba(32, 37, 50, 0.03);
+    box-shadow: -2px 0 10px 0 rgba(32, 37, 50, 0.03),
+        0 10px 21px 20px rgba(32, 37, 50, 0.03);
 }
 .copy-node-form-box {
     margin-top: 24px;
@@ -850,9 +838,172 @@ html.theme-dark {
             opacity: 1;
             transition: opacity 0.2s;
             &:hover {
-                opacity: .5;
+                opacity: 0.5;
             }
         }
     }
 }
 </style>
+
+<style lang="scss" scoped>
+.hc-tree-back-to{
+    display: flex;
+    justify-content: space-between;
+}
+/* 新增拖拽排序相关样式 */
+.sortable-ghost {
+  opacity: 0.5;
+  background: #f5f5f5;
+  justify-content: center;
+}
+
+.hc-attachment-item {
+  transition: all 0.3s;
+  cursor: move;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px;
+  margin-bottom: 8px;
+  background: #fff;
+  border-radius: 4px;
+  border: 1px solid #ebeef5;
+  
+  &:hover {
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  }
+}
+
+.hc-attachment-content {
+  min-height: 20px;
+}
+
+/* 原有样式保持不变 */
+.hc-attachment-card {
+  margin-bottom: 16px;
+  
+  .hc-attachment-header {
+    font-weight: bold;
+    margin-bottom: 8px;
+    padding-left: 8px;
+    border-left: 3px solid #409eff;
+
+  }
+  
+  .hc-attachment-file-name {
+    display: flex;
+    align-items: center;
+    
+    .name {
+      margin-left: 8px;
+    }
+  }
+  
+  .hc-attachment-btn-box {
+    display: flex;
+  }
+}
+</style>
+
+<style>
+.custom-tooltip-pro {
+  background-color: #7691E0 !important;
+  color: white !important;
+  border: none !important;
+  max-width: 300px !important; /* 最大宽度 */
+  padding: 10px !important;
+   font-size: 14px;
+
+
+
+
+}
+
+.tooltip-content {
+  width: 100%;
+}
+
+.new-folder {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 5px;
+  margin-bottom: 5px;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+  cursor: pointer;
+}
+
+.add-icon {
+  font-size: 18px;
+}
+
+.add-input-container {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 5px;
+  margin-bottom: 8px;
+  background: white;
+}
+
+.folder-input {
+  flex: 1;
+  background-color: rgba(255, 255, 255, 1);
+  border: none;
+  border-radius: 4px;
+ 
+}
+
+.input-buttons {
+  display: flex;
+  gap: 8px;
+}
+
+.confirm-icon {
+  color: #4CAF50;
+  font-size: 18px;
+}
+
+.cancel-icon {
+  color: #f44336;
+  font-size: 18px;
+}
+
+.folder-list-container {
+  max-height: 200px; /* 最大高度 */
+  overflow-y: auto; /* 超出滚动 */
+  overflow-x: hidden;
+}
+
+.folder-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 5px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.folder-name {
+  margin-right: 15px; /* 名称与删除图标间距 */
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.delete-icon {
+  font-size: 18px;
+  flex-shrink: 0; /* 防止图标被压缩 */
+}
+
+/* 滚动条样式优化 */
+.folder-list-container::-webkit-scrollbar {
+  width: 6px;
+}
+
+.folder-list-container::-webkit-scrollbar-thumb {
+  background-color: rgba(255, 255, 255, 0.3);
+  border-radius: 3px;
+}
+</style>

src/views/systemService/test.vue

@@ -200,6 +200,7 @@
                                     <el-option :value="1" label="检测中" />
                                     <el-option :value="2" label="检测无误" />
                                     <el-option :value="3" label="检测有误" />
+                                    <el-option :value="4" label="无效的PDF" />
                                 </el-select>
                             </div>
                             <div class="ml-2 w-64">

src/views/tasks/components/TableCard.vue

@@ -280,6 +280,8 @@ const getTableData = () => {
         searchForm.value.selectedType = 2
     } else if (key === 'key3') {
         searchForm.value.selectedType = 3
+    } else if (key === 'key4') {
+        searchForm.value.selectedType = 4
     }
     queryPage()
 }

src/views/tasks/components/hc-tasks-user/index.vue

@@ -0,0 +1,77 @@
+<template>
+    <div :class="ui" class="tasks-user-box">
+        <div class="tag-user-list" @click="userShowModal">
+            <template v-for="(item, index) in fixedData" :key="index">
+                <el-tag>{{ item.name }}</el-tag>
+                <hc-icon v-if="(fixedData.length - 1) > index" name="arrow-right" ui="arrow-icon-tag" />
+            </template>
+            <div v-if="fixedData.length <= 0" class="tasks-placeholder">点击这里选择任务</div>
+        </div>
+        <!-- 选择任务人 -->
+        <HcUserModal v-model="isUserModalShow" :data="fixedData" :datas="dataInfo" @finish="fixedUserFinish" />
+    </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+import { deepClone, getArrValue, getObjValue } from 'js-fast-way'
+import HcUserModal from './modules/user-modal.vue'
+
+//参数
+const props = defineProps({
+    ui: {
+        type: String,
+        default: '',
+    },
+    data: {
+        type: Array,
+        default: () => ([]),
+    },
+    datas: {
+        type: Object,
+        default: () => ({}),
+    },
+})
+
+//事件
+const emit = defineEmits(['change'])
+
+//监听基础数据
+const dataInfo = ref(props.datas)
+watch(() => props.datas, (data) => {
+    dataInfo.value = getObjValue(data)
+}, { deep: true, immediate: true })
+
+//监听用户数据
+const fixedData = ref(props.data)
+watch(() => props.data, (data) => {
+    fixedData.value = getArrValue(data)
+}, { deep: true, immediate: true })
+
+//展开弹窗
+const isUserModalShow = ref(false)
+const userShowModal = () => {
+    isUserModalShow.value = true
+}
+
+//选择完成
+const fixedUserFinish = (data) => {
+    isUserModalShow.value = false
+    const res = getArrValue(data)
+    fixedData.value = res
+    const arr = deepClone(res)
+    for (let i = 0; i < arr.length; i++) {
+        const { userList } = arr[i]
+        let newUserId = []
+        for (let j = 0; j < userList.length; j++) {
+            newUserId.push(userList[j].userId)
+        }
+        arr[i].userIds = newUserId.join(',')
+    }
+    emit('change', arr)
+}
+</script>
+
+<style lang="scss">
+@import './style.scss';
+</style>

src/views/tasks/components/hc-tasks-user/modules/process-modal.vue

@@ -0,0 +1,131 @@
+<template>
+    <hc-dialog v-model="isShow" ui="hc-tasks-user-process-modal" widths="800px" title="流程设置" @close="modalClose">
+        <hc-table
+            ref="tableRef" :column="tableColumn" :datas="tableData" ui="hc-tasks-process-drop-table"
+            is-row-drop quick-sort is-sort @row-drop="rowDropTap" @row-sort="rowSortTap"
+        >
+            <template #name="{ row }">
+                <hc-table-input v-model="row.name" size="small" />
+            </template>
+            <template #flowTaskType="{ row }">
+                <el-select v-model="row.flowTaskType" size="small" filterable block>
+                    <template v-if="flowTaskTypeData.length > 0">
+                        <el-option v-for="item in flowTaskTypeData" :key="item.value" :label="item.label" :value="item.value" />
+                    </template>
+                    <el-option v-else label="普通流程" :value="1" />
+                </el-select>
+            </template>
+            <template #type="{ row }">
+                <el-select v-model="row.type" size="small" filterable block>
+                    <el-option label="流程审批" :value="1" />
+                    <el-option label="平行审批" :value="2" />
+                </el-select>
+            </template>
+            <template #action="{ row, index }">
+                <el-link type="danger" @click="delRowClick(row, index)">删除</el-link>
+            </template>
+        </hc-table>
+        <template #footer>
+            <el-button @click="modalClose">取消</el-button>
+            <el-button type="primary" @click="confirmClick">确定</el-button>
+        </template>
+    </hc-dialog>
+</template>
+
+<script setup>
+import { nextTick, ref, watch } from 'vue'
+import { HcDelMsg } from 'hc-vue3-ui'
+import { deepClone, getArrValue } from 'js-fast-way'
+import { getDictionaryData } from '~uti/tools'
+
+const props = defineProps({
+    data: {
+        type: Array,
+        default: () => ([]),
+    },
+})
+
+const emit = defineEmits(['finish', 'close'])
+
+//双向绑定
+const isShow = defineModel('modelValue', {
+    default: false,
+})
+
+//监听数据
+const fixedData = ref([])
+watch(() => props.data, (data) => {
+    const res = getArrValue(data)
+    fixedData.value = deepClone(res)
+}, { deep: true, immediate: true })
+
+watch(isShow, (val) => {
+    if (val) setInitData()
+})
+
+//表格
+const tableRef = ref(null)
+const tableColumn = [
+    { key: 'name', name: '名称' },
+    { key: 'flowTaskType', name: '流程类型', width: 120 },
+    { key: 'type', name: '审批类型', width: 120 },
+    { key: 'action', name: '操作', width: 70, align: 'center' },
+]
+const tableData = ref([])
+
+//初始化
+const setInitData = async () => {
+    await nextTick()
+    tableData.value = getArrValue(fixedData.value)
+    getFlowTaskTypeData().then()
+}
+
+//获取流程类型
+const flowTaskTypeData = ref([])
+const getFlowTaskTypeData = async () => {
+    flowTaskTypeData.value = await getDictionaryData('flow_task_type', true)
+}
+
+//删除数据
+const delRowClick = (item, index) => {
+    HcDelMsg({
+        title: '确认删除任务流程？',
+        text: `确认是否需要删除【${item.name}】？`,
+    }, (resolve) => {
+        tableData.value?.splice(index, 1)
+        resolve()
+    })
+}
+
+// 行拖拽
+const rowDropTap = async (rows) => {
+    // 先清空，否则排序会异常
+    tableData.value = []
+    await nextTick()
+    tableRef.value?.setData(rows)
+        tableData.value = rows
+}
+
+// 点击排序
+const rowSortTap = async (rows) => {
+    // 先清空，否则排序会异常
+    tableData.value = []
+    await nextTick()
+    tableData.value = rows
+}
+
+//确定选择
+const confirmClick = async () => {
+    const list = deepClone(tableData.value)
+
+    
+    emit('finish', list)
+    modalClose()
+}
+
+//关闭窗口
+const modalClose = () => {
+    isShow.value = false
+    emit('close')
+}
+</script>

src/views/tasks/components/hc-tasks-user/modules/sort-modal.vue

@@ -0,0 +1,80 @@
+<template>
+    <hc-dialog v-model="isShow" ui="hc-tasks-user-sort-modal" widths="600px" title="调整任务人顺序" @close="modalClose">
+        <hc-table
+            ref="tableRef" :column="tableColumn" :datas="tableData" ui="hc-tasks-user-sort-drop-table"
+            is-row-drop quick-sort is-sort @row-drop="rowDropTap" @row-sort="rowSortTap"
+        />
+        <template #footer>
+            <el-button @click="modalClose">取消</el-button>
+            <el-button type="primary" @click="confirmClick">确定</el-button>
+        </template>
+    </hc-dialog>
+</template>
+
+<script setup>
+import { nextTick, ref, watch } from 'vue'
+import { deepClone, getArrValue } from 'js-fast-way'
+
+const props = defineProps({
+    data: {
+        type: Array,
+        default: () => ([]),
+    },
+})
+
+const emit = defineEmits(['finish', 'close'])
+
+//双向绑定
+const isShow = defineModel('modelValue', {
+    default: false,
+})
+
+//监听数据
+const userData = ref([])
+watch(() => props.data, (data) => {
+    const res = getArrValue(data)
+    userData.value = deepClone(res)
+}, { deep: true, immediate: true })
+
+watch(isShow, (val) => {
+    if (val) setInitData()
+})
+
+//表格
+const tableRef = ref(null)
+const tableColumn = [{ key: 'userName', name: '名称' }]
+const tableData = ref([])
+
+//初始化
+const setInitData = async () => {
+    await nextTick()
+    tableData.value = getArrValue(userData.value)
+}
+
+// 行拖拽
+const rowDropTap = async (rows) => {
+    tableData.value = []
+    await nextTick()
+    tableData.value = rows
+}
+
+// 点击排序
+const rowSortTap = async (rows) => {
+    tableData.value = []
+    await nextTick()
+    tableData.value = rows
+}
+
+//确定选择
+const confirmClick = async () => {
+    const list = deepClone(tableData.value)
+    emit('finish', list)
+    modalClose()
+}
+
+//关闭窗口
+const modalClose = () => {
+    isShow.value = false
+    emit('close')
+}
+</script>

src/views/tasks/components/hc-tasks-user/modules/user-modal.vue

@@ -0,0 +1,500 @@
+<template>
+    <hc-dialog v-model="isShow" ui="hc-tasks-user-modal" widths="1195px" title="选择任务人" @close="modalClose">
+        <div class="card-div-1 h-full w-235px">
+            <hc-body scrollbar padding="0">
+                <div class="hc-process-item">
+                    <div class="process setup" @click="processSetupClick">
+                        <div class="icon hc-flex-center">
+                            <i class="i-hugeicons-flowchart-01" />
+                        </div>
+                        <div class="name">流程设置</div>
+                    </div>
+                </div>
+                <template v-for="(item, index) in fixedData" :key="index">
+                    <div class="hc-process-item">
+                        <div
+                            class="process content"
+                            :class="fixedIndex === index ? 's-orange' : item.isDataAdd ? 's-gray' : item.isDataSave ? 's-blue' : 's-gray'"
+                            @click.capture="fixedItemClick(item, index)"
+                        >
+                            <div class="icon hc-flex-center" @click="fixedTypeClick(item)">
+                                <i :class="getProcessIcon(item)" />
+                            </div>
+                            <div class="input-box">
+                                <div class="width-name">{{ item.name }}</div>
+                                <input v-model="item.name" class="input">
+                            </div>
+                            <div class="del-icon hc-flex-center" @click="fixedDelClick(item, index)">
+                                <i class="i-ri-delete-bin-2-line" />
+                            </div>
+                        </div>
+                    </div>
+                </template>
+                <div class="hc-process-item">
+                    <div class="process add" @click="fixedAddClick">
+                        <div class="icon hc-flex-center">
+                            <i class="i-iconoir-plus" />
+                        </div>
+                    </div>
+                </div>
+            </hc-body>
+        </div>
+        <div v-if="fixedIndex === -1" class="card-div-no h-full flex-1">
+            <hc-empty :src="HcLoadSvg" title="请选择流程后，设置流程人员" />
+        </div>
+        <template v-else>
+            <div class="cards-wrapper">
+                <div class="card-div-2 h-full w-235px">
+                    <hc-card scrollbar title="角色类型" :loading="signUserLoading">
+                        <template v-for="item in signUserList" :key="item.roleId">
+                            <div class="hc-tasks-user-role-item" :class="{ cur: roleItem.roleId === item.roleId }" @click="roleItemClick(item)">
+                                {{ item.roleName }}
+                            </div>
+                        </template>
+                    </hc-card>
+                </div>
+                <div v-if="roleItem.roleId" class="card-div-3 h-full w-265px">
+                    <hc-card v-if="positionList.length > 0" scrollbar>
+                        <template #header>
+                            <hc-search-input v-model="positionKey" placeholder="岗位搜索" icon="" @search="positionSearch" />
+                        </template>
+                        <template v-for="item in positionList" :key="item.roleId">
+                            <div class="hc-tasks-user-role-item" :class="{ cur: positionItem.roleId === item.roleId }" @click="positionItemClick(item)">
+                                <i class="i-ph-user-list-light mr-5px" />
+                                <span>{{ item.roleName }}</span>
+                            </div>
+                        </template>
+                    </hc-card>
+                    <div v-else class="card-empty-no">
+                        <hc-empty :src="HcLoadSvg" title="请先选择角色" />
+                    </div>
+                </div>
+                <div class="card-div-4 h-full w-235px">
+                    <hc-card v-if="signPfxFileList.length > 0">
+                        <template #header>
+                            <hc-search-input v-model="signUserKey" placeholder="人员搜索" icon="" @search="signUserSearch" />
+                        </template>
+                        <div class="hc-tasks-user-sign-pfx-box">
+                            <el-scrollbar ref="scrollRef">
+                                <template v-for="item in signPfxFileList" :key="item.name">
+                                    <div v-if="item.data.length > 0" :id="`hc-sign-pfx-file-item-${item.name}`" class="hc-sign-pfx-file-item">
+                                        <div class="hc-tasks-user-letter">{{ item.name }}</div>
+                                        <template v-for="(items, index) in item.data" :key="index">
+                                            <div class="hc-tasks-user-item" @click="signUserItemClick(items)">
+                                                <i class="i-iconoir-user mr-5px" />
+                                                <span>{{ items.certificateUserName }}</span>
+                                            </div>
+                                        </template>
+                                    </div>
+                                </template>
+                            </el-scrollbar>
+                        </div>
+                        <div class="hc-tasks-user-letter-index">
+                            <div v-for="item in alphabet" :key="item" class="item" @click="alphabetClick(item)">{{ item }}</div>
+                        </div>
+                    </hc-card>
+                    <div v-else class="card-empty-no">
+                        <hc-empty :src="HcLoadSvg" title="请先选择岗位" />
+                    </div>
+                </div>
+                <div class="card-div-5 h-full w-205px">
+                    <hc-card v-if="fixedItem?.userList?.length > 0" scrollbar>
+                        <template #header>
+                            <span>已选择{{ fixedItem?.userList?.length || 0 }}人</span>
+                        </template>
+                        <template #extra>
+                            <el-button type="warning" size="small" @click="fixedUserSortClick">调整排序</el-button>
+                        </template>
+                        <div class="hc-tasks-user-cur-box" :class="`type-${fixedItem.type}`">
+                            <template v-for="(item, index) in fixedItem?.userList" :key="index">
+                                <div class="hc-tasks-user-item">
+                                    <el-tag closable @close="fixedItemUserListDel(index)">
+                                        <i class="i-ri-user-3-fill mr-5px" />
+                                        <span>{{ item.userName }}</span>
+                                    </el-tag>
+                                </div>
+                            </template>
+                        </div>
+                        <template #action>
+                            <el-button block size="default" type="success" @click="singleSaveClick">保存</el-button>
+                        </template>
+                    </hc-card>
+                    <div v-else class="card-empty-no">
+                        <hc-empty :src="HcLoadSvg" title="请先选择人员" />
+                    </div>
+                </div>
+            </div>
+        </template>
+        <template #footer>
+            <el-button @click="modalClose">取消</el-button>
+            <el-button type="primary" :loading="confirmLoading" @click="confirmClick">确定</el-button>
+        </template>
+    </hc-dialog>
+    <!-- 流程设置 -->
+    <HcProcessModal v-model="isProcessSetup" :data="fixedData" @finish="processSetupFinish" />
+    <!-- 任务人排序 -->
+    <HcSortModal v-model="isUserSort" :data="userSortData" @finish="userSortFinish" />
+</template>
+
+<script setup>
+import { nextTick, ref, watch } from 'vue'
+import { HcDelMsg } from 'hc-vue3-ui'
+import { pinyin } from 'pinyin-pro'
+import { deepClone, getArrValue, getObjValue, isNullES } from 'js-fast-way'
+import HcLoadSvg from '~src/assets/view/load.svg'
+import HcProcessModal from './process-modal.vue'
+import HcSortModal from './sort-modal.vue'
+import mainApi from '~api/tasks/flow'
+
+const props = defineProps({
+    data: {
+        type: Array,
+        default: () => ([]),
+    },
+    datas: {
+        type: Object,
+        default: () => ({}),
+    },
+})
+
+const emit = defineEmits(['finish', 'close'])
+
+//双向绑定
+const isShow = defineModel('modelValue', {
+    default: false,
+})
+
+//监听参数
+const dataInfo = ref(props.datas)
+watch(() => props.datas, (data) => {
+    dataInfo.value = getObjValue(data)
+}, { deep: true, immediate: true })
+
+//监听数据
+const fixedData = ref([])
+watch(() => props.data, (data) => {
+    const res = getArrValue(data)
+    fixedData.value = deepClone(res)
+}, { deep: true, immediate: true })
+
+watch(isShow, (val) => {
+    if (val) setInitData()
+})
+
+//初始化
+const setInitData = async () => {
+    await nextTick()
+    fixedData.value.forEach(item => {
+        item.isDataSave = true
+        item.flowTaskType = isNullES(item.flowTaskType) ? 1 : item.flowTaskType
+    })
+}
+
+//流程被点击
+const fixedIndex = ref(-1)
+const fixedItem = ref({})
+const fixedItemClick = (item, index) => {
+    item.isDataAdd = false
+    fixedIndex.value = index
+    fixedItem.value = item
+    getAllRoleList()
+    getsignPfxFileList()
+}
+
+const signPfxFileListLoading = ref(false)
+const getsignPfxFileList = async () => {
+    signPfxFileListLoading.value = true
+    const { contractId } = getObjValue(dataInfo.value)
+    const { data } = await mainApi.findAllUserAndRoleList({ contractId, roleId:roleItem.value?.roleId || '' })
+
+    let arr = getObjValue(data)
+    setSignPfxUser(arr['userList'])
+    signPfxFileListLoading.value = false
+
+}
+//获取流程图标
+const getProcessIcon = (item) => {
+    return item.type === 1 ? 'i-hugeicons-workflow-square-03' : 'i-hugeicons-workflow-square-06'
+}
+
+//流程类型切换
+const fixedTypeClick = (item) => {
+    item.type = item.type === 1 ? 2 : 1
+}
+
+//新增流程
+const fixedAddClick = () => {
+    fixedData.value.push({
+        type: 1,
+        flowTaskType: 1,
+        name: '流程审批名称',
+        isDataAdd: true,
+        isDataSave: false,
+        userList: [],
+    })
+}
+
+//删除流程
+const fixedDelClick = (item, index) => {
+    HcDelMsg({
+        title: '确认删除任务流程？',
+        text: `确认是否需要删除【${item.name}】？`,
+    }, (resolve) => {
+        fixedData.value?.splice(index, 1)
+        if (fixedIndex.value === index) {
+            fixedIndex.value = -1
+        }
+        resolve()
+    })
+}
+
+//角色列表
+const signUserLoading = ref(false)
+const signUserList = ref([])
+const getAllRoleList = async () => {
+    signUserLoading.value = true
+    const { contractId } = getObjValue(dataInfo.value)
+    const { data } = await mainApi.queryAllRoleList({ contractId, type:1 })
+    signUserList.value = getArrValue(data)
+    signUserLoading.value = false
+}
+
+//角色被点击
+const roleItem = ref({})
+const roleItemClick = async (item) => {
+    
+    
+    if (roleItem.value.roleId === item.roleId) {
+        // 如果点击的是已选中的角色，则清空选择
+        roleItem.value = {}
+        positionList.value = []
+        positionItem.value = {}
+        roleItem.value = {}
+        await getsignPfxFileList()
+        return
+    }
+    roleItem.value = item
+    const arr = getArrValue(item.childRoleList)
+    positionList.value = deepClone(arr)
+    setSignPfxUser(item.signPfxFileList)
+}
+
+//岗位搜索
+const positionKey = ref('')
+const positionList = ref([])
+const positionSearch = () => {
+    const key = positionKey.value
+    const list = getArrValue(roleItem.value?.childRoleList)
+    const arr = deepClone(list)
+    if (isNullES(key)) {
+        positionList.value = arr
+        return
+    }
+    positionList.value = arr.filter(({ roleName }) => roleName.toLowerCase().includes(key.toLowerCase()))
+}
+
+//岗位被点击
+const positionItem = ref({})
+const positionItemClick = async (item) => {
+    if (positionItem.value.roleId === item.roleId) {
+        // 如果点击的是已选中的岗位，则清空选择
+        positionItem.value = {}
+        await getsignPfxFileList()
+        return
+    }
+    positionItem.value = item
+    setSignPfxUser(item.signPfxFileList)
+}
+
+//设置任务人数据
+const alphabet = Array.from({ length: 26 }, (_, i) => String.fromCharCode(65 + i))
+const setSignPfxUser = (data) => {
+    const list = deepClone(data)
+    const arr = getArrValue(list)
+    arr.forEach(item => {
+        item.letter = getFirstLetter(item.certificateUserName)
+    })
+    signPfxFileData.value = deepClone(arr)
+    signPfxFileList.value = alphabet.map(letter => ({
+        name: letter,
+        data: arr.filter(item => item.letter === letter),
+    }))
+}
+
+//中文转姓氏拼音
+const getFirstLetter = (name) => {
+    return pinyin(name.charAt(0), { pattern: 'first', toneType: 'none', surname: 'head' }).charAt(0).toUpperCase()
+}
+
+//搜索任务人
+const signPfxFileData = ref([])
+const signUserKey = ref('')
+const signPfxFileList = ref([])
+const signUserSearch = () => {
+    const key = signUserKey.value
+    const arr = deepClone(signPfxFileData.value)
+    if (isNullES(key)) {
+        setSignPfxUser(arr)
+        return
+    }
+    // 判断是否为全英文
+    const isAllEnglish = /^[A-Za-z]+$/.test(key)
+    const letterName = getFirstLetter(key)
+    //搜索筛选
+    const filteredData = arr.filter(({ certificateUserName, letter }) => {
+        if (isAllEnglish) {
+            // 如果是英文，判断首字母是否一致
+            return letter.toLowerCase().includes(letterName.toLowerCase())
+        } else {
+            // 如果是中文或其他字符，进行精准搜索
+            return certificateUserName.toLowerCase().includes(key.toLowerCase())
+        }
+    })
+    signPfxFileList.value = alphabet.map(letter => ({
+        name: letter,
+        data: filteredData.filter(item => item.letter === letter),
+    }))
+}
+
+//滚动到相关位置
+const scrollRef = ref(null)
+const alphabetClick = (key) => {
+    const ids = `hc-sign-pfx-file-item-${key}`
+    const dom = document.getElementById(ids)
+    if (isNullES(dom)) return
+    scrollRef.value?.setScrollTop(dom.offsetTop - 20)
+}
+
+//任务人被点击
+const signUserItemClick = ({ certificateUserId, certificateUserName }) => {
+    const arr = fixedData.value, index = fixedIndex.value
+    const list = getArrValue(arr[index]?.userList)
+    list.push({ userId: certificateUserId, userName: certificateUserName })
+    fixedData.value[index].userList = list
+    fixedItem.value = fixedData.value[index]
+}
+
+//删除选择的任务人
+const fixedItemUserListDel = (index) => {
+    const arr = fixedData.value, i = fixedIndex.value
+    const list = getArrValue(arr[i]?.userList)
+    list.splice(index, 1)
+    fixedData.value[i].userList = list
+    fixedItem.value = fixedData.value[i]
+}
+
+//单个流程保存
+const singleSaveClick = () => {
+    const arr = getArrValue(fixedItem.value?.userList)
+    if (arr.length <= 0) {
+        window.$message.warning('请选择对应的任务人员')
+        return
+    }
+    window.$message.success('保存成功，全部完成后，请点击确定')
+    const index = fixedIndex.value
+    fixedData.value[index].isDataSave = true
+    fixedData.value[index].isDataAdd = false
+}
+
+//流程设置
+const isProcessSetup = ref(false)
+const processSetupClick = () => {
+    const arr = getArrValue(fixedData.value)
+    if (arr.length <= 0) {
+        window.$message.warning('请先创建任务流程')
+        return
+    }
+    isProcessSetup.value = true
+}
+
+//流程设置完成
+const processSetupFinish = (data) => {
+    isProcessSetup.value = false
+    fixedData.value = getArrValue(data)
+    fixedIndex.value = -1
+    fixedItem.value = {}
+}
+
+//任务人排序
+const isUserSort = ref(false)
+const userSortData = ref([])
+const fixedUserSortClick = () => {
+    const arr = fixedData.value, index = fixedIndex.value
+    const list = getArrValue(arr[index]?.userList)
+    if (list.length <= 0) {
+        window.$message.warning('请先添加任务人')
+        return
+    }
+    userSortData.value = list
+    isUserSort.value = true
+}
+
+//任务人排序完成
+const userSortFinish = (data) => {
+    const index = fixedIndex.value
+    fixedData.value[index].userList = getArrValue(data)
+}
+
+//确定选择
+const confirmLoading = ref(false)
+const confirmClick = async () => {
+    const list = deepClone(fixedData.value)
+    if (list.length <= 0) {
+        window.$message.warning('请先创建人物流程和选择任务人')
+        return
+    }
+    //验证数组
+    let isRes = true
+    for (let i = 0; i < list.length; i++) {
+        delete list[i].isDataAdd
+        delete list[i].isDataSave
+        const { name, userList } = list[i]
+        if (userList.length <= 0) {
+            isRes = false
+            window.$message.warning(name + '，中没有选择任务人')
+            break
+        }
+    }
+    if (!isRes) return
+    emit('finish', list)
+    modalClose()
+}
+
+//关闭窗口
+const modalClose = () => {
+    isShow.value = false
+    emit('close')
+}
+</script>
+
+<style scoped>
+.cards-wrapper {
+    display: flex;
+    gap: 12px;
+    width: 100%;
+    height: 100%;
+}
+
+.card-div-2,
+.card-div-3,
+.card-div-4,
+.card-div-5 {
+    height: 100%;
+}
+
+.card-div-2 {
+    width: 235px;
+    flex-shrink: 0;
+}
+
+.card-div-3 {
+    width: 265px;
+    flex-shrink: 0;
+}
+
+.card-div-4,
+.card-div-5 {
+    flex: 1;
+    min-width: 205px;
+}
+</style>

src/views/tasks/components/hc-tasks-user/style.scss

@@ -0,0 +1,379 @@
+.tasks-user-box {
+    position: relative;
+    padding: 0 12px;
+    cursor: pointer;
+    min-height: 40px;
+    border: 1px solid #e0e0e6;
+    border-radius: 4px;
+    .tag-user-list {
+        position: relative;
+        display: flex;
+        align-items: center;
+        flex-flow: row wrap;
+        min-height: inherit;
+        .tasks-placeholder {
+            color: #a9abb2;
+            font-size: 14px;
+        }
+        .arrow-icon-tag {
+            position: relative;
+            color: #a9abb2;
+            font-size: 18px;
+            margin: 0 8px;
+        }
+    }
+}
+
+//选择任务人弹窗
+.el-overlay-dialog .el-dialog.hc-tasks-user-modal {
+    height: 650px;
+    .el-dialog__body .hc-new-main-body_content {
+        padding: 0;
+        height: 100%;
+        display: flex;
+    }
+    .card-div-1 {
+        position: relative;
+        border-left: 1px solid;
+        border-color: #EEEEEE;
+        .hc-process-item {
+            position: relative;
+            margin-top: 24px;
+            .process {
+                position: relative;
+                cursor: pointer;
+                height: 34px;
+                display: inline-flex;
+                align-items: center;
+                border: 1px solid;
+                border-radius: 0 50px 50px 0;
+                transition: all .2s;
+                .icon {
+                    position: relative;
+                    height: 34px;
+                    width: 34px;
+                    transition: all .2s;
+                    i {
+                        display: inline-flex;
+                        font-size: 18px;
+                    }
+                }
+                .name {
+                    padding: 10px 24px 10px 10px;
+                }
+                .del-icon {
+                    position: relative;
+                    height: 34px;
+                    width: 0;
+                    color: white;
+                    background: #ff5151;
+                    border-radius: 0 50px 50px 0;
+                    transition: all .3s;
+                    i {
+                        display: inline-flex;
+                        font-size: 18px;
+                    }
+                }
+                &.setup {
+                    color: white;
+                    background: #2550A2;
+                    border-color: #2550A2;
+                    &:hover {
+                        background: #0058ff;
+                        border-color: #0058ff;
+                    }
+                    .name {
+                        padding-left: 0;
+                        padding-right: 16px;
+                    }
+                }
+                &.content {
+                    color: #FF7D43;
+                    background: #FFE3D7;
+                    border-color: #FF7D43;
+                    .icon {
+                        color: white;
+                        background: #FF7D43;
+                        &:hover {
+                            opacity: .6;
+                        }
+                    }
+                    .input-box {
+                        position: relative;
+                        height: 100%;
+                        .width-name {
+                            position: relative;
+                            padding-right: 26px;
+                            visibility: hidden;
+                        }
+                        .input {
+                            position: absolute;
+                            left: 0;
+                            top: 0;
+                            height: 100%;
+                            border: none;
+                            padding: 0 0 0 10px;
+                            width: calc(100% - 10px);
+                            background: transparent;
+                            &:focus {
+                                border: none;
+                                outline: none;
+                            }
+                        }
+                    }
+                    &.s-gray {
+                        color: #101010;
+                        background: white;
+                        border-color: #BBBBBB;
+                        .icon {
+                            color: #101010;
+                            background: #BBBBBB;
+                        }
+                        .input-box .input {
+                            color: #101010;
+                        }
+                        &:hover {
+                            background: #efefef;
+                        }
+                    }
+                    &.s-orange {
+                        color: #FF7D43;
+                        background: #FFE3D7;
+                        border-color: #FF7D43;
+                        .icon {
+                            color: white;
+                            background: #FF7D43;
+                        }
+                        .input-box .input {
+                            color: #FF7D43;
+                        }
+                    }
+                    &.s-blue {
+                        color: #3A85E9;
+                        background: #D7E6FB;
+                        border-color: #3A85E9;
+                        .icon {
+                            color: white;
+                            background: #3A85E9;
+                        }
+                        .input-box .input {
+                            color: #3A85E9;
+                        }
+                        &:hover {
+                            background: #c5d9f6;
+                        }
+                    }
+                    &:hover {
+                        .del-icon {
+                            width: 34px;
+                        }
+                    }
+                }
+                &.add {
+                    color: white;
+                    background: #3984EF;
+                    border-color: #3984EF;
+                    padding-right: 4px;
+                    &:hover {
+                        background: #2550A2;
+                        border-color: #2550A2;
+                    }
+                    .icon i {
+                        font-size: 24px;
+                    }
+                }
+            }
+        }
+        .hc-process-item + .hc-process-item {
+            &::before{
+                content: "";
+                position: absolute;
+                background: #BBBBBB;
+                top: -24px;
+                height: 24px;
+                width: 1.5px;
+                left: 17px;
+            }
+        }
+        .hc-process-item:first-child {
+            margin-top: 14px;
+        }
+    }
+    .card-div-no, .card-empty-no {
+        position: relative;
+        border-left: 1px solid;
+        border-color: #EEEEEE;
+        background: #e8e8e8;
+    }
+    .card-div-no .hc-empty-box .hc-empty-body .hc-empty-title,
+    .card-empty-no .hc-empty-box .hc-empty-body .hc-empty-title {
+        color: #777777;
+    }
+    .card-empty-no {
+        height: 100%;
+        border-left: 0;
+    }
+    .card-empty-no .hc-empty-box .hc-empty-body .hc-empty-assets {
+        display: none;
+    }
+    .card-div-2 {
+        position: relative;
+        border-left: 1px solid;
+        border-color: #EEEEEE;
+    }
+    .card-div-3 {
+        position: relative;
+        border-left: 1px solid;
+        border-color: #EEEEEE;
+    }
+    .card-div-4 {
+        position: relative;
+        border-left: 1px solid;
+        border-color: #EEEEEE;
+    }
+    .card-div-5 {
+        position: relative;
+        border-left: 1px solid;
+        border-right: 1px solid;
+        border-color: #EEEEEE;
+    }
+    //卡片
+    .el-card.hc-card-box.hc-new-card-box {
+        box-shadow: none;
+        --el-card-border-radius: 0;
+        --el-card-bg-color: transparent;
+        .el-scrollbar__bar.is-vertical {
+            right: -8px;
+        }
+    }
+    //角色类型
+    .hc-tasks-user-role-item {
+        position: relative;
+        color: #1F222A;
+        background: white;
+        cursor: pointer;
+        padding: 6px 10px;
+        border-radius: 3px;
+        transition: all .2s;
+        display: flex;
+        align-items: center;
+        i {
+            font-size: 18px;
+            display: inline-block;
+        }
+        &:hover {
+            color: #3A85E9;
+            background: #f2f3f5;
+        }
+        &.cur {
+            color: #3A85E9;
+            background: #EDF3FF;
+        }
+    }
+    //人员列表
+    .hc-tasks-user-sign-pfx-box {
+        position: relative;
+        padding-right: 8px;
+        height: 100%;
+        .el-scrollbar__bar.is-vertical {
+            right: 2px;
+        }
+    }
+    .hc-sign-pfx-file-item {
+        position: relative;
+        background: #f7f7f7;
+        .hc-tasks-user-letter {
+            position: relative;
+            font-weight: bold;
+            padding: 6px 6px;
+            border-bottom: 1px solid #eee;
+        }
+        .hc-tasks-user-item {
+            position: relative;
+            color: #1F222A;
+            background: white;
+            cursor: pointer;
+            padding: 6px 6px;
+            border-radius: 3px;
+            transition: all .2s;
+            display: flex;
+            align-items: center;
+            i {
+                font-size: 16px;
+                display: inline-block;
+            }
+            &:hover {
+                color: #3A85E9;
+                background: #f2f3f5;
+            }
+            &.cur {
+                color: #3A85E9;
+                background: #EDF3FF;
+            }
+        }
+    }
+    //字母索引
+    .hc-tasks-user-letter-index {
+        position: absolute;
+        right: -8px;
+        top: 0;
+        bottom: 0;
+        width: 13px;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        color: #5f5e5e;
+        .item {
+            position: relative;
+            flex: 13px;
+            width: 13px;
+            height: 13px;
+            font-size: 12px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            cursor: pointer;
+            transition: all .2s;
+            &:hover {
+                color: #0a84ff;
+            }
+        }
+    }
+    //已选择列表
+    .hc-tasks-user-cur-box {
+        position: relative;
+        .hc-tasks-user-item {
+            position: relative;
+            margin-top: 18px;
+        }
+        .hc-tasks-user-item:first-child {
+            margin-top: 0;
+        }
+        &.type-1 {
+            .hc-tasks-user-item + .hc-tasks-user-item {
+                &::before{
+                    content: "";
+                    position: absolute;
+                    background: #BBBBBB;
+                    top: -18px;
+                    height: 18px;
+                    width: 1px;
+                    left: 18px;
+                }
+            }
+        }
+        .el-tag {
+            --el-tag-bg-color: #D7E6FB;
+            --el-tag-border-color: #AECCEE;
+            --el-tag-hover-color: var(--el-color-primary);
+            .el-tag__content {
+                display: flex;
+                align-items: center;
+                i {
+                    font-size: 14px;
+                    display: inline-block;
+                }
+            }
+        }
+    }
+}

src/views/tasks/flow.vue

@@ -13,13 +13,16 @@
             <template #extra>
                 <el-alert :closable="false" title="同一合同段内，只需要设置重复岗位的流程即可，其他任务岗位，系统将自动推送，无需创建更多任务流" type="error" />
             </template>
-            <hc-table :column="tableListColumn" :datas="tableListData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
+            <hc-table ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
                 <template #action="{ row }">
                     <hc-tooltip keys="tasks_flow_edit">
                         <el-button plain size="small" type="primary" :disabled="!row.deletedIs" @click="handleTableEdit(row)">编辑</el-button>
                     </hc-tooltip>
                     <hc-tooltip keys="tasks_flow_del">
-                        <el-button v-del-com:[handleTableDel]="row" plain size="small" type="danger" :disabled="!row.deletedIs">删除</el-button>
+                        <el-button plain size="small" type="danger" :disabled="!row.deletedIs" @click="handleTableDel(row)">删除</el-button>
+                    </hc-tooltip>
+                    <hc-tooltip keys="tasks_flow_copy">
+                        <el-button plain size="small" type="warning" @click="handleCopyEdit(row)">复制</el-button>
                     </hc-tooltip>
                 </template>
             </hc-table>
@@ -28,17 +31,17 @@
             </template>
         </hc-new-card>
         <!-- 新增/编辑流程 弹框 -->
-        <hc-new-dialog v-model="showEditModal" :title="`${flowFormData.id ? '编辑' : '新增'}流程`" widths="47rem">
-            <el-form ref="formFlowRef" :model="flowFormData" :rules="formFlowRules" label-width="auto" size="large">
-                <el-form-item label="流程名称" prop="fixedFlowName">
-                    <el-input v-model="flowFormData.fixedFlowName" placeholder="请输入流程名称" />
+
+        <hc-new-dialog v-model="showEditModal" :title="`${flowFormData.id ? '编辑' : '新增'}流程`" widths="40rem">
+            <el-form
+                ref="formFlowRef" class="p-4" :model="flowFormData" :rules="formFlowRules" label-width="auto"
+                size="large"
+            >
+                <el-form-item label="流程名称" prop="fixedName">
+                    <el-input v-model="flowFormData.fixedName" placeholder="请输入流程名称" />
                 </el-form-item>
-                <el-form-item label="任务人" prop="linkUserJoinString">
-                    <hc-tasks-user
-                        :fixed-flow-link-type-val="fixedFlowLinkTypeVal"
-                        :contract-id="contractId" :project-id="projectId" :users="userData"
-                        ui="w-full" :data="dataInfo" @change="tasksUserChange"
-                    />
+                <el-form-item label="选择任务人" prop="fixedBranchList">
+                    <HcTasksUser :data="flowFormData.fixedBranchList" :datas="fixedData" ui="w-full" @change="flowFormChange" />
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -87,9 +90,10 @@
 <script setup>
 import { nextTick, onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
-import { getArrValue, getObjValue } from 'js-fast-way'
+import { deepClone, formValidate, getArrValue, getObjValue } from 'js-fast-way'
 import tasksFlowApi from '~api/tasks/flow'
-
+import HcTasksUser from './components/hc-tasks-user/index.vue'
+import { HcDelMsg } from 'hc-vue3-ui'
 
 //变量
 const useAppState = useAppStore()
@@ -117,6 +121,7 @@ const pageChange = ({ current, size }) => {
 //获取数据
 const tableLoading = ref(false)
 const tableListData = ref([])
+const tableListRef = ref(null)
 
 const tableListColumn = ref([
     { key: 'fixedFlowName', name: '流程名称' },
@@ -142,82 +147,106 @@ const getTableData = async () => {
     }
 }
 
-//新增编辑数据
-const showEditModal = ref(false)
-const formFlowRef = ref(null)
-const flowFormData = ref({ id: '', fixedFlowName: '', linkUserJoinString: '' })
-const formFlowRules = {
-    fixedFlowName: {
-        required: true,
-        trigger: 'blur',
-        message: '请输入流程名称',
-    },
-    linkUserJoinString: {
-        required: true,
-        trigger: 'blur',
-        message: '请选择任务人',
-    },
-}
 
-//任务人选择改变
-const tasksUserChange = ( users) => {
-    let usersString = getTaskUsers(users)
-    flowFormData.value.linkUserJoinString = usersString
-}
-const getTaskUsers = (data)=>{
-    // 格式化字符串
-    const formattedStrings = data.map(item => `${item.userName}-${item.userId}`)
-    // 拼接字符串
-    const result = formattedStrings.join(',')
-    return result
+//复制流程
+const handleCopyEditLoad = ref(false)
+const handleCopyEdit = async (row) => {
+    handleCopyEditLoad.value = true
+
+    const { error, code, msg, data } = await tasksFlowApi.copyFixedFlowData(
+        {   
+            ids: row.id,
+        },
+    )
+        handleCopyEditLoad.value = false
+    if (!error && code === 200) {
+        window.$message?.success(msg)
+       await getTableData().then()
+           const targetId = data
+            nextTick(() => {
+               
+                tableListRef.value?.setCurrentRowByRowId(targetId)
+            })
+    } 
 }
+
+
 //新建流程
+const fixedData = ref({})
 const addFlowData = () => {
-    userData.value = []
-    flowFormData.value = { id: '', fixedFlowName: '', linkUserJoinString: '' }
+    flowFormData.value = { id: '', fixedName: '', fixedBranchList: [] }
+    fixedData.value = {
+        projectId: projectId.value,
+        contractId: contractId.value,
+    }
     showEditModal.value = true
 }
-const userData = ref([])
-const fixedFlowLinkTypeVal = ref('')
+
 //编辑流程
+const changeId = ref('')
 const handleTableEdit = async (row) => {
-    const { fixedFlowLinkType } = row
-    fixedFlowLinkTypeVal.value = fixedFlowLinkType
-    flowFormData.value = { id: '', fixedFlowName: '', linkUserJoinString: '' }
+    changeId.value = row.id
+    fixedData.value = {
+        id: row.id,
+        projectId: projectId.value,
+        contractId: contractId.value,
+    }
     showEditModal.value = true
+    getFlowDetail().then()
+}
+
+const getFlowDetail = async () => {
     const { error, code, data } = await tasksFlowApi.queryFixedFlowDetail({
-        id: row?.id,
+        id: changeId.value,
     })
     if (!error && code === 200) {
-        let users = '', res = getObjValue(data)
-        const list = getArrValue(res['fixedFlowLinkList'])
-        userData.value = []
-        for (let i = 0; i < list.length; i++) {
-          
-            const item = getObjValue(list[i])
-            userData.value.push({
-                userId:item['fixedFlowLinkUser'],
-                userName:item['fixedFlowLinkUserName'],
-            })
-            if (users) {
-                users += `,${item['fixedFlowLinkUserName']}-${item['fixedFlowLinkUser']}`
-            } else {
-                users = `${item['fixedFlowLinkUserName']}-${item['fixedFlowLinkUser']}`
-            }
+        const { fixedFlowName, fixedBranchVOList } = getObjValue(data)
+        flowFormData.value = {
+            id: changeId.value,
+            fixedName: fixedFlowName,
+            fixedBranchList: fixedBranchVOList,
         }
-        flowFormData.value = { id: res.id, fixedFlowName: res.fixedFlowName, linkUserJoinString: users }
     } else {
-        flowFormData.value = { id: '', fixedFlowName: '', linkUserJoinString: '' }
+        flowFormData.value = { id: '', fixedName: '', fixedBranchList: [] }
     }
 }
 
+//新增编辑数据
+const showEditModal = ref(false)
+const formFlowRef = ref(null)
+const flowFormData = ref({ id: '', fixedName: '', fixedBranchList: [] })
+const formFlowRules = {
+    fixedName: {
+        required: true,
+        trigger: 'blur',
+        message: '请输入流程名称',
+    },
+    fixedBranchList: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择任务',
+    },
+}
+
+//流程数据
+const flowFormChange = (data) => {
+    flowFormData.value.fixedBranchList = getArrValue(data)
+}
+
 //提交保存
 const sevaLoading = ref(false)
 const saveFormClick = async () => {
-    const form = flowFormData.value
-    if (!form.id) {
+    const isValidate = await formValidate(formFlowRef.value)
+    if (!isValidate) return false
+    const form = deepClone(flowFormData.value)
+    const fixedBranchList = form.fixedBranchList
+    fixedBranchList.forEach((ele) => {
+        delete ele.users
+    })
+    form.fixedBranchList = fixedBranchList
+    if (!form.id && !form.fixedFlowId) {
         sevaLoading.value = true
-        const { error, code, msg } = await tasksFlowApi.addFixedFlowData({
+        const { error, code, data } = await tasksFlowApi.saveFixedFlow({
             ...form,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -228,12 +257,13 @@ const saveFormClick = async () => {
             showEditModal.value = false
             window?.$message?.success('保存成功')
             getTableData().then()
-        } else {
-            window.$message.error(msg)
+         
         }
     } else {
         sevaLoading.value = true
-        const { error, code, msg } = await tasksFlowApi.updateFixedFlowData({
+        form.fixedFlowId = changeId.value
+        delete form.id
+        const { error, code } = await tasksFlowApi.updateFixedFlowData({
             ...form,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -244,32 +274,28 @@ const saveFormClick = async () => {
             showEditModal.value = false
             window?.$message?.success('保存成功')
             getTableData().then()
-        } else {
-            window.$message.error(msg)
         }
     }
 }
 
 //删除
-const handleTableDel = async ({ item }, resolve) => {
-    await removeFixedFlowData(item)
-    resolve()
-}
-
-//确认删除
-const removeFixedFlowData = async (row) => {
-    const { error, code } = await tasksFlowApi.removeFixedFlowData({
-        ids: row?.id || '',
+const handleTableDel = (row) => {
+    HcDelMsg(async (resolve) => {
+        const { error, code } = await tasksFlowApi.removeFixedFlowData({
+              id: row?.id || '',
         projectId: projectId.value,
         contractId: contractId.value,
+        })
+        //处理数据
+        if (!error && code === 200) {
+            window.$message?.success('删除成功')
+               resolve() //关闭弹窗的回调
+            getTableData().then()
+        }
     })
-    //处理数据
-    if (!error && code === 200) {
-        window.$message?.success('删除成功')
-        getTableData().then()
-    }
 }
 
+
 //表格排序
 const sortModal = ref(false)
 //显示
@@ -282,7 +308,7 @@ const tableSortClick = () => {
 const sortTableColumn = ref([
     { key: 'fixedFlowName', name: '流程名称' },
     { key: 'linkUserJoinString', name: '流程详情' },
-    { key:'action', name: '排序', width: 90, align: 'center' },
+    { key: 'action', name: '排序', width: 90, align: 'center' },
 ])
 const sortTableData = ref([])
 
@@ -347,8 +373,6 @@ const sortModalSave = async () => {
         window.$message?.success('保存成功')
         sortModal.value = false
         getTableData().then()
-    } else {
-        window.$message?.error('保存失败')
     }
 }
 

src/views/tasks/hc-data.vue

@@ -34,6 +34,17 @@
                     @changeselect-contrac-id="changeselectContracId"
                 />
             </template>
+            <template #tab-key4>
+                <TableCard
+                    v-if="sbTableKey === 'key4'" :contract-id="contractId"
+                    :contract-list="contractList"
+                    :project-id="projectId" :table-key="sbTableKey"
+                    :select-contrac-id="selectContracId" @batch-approval="batchApprovalTaskClick"
+                    @row-task-name="rowTaskName"
+                    @sign-rules="setSignRulesClick"
+                    @changeselect-contrac-id="changeselectContracId"
+                />
+            </template>
         </HcTabsSimple>
 
         <!-- 任务审核 -->
@@ -192,6 +203,7 @@ const getContractInfoList = async ()=>{
 const sbTableKey = ref(activeName)
 const sbTableData = ref([
     { icon: 'time', label: '待办任务', key: 'key1' },
+    //  { icon: 'file-edit', label: '电签中', key: 'key4' },
     { icon: 'calendar-check', label: '已办任务', key: 'key2' },
     { icon: 'user-shared', label: '我发起的', key: 'key3' },
 ])

src/views/tentative/detect/components/basicInfo.vue

@@ -384,7 +384,7 @@ infoLoad.value = true
     //处理数据
 infoLoad.value = false
     if (!error && code === 200) {
-      console.log(data, '基础信息数据')
+    
         basicInfoData.value = getObjValue(data)
         standardId.value = data?.standardId
  

src/views/tentative/detect/test.vue

@@ -1491,6 +1491,7 @@ const sortDialog = ref(false)
 const sortFormClick = ()=>{
     sortDialog.value = true
 }
+
 const sortType = ref('')
 
 

yarn.lock

@@ -487,6 +487,13 @@
   resolved "http://219.151.181.73:9000/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
+"@iconify-json/hugeicons@^1.2.16":
+  version "1.2.16"
+  resolved "https://registry.npmjs.org/@iconify-json/hugeicons/-/hugeicons-1.2.16.tgz#b7f239f3c167429da0d5b0085efd30c7b83c9d24"
+  integrity sha512-Ow0ig3yNY1VPZLBYYNVAAHA2jvSUoHbmtHzo87SnvA5rpDZVH6FMONeyro8LO31ReVwbaTVv9Mnd7yUXMFRufA==
+  dependencies:
+    "@iconify/types" "*"
+
 "@iconify-json/iconoir@^1.2.7":
   version "1.2.7"
   resolved "http://219.151.181.73:9000/@iconify-json/iconoir/-/iconoir-1.2.7.tgz#93a1a89e989997c4c12d7c8011652ebbc3324d9b"
@@ -508,6 +515,13 @@
   dependencies:
     "@iconify/types" "*"
 
+"@iconify/iconify@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/@iconify/iconify/-/iconify-3.1.1.tgz#aa0f3807be2eab53e86228f7bb1ad3bd59bcec1a"
+  integrity sha512-1nemfyD/OJzh9ALepH7YfuuP8BdEB24Skhd8DXWh0hzcOxImbb1ZizSZkpCzAwSZSGcJFmscIBaBQu+yLyWaxQ==
+  dependencies:
+    "@iconify/types" "^2.0.0"
+
 "@iconify/types@*", "@iconify/types@^2.0.0":
   version "2.0.0"
   resolved "http://219.151.181.73:9000/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"
@@ -2109,10 +2123,10 @@ has-flag@^4.0.0:
   resolved "http://219.151.181.73:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.9.3:
-  version "4.9.3"
-  resolved "http://219.151.181.73:9000/hc-vue3-ui/-/hc-vue3-ui-4.9.3.tgz#a34d605cbce5f0f65085a7d9f30dca1325407a16"
-  integrity sha512-U7ANZwAwVVMs96FMuRSLK/NX4Iig0e+Sx2x/H0Ehv7+7WhysFx51iDa8yF4J+gVJ0fiSSbQUAg4LTZ36CS7V0g==
+hc-vue3-ui@^4.9.9:
+  version "4.9.9"
+  resolved "http://219.151.181.73:9000/hc-vue3-ui/-/hc-vue3-ui-4.9.9.tgz#d861d14c42e100a83504f0bcd7f79b400e14e0cf"
+  integrity sha512-ULcVsKpcfjYzQBnmWZ+rac9p16u6hkeeEtiFFK8oFr6sh06tLlaRG5t0FR+NhbcUwP95YxUrujnbbM0KnBSDEQ==
   dependencies:
     axios "^1.7.7"
     dayjs "^1.11.13"