From 14ff639507ffd367b2d61694924652746621847d Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 6 Jul 2022 13:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86-list?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=A1=B9=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesList/archivesDetail.vue           |   3 +-
 .../archivesManage/archivesList/index.vue     |  16 ++-
 .../module/archivesAnjuan/index.vue           |  27 +++-
 .../module/archivesJuannei/index.vue          |  22 +--
 .../module/archivesProject/index.vue          |  10 +-
 .../archivesList/module/binding/index.vue     | 133 ------------------
 6 files changed, 51 insertions(+), 160 deletions(-)
 delete mode 100644 src/views/archivesManage/archivesList/module/binding/index.vue

diff --git a/src/views/archivesManage/archivesList/archivesDetail.vue b/src/views/archivesManage/archivesList/archivesDetail.vue
index 75caea1..2d336a4 100644
--- a/src/views/archivesManage/archivesList/archivesDetail.vue
+++ b/src/views/archivesManage/archivesList/archivesDetail.vue
@@ -171,11 +171,10 @@ import PreviewForm from '@/views/components/category/PreviewForm'
 import UploadFile from './module/uploadFile/index'
 import ArchivesInfo from './module/archivesInfo/index'
 import Packing from './module/packing/index'
-import Binding from './module/binding/index'
 
 export default {
   name: 'ArchivesDetail',
-  components: { crudOperation, rrOperation, pagination, PreviewForm, UploadFile, ArchivesInfo, Packing, Binding },
+  components: { crudOperation, rrOperation, pagination, PreviewForm, UploadFile, ArchivesInfo, Packing },
   mixins: [
     presenter(),
     header(),
diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue
index 20cd9e1..d015486 100644
--- a/src/views/archivesManage/archivesList/index.vue
+++ b/src/views/archivesManage/archivesList/index.vue
@@ -393,7 +393,9 @@ export default {
             this.$refs.anjuan.getTableDisplayFields()
             this.$refs.file.getTableDisplayFields()
           }
-          this.$refs.project.getTableList()
+          setTimeout(() => {
+            this.$refs.project.getTableList()
+          }, 200)
           if (!this.treeCurrentNode) {
             this.getYear('project')
           }
@@ -406,7 +408,9 @@ export default {
           if (this.selectedCategory.children.length !== 0) {
             this.$refs.file.getTableDisplayFields()
           }
-          this.$refs.anjuan.getTableList()
+          setTimeout(() => {
+            this.$refs.anjuan.getTableList()
+          }, 200)
           if (!this.treeCurrentNode) {
             this.getYear('anjuan')
           }
@@ -415,7 +419,9 @@ export default {
         this.$nextTick(() => {
           this.$refs.file.junneiData = []
           this.$refs.file.getTableDisplayFields()
-          this.$refs.file.getTableList()
+          setTimeout(() => {
+            this.$refs.file.getTableList()
+          }, 200)
           if (!this.treeCurrentNode) {
             this.getYear('file')
           }
@@ -424,7 +430,9 @@ export default {
         this.$nextTick(() => {
           this.$refs.anjuan.anjuanData = []
           this.$refs.anjuan.getTableDisplayFields()
-          this.$refs.anjuan.getTableList()
+          setTimeout(() => {
+            this.$refs.anjuan.getTableList()
+          }, 200)
           if (!this.treeCurrentNode) {
             this.getYear('anjuan')
           }
diff --git a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
index a0cf9c6..3786c17 100644
--- a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
@@ -28,7 +28,7 @@
           <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
           <el-option v-for="item in stateOptions" :key="item.key" :label="item.label" :value="item.key" />
         </el-select>
-        <el-input v-model="anjuanQuery[anjuanInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="getTableList()">
+        <el-input v-model="anjuanQuery[anjuanInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
           <el-select slot="prepend" v-model="anjuanInputSelect" style="width: 80px" @change="querySelect">
             <el-option
               v-for="item in queryOption"
@@ -283,7 +283,8 @@ export default {
         'queryTitle': null,
         'recordNo': null,
         'archiveCtgNo': null,
-        'archiveNo': null
+        'archiveNo': null,
+        'responsibleby': null
       },
       stateOptions: [ // 搜索 - 状态选择
         { key: '1', label: '全部' },
@@ -343,6 +344,11 @@ export default {
   created() {
     // 初始化带select的输入框的 - 搜索
     this.anjuanInputSelect = this.queryOption[0].value
+    if (this.selectedCategory === 5) {
+      this.queryOption.push({ value: 'responsibleby', label: '责任者' })
+    } else {
+      this.queryOption.push({ value: 'archiveCtgNo', label: '实体分类号' })
+    }
   },
   mounted() {
   },
@@ -378,12 +384,12 @@ export default {
       }
       FetchTableDisplayFields({ categoryId: this.categoryId }).then(data => {
         if (data) {
+          this.arrySort = []
           this.tableDisplayFields = data
           this.getTableDisplayFieldsLoading = false
-          this.tableDisplayFields.map(item => {
-            if (item.queue) {
-              this.arrySort.push(item.fieldName + ', ' + (item.displayOrder === 1 ? 'asc' : 'desc'))
-            }
+          const orderSortArry = this.tableDisplayFields.filter(item => item.queue).sort((a, b) => a.queue - b.queue)
+          orderSortArry.forEach(item => {
+            this.arrySort.push(item.fieldName + ',' + item.displayOrderBy)
           })
         }
       })
@@ -394,9 +400,17 @@ export default {
       switch (this.anjuanInputSelect) {
         case 'queryTitle': // 题名
           this.query.queryTitle = this.anjuanQuery[this.anjuanInputSelect]
+          this.query.archiveNo = ''
           break
         case 'archiveNo': // 档号
           this.query.archiveNo = this.anjuanQuery[this.anjuanInputSelect]
+          this.query.queryTitle = ''
+          break
+        case 'archiveCtgNo': // 实体分类号
+          this.query.archiveCtgNo = this.juanneiQuery[this.juanneiInputSelect]
+          break
+        case 'responsibleby': // 责任者
+          this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect]
           break
       }
       this.page.page = isNaN(page - 1) ? 0 : page - 1
@@ -418,6 +432,7 @@ export default {
         'queryTitle': this.query.queryTitle,
         'recordNo': this.query.recordNo,
         'archiveCtgNo': this.query.archiveCtgNo,
+        'responsibleby': this.query.responsibleby,
         'archiveNo': this.query.archiveNo,
         'archiveYear': this.smartQuery.archiveYear,
         'department': this.smartQuery.department,
diff --git a/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
index adecb29..26ce0b1 100644
--- a/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
@@ -22,7 +22,7 @@
       </div>
       <div class="head-search">
         <!-- @keyup.enter.native="crud.toQuery" -->
-        <el-input v-model="juanneiQuery[juanneiInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="getTableList()">
+        <el-input v-model="juanneiQuery[juanneiInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
           <el-select slot="prepend" v-model="juanneiInputSelect" style="width: 80px" @change="querySelect">
             <el-option
               v-for="item in queryOption"
@@ -226,7 +226,8 @@ export default {
         'queryTitle': null,
         'recordNo': null,
         'archiveCtgNo': null,
-        'archiveNo': null
+        'archiveNo': null,
+        'responsibleby': null
       },
       stateOptions: [ // 搜索 - 状态选择
         { key: '1', label: '全部' },
@@ -239,7 +240,7 @@ export default {
       queryOption: [
         { value: 'queryTitle', label: '题名' },
         { value: 'archiveNo', label: '档号' },
-        { value: 'archiveCtgNo', label: '实体分类号' }
+        { value: 'responsibleby', label: '责任者' }
       ],
       juanneiInputSelect: '',
       deleteVisible: false, // 删除dialog
@@ -325,12 +326,12 @@ export default {
       }
       FetchTableDisplayFields({ categoryId: this.categoryId }).then(data => {
         if (data) {
+          this.arrySort = []
           this.tableDisplayFields = data
           this.getTableDisplayFieldsLoading = false
-          this.tableDisplayFields.map(item => {
-            if (item.queue) {
-              this.arrySort.push(item.fieldName + ', ' + (item.displayOrder === 1 ? 'asc' : 'desc'))
-            }
+          const orderSortArry = this.tableDisplayFields.filter(item => item.queue).sort((a, b) => a.queue - b.queue)
+          orderSortArry.forEach(item => {
+            this.arrySort.push(item.fieldName + ',' + item.displayOrderBy)
           })
         }
       })
@@ -345,8 +346,8 @@ export default {
         case 'archiveNo': // 档号
           this.query.archiveNo = this.juanneiQuery[this.juanneiInputSelect]
           break
-        case 'archiveCtgNo': // 实体分类号
-          this.query.archiveCtgNo = this.juanneiQuery[this.juanneiInputSelect]
+        case 'responsibleby': // 责任者
+          this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect]
           break
       }
       this.page.page = isNaN(page - 1) ? 0 : page - 1
@@ -368,6 +369,7 @@ export default {
         'queryTitle': this.query.queryTitle,
         'recordNo': this.query.recordNo,
         'archiveCtgNo': this.query.archiveCtgNo,
+        'responsibleby': this.query.responsibleby,
         'archiveNo': this.query.archiveNo,
         'archiveYear': this.smartQuery.archiveYear,
         'department': this.smartQuery.department,
@@ -444,9 +446,9 @@ export default {
     },
     // table - 当前选中得row
     clickRowHandler(row) {
-      this.selections = this.crud.selections
       this.$refs.table.clearSelection()
       this.$refs.table.toggleRowSelection(row)
+      this.selections = this.crud.selections
     },
     // 触发单选
     handleCurrentChange(selection, row) {
diff --git a/src/views/archivesManage/archivesList/module/archivesProject/index.vue b/src/views/archivesManage/archivesList/module/archivesProject/index.vue
index c935a4b..ddb9e9b 100644
--- a/src/views/archivesManage/archivesList/module/archivesProject/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesProject/index.vue
@@ -18,7 +18,7 @@
       </div>
       <div class="head-search">
         <!-- @keyup.enter.native="crud.toQuery" -->
-        <el-input v-model="projectQuery[projectInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="getTableList()">
+        <el-input v-model="projectQuery[projectInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
           <el-select slot="prepend" v-model="projectInputSelect" style="width: 80px" @change="querySelect">
             <el-option
               v-for="item in queryOption"
@@ -242,12 +242,12 @@ export default {
       this.selections = []
       FetchTableDisplayFields({ categoryId: this.selectedCategory.id }).then(data => {
         if (data) {
+          this.arrySort = []
           this.tableDisplayFields = data
           this.getTableDisplayFieldsLoading = false
-          this.tableDisplayFields.map(item => {
-            if (item.queue) {
-              this.arrySort.push(item.fieldName + ', ' + (item.displayOrder === 1 ? 'asc' : 'desc'))
-            }
+          const orderSortArry = this.tableDisplayFields.filter(item => item.queue).sort((a, b) => a.queue - b.queue)
+          orderSortArry.forEach(item => {
+            this.arrySort.push(item.fieldName + ',' + item.displayOrderBy)
           })
         }
       })
diff --git a/src/views/archivesManage/archivesList/module/binding/index.vue b/src/views/archivesManage/archivesList/module/binding/index.vue
deleted file mode 100644
index c16aa4c..0000000
--- a/src/views/archivesManage/archivesList/module/binding/index.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <div>
-    <el-dialog class="bindingDialog" :title="bindingTitle" :visible.sync="bindingVisible" :close-on-click-modal="false" :before-close="handleClose">
-      <span class="dialog-right-top" />
-      <span class="dialog-left-bottom" />
-      <div class="setting-dialog">
-        <div class="binding-wrap">
-          <div v-if="isBinding" class="rebinding">
-            <span>TID</span>
-            <el-input v-model="tidCode" placeholder="请输入内容" />
-          </div>
-          <div v-else class="binding-flow">
-            <div class="step-item">
-              <!-- step-active 完成  step-loading 进行种 -->
-              <span class="step-left-num step-active">1</span>
-              <div class="step-right-cont">
-                <p class="step-title">第一步<span>连接读写器</span></p>
-                <p class="step-tip tip-active">连接成功</p>
-              <!-- err: 连接失败，请检查网络 -->
-              <!-- err: 当前电脑未绑定读写器，请到档案设备里进行绑定 -->
-              </div>
-            </div>
-            <div class="step-item">
-              <span class="step-left-num step-active step-loading">2</span>
-              <div class="pulse1" />
-              <div class="pulse2" />
-              <div class="pulse3" />
-              <div class="step-right-cont">
-                <p class="step-title">第二步<span>放入标签</span></p>
-                <p class="step-tip tip-error">请放入标签</p>
-              <!-- tip: 已放入标签 -->
-              <!-- err: 未读取到标签，请重新放入 -->
-              </div>
-            </div>
-            <div class="step-item">
-              <span class="step-left-num">3</span>
-              <div class="step-right-cont">
-                <p class="step-title">第三步<span>读取标签</span></p>
-                <p class="step-tip">放入标签后开始读取标签</p>
-              <!-- tip: 读取成功 -->
-              <!-- err: 当前标签存在多个，请取出多余的标签只保留一张！ -->
-              </div>
-            </div>
-            <div class="step-item">
-              <span class="step-left-num">4</span>
-              <div class="step-right-cont">
-                <p class="step-title">第四步<span>开始绑定</span></p>
-                <p class="step-tip">标签读取成功后，开始绑定档案</p>
-              <!-- tip: 绑定中 -->
-              <!-- err: 当前标签已被绑定，是否覆盖？  -->
-              <!-- 3s后 弹出覆盖绑定dialog -->
-              <!-- tip: 已覆盖 -->
-              <!-- err: 绑定失败，请拿走当前标签  -->
-              </div>
-            </div>
-            <div class="step-item">
-              <span class="step-left-num">5</span>
-              <div class="step-right-cont">
-                <p class="step-title">第五步<span>绑定成功</span></p>
-                <p class="step-tip">当前标签与档案绑定成功</p>
-              <!-- tip: 绑定成功 -->
-              </div>
-            </div>
-          </div>
-          <div v-if="isBinding" slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="isBinding=false">下一步</el-button>
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-
-    <!-- 是否覆盖 -->
-    <el-dialog title="覆盖绑定" :append-to-body="true" :visible.sync="coverBindingVisible" :before-close="handleClose">
-      <span class="dialog-right-top" />
-      <span class="dialog-left-bottom" />
-      <div class="setting-dialog">
-        <div class="dialog-delt">
-          <p><span>当前标签已被绑定，是否覆盖？</span></p>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary">确定覆盖</el-button>
-          <el-button type="text" @click="coverBindingVisible=false">取消</el-button>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Binging',
-  components: {},
-  mixins: [],
-  props: {
-    isBinding: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      bindingVisible: false, // 绑定标签
-      bindingTitle: '绑定标签',
-      tidCode: null,
-      coverBindingVisible: false
-    }
-  },
-  mounted() {
-    // test
-    // setTimeout(() => {
-    //   this.coverBindingVisible = true
-    // }, 4000)
-  },
-  methods: {
-    // 右边初始化数据是空
-    // [CRUD.HOOK.beforeRefresh]() {
-    //   if (this.$refs.dictDetail) {
-    //     this.$refs.dictDetail.query.id = ''
-    //   }
-    //   return true
-    // },
-    // 关闭
-    handleClose(done) {
-      this.coverBindingVisible = false
-      done()
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "~@/assets/styles/archives-manage.scss";
-</style>