Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/dictionary/template/file/fileForm.vue

@@ -1,85 +1,41 @@
 <template>
   <base-model :config="config">
     <div slot="dialog-body">
-      <el-form
+      <el-form ref="fileForm" :model="form" label-width="100px" size="small" :rules="rules">
-        ref="fileForm"
-        :model="form"
-        label-width="100px"
-        size="small"
-        :rules="rules"
-      >
         <div class="base-dialog-body">
           <el-form-item :label="$t('dictionary:file:form:name')" prop="Name">
             <el-input v-model="form.Name" />
           </el-form-item>
-          <el-form-item
+          <el-form-item :label="$t('dictionary:file:form:nameCN')" prop="NameCN">
-            :label="$t('dictionary:file:form:nameCN')"
-            prop="NameCN"
-          >
             <el-input v-model="form.NameCN" />
           </el-form-item>
-          <el-form-item
+          <el-form-item :label="$t('dictionary:browser:form:ArchiveTypeEnum')" prop="ArchiveTypeEnum">
-            :label="$t('dictionary:browser:form:ArchiveTypeEnum')"
+            <el-select v-model="form.ArchiveTypeEnum" clearable placeholder="" style="width: 100%">
-            prop="ArchiveTypeEnum"
+              <el-option v-for="item in $d.ArchiveType" :key="item.id" :label="item.label" :value="item.value">
-          >
-            <el-select
-              v-model="form.ArchiveTypeEnum"
-              clearable
-              placeholder=""
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in $d.ArchiveType"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+          <el-form-item :label="$t('dictionary:browser:form:SubIdentificationEnum')" prop="SubIdentificationEnum">
-            :label="$t('dictionary:browser:form:SubIdentificationEnum')"
+            <el-select style="width: 100%" v-model="form.SubIdentificationEnum" clearable placeholder="">
-            prop="SubIdentificationEnum"
+              <el-option v-for="item in $d.SubIdentification" :key="item.id" :label="item.label" :value="item.value">
-          >
-            <el-select
-              style="width: 100%"
-              v-model="form.SubIdentificationEnum"
-              clearable
-              placeholder=""
-            >
-              <el-option
-                v-for="item in $d.SubIdentification"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+          <el-form-item :label="$t('dictionary:browser:form:SysTemplateTypeEnum')" prop="SysTemplateTypeEnum">
-            :label="$t('dictionary:file:form:ShowOrder')"
+            <el-select style="width: 100%" v-model="form.SysTemplateTypeEnum" clearable placeholder="">
-            prop="ShowOrder"
+              <el-option v-for="item in $d.SysTemplateType" :key="item.id" :label="item.label" :value="item.value">
-          >
+              </el-option>
-            <el-input-number
+            </el-select>
-              v-model="form.ShowOrder"
+          </el-form-item>
-              :step="1"
+          <el-form-item :label="$t('dictionary:file:form:ShowOrder')" prop="ShowOrder">
-              step-strictly
+            <el-input-number v-model="form.ShowOrder" :step="1" step-strictly></el-input-number>
-            ></el-input-number>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:form:IsEnable')">
-            <el-switch
+            <el-switch v-model="form.IsEnable" :active-value="true" :inactive-value="false">
-              v-model="form.IsEnable"
-              :active-value="true"
-              :inactive-value="false"
-            >
             </el-switch>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:form:IsConfirmRecord')">
-            <el-switch
+            <el-switch v-model="form.IsConfirmRecord" :active-value="true" :inactive-value="false">
-              v-model="form.IsConfirmRecord"
-              :active-value="true"
-              :inactive-value="false"
-            >
             </el-switch>
           </el-form-item>
         </div>
