Merge branch 'master' of http://219.151.181.73:3000/web/for_client

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

@@ -98,7 +98,7 @@
                                     删除本表
                                 </el-link>
                             </HcTooltip>
-                        
+
                             <el-link
                                 v-if="
                                     treenodeDataInfo?.majorDataType === 8
@@ -112,7 +112,7 @@
                             </el-link>
                             <el-link
                                 v-if="isTemplateType"
-                                
+
                                 type="primary"
                                 @click="autoClick(item)"
                             >
@@ -511,7 +511,7 @@
             :wbs-id="wbsTemp_id"
             :wbs-type="wbs_type"
         />
-       
+
         <HcTestFileCy
             v-else
             ref="testFileRefsCy"
@@ -661,7 +661,7 @@
                         :key="item.dictKey"
                         :label="item.dictValue"
                         :value="item.dictKey"
-                    />   
+                    />
                 </el-select>
                 <template v-if="isShowNum">
                     <el-input v-model="autoModal.customValue" block placeholder="高程偏差/顶面高差" class="mt-1" />
@@ -677,7 +677,7 @@
         widths="55%"
         save-text="保存"
         title="插入编号"
-       
+
         @close="cancelPushCode"
         @save="submitPushCode"
     >
@@ -719,7 +719,7 @@
         </el-form>
     </hc-new-dialog>
 
-    
+
     <!-- 选择试验附件类型 -->
     <hc-dialog v-model="fileTypeDialog" title="设置自动获取" :loading="fileTypeLoading" @save="fileTypeSaveClick">
         <el-form
@@ -735,7 +735,7 @@
                         v-for="item in fileType"
                         :key="item.dictKey"
                         :label="item.label" :value="item.value"
-                    />   
+                    />
                 </el-select>
             </el-form-item>
         </el-form>
@@ -759,7 +759,7 @@
                     color="#419EFF"
                     hc-btn
                     style="color:white"
-             
+
                     @click="clearSaveClick(1)"
                 >
                     仅删除当前表单的字段数据
