Merge branch 'master' of http://219.151.181.73:3000/web/for_client into test-dev

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

@@ -523,7 +523,7 @@ export default {
         async addBussFileNode(form) {
         return HcApi({
               headers: {
-            'Content-Type': 'multipart/form-data', 
+            'Content-Type': 'multipart/form-data',
         },
             url: '/api/blade-manager/exceltab/add-bussfile-node',
             method: 'post',
@@ -533,7 +533,7 @@ export default {
     async addBussFile(form) {
         return HcApi({
               headers: {
-            'Content-Type': 'multipart/form-data', 
+            'Content-Type': 'multipart/form-data',
         },
             url: '/api/blade-manager/exceltab/add-buss-file',
             method: 'post',
@@ -555,7 +555,7 @@ export default {
     async previewBussfile(form) {
              return HcApi({
               headers: {
-            'Content-Type': 'multipart/form-data', 
+            'Content-Type': 'multipart/form-data',
         },
             url: '/api/blade-manager/exceltab/previewBussfile',
             method: 'post',
@@ -571,7 +571,7 @@ export default {
         })
     },
     //批量插入编号
-    
+
     async batchAddNumbers(form) {
         return HcApi({
             url: '/api/blade-manager/exceltab/batchAddNumbers',
@@ -579,7 +579,7 @@ export default {
             data: form,
         })
     },
-    //获取偏差范围    
+    //获取偏差范围
     async getDeviationRange(form) {
         return HcApi({
             url: '/api/blade-manager/param/getDeviationRange',

src/router/modules/base.js

@@ -227,7 +227,7 @@ export default [
                         meta: { title: '隐藏资料' },
                         component: () => import('~src/views/other/hide-data.vue'),
                     },
-                     {
+                    {
                         path: '/cross/section',
                         name: 'cross-section',
                         meta: { title: '断面仪' },
@@ -530,7 +530,7 @@ export default [
                 meta: { title: '资料检测' },
                 component: () => import('~src/views/systemService/test.vue'),
             },
-           
+
 
 
         ],

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

@@ -1217,26 +1217,25 @@ const tableFormRightTap = (
     console.log(clearautomatic, 'clearautomatic')
 
    // 先过滤掉可能存在的"取消自动获取数据"（避免重复添加）
-        tableFormMenu.value = tableFormMenu.value.filter(item => item.key !== 'clearautomatic')
-
-        if (clearautomatic === '1') {
-            // 条件满足时：添加"取消自动获取数据"，并移除"设置自动获取数据"
-            tableFormMenu.value.push({
-                label: '取消自动获取数据',
-                key: 'clearautomatic',
-            })
-            tableFormMenu.value = tableFormMenu.value.filter(item => item.key !== 'auto')
-        } else {
-            // 条件不满足时：确保"设置自动获取数据"存在（如果原本没有可补充，若已有则保留）
-            const hasAutoItem = tableFormMenu.value.some(item => item.key === 'auto')
-            if (!hasAutoItem) {
-                tableFormMenu.value.push({
-                    label: '设置自动获取数据',
-                    key: 'auto',
-                })
-            }
-        }
-
+        // tableFormMenu.value = tableFormMenu.value.filter(item => item.key !== 'clearautomatic')
+
+        // if (clearautomatic === '1') {
+        //     // 条件满足时：添加"取消自动获取数据"，并移除"设置自动获取数据"
+        //     tableFormMenu.value.push({
+        //         label: '取消自动获取数据',
+        //         key: 'clearautomatic',
+        //     })
+        //     tableFormMenu.value = tableFormMenu.value.filter(item => item.key !== 'auto')
+        // } else {
+        //     // 条件不满足时：确保"设置自动获取数据"存在（如果原本没有可补充，若已有则保留）
+        //     const hasAutoItem = tableFormMenu.value.some(item => item.key === 'auto')
+        //     if (!hasAutoItem) {
+        //         tableFormMenu.value.push({
+        //             label: '设置自动获取数据',
+        //             key: 'auto',
+        //         })
+        //     }
+        // }
 
     contextMenuRef.value?.showMenu(event, false) //展开菜单
 }

src/views/data-fill/query.vue

@@ -68,10 +68,10 @@
                                 <span>上报</span>
                             </el-button>
                         </HcTooltip>
+
                         <HcTooltip keys="query_download">
                             <el-button
                                 v-if="!website.localModel"
-                   
                                 :disabled="tableCheckedKeys.length <= 0 || userInfo.user_id !== '1968964896450904066'" :loading="downloadLoading" hc-btn
                                 color="#A16222" @click="batchDownload"
                             >
@@ -80,7 +80,7 @@
                             </el-button>
                             <el-button
                                 v-else
-                   
+
                                 :disabled="tableCheckedKeys.length <= 0 " :loading="downloadLoading" hc-btn
                                 color="#A16222" @click="batchDownload"
                             >
@@ -123,13 +123,13 @@
                         </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 
+                            <el-button
                                 v-if="userInfo.dept_id === '1536982621165592577'"
-                                :disabled="tableCheckedKeys.length <= 0 || userInfo.dept_id !== '1536982621165592577'" 
-                                :loading="signLoading" 
-                                hc-btn type="warning" 
+                                :disabled="tableCheckedKeys.length <= 0 || userInfo.dept_id !== '1536982621165592577'"
+                                :loading="signLoading"
+                                hc-btn type="warning"
                                 @click="resignClick1"
-                            >  
+                            >
                                 <HcIcon name="repeat" />
                                 一键电签
                             </el-button>
@@ -144,8 +144,8 @@
                             </el-button>
                         </HcTooltip>
                         <HcTooltip keys="data-query-resign-title">
-                            <el-button 
-                               
+                            <el-button
+
                                 :disabled="tableCheckedKeys.length <= 0"
                                 hc-btn
                                 color="#3F9EFF" style="color: white;" :loading="ruleModalSaveLoad" @click="resignTitleClick"
@@ -342,8 +342,8 @@
                 <el-checkbox-group v-model="checkTaskUserIds">
                     <el-checkbox v-for="item in tableCheckedKeys[0].waitingUserList" :key="item.id" :label="item.waitingUserName" :value="item.userId">
                         <el-tag
-                                   
-                                 
+
+
                             :type="`${item.status === 2 ? 'success' : item.status === 3 ? 'warning' : item.status === 999 ? 'danger' : 'info'}`"
                             class="mx-1" effect="dark"
                         >
@@ -373,13 +373,13 @@
                     </div>
                 </div>
             </template>
-         
+
             <div class="flex items-center justify-between">
                 <div>批量设置：</div>
-                <el-select 
-                    v-model="setValue" 
-                    placeholder="请选择" 
-                      
+                <el-select
+                    v-model="setValue"
+                    placeholder="请选择"
+
                     multiple
                     clearable
                     class="custom-select flex-1"
@@ -395,16 +395,16 @@
                 </el-select>
                 <el-button type="primary" hc-btn size="small" class="ml-2" :disabled="setValue.length === 0" @click="batchSetRule">设置</el-button>
             </div>
-            
+
             <div style="position: relative; height: 440px" class="mt-2">
                 <HcTable v-loading="ruleTableLoading" :column="ruleTableColumn" :datas="ruleTableData" :loading="ruleTableLoading">
                     <template #rule="{ row }">
                         <div class="flex items-center">
                             <span class="text-red">*</span>
-                            <el-select 
+                            <el-select
                                 v-model="row.rule"
-                                :class="{ 'error-border': !row.rule || row.rule.length === 0 }" 
-                                placeholder="请选择" 
+                                :class="{ 'error-border': !row.rule || row.rule.length === 0 }"
+                                placeholder="请选择"
                                 multiple
                                 clearable
                                 class="custom-select"
@@ -483,7 +483,7 @@ onMounted(() => {
     isCanDown.value = !website.localModel
     const treeWidth = useAppState.getTreeWidth
     leftWidth.value = isNullES(treeWidth) || treeWidth <= 0 ? 440 : treeWidth
-    
+
 })
 
 //获取
@@ -586,7 +586,7 @@ const wbsElTreeClick = ({ node, data, keys }) => {
 
     getTableData().then(()=>{
         getFileUser()
-    })  
+    })
 }
 
 //搜索条件
@@ -611,6 +611,7 @@ const getFileUser = async () => {
     //     window.$message?.warning('请先点击左侧节点')
     //     return
     // }
+
     const { error, code, data } = await queryApi.getFileUser({
         contractId: contractId.value,
         contractIdRelation: contractInfo.value?.contractType === 2 ? info?.contractIdRelation : contractId.value,
@@ -1074,7 +1075,7 @@ const leftWidth = ref(300)
 watch(
     () => leftWidth.value,
     (diffVal) => {
-     
+
         setUserConfig(diffVal)
     },
 )
@@ -1127,7 +1128,7 @@ const signClick = async () => {
     const taskIds = arrToKey(rows, 'taskId')
     const idsArr = taskIds.split(',')
     let isCan = idsArr.some(ele=>!ele)
-  
+
     if (isCan) {
         window.$message?.warning('参数异常，暂不支持该操作')
         return
@@ -1187,15 +1188,15 @@ const saveAginLoading = ref(false)
 //重置文件题名
 const resignTitleModal = ref(false)
 const resignTitleClick = async ()=>{
- 
+
     // resignTitleModal.value = true
      if (isTemplateType.value) {
-       
+
         resignTitleModal.value = true
      } else {
         resignTitleSave()
      }
-    
+
 }
 const resignTitleSave = async ()=>{
       const rows = tableCheckedKeys.value
@@ -1235,12 +1236,12 @@ const changeRuleClick = async ()=>{
 
     let arr = tableCheckedKeys.value.map(item=>{
         return {
-         
+
             wbsId:item.wbsId,
             projectId:projectId.value,
             id:item.id,
 
-           
+
         }
     })
     let arr1 = await getRuleListData(arr)
@@ -1255,9 +1256,9 @@ const changeRuleClick = async ()=>{
             }
         }
     // ruleTableData.value = arr
- 
-    
-    
+
+
+
 }
 const ruleModal = ref(false)
 const ruleModalSaveLoad = ref(false)
@@ -1296,7 +1297,7 @@ const ruleModalSave = async ()=>{
        resignTitleModal.value = false
 
 
-    } 
+    }
 }
 const setValue = ref('')
 
@@ -1316,16 +1317,16 @@ const batchSetRule = async ()=>{
         let matchedItems = [] // 存储匹配的项
         if (ele.rule.length > 0) {
             // 1. 找出所有匹配的项
-            matchedItems = nodeTypeData.value.filter(dataItem => 
+            matchedItems = nodeTypeData.value.filter(dataItem =>
                 ele.rule.includes(dataItem.value),
             )
             // 2. 按原始 sort 排序
             matchedItems.sort((a, b) => a.sort - b.sort)
-            
+
             // 3. 更新 ele.rule 为排序后的 value 数组
             ele.rule = matchedItems.map(item => item.value)
-            
-           
+
+
         }
    })
 
@@ -1352,41 +1353,43 @@ const batchSetRule = async ()=>{
 
 
 const ruleChange = async (ele) => {
+
+
     let str = ''
     let matchedItems = [] // 存储匹配的项
-    
+
     if (ele.rule.length > 0) {
         // 1. 找出所有匹配的项
-        matchedItems = nodeTypeData.value.filter(dataItem => 
+        matchedItems = nodeTypeData.value.filter(dataItem =>
             ele.rule.includes(dataItem.value),
         )
-        
+
         // 2. 按原始 sort 排序
         matchedItems.sort((a, b) => a.sort - b.sort)
-        
+
         // 3. 更新 ele.rule 为排序后的 value 数组
         ele.rule = matchedItems.map(item => item.value)
-        
+
         // 4. 生成连接字符串
         str = ele.rule.join('-')
     }
- 
-    
+
+
     // 5. 调用API
     let arr = [{
         wbsId: ele.wbsId,
         nameRule: str,
         projectId: projectId.value,
         id:ele.id,
-      
+
     }]
-    
+
     let afterArr = await getRuleValue(arr)
     ele.newNodeName = afterArr[0].newNodeName
 }
 const getRuleLoad = ref(false)
 const ruleTableLoading = ref(false)
-const getRuleListData = async (arr) => { 
+const getRuleListData = async (arr) => {
 
     ruleTableLoading.value = true
     const { error, code, msg, data } = await queryApi.getNameRuleList(arr)
@@ -1399,7 +1402,7 @@ const getRuleListData = async (arr) => {
     }
 
 }
-const getRuleValue = async (arr) => { 
+const getRuleValue = async (arr) => {
   // 检查 arr 中每一项的 nameRule 是否有值
   const hasInvalidItem = arr.some(item => !item.nameRule || item.nameRule.length === 0)
   if (hasInvalidItem) {
@@ -1428,13 +1431,13 @@ const getWbsNodeTypeApi = async () => {
     let newArr = []
     const newData = getArrValue(data)
     for (let i = 0; i < newData.length; i++) {
-      
+
              newArr.push({
             label: newData[i]['dictValue'],
             value:newData[i]['dictKey'],
         })
-        
-       
+
+
     }
     nodeTypeData.value = newArr
 }
@@ -1451,12 +1454,12 @@ const resignClick1 = ()=>{
     const taskIds = arrToKey(rows, 'taskId')
     const idsArr = taskIds.split(',')
     let isCan = idsArr.some(ele=>!ele)
-  
+
     if (isCan) {
         window.$message?.warning('只能操作待审批和已审批数据')
         return
     }
-    
+
 
     resignModal1.value = true
 }
@@ -1475,7 +1478,7 @@ const signClick1 = async () => {
 
 
        if (resignModalRadio1.value === 1) {
-            if (checkTaskUserIds.value.length === 0) { 
+            if (checkTaskUserIds.value.length === 0) {
                 return window.$message?.warning('请选择用户')
             }
         } else {
@@ -1484,13 +1487,13 @@ const signClick1 = async () => {
     //发起请求
     signLoading1.value = true
 
-    
+
     const { error, code, msg } = await queryApi.reSigningEVisa1({
         userIds: checkTaskUserIds.value.length === 1 ? checkTaskUserIds.value[0] : checkTaskUserIds.value.join(','),
 
         ids: ids,
-      
-   
+
+
     })
     //处理数据
     signLoading1.value = false
@@ -1499,7 +1502,7 @@ const signClick1 = async () => {
         window.$message?.success(msg ?? '提交成功，请请耐心等待重签，可继续操作其它的功能。')
            cancelresign1()
         getTableData().then()
-    } 
+    }
 
 }
 const checkTaskUserIds = ref([])
@@ -1549,7 +1552,7 @@ const checkTaskUserIds = ref([])
         overflow-y: hidden;
         overflow-x: hidden;
         flex-wrap: nowrap;
-     
+
     }
 }
 </style>

src/views/systemService/test.vue

@@ -29,7 +29,7 @@
                             :auto-expand-keys="treeAutoExpandKeys"
                             default-expand-all
                             :menus="treeMenus"
-                            @node-tap="wbsElTreeClick" 
+                            @node-tap="wbsElTreeClick"
                             @menu-tap="ElTreeMenuClick"
                         />
                     </el-scrollbar>
@@ -41,7 +41,7 @@
                             is-type
                             :menus="treeMenus"
                             @load="treeLoadNode"
-                            @node-tap="wbsElTreeClick" 
+                            @node-tap="wbsElTreeClick"
                             @menu-tap="ElTreeMenuClick"
                         />
                     </el-scrollbar>
@@ -168,8 +168,8 @@
                             <HcIcon name="send-plane-2" />
                             <span>上报</span>
                         </el-button>
-              
-                     
+
+
                         <el-button :disabled="tableCheckedKeys.length <= 0" :loading="reportLoading" hc-btn color="#FF976A" style="color: white;" @click="reportModalClick">
                             <HcIcon name="send-plane-2" />
                             <span>上报且审批</span>
@@ -183,11 +183,11 @@
                             <span>save-again</span>
                         </el-button>
                         <el-button :disabled="tableCheckedKeys.length <= 0" :loading="signLoading" hc-btn type="primary" @click="resignClick">  <HcIcon name="repeat" />re-sign</el-button>
-                 
-                     
+
+
                         <el-button
                             hc-btn
-                            color="#52B200" 
+                            color="#52B200"
                             style="color: white;"
                             :disabled="tableCheckedKeys.length <= 0 "
                             @click="batchOnlineClick"
@@ -195,15 +195,15 @@
                             <HcIcon name="survey" />
                             <span>电签检测</span>
                         </el-button>
-                      
+
                         <HcTooltip keys="data-query-once-agin">
-                            <el-button 
+                            <el-button
                                 v-if="userInfo.dept_id === '1536982621165592577'"
-                                :disabled="tableCheckedKeys.length <= 0 || userInfo.dept_id !== '1536982621165592577'" 
-                                :loading="signLoading" 
-                                hc-btn type="warning" 
+                                :disabled="tableCheckedKeys.length <= 0 || userInfo.dept_id !== '1536982621165592577'"
+                                :loading="signLoading"
+                                hc-btn type="warning"
                                 @click="resignClick1"
-                            >  
+                            >
                                 <HcIcon name="repeat" />
                                 一键电签
                             </el-button>
@@ -237,7 +237,7 @@
                                     />
                                 </el-select>
                             </div>
-                           
+
                             <div class="ml-2 w-40">
                                 <el-select v-model="searchForm.sourceType" clearable placeholder="文件类型">
                                     <el-option
@@ -411,8 +411,8 @@
                 <el-checkbox-group v-model="checkTaskUserIds">
                     <el-checkbox v-for="item in tableCheckedKeys[0].waitingUserList" :key="item.id" :label="item.waitingUserName" :value="item.userId">
                         <el-tag
-                                   
-                                 
+
+
                             :type="`${item.status === 2 ? 'success' : item.status === 3 ? 'warning' : item.status === 999 ? 'danger' : 'info'}`"
                             class="mx-1" effect="dark"
                         >
@@ -442,13 +442,13 @@
                     </div>
                 </div>
             </template>
-         
+
             <div class="flex items-center justify-between">
                 <div>批量设置：</div>
-                <el-select 
-                    v-model="setValue" 
-                    placeholder="请选择" 
-                      
+                <el-select
+                    v-model="setValue"
+                    placeholder="请选择"
+
                     multiple
                     clearable
                     class="custom-select flex-1"
@@ -464,16 +464,16 @@
                 </el-select>
                 <el-button type="primary" hc-btn size="small" class="ml-2" :disabled="setValue.length === 0" @click="batchSetRule">设置</el-button>
             </div>
-            
+
             <div style="position: relative; height: 440px" class="mt-2">
                 <HcTable v-loading="ruleTableLoading" :column="ruleTableColumn" :datas="ruleTableData" :loading="ruleTableLoading">
                     <template #rule="{ row }">
                         <div class="flex items-center">
                             <span class="text-red">*</span>
-                            <el-select 
+                            <el-select
                                 v-model="row.rule"
-                                :class="{ 'error-border': !row.rule || row.rule.length === 0 }" 
-                                placeholder="请选择" 
+                                :class="{ 'error-border': !row.rule || row.rule.length === 0 }"
+                                placeholder="请选择"
                                 multiple
                                 clearable
                                 class="custom-select"
@@ -553,7 +553,7 @@ onMounted(() => {
     isCanDown.value = !website.localModel
     const treeWidth = useAppState.getTreeWidth
     leftWidth.value = isNullES(treeWidth) || treeWidth <= 0 ? 440 : treeWidth
-    
+
 })
 
 //获取
@@ -655,7 +655,7 @@ const wbsElTreeClick = ({ node, data, keys }) => {
     searchForm.value.current = 1
     getFileUser()
     getTableData()
-  
+
 }
 
 //搜索条件
@@ -667,7 +667,7 @@ const reportBatchData = ref([]) //上报批次
 //获取所有填报人
 const getFileUser = async () => {
     const info = nodeDataInfo.value
-   
+
     if (!info ) {
         window.$message?.warning('请先点击左侧节点')
         return
@@ -806,7 +806,7 @@ const tableListRef = ref(null)
 const tableLoading = ref(false)
 const tableListColumn = ref([
     { key: 'name', name: '文件题名' },
- 
+
     { key: 'taskStatusStr', name: '资料状态', width: 100, align: 'center' },
     { key: 'chekStatus', name: '检测状态', width: 100, align: 'center' },
       { key: 'checkDesc', name: '检测描述', align: 'center' },
@@ -1124,7 +1124,7 @@ const leftWidth = ref(300)
 watch(
     () => leftWidth.value,
     (diffVal) => {
-     
+
         setUserConfig(diffVal)
     },
 )
@@ -1163,7 +1163,7 @@ const resignModalRadio = ref(0)
 const resignClick = async ()=>{
     const rows = tableCheckedKeys.value
 
-    
+
     if (rows.length <= 0) {
         window.$message?.warning('只能操作待审批和已审批数据')
         return
@@ -1179,7 +1179,7 @@ const signClick = async () => {
     const taskIds = arrToKey(rows, 'taskId')
     const idsArr = taskIds.split(',')
     let isCan = idsArr.some(ele=>!ele)
-  
+
     if (isCan) {
         window.$message?.warning('该数据不存在任务ID，请重新勾选数据！')
 
@@ -1242,15 +1242,15 @@ const saveAginLoading = ref(false)
 //重置文件题名
 const resignTitleModal = ref(false)
 const resignTitleClick = async ()=>{
- 
+
     // resignTitleModal.value = true
      if (isTemplateType.value) {
-       
+
         resignTitleModal.value = true
      } else {
         resignTitleSave()
      }
-    
+
 }
 const resignTitleSave = async ()=>{
       const rows = tableCheckedKeys.value
@@ -1290,11 +1290,11 @@ const changeRuleClick = async ()=>{
 
     let arr = tableCheckedKeys.value.map(item=>{
         return {
-         
+
             wbsId:item.wbsId,
             projectId:projectId.value,
 
-           
+
         }
     })
     let arr1 = await getRuleListData(arr)
@@ -1309,9 +1309,9 @@ const changeRuleClick = async ()=>{
             }
         }
     // ruleTableData.value = arr
- 
-    
-    
+
+
+
 }
 const ruleModal = ref(false)
 const ruleModalSaveLoad = ref(false)
@@ -1350,7 +1350,7 @@ const ruleModalSave = async ()=>{
        resignTitleModal.value = false
 
 
-    } 
+    }
 }
 const setValue = ref('')
 
@@ -1370,16 +1370,16 @@ const batchSetRule = async ()=>{
         let matchedItems = [] // 存储匹配的项
         if (ele.rule.length > 0) {
             // 1. 找出所有匹配的项
-            matchedItems = nodeTypeData.value.filter(dataItem => 
+            matchedItems = nodeTypeData.value.filter(dataItem =>
                 ele.rule.includes(dataItem.value),
             )
             // 2. 按原始 sort 排序
             matchedItems.sort((a, b) => a.sort - b.sort)
-            
+
             // 3. 更新 ele.rule 为排序后的 value 数组
             ele.rule = matchedItems.map(item => item.value)
-            
-           
+
+
         }
    })
 
@@ -1407,36 +1407,36 @@ const batchSetRule = async ()=>{
 const ruleChange = async (ele) => {
     let str = ''
     let matchedItems = [] // 存储匹配的项
-    
+
     if (ele.rule.length > 0) {
         // 1. 找出所有匹配的项
-        matchedItems = nodeTypeData.value.filter(dataItem => 
+        matchedItems = nodeTypeData.value.filter(dataItem =>
             ele.rule.includes(dataItem.value),
         )
-        
+
         // 2. 按原始 sort 排序
         matchedItems.sort((a, b) => a.sort - b.sort)
-        
+
         // 3. 更新 ele.rule 为排序后的 value 数组
         ele.rule = matchedItems.map(item => item.value)
-        
+
         // 4. 生成连接字符串
         str = ele.rule.join('-')
     }
- 
-    
+
+
     // 5. 调用API
     let arr = [{
         wbsId: ele.wbsId,
         nameRule: str,
     }]
-    
+
     let afterArr = await getRuleValue(arr)
     ele.newNodeName = afterArr[0].newNodeName
 }
 const getRuleLoad = ref(false)
 const ruleTableLoading = ref(false)
-const getRuleListData = async (arr) => { 
+const getRuleListData = async (arr) => {
 
     ruleTableLoading.value = true
     const { error, code, msg, data } = await queryApi.getNameRuleList(arr)
@@ -1449,7 +1449,7 @@ const getRuleListData = async (arr) => {
     }
 
 }
-const getRuleValue = async (arr) => { 
+const getRuleValue = async (arr) => {
   // 检查 arr 中每一项的 nameRule 是否有值
   const hasInvalidItem = arr.some(item => !item.nameRule || item.nameRule.length === 0)
   if (hasInvalidItem) {
@@ -1478,13 +1478,13 @@ const getWbsNodeTypeApi = async () => {
     let newArr = []
     const newData = getArrValue(data)
     for (let i = 0; i < newData.length; i++) {
-      
+
              newArr.push({
             label: newData[i]['dictValue'],
             value:newData[i]['dictKey'],
         })
-        
-       
+
+
     }
     nodeTypeData.value = newArr
 }
@@ -1501,13 +1501,13 @@ const resignClick1 = ()=>{
     const taskIds = arrToKey(rows, 'taskId')
     const idsArr = taskIds.split(',')
     let isCan = idsArr.some(ele=>!ele)
-  
+
     if (isCan) {
         window.$message?.warning('只能操作待审批和已审批数据')
         return
     }
-    
-    
+
+
 
     resignModal1.value = true
 }
@@ -1525,7 +1525,7 @@ const signClick1 = async () => {
        const ids = arrToId(rows)
 
        if (resignModalRadio1.value === 1) {
-            if (checkTaskUserIds.value.length === 0) { 
+            if (checkTaskUserIds.value.length === 0) {
                 return window.$message?.warning('请选择用户')
             }
         } else {
@@ -1534,13 +1534,13 @@ const signClick1 = async () => {
     //发起请求
     signLoading1.value = true
 
-    
+
     const { error, code, msg } = await queryApi.reSigningEVisa1({
         userIds: checkTaskUserIds.value.length === 1 ? checkTaskUserIds.value[0] : checkTaskUserIds.value.join(','),
 
         ids: ids,
-      
-   
+
+
     })
     //处理数据
     signLoading1.value = false
@@ -1550,7 +1550,7 @@ const signClick1 = async () => {
            cancelresign1()
         getTableData().then()
          getOtherPaceInfoData()
-    } 
+    }
 
 }
 const checkTaskUserIds = ref([])
@@ -1568,7 +1568,7 @@ const batchOnlineClick = async ()=>{
         type:2,
         ids,
       },
-   
+
     )
      batchOnlineClickLoad.value = false
     //处理数据
@@ -1578,10 +1578,10 @@ const batchOnlineClick = async ()=>{
         window.$message?.success(msg )
          getCheckPdfPaceInfoData()
         getTableData()
-    } 
-    
+    }
+
+
 
-   
 }
 const treeMenus = ref([
     {
@@ -1589,7 +1589,7 @@ const treeMenus = ref([
                 label: '电签检测',
                 key: 'add1',
             },
-           
+
 ])
 
 const ElTreeMenuClick = async ({ key, node, data, keys }) => {
@@ -1610,7 +1610,7 @@ const ElTreeMenuClick = async ({ key, node, data, keys }) => {
                             type:1,
                             ids:nodeDataInfo.value.primaryKeyId,
                         },
-                    
+
                         )
                         batchOnlineClickLoad.value = false
                         //处理数据
@@ -1621,13 +1621,13 @@ const ElTreeMenuClick = async ({ key, node, data, keys }) => {
                             getCheckPdfPaceInfoData().then()
 
                             getTableData().then()
-                        } 
+                        }
                 }
             },
         })
-        
+
     }
-   
+
 }
 //获取进度状态
 const progressObj = ref({
@@ -1637,16 +1637,16 @@ const progressObj = ref({
 })
 const getCheckPdfPaceInfoData = async () => {
            const { error, code, data, msg } = await queryApi.getCheckPdfPaceInfo({
-           
+
             contractId: contractId.value,
-          
+
             classify: contractTypeTabKey.value,
         })
         //处理数据
-      
+
         if (!error && code === 200) {
             progressObj.value = getObjValue(data)
-            
+
         } else {
           progressObj.value = {
             finishCount:0,
@@ -1654,7 +1654,7 @@ const getCheckPdfPaceInfoData = async () => {
             pace:0,
         }
         }
- 
+
 }
 const saveAgainData = ref(
     {
@@ -1679,13 +1679,13 @@ const electronicSignData = ref(
 )
 const getOtherPaceInfoData = async () => {
            const { error, code, data, msg } = await queryApi.getTaskProgress({
-           
+
             contractId: contractId.value,
-          
+
             projectId:projectId.value,
         })
         //处理数据
-      
+
         if (!error && code === 200) {
            console.log(data, 'data')
            const resData = getObjValue(data)
@@ -1704,8 +1704,8 @@ const getOtherPaceInfoData = async () => {
                 pace:0,
                 finishCount:0,
            }
-       
-            
+
+
         } else {
             saveAgainData.value = {
                 totalCount:0,
@@ -1722,9 +1722,9 @@ const getOtherPaceInfoData = async () => {
                 pace:0,
                 finishCount:0,
             }
-      
+
         }
- 
+
 }
 </script>
 
@@ -1740,7 +1740,7 @@ const getOtherPaceInfoData = async () => {
 .bg-primary-color {
     background-color: var(--el-color-primary) ;
 }
-.basic-info-box { 
+.basic-info-box {
     height: calc(100% - 77px);
 }
 </style>
@@ -1775,7 +1775,7 @@ const getOtherPaceInfoData = async () => {
         overflow-y: hidden;
         overflow-x: hidden;
         flex-wrap: nowrap;
-     
+
     }
 }
 </style>

src/views/tentative/detect/test.vue

@@ -1493,6 +1493,12 @@ const sortFormClick = ()=>{
 }
 
 const sortType = ref('')
+
+
+
+
+
+
 const closeSort = ()=>{
     sortDialog.value = false
     sortType.value = ''

src/views/tentative/material/approach.vue

@@ -616,22 +616,10 @@ const copyTableData = ref([])
 
 //复制
 const copyTableModal = ref(false)
-const copyTableModalClick = async () => {
-
-   await getMaterialNumber()
-    copyTableData.value = deepClone(tableCheckedKeys.value)
-   copyTableData.value.forEach(item => {
-    item.trialNumber = backObj.value.trialNumber
-        item.materialNumber = backObj.value.trialNumber
-        item.autoIncrementNumber = backObj.value.autoIncrementNumber
-    })
+const copyTableModalClick = () => {
     copyTableModal.value = true
-   }
-       
- 
-   
-
-
+    copyTableData.value = deepClone(tableCheckedKeys.value)
+}
 
 //效验材料编号
 const materialNumberBlur = async (row) => {
@@ -661,10 +649,6 @@ const copyTableModalClose = () => {
 const copyTableLoading = ref(false)
 const copyTableClick = () => {
     const rows = copyTableData.value
-   
-
-
-    
     if (rows.length > 0) {
         //判断是否满足条件
         const result = rows.every(({ materialNumber }) => {