ME 1 viikko sitten
vanhempi
commit
7a47ee0c35
2 muutettua tiedostoa jossa 34 lisäystä ja 8 poistoa
  1. 9 5
      src/views/emergency/archive-add-or-update.vue
  2. 25 3
      src/views/emergency/archive.vue

+ 9 - 5
src/views/emergency/archive-add-or-update.vue

@@ -4,11 +4,16 @@
           <el-form-item label="档案名称" prop="archiveName">
         <el-input v-model="dataForm.archiveName" placeholder="档案名称"></el-input>
       </el-form-item>
-          <el-form-item label="档案类型(1-月度评测 2-年度评测 3-其他)" prop="archiveType">
-        <el-input v-model="dataForm.archiveType" placeholder="档案类型(1-月度评测 2-年度评测 3-其他)"></el-input>
+          <el-form-item label="档案类型" prop="archiveType">
+         <el-select v-model="dataForm.archiveType" placeholder="档案类型">
+          <el-option label="月度评测" value="1"></el-option>
+          <el-option label="年度评测" value="2"></el-option>
+          <el-option label="其他" value="3"></el-option>
+        </el-select>
       </el-form-item>
           <el-form-item label="文件存储路径" prop="filePath">
         <el-input v-model="dataForm.filePath" placeholder="文件存储路径"></el-input>
+        
       </el-form-item>
           <el-form-item label="档案描述" prop="description">
         <el-input v-model="dataForm.description" placeholder="档案描述"></el-input>
@@ -49,9 +54,8 @@ const rules = ref({
           description: [
       { required: true, message: '必填项不能为空', trigger: 'blur' }
     ],
-                  remark: [
-      { required: true, message: '必填项不能为空', trigger: 'blur' }
-    ]
+          remark: []
+    
   });
 
 const init = (id?: number) => {

+ 25 - 3
src/views/emergency/archive.vue

@@ -1,18 +1,36 @@
 <template>
   <div class="mod-demo__archive">
     <el-form :inline="true" :model="state.dataForm" @keyup.enter="state.getDataList()">
+      <el-form-item>
+        <el-input v-model="state.dataForm.archiveName" placeholder="档案名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <ren-select v-model="state.dataForm.archiveType" dict-type="archiveType" placeholder="档案类型"></ren-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="state.getDataList()">查询</el-button>
+      </el-form-item>
       <el-form-item>
         <el-button v-if="state.hasPermission('emergency:archive:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
       </el-form-item>
       <el-form-item>
         <el-button v-if="state.hasPermission('emergency:archive:delete')" type="danger" @click="state.deleteHandle()">删除</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button v-if="state.hasPermission('emergency:archive:export')" type="info" @click="state.exportHandle()">导出</el-button>
+      </el-form-item>
     </el-form>
     <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" style="width: 100%">
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
               <el-table-column prop="id" label="档案ID" header-align="center" align="center"></el-table-column>
               <el-table-column prop="archiveName" label="档案名称" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="archiveType" label="档案类型(1-月度评测 2-年度评测 3-其他)" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="archiveType" label="档案类型" header-align="center" align="center">
+                <template v-slot="scope">
+                  <span v-if="scope.row.archiveType === 1">月度测评</span>
+                  <span v-else-if="scope.row.archiveType === 2">年度测评</span>
+                  <span v-else-if="scope.row.archiveType === 3">其他</span>
+                </template>
+              </el-table-column>
               <el-table-column prop="filePath" label="文件存储路径" header-align="center" align="center"></el-table-column>
               <el-table-column prop="description" label="档案描述" header-align="center" align="center"></el-table-column>
               <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
@@ -35,7 +53,7 @@
 
 <script lang="ts" setup>
 import useView from "@/hooks/useView";
-import { reactive, ref, toRefs } from "vue";
+import { reactive, ref, toRefs, computed } from "vue";
 import AddOrUpdate from "./archive-add-or-update.vue";
 
 const view = reactive({
@@ -43,7 +61,11 @@ const view = reactive({
   getDataListURL: "/emergency/archive/page",
   getDataListIsPage: true,
   exportURL: "/emergency/archive/export",
-  deleteURL: "/emergency/archive"
+  deleteURL: "/emergency/archive",
+  dataForm: {
+    archiveName: "",
+    archiveType: "",
+  }
 });
 
 const state = reactive({ ...useView(view), ...toRefs(view) });