111

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240515143544"
+  "value": "20240516175557"
 }

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

@@ -41,4 +41,12 @@ export default {
             params: { ids },
         }, msg)
     },
+    //详情
+    async selfDetail(id, msg = true) {
+        return HcApi({
+            url: '/api/blade-business/detection/self/trialSelfInById',
+            method: 'post',
+            params: { id },
+        }, msg)
+    },
 }

src/views/tentative/detect/commission.vue

@@ -57,7 +57,8 @@
                 <template #action="{ row }">
                     <el-link v-if="row.status === 1" type="primary" @click="rowEdit(row)">修改</el-link>
                     <el-link v-else type="success" @click="rowView(row)">查看</el-link>
-                    <el-link type="danger" :disabled="row.status !== 1" @click="rowReports(row)">创建报告</el-link>
+                    <el-link v-if="isNullES(row.testId)" type="danger" :disabled="row.status !== 1" @click="rowReports(row)">创建报告</el-link>
+                    <el-link v-else type="danger" :disabled="row.status !== 1" @click="rowFillReports(row)">填写报告</el-link>
                 </template>
             </hc-table>
             <template #action>
@@ -66,7 +67,7 @@
         </hc-new-card>
 
         <!-- 新增委托 -->
-        <hc-new-dialog v-model="delegateModal" ui="hc-delegate-html-modal" is-footer-center is-table title="新增委托" widths="60rem" @close="delegateModalClose">
+        <hc-new-dialog v-model="delegateModal" ui="hc-delegate-html-modal" is-footer-center is-table :title="`${editHtmlId ? '修改' : '新增'}委托`" widths="60rem" @close="delegateModalClose">
             <div class="hc-delegate-contract hc-flex h-40px">
                 <el-select v-model="delegateContractId" placeholder="请先选择合同段" filterable class="w-400px" @change="delegateContractChange">
                     <el-option v-for="item in contractData" :key="item.id" :label="item.contractName" :value="item.id" />
@@ -482,6 +483,29 @@ const rowActionModalClose = () => {
     formModel.value = {}
 }
 
+//填写报告
+const rowFillReports = async ({ id, testId }) => {
+    const { error, code, data, msg } = await mainApi.selfDetail(testId)
+    if (!error && code === 200) {
+        const res = getObjValue(data)
+        setStoreValue('test-form', res)
+        setStoreValue('testTreeItem', nodeDataInfo.value)
+        setStoreValue('prenodeDataInfo', nodeDataInfo.value)
+        router.push({
+            path: '/tentative/detect/test-form',
+            query: {
+                id: testId,
+                nodeId: res.nodeId,
+                dataType: res.type,
+                commissionId: id,
+                tabTypeKey: 1,
+            },
+        }).then()
+    } else {
+        window.$message.error(msg || '操作失败')
+    }
+}
+
 //批量打印
 const batchPrinting = () => {
 

src/views/tentative/material/sampling.vue

@@ -794,9 +794,14 @@ const delegationClick = () => {
         window.$message.warning('只能选择其中一条数据进行委托')
         return
     }
+    const data = rows[0]
+    if (!isNullES(data.testId)) {
+        window.$message.warning('已上报的数据不允许委托')
+        return
+    }
     delegateModal.value = true
-    editHtmlId.value = rows[0].id
-    entrustId.value = rows[0].entrustId
+    editHtmlId.value = data.id
+    entrustId.value = data.entrustId
     const { contractId } = deepClone(searchForm.value)
     delegateContractId.value = contractId
     if (!isNullES(contractId)) {