Merge remote-tracking branch 'origin/main'

src/utils/dict.js

@@ -163,6 +163,9 @@ CONSULTATION_TYPE: 'consultation_type',
   ASSET_TYPE: 'asset_type',
 //其他档案业务类型
 OTHER_BUSINESS_TYPE: 'other_business_type',
+//启用状态
+ENABLE_STATE: 'enable_state',
+
 
 }
 

src/views/borrow/record/index.vue

@@ -21,14 +21,15 @@
         <el-select
           v-model="queryParams.borrowState"
           placeholder="请选择借阅状态	"
+          clearable
+          size="small"
         >
           <el-option
-            v-for="item in borrowStateOptions"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          >
-          </el-option>
+            v-for="dict in this.getDictDatas(DICT_TYPE.BORROW_APPLY)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="借阅人名称" prop="userName">

src/views/setting/fileCategory/index.vue

@@ -1,65 +1,31 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="98px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
       <el-form-item label="档案类型编码" prop="categoryCode">
-        <el-input
-          v-model="queryParams.categoryCode"
-          placeholder="请输入档案类型编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.categoryCode" placeholder="请输入档案类型编码" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="类型名称" prop="typeName">
-        <el-input
-          v-model="queryParams.typeName"
-          placeholder="请输入类型名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.typeName" placeholder="请输入类型名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="目录号" prop="catalogNumber">
-        <el-input
-          v-model="queryParams.catalogNumber"
-          placeholder="请输入目录号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.catalogNumber" placeholder="请输入目录号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="保管期限" prop="custodyTime">
-        <el-date-picker
-          v-model="queryParams.custodyTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-        />
+        <el-date-picker v-model="queryParams.custodyTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="启用状态 " prop="state">
-        <el-select
-          v-model="queryParams.state"
-          placeholder="请选择启用状态 "
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
+        <el-select v-model="queryParams.state" placeholder="请选启用状态	" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ENABLE_STATE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -67,129 +33,63 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['setting:file-category:create']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['setting:file-category:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['setting:file-category:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['setting:file-category:export']">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column
-        label="档案类型编码"
-        align="center"
-        prop="categoryCode"
-      />
+      <el-table-column label="档案类型编码" align="center" prop="categoryCode" />
       <!-- <el-table-column label="档案类型父id" align="center" prop="parentId" /> -->
       <el-table-column label="类型名称" align="center" prop="typeName">
         <template v-slot="scope">
-          <dict-tag
-            :type="DICT_TYPE.ARCHIVES_FILE_TYPE"
-            :value="scope.row.typeName"
-          />
+          <dict-tag :type="DICT_TYPE.ARCHIVES_FILE_TYPE" :value="scope.row.typeName" />
         </template>
       </el-table-column>
       <el-table-column label="目录号" align="center" prop="catalogNumber" />
-      <el-table-column
-        label="二级类别号"
-        align="center"
-        prop="twoCatalogNumber"
-      />
-      <el-table-column
-        label="保管期限"
-        align="center"
-        prop="custodyTime"
-        width="180"
-      >
+      <el-table-column label="二级类别号" align="center" prop="twoCatalogNumber" />
+      <el-table-column label="保管期限" align="center" prop="custodyTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.custodyTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="启用状态 " align="center" prop="state" />
-      <el-table-column
-        label="创建日期"
-        align="center"
-        prop="createTime"
-        width="180"
-      >
+      <el-table-column label="启用状态 " align="center" prop="state">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.ENABLE_STATE" :value="scope.row.state" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建日期" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="制单人" align="center" prop="createBy" /> -->
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        fixed="right"
-        width="180px"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
         <template v-slot="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['setting:file-category:update']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['setting:file-category:delete']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['setting:file-category:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['setting:file-category:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="档案类型编码" prop="categoryCode">
-              <el-input
-                v-model="form.categoryCode"
-                placeholder="请输入档案类型编码"
-              />
+              <el-input v-model="form.categoryCode" placeholder="请输入档案类型编码" />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="8">
@@ -203,50 +103,36 @@
           <el-col :span="8">
             <el-form-item label="类型名称" prop="typeName">
               <el-select v-model="form.typeName" placeholder="请选择档案类型">
-                <el-option
-                  v-for="item in fileTypeOptions"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                >
+                <el-option v-for="item in fileTypeOptions" :key="item.id" :value="item.value" :label="item.label">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="目录号" prop="catalogNumber">
-              <el-input
-                v-model="form.catalogNumber"
-                placeholder="请输入目录号"
-              />
+              <el-input v-model="form.catalogNumber" placeholder="请输入目录号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="二级类别号" prop="twoCatalogNumber">
-              <el-input
-                v-model="form.twoCatalogNumber"
-                placeholder="请输入二级类别号"
-              />
+              <el-input v-model="form.twoCatalogNumber" placeholder="请输入二级类别号" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="保管期限" prop="custodyTime">
-              <el-date-picker
-                clearable
-                v-model="form.custodyTime"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择保管期限"
-              />
+              <el-date-picker clearable v-model="form.custodyTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择保管期限" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="启用状态 " prop="state">
-              <el-radio-group v-model="form.state">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
+              <el-select v-model="form.state" placeholder="请选择启用状态	" clearable size="small">
+                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ENABLE_STATE)" :key="dict.value"
+                  :label="dict.label" :value="dict.value" />
+              </el-select>
+
             </el-form-item>
           </el-col>
         </el-row>