试验修改

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

@@ -1,5 +1,5 @@
 <template>
-    <div class="form-item-dashed hover flex" @click="importModalClick">
+    <div class="form-item-dashed hover flex w-full" @click="importModalClick">
         <div v-if="uploadValue" class="flex-1 truncate">{{ fileNameValue }}</div>
         <div v-else class="flex-1">点此上传文件</div>
         <div v-if="uploadValue" class="text-hover" @click.stop="previewClick">预览文件</div>
@@ -227,3 +227,10 @@ const previewClick = () => {
     }
 }
 </style>
+
+<style scoped>
+.form-item-dashed{
+    border: 1px dashed lightgray;
+    padding: 5px;
+}
+</style>

src/views/tentative/detect/outside.vue

@@ -499,8 +499,8 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
-
+        // addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         formModalTitle.value = '编辑'
         addEditFormModal.value = true
     } else if (keys.length > 1) {

src/views/tentative/detect/third.vue

@@ -501,7 +501,8 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        // addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         formModalTitle.value = '编辑'
         addEditFormModal.value = true
     } else if (keys.length > 1) {
@@ -616,18 +617,16 @@ const copyFormApi = async () => {
         contractId: contractId.value,
     })
     //处理数据
-
+    addEditFormLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         addEditFormModal.value = false
-        setTimeout(() => {
-            addEditFormLoading.value = false
-        }, 1000)
+     
         await getTableData()
     } else {
         window?.$message?.error(msg)
     }
-    addEditFormLoading.value = false
+ 
 }
 
 //批量复制 提交保存

src/views/tentative/device/approach.vue

