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

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

@@ -56,6 +56,16 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:file:form:ShowOrder')"
+            prop="ShowOrder"
+          >
+            <el-input-number
+              v-model="form.ShowOrder"
+              :step="1"
+              step-strictly
+            ></el-input-number>
+          </el-form-item>
           <el-form-item :label="$t('dictionary:file:form:IsEnable')">
             <el-switch
               v-model="form.IsEnable"
@@ -115,6 +125,7 @@ export default {
         Name: null,
         NameCN: null,
         SubIdentificationEnum: null,
+        ShowOrder: 0,
       },
       rules: {
         Name: [

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

@@ -144,6 +144,12 @@
             {{ $fd('SubIdentification', scope.row.SubIdentificationEnum) }}
           </template>
         </el-table-column>
+        <el-table-column
+          prop="ShowOrder"
+          :label="$t('dictionary:file:table:ShowOrder')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <el-table-column
           :label="$t('dictionary:file:table:IsEnable')"
           prop="IsEnable"