Browse Source

优化试验管理页面

iZaiZaiA 2 years ago
parent
commit
9eb338cecb
2 changed files with 16 additions and 5 deletions
  1. 3 3
      src/views/tentative/collect/monthly.vue
  2. 13 2
      src/views/tentative/detect/test-form.vue

+ 3 - 3
src/views/tentative/collect/monthly.vue

@@ -38,15 +38,15 @@
             <HcCard>
                 <template #header>
                     <div class="w-40">
-                        <el-select v-model="searchForm.type" placeholder="请选择材料类别" clearable>
+                        <el-select v-model="searchForm.type" placeholder="请选择材料类别" clearable size="large">
                             <el-option v-for="item in typeData" :key="item.value" :label="item['label']" :value="item['value']"/>
                         </el-select>
                     </div>
                     <div class="w-64 ml-2">
-                        <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate"/>
+                        <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" size="large"/>
                     </div>
                     <div class="ml-2">
-                        <el-button type="primary" @click="searchClick">
+                        <el-button type="primary" @click="searchClick" size="large">
                             <HcIcon name="search-2"/>
                             <span>搜索</span>
                         </el-button>

+ 13 - 2
src/views/tentative/detect/test-form.vue

@@ -21,10 +21,10 @@
                     <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" size="default" :round="false"/>
                 </div>
                 <div class="hc-search-top-form">
-                    <div class="w-36">
+                    <div class="w-36" v-if="tabTypeKey === 'tab2'">
                         <el-date-picker type="date" v-model="topFormModel.key1" class="block" value-format="YYYY-MM-DD" :clearable="false" placeholder="请选择报告日期"/>
                     </div>
-                    <div class="w-28 ml-2">
+                    <div class="w-28 ml-2" v-if="tabTypeKey === 'tab2'">
                         <el-select v-model="topFormModel.key2" placeholder="是否合格" block>
                             <el-option label="合格" value="1" />
                             <el-option label="不合格" value="2" />
@@ -125,6 +125,7 @@ import {useAppStore} from "~src/store";
 import {useRouter, useRoute} from 'vue-router'
 import ListItem from "./components/ListItem.vue"
 import WbsTree from "../../data-fill/components/WbsTree.vue"
+import dayjs from "dayjs"
 
 //变量
 const router = useRouter()
@@ -141,9 +142,12 @@ const dataId = routerQuery?.id || '';
 const dataType = parseInt(routerQuery?.type + '') || 1;
 const fileType = parseInt(routerQuery?.fileType + '') || 2;
 
+const dayDate = dayjs().format('YYYY-MM-DD')
+
 //渲染完成
 onMounted(() => {
     setContractType(contractInfo.value?.contractType)
+    topFormModel.value.key1 = dayDate
 })
 
 //身份按钮切换数据
@@ -159,8 +163,15 @@ const authBtnTabClick = (val) => {
 const setContractType = (contractType) => {
     if (contractType <= 0) {
         authBtnTabKey.value = '1'
+        authBtnTabKey.value = '1'
+        topFormModel.value.key3 = '1'
     } else {
         authBtnTabKey.value = contractType + ''
+        if (contractType < 3) {
+            topFormModel.value.key3 = contractType + ''
+        } else {
+            topFormModel.value.key3 = '1'
+        }
     }
 }