@@ -350,7 +350,7 @@ const setContextMenu = () => {
 //菜单的右键菜单被点击
 const contextMenuClick = ({ key, item }) => {
     if (key === 'edit') {
-        addEditNodeFormModel.value = item
+        addEditNodeFormModel.value = { ...item }
         addEditNodeFormModal.value = true
     } else if (key === 'del') {
         delNodeModalClick(item.id)
@@ -676,7 +676,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')

src/views/tentative/device/employ.vue

@@ -487,7 +487,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')
@@ -627,11 +627,11 @@ const addEditFormClick = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
-            addEditFormLoading.value = false
+         
             await getTableData()
         } else {
                 window?.$message?.error(msg)

src/views/tentative/device/overhaul.vue

@@ -448,7 +448,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')
@@ -523,11 +523,11 @@ const addEditFormClick = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+      
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
-            addEditFormLoading.value = false
             await getTableData()
         } else {
             window?.$message?.error(msg)

src/views/tentative/laboratory/print.vue

@@ -69,6 +69,7 @@ const projectId = ref(useAppState.getProjectId)
 const contractId = ref(useAppState.getContractId)
 const projectInfo = ref(useAppState.getProjectInfo)
 const isCollapse = ref(useAppState.getCollapse)
+const userInfo = ref(useAppState.getUserInfo)
 
 //监听
 watch(() => [

src/views/tentative/laboratory/user.vue

@@ -334,7 +334,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModel.value.certificateType = addEditFormModel.value.certificateType + ''
         addEditFormModel.value.certificateMajor = addEditFormModel.value.certificateMajor + ''
         addEditFormModal.value = true
@@ -410,11 +410,11 @@ const addEditFormClick = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
-            addEditFormLoading.value = false
+           
             await getTableData()
         } else {
             window?.$message?.error(msg)

src/views/tentative/material/approach.vue

@@ -429,13 +429,14 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
-        addEditFormModel.value.materialType = addEditFormModel.value.materialType + ''
-        addEditFormModel.value.materialCount = addEditFormModel.value.materialCount === -1 ? '' : addEditFormModel.value.materialCount
-        addEditFormModel.value.materialPrice = addEditFormModel.value.materialPrice === -1 ? '' : addEditFormModel.value.materialPrice
-        productionCertificateName.value = addEditFormModel.value.productionCertificateName
-        otherAccessoriesName.value = addEditFormModel.value.otherAccessoriesName
-        qualityInspectionReportName.value = addEditFormModel.value.qualityInspectionReportName
+        addEditFormModel.value = { ...keys[0] }
+        const editobj = { ...addEditFormModel.value }
+        addEditFormModel.value.materialType = editobj.materialType + ''
+        addEditFormModel.value.materialCount = editobj.materialCount === -1 ? '' : editobj.materialCount
+        addEditFormModel.value.materialPrice = editobj.materialPrice === -1 ? '' : editobj.materialPrice
+        productionCertificateName.value = editobj.productionCertificateName
+        otherAccessoriesName.value = editobj.otherAccessoriesName
+        qualityInspectionReportName.value = editobj.qualityInspectionReportName
 
         addEditFormModal.value = true
     } else if (keys.length > 1) {

src/views/tentative/material/sampling.vue

@@ -471,7 +471,8 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        // addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModel.value.representativeCount = addEditFormModel.value.representativeCount === -1 ? '' : addEditFormModel.value.representativeCount
         addEditFormModel.value.materialCount = addEditFormModel.value.materialCount === -1 ? '' : addEditFormModel.value.materialCount
         addEditFormModal.value = true
@@ -539,13 +540,11 @@ const addEditFormClick = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
-            setTimeout(() => {
-                addEditFormLoading.value = false
-            }, 1000)
+         
             await getTableData()
         } else {
             window?.$message?.error(msg)

src/views/tentative/parameter/compactness.vue

@@ -146,7 +146,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')
@@ -195,11 +195,11 @@ const addEditFormClick = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
-            addEditFormLoading.value = false
+         
             await getTableData()
         } else {
             window?.$message?.error(msg)

src/views/tentative/parameter/container.vue

@@ -277,7 +277,7 @@ const setContextMenu = () => {
 //菜单的右键菜单被点击
 const contextMenuClick = ({ key, item }) => {
     if (key === 'edit') {
-        addEditNodeFormModel.value = item
+        addEditNodeFormModel.value = { ...item }
         addEditNodeFormModal.value = true
     } else if (key === 'del') {
         delNodeModalClick(item.id)
@@ -541,7 +541,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')
@@ -582,12 +582,12 @@ const addEditFormClick = async () => {
             id: form['id'] ?? '',
         })
         //处理数据
-
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
 
-            addEditFormLoading.value = false
+          
 
             await getTableData()
             console.log(addEditFormLoading.value, 'addEditFormLoading.value')

src/views/tentative/parameter/density.vue

@@ -138,7 +138,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')
@@ -177,11 +177,11 @@ const addEditFormClick = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
-            addEditFormLoading.value = false
+            
             await getTableData()
         } else {
             window?.$message?.error(msg)

src/views/tentative/parameter/sieve.vue

@@ -199,7 +199,7 @@ const contextMenuItem = ref({})
 const contextMenuClick = ({ key, item }) => {
     contextMenuItem.value = item
     if (key === 'edit') {
-        addEditNodeFormModel.value = item
+        addEditNodeFormModel.value = { ...item }
         addEditNodeFormModal.value = true
     } else if (key === 'del') {
         HcDelMsg({}, async (instance, resolve) => {
@@ -310,11 +310,11 @@ const addEditNodeFormModalSave = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+        addEditNodeFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditNodeFormModal.value = false
-            addEditNodeFormLoading.value = false
+           
             await queryClassification()
         } else {
             window?.$message?.error(msg)
@@ -359,7 +359,7 @@ const addFormModalClick = () => {
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
     if (keys.length === 1) {
-        addEditFormModel.value = keys[0]
+        addEditFormModel.value = { ...keys[0] }
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')
@@ -428,11 +428,11 @@ const addEditFormClick = async () => {
             contractId: contractId.value,
         })
         //处理数据
-
+        addEditFormLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             addEditFormModal.value = false
-            addEditFormLoading.value = false
+    
             await getTableData()
         } else {
             window?.$message?.error(msg)