Merge remote-tracking branch 'origin/master'

src/views/project/contract/index.vue

@@ -1,16 +1,16 @@
 <template>
     <HcCard>
         <template #header>
-            <div class="w-36">
+            <!-- <div class="w-36">
                 <el-select v-model="searchForm.projectType" block clearable placeholder="项目类型" size="large">
-                    <el-option v-for="item in projectType" :label="item.name" :value="item.key"/>
+                    <el-option v-for="item in projectType" :label="item.dictName" :value="item.dictValue"/>
                 </el-select>
             </div>
             <div class="w-40 ml-2">
-                <el-select v-model="searchForm.projectType" block clearable placeholder="服务类型" size="large">
-                    <el-option v-for="item in projectType" :label="item.name" :value="item.key"/>
+                <el-select v-model="searchForm.projectServerType" block clearable placeholder="服务类型" size="large">
+                    <el-option v-for="item in serverType" :label="item.dictName" :value="item.dictValue"/>
                 </el-select>
-            </div>
+            </div> -->
             <div class="w-48 ml-2">
                 <el-input v-model="searchForm.queryValue" clearable placeholder="请输入项目名称进行查询" size="large"/>
             </div>
@@ -63,27 +63,23 @@ import {useRouter} from 'vue-router'
 import contractApi from '~api/project/project-contract.js';
 import {getArrValue} from "js-fast-way"
 import {delMessage} from "~uti/tools";
+import projectApi from '~api/project/project-list.js';
 
 const router = useRouter()
 onActivated(()=>{
     getTableData()
+  
 })
 onMounted(()=>{
     getTableData()
   
 })
 
-//项目类型
-const projectType = ref([
-    {name: '二级路', key: '二级路'},
-    {name: '国道', key: '国道'},
-    {name: '水利水电', key: '水利水电'},
-    {name: '市政', key: '市政'},
-])
+
 
 //搜索表单
 const searchForm = ref({
-    projectType: null, user: null, project: null,
+    queryValue: null,
     current: 1, size: 20, total: 0
 })