Prechádzať zdrojové kódy

试验自检新增编辑修改

duy 2 rokov pred
rodič
commit
47fc54f7ec

+ 20 - 2
src/views/tentative/detect/components/ListItem.vue

@@ -256,6 +256,12 @@ const formKeyIds = ref('')
 const CollapseChange = async (name) => {
     ActiveKey.value = name
     const names = name ? name.split('-') : []
+    console.log(names[2]);
+    formData.value.forEach((changeitem)=>{
+        if(changeitem.pkeyId===names[2]){
+            changeitem.isCollapseLoad=true
+        }
+    })
     if (names.length > 0) {
         getOffsetTop(name)
         const index = names[1]
@@ -381,14 +387,25 @@ const getBussDataInfo = async (item, index) => {
         window?.$message?.warning('pkeyId为空')
     }
 }
-
+const toBackClick = () => {
+    router.push({
+        path: '/tentative/detect/test',
+        query: {}
+    })
+}
 //单个保存
 const tableFormSaveLoading = ref(false)
 const tableFormSaveClick = async (item,index) => {
     if (isStatus.value !== '3') {
         const res = await saveExcelBussData(item,index)
         if (res) {
-            await getBussPdfInfo(item)
+            if(!isaddType){
+                 await getBussPdfInfo(item)
+            }else{
+                //返回
+                toBackClick()
+            }
+           
             renewData()
         }
     } else {
@@ -926,6 +943,7 @@ const renewData = () => {
 //获取表单数据
 const getFormData = () => {
     const formArr = formData.value;
+    console.log( formData.value,' formData.value');
     return  formArr.filter(({pkeyId, isCollapseLoad}) => {
         return (pkeyId ?? '') !== '' && isCollapseLoad;
     })

+ 12 - 3
src/views/tentative/detect/test-form.vue

@@ -49,7 +49,7 @@
                 />
             </el-scrollbar>
             <template #action>
-                <el-button type="primary" hc-btn :disabled="listItemData.length <= 0" :loading="tableFormSaveLoading" @click="tableFormSaveClick">
+                <el-button type="primary" hc-btn :disabled="NodeStatus === '3' || listItemData.length <= 0" :loading="tableFormSaveLoading" @click="tableFormSaveClick">
                     <HcIcon name="save"/>
                     <span>保存</span>
                 </el-button>
@@ -174,6 +174,7 @@ const routerQuery = useRoutes?.query;
 const dataId = routerQuery?.id || '';
 const nodeId = routerQuery?.nodeId || '';
 const dataType = routerQuery?.dataType || '1';
+const isaddType = routerQuery?.isaddType || false;
 
 const dayDate = dayjs().format('YYYY-MM-DD')
 const testTreeItem = ref(getStoreData('testTreeItem'));
@@ -509,11 +510,19 @@ const tableFormSaveClick = async () => {
             window?.$message?.success('保存成功')
             listItemBaseData.value.deviceUseIds=''
             checkTabId.value=''
-            bussPdfsClick()
+            if(!isaddType){
+                bussPdfsClick()
+            }else{
+                toBackClick()
+            }
+           
             getTableDataAll()
         }
     } else {
-        bussPdfsClick()
+          if(!isaddType){
+                bussPdfsClick()
+            }
+    
     }
 }