待测样品

public/version.json

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

src/api/modules/tentative/acquisition/data.js

@@ -0,0 +1,28 @@
+import { HcApi } from '../../../request/index'
+
+export default {
+    //分页查询
+    async page(form, msg = true) {
+        return HcApi({
+            url: '/api/blade-business/entrustinfo/pageDataInfo',
+            method: 'get',
+            params: form,
+        }, msg)
+    },
+    //删除在测样品
+    async sampleRemove(ids, msg = true) {
+        return HcApi({
+            url: '/api/blade-business/entrustinfo/sample_remove',
+            method: 'post',
+            params: { ids },
+        }, msg)
+    },
+    //修改
+    async update(form, msg = true) {
+        return HcApi({
+            url: '/api/blade-business/entrustinfo/update',
+            method: 'post',
+            data: form,
+        }, msg)
+    },
+}

src/views/tentative/acquisition/data.vue

@@ -30,26 +30,25 @@
         </template>
         <hc-card>
             <template #header>
-                <div class="w-50">
-                    <el-select v-model="searchForm.contractId" placeholder="选择合同段" filterable clearable block>
-                        <el-option label="测试1" value="1" />
-                        <el-option label="测试2" value="2" />
+                <div class="w-200px">
+                    <el-select v-model="searchForm.contractId" placeholder="选择合同段" filterable block>
+                        <el-option v-for="item in contractData" :key="item.id" :label="item.contractName" :value="item.id" />
                     </el-select>
                 </div>
                 <div class="ml-2 w-40">
-                    <el-select v-model="searchForm.key1" placeholder="是否合格" filterable clearable block>
-                        <el-option label="合格" value="1" />
-                        <el-option label="不合格" value="2" />
+                    <el-select v-model="searchForm.dataQualified" placeholder="是否合格" filterable clearable block>
+                        <el-option label="合格" :value="1" />
+                        <el-option label="不合格" :value="2" />
                     </el-select>
                 </div>
                 <div class="ml-2 w-40">
-                    <el-select v-model="searchForm.key2" placeholder="数据状态" filterable clearable block>
-                        <el-option label="已引用" value="1" />
-                        <el-option label="未引用" value="2" />
+                    <el-select v-model="searchForm.dataStatus" placeholder="数据状态" filterable clearable block>
+                        <el-option label="已引用" :value="2" />
+                        <el-option label="未引用" :value="1" />
                     </el-select>
                 </div>
-                <div class="ml-2 w-150px">
-                    <el-date-picker v-model="searchForm.date" class="block" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" clearable placeholder="试验时间" />
+                <div class="ml-2 w-250px">
+                    <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                 </div>
                 <div class="ml-2">
                     <el-button type="primary" @click="searchClick">
@@ -108,11 +107,20 @@
 </template>
 
 <script setup>
-import { onActivated, onDeactivated, ref } from 'vue'
+import { onActivated, ref } from 'vue'
+import { useAppStore } from '~src/store'
+import { getErtractInfo } from '~api/other'
+import { getArrValue, getObjValue, isNullES } from 'js-fast-way'
+import mainApi from '~api/tentative/acquisition/data'
+
+//变量
+const store = useAppStore()
+const projectId = ref(store.getProjectId)
+const contractId = ref(store.getContractId)
 
 //渲染完成
 onActivated(() => {
-
+    getContractData()
 })
 
 //分割配置
@@ -124,6 +132,34 @@ const bodySplitOptions = {
 //搜索表单
 const searchForm = ref({ current: 1, size: 20, total: 0 })
 
+//获取合同段信息
+const contractData = ref([])
+const getContractData = async () => {
+    const { data } = await getErtractInfo({
+        projectId: projectId.value,
+        contractId: contractId.value,
+    })
+    const res = getArrValue(data)
+    contractData.value = res
+    if (res.length > 0) {
+        searchForm.value.contractId = res[0].id
+        searchClick()
+    }
+}
+
+//日期时间被选择
+const betweenTime = ref(null)
+const betweenTimeUpdate = ({ arr }) => {
+    betweenTime.value = arr
+    if (arr.length > 0) {
+        searchForm.value.startTime = arr[0]
+        searchForm.value.endTime = arr[1]
+    } else {
+        searchForm.value.startTime = null
+        searchForm.value.endTime = null
+    }
+}
+
 //分类数据
 const menuData = ref([
     {