@@ -126,6 +82,7 @@ export default {
         NameCN: null,
         SubIdentificationEnum: null,
         ShowOrder: 0,
+        SysTemplateTypeEnum: null
       },
       rules: {
         Name: [
@@ -149,6 +106,13 @@ export default {
             trigger: ['blur', 'change'],
           },
         ],
+        SysTemplateTypeEnum: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         ArchiveTypeEnum: [
           {
             required: true,

src/views/dictionary/template/file/index.vue

@@ -11,85 +11,41 @@
             <el-input v-model="searchData.NameCN" style="width: 100px" />
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:search:archiveTypeEnum')">
-            <el-select
+            <el-select v-model="searchData.ArchiveTypeEnum" clearable placeholder="" style="width: 100px">
-              v-model="searchData.ArchiveTypeEnum"
+              <el-option v-for="item in $d.ArchiveType" :key="item.id" :label="item.label" :value="item.value">
-              clearable
-              placeholder=""
-              style="width: 100px"
-            >
-              <el-option
-                v-for="item in $d.ArchiveType"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+          <el-form-item :label="$t('dictionary:file:search:subIdentificationEnum')">
-            :label="$t('dictionary:file:search:subIdentificationEnum')"
+            <el-select v-model="searchData.SubIdentificationEnum" clearable placeholder="" style="width: 100px">
-          >
+              <el-option v-for="item in $d.SubIdentification" :key="item.id" :label="item.label" :value="item.value">
-            <el-select
+              </el-option>
-              v-model="searchData.SubIdentificationEnum"
+            </el-select>
-              clearable
+          </el-form-item>
-              placeholder=""
+          <el-form-item :label="$t('dictionary:file:search:SysTemplateTypeEnum')">
-              style="width: 100px"
+            <el-select v-model="searchData.SysTemplateTypeEnum" clearable placeholder="" style="width: 100px">
-            >
+              <el-option v-for="item in $d.SysTemplateType" :key="item.id" :label="item.label" :value="item.value">
-              <el-option
-                v-for="item in $d.SubIdentification"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:search:isEnable')">
-            <el-select
+            <el-select v-model="searchData.IsEnable" clearable placeholder="" style="width: 100px">
-              v-model="searchData.IsEnable"
+              <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
-              clearable
-              placeholder=""
-              style="width: 100px"
-            >
-              <el-option
-                v-for="item in $d.YesOrNo"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('dictionary:file:search:isConfirmRecord')">
-            <el-select
+            <el-select v-model="searchData.IsConfirmRecord" clearable placeholder="" style="width: 100px">
-              v-model="searchData.IsConfirmRecord"
+              <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
-              clearable
-              placeholder=""
-              style="width: 100px"
-            >
-              <el-option
-                v-for="item in $d.YesOrNo"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              >
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item>
-            <el-button
+            <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-              type="primary"
-              icon="el-icon-search"
-              @click="handleSearch"
-            >
               {{ $t('common:button:search') }}
             </el-button>
-            <el-button
+            <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-              type="primary"
-              icon="el-icon-refresh-left"
-              @click="handleReset"
-            >
               {{ $t('common:button:reset') }}
             </el-button>
           </el-form-item>
@@ -101,106 +57,60 @@
         </span>
       </div>
 
-      <el-table
+      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe height="100"
-        v-loading="loading"
+        style="width: 100%" @sort-change="handleSortByColumn">
-        v-adaptive="{ bottomOffset: 45 }"
-        :data="list"
-        stripe
-        height="100"
-        style="width: 100%"
-        @sort-change="handleSortByColumn"
-      >
         <el-table-column type="index" width="40" />
 
-        <el-table-column
+        <el-table-column prop="Name" :label="$t('dictionary:file:table:Name')" sortable="custom" show-overflow-tooltip
-          prop="Name"
+          min-width="150px" />
-          :label="$t('dictionary:file:table:Name')"
+        <el-table-column prop="NameCN" :label="$t('dictionary:file:table:NameCN')" show-overflow-tooltip
-          sortable="custom"
+          sortable="custom" min-width="150px" />
-          show-overflow-tooltip
+        <el-table-column prop="ArchiveTypeEnum" :label="$t('dictionary:file:table:archiveTypeEnum')"
-        />
+          show-overflow-tooltip sortable="custom" min-width="120px">
-        <el-table-column
-          prop="NameCN"
-          :label="$t('dictionary:file:table:NameCN')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          prop="ArchiveTypeEnum"
-          :label="$t('dictionary:file:table:archiveTypeEnum')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
             {{ $fd('ArchiveType', scope.row.ArchiveTypeEnum) }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="SubIdentificationEnum" :label="$t('dictionary:file:table:subIdentificationEnum')"
-          prop="SubIdentificationEnum"
+          show-overflow-tooltip sortable="custom" min-width="120px">
-          :label="$t('dictionary:file:table:subIdentificationEnum')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
             {{ $fd('SubIdentification', scope.row.SubIdentificationEnum) }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="SysTemplateTypeEnum" :label="$t('dictionary:file:table:SysTemplateTypeEnum')"
-          prop="ShowOrder"
+          show-overflow-tooltip sortable="custom">
-          :label="$t('dictionary:file:table:ShowOrder')"
+          <template slot-scope="scope">
-          show-overflow-tooltip
+            {{ $fd('SysTemplateType', scope.row.SysTemplateTypeEnum) }}
-          sortable="custom"
+          </template>
-        />
+        </el-table-column>
-        <el-table-column
+        <el-table-column prop="ShowOrder" :label="$t('dictionary:file:table:ShowOrder')" show-overflow-tooltip
-          :label="$t('dictionary:file:table:IsEnable')"
+          sortable="custom" />
-          prop="IsEnable"
+        <el-table-column :label="$t('dictionary:file:table:IsEnable')" prop="IsEnable" show-overflow-tooltip
-          show-overflow-tooltip
+          sortable="custom" min-width="120px">
-          sortable="custom"
-        >
           <template slot-scope="scope">
             <el-tag :type="!scope.row.IsEnable ? 'info' : ''">
               {{ $fd('YesOrNo', scope.row.IsEnable) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column :label="$t('dictionary:file:table:isConfirmRecord')" prop="IsConfirmRecord"
-          :label="$t('dictionary:file:table:isConfirmRecord')"
+          show-overflow-tooltip sortable="custom" min-width="150px">
-          prop="IsConfirmRecord"
-          show-overflow-tooltip
-          sortable="custom"
-          width="200"
-        >
           <template slot-scope="scope">
             <el-tag :type="!scope.row.IsEnable ? 'info' : ''">
               {{ $fd('YesOrNo', scope.row.IsConfirmRecord) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="CreateTime" :label="$t('dictionary:file:table:createTime')" show-overflow-tooltip
-          prop="CreateTime"
+          sortable="custom" min-width="180px" />
-          :label="$t('dictionary:file:table:createTime')"
+        <el-table-column prop="UpdateTime" :label="$t('dictionary:file:table:updateTime')" show-overflow-tooltip
-          show-overflow-tooltip
+          sortable="custom" min-width="180px" />
-          sortable="custom"
+        <el-table-column :label="$t('dictionary:file:table:action')" width="200" fixed="right">
-        />
-        <el-table-column
-          prop="UpdateTime"
-          :label="$t('dictionary:file:table:updateTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          :label="$t('dictionary:file:table:action')"
-          width="200"
-          fixed="right"
-        >
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row)">
               {{ $t('dictionary:file:button:edit') }}
             </el-button>
-            <el-button
+            <el-button type="text" @click="handleDelete(scope.row)" v-if="hasPermi(['dictionary:template:file:del'])">
-              type="text"
-              @click="handleDelete(scope.row)"
-              v-if="hasPermi(['dictionary:template:file:del'])"
-            >
               {{ $t('dictionary:file:button:delete') }}
             </el-button>
           </template>
@@ -208,20 +118,9 @@
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        class="page"
+        @pagination="getList" />
-        :total="total"
+      <File-form :config="config" :data="rowData" v-if="config.visible" @close="close" @getList="getList" />
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
-      <File-form
-        :config="config"
-        :data="rowData"
-        v-if="config.visible"
-        @close="close"
-        @getList="getList"
-      />
     </box-content>
   </BoxContent>
 </template>
@@ -238,6 +137,7 @@ const searchDataDefault = () => {
     Name: null,
     NameCN: null,
     SubIdentificationEnum: null,
+    SysTemplateTypeEnum: null,
     PageIndex: 1,
     PageSize: 20,
     asc: false,
@@ -344,4 +244,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.box-body .search .base-search-form .el-form-item {
+  margin-bottom: 10px;
+}
 </style>