@@ -1036,7 +1036,7 @@ const ActiveKey = ref('')
 const CollapseChange = (name) => {
  if (isEnableBulk.value) {
         setMountOnEventKey()
-    
+
     }
     ActiveKey.value = name
     let index = getCollapseItemIndex(name)
@@ -1095,7 +1095,7 @@ const isOpen = infos['isOpenRandomNumber'] ?? 0
     if (isTemplateType.value) {
         newArr.push({ label: '设置自动获取数据', key: 'auto' })
     }
-    
+
     if (isOpen === 1 && isStatus.value !== 3) {
         newArr.push({ label: '插入设计值/频率', key: 'design' })
     }
@@ -1154,7 +1154,7 @@ const handleMenuSelect = async ({ key }) => {
         const { pkeyId } = tableFormItemNode.value
         const refs = await getFormRef(pkeyId)
         const copyVal = await refs?.getCetCopyKeyList()
-   
+
         checkKeys.value = []
         if (copyVal.length > 0) {
             copyVal.forEach(item=>{
@@ -1162,7 +1162,7 @@ const handleMenuSelect = async ({ key }) => {
 
             })
         }
-   
+
     } else if (key === 'clear') {
          clearShow.value = true
     } else if (key === 'water') {
@@ -1193,17 +1193,17 @@ const handleMenuSelect = async ({ key }) => {
         refs?.setFormData(curFormData)
     } else if (key === 'auto') {
         console.log('自动获取数据')
-        
-        
+
+
         autoModalDialog.value = true
         isShowNum.value = false
         autoModal.value = {
-            
+
         }
         getMajorDataTypeOptions()
-    } else if (key === 'pushCode') { 
+    } else if (key === 'pushCode') {
         pushCodeShow.value = true
-        
+
     } else if (key === 'deviation') {
          deviationShow.value = true
          getDeviationData()
@@ -1394,8 +1394,8 @@ const testFileRefs = ref(null)
 const fileModalLoading = ref(false)
 const savefileModal = async () => {
     fileModalLoading.value = true
- 
-  
+
+
     if (!isUseTestTreeCy.value) {
           await testFileRefs.value?.savefileSubmit()
     } else {
@@ -1410,8 +1410,8 @@ const getIsUseTestTreeCy = async ()=>{
      const { error, code, data } = await thirdApi.isCyAndTestModule({
         projectId: projectId.value,
         contractId:   contract_id.value,
- 
-     
+
+
     })
     if (!error && code === 200) {
        isUseTestTreeCy.value = data
@@ -1441,7 +1441,7 @@ const formulaSaveClick = async () => {
     const { pkeyId } = tableFormItemNode.value
     const refs = await getFormRef(pkeyId)
 
-    
+
     refs?.clearCheckKeyList()
     formulaModalLoading.value = false
     formulaModal.value = false
@@ -2210,14 +2210,13 @@ const getEvaluteData = async (isRes, item) => {
     const { pkeyId } = item
 
     evaluateLoaing.value = true
-     const apiCall = isRes ? await wbsApi.evaluateTotalNew : await wbsApi.evaluateTotal
-            const { error, code, msg } = apiCall({
+     const apiCall = isRes ? wbsApi.evaluateTotalNew : wbsApi.evaluateTotal
+            const { error, code, msg } = await apiCall({
             tablePkeyId: pkeyId,
         })
         evaluateLoaing.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
-
             renewData()
         } else {
             window?.$message?.error(msg || '操作失败')
@@ -2233,7 +2232,7 @@ const dataType = ref([])
 const getMajorDataTypeOptions = async () => {
     const { data } = await getDictionary({ code:'auto_retrieve' })
     dataType.value = data
-   
+
 }
 const isShowNum = ref(false)
 const autoChangeType = (val)=>{
@@ -2271,7 +2270,7 @@ min = values[0]
 max = values[1]
          min = autoModal.value.customValue.split('/')[0]
         max = autoModal.value.customValue.split('/')[1]
-    } 
+    }
 
 
     const { error, code, msg, data } = await nodeBaseApi.getNodeBaseInfoByPkeyId(
@@ -2294,8 +2293,8 @@ max = values[1]
        window.$message?.success(msg || '操作成功')
        autoModalDialog.value = false
 
-    
-    } 
+
+    }
 }
 const autoClick = async (item)=>{
     console.log(item, 'item')
@@ -2317,7 +2316,7 @@ const autoClick = async (item)=>{
         console.log(data, 'data')
         refs?.setFormData(data)
 
-        } 
+        }
     }, 1000)
 }
 //插入编号
@@ -2336,8 +2335,8 @@ const submitPushCode = async ()=>{
             renewData()
             cancelPushCode()
         }
-     
-    
+
+
 }
 const pushCodeRef = ref(null)
 //测量偏差
@@ -2354,7 +2353,7 @@ const getDeviationData = async () => {
         // 从数组中找出k为"g8pcfw"和"g10pcfw"的对象，并提取v值
         const g8pcfwObj = data.find(item => item.k === 'g8pcfw')
         const g10pcfwObj = data.find(item => item.k === 'G10pcfw')
-        
+
         // 将找到的v值赋给deviationModal对应的属性
         deviationModal.value.g8pcfw = g8pcfwObj ? g8pcfwObj.v : ''
         deviationModal.value.g10pcfw = g10pcfwObj ? g10pcfwObj.v : ''
@@ -2363,7 +2362,7 @@ const getDeviationData = async () => {
         deviationModal.value.g8pcfw = ''
         deviationModal.value.g10pcfw = ''
     }
-}  
+}
 const validateDeviation = (rule, value, callback) => {
   if (!value) {
     callback(new Error('请输入偏差值')) // 空值提示
@@ -2397,7 +2396,7 @@ const deviationSaveClick = async ()=>{
             g8pcfw: deviationModal.value.g8pcfw,
             g10pcfw: deviationModal.value.g10pcfw,
             pKeyId: pkeyId,
-           
+
         },
     )
 
@@ -2405,7 +2404,7 @@ const deviationSaveClick = async ()=>{
     if (!error && code === 200) {
        window.$message?.success(msg || '操作成功')
       deviationShow.value = false
-    
+
 }
 }
 
@@ -2418,7 +2417,7 @@ const fileTypeSaveClick = ()=>{
 }
 const fileTypeModal = ref({
     type: '',
-   
+
 })
 const fileTypeLoading = ref(false)
 const fileType = ref([])
@@ -2431,14 +2430,14 @@ const fileTypeRules = {
         trigger: 'blur',
         message: '请选择附件类型',
     },
-  
+
 }
 //清除所有数据
 const clearShow = ref(false)
 const clearLoading1 = ref(false)
 const clearLoading2 = ref(false)
 const clearSaveClick = async (type)=>{
- 
+
     const { pkeyId, index } = tableFormItemNode.value
      const refs = await getFormRef(pkeyId)
         await HcDelMsg(async (resolve) => {
@@ -2480,7 +2479,7 @@ const clearSaveClick = async (type)=>{
                 window.$message.error(msg)
                  clearShow.value = false
             }
-           
+
 
             resolve() //关闭弹窗的回调
         })