0425需求更新

src/views/archivesManage/archivesList/archivesAnjuan/index.vue

@@ -255,15 +255,7 @@ export default {
       anjuanQuery: {},
       queryOption: [],
       anjuanInputSelect: '',
-      stateOptions: [ // 搜索 - 状态选择
-        { value: '0', label: '全部' },
-        { value: '1', label: '未装' },
-        { value: '2', label: '未入' },
-        { value: '3', label: '待入' },
-        { value: '4', label: '在库' },
-        { value: '5', label: '待借' },
-        { value: '6', label: '已借' }
-      ],
+      stateOptions: [],
       isAnjuan: true, // 用于判断卷内-新增/导出按钮
       lengingVisible: false // 借阅
     }
@@ -275,10 +267,31 @@ export default {
   },
   watch: {
     selectedCategory: function(newValue, oldValue) {
+      console.log('selectedCategory', newValue.isType)
       this.query.queryTitle = ''
       this.query.archiveNo = ''
       this.query.archiveCtgNo = ''
       this.query.responsibleby = ''
+
+      if (newValue.isType === 5) {
+        this.stateOptions = [
+          { value: '0', label: '全部' },
+          { value: '1', label: '未装' },
+          { value: '2', label: '未入' },
+          { value: '3', label: '待入' },
+          { value: '4', label: '在库' },
+          { value: '5', label: '待借' },
+          { value: '6', label: '已借' }
+        ]
+      } else {
+        this.stateOptions = [
+          { value: '0', label: '全部' },
+          { value: '1', label: '未装' },
+          { value: '2', label: '未入' },
+          { value: '3', label: '待入' },
+          { value: '7', label: '已入' }
+        ]
+      }
       this.resetQuery()
     },
     tableDisplayFields(val) {
@@ -301,6 +314,25 @@ export default {
   created() {
     this.resetQuery()
     this.selections = []
+    if (this.selectedCategory.isType === 5) {
+      this.stateOptions = [
+        { value: '0', label: '全部' },
+        { value: '1', label: '未装' },
+        { value: '2', label: '未入' },
+        { value: '3', label: '待入' },
+        { value: '4', label: '在库' },
+        { value: '5', label: '待借' },
+        { value: '6', label: '已借' }
+      ]
+    } else {
+      this.stateOptions = [
+        { value: '0', label: '全部' },
+        { value: '1', label: '未装' },
+        { value: '2', label: '未入' },
+        { value: '3', label: '待入' },
+        { value: '7', label: '已入' }
+      ]
+    }
     this.query.queryType = this.stateOptions[0].value
   },
   mounted() {
@@ -380,11 +412,12 @@ export default {
     tableDoubleClick(row) {
       if (this.selectedCategory.isType !== 5) {
         this.$refs.archivesInfo.isHasFile = false
+        this.$refs.archivesInfo.isTidOrBorrow = false
       } else {
         this.$refs.archivesInfo.isHasFile = true
+        this.$refs.archivesInfo.isTidOrBorrow = true
       }
       this.$refs.archivesInfo.isDetailsInfo = true
-      this.$refs.archivesInfo.isTidOrBorrow = true
       this.arcId = row.id
       this.$refs.archivesInfo.detailTitle = '档案详情'
       this.$refs.archivesInfo.archivesInfoVisible = true

src/views/archivesManage/archivesList/archivesJuannei/index.vue

@@ -24,6 +24,10 @@
       </div>
       <div class="head-search">
         <!-- @keyup.enter.native="crud.toQuery" -->
+        <el-select v-if="!recycleMain.isRecycle" v-model="query.queryType" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px" @change="stateSelect">
+          <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
+          <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
         <el-input v-model="juanneiQuery[juanneiInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 220px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
           <el-select slot="prepend" v-model="juanneiInputSelect" style="width: 100px" @change="querySelect(juanneiInputSelect)">
             <el-option
@@ -238,7 +242,16 @@ export default {
         { value: 'documentNo', label: '文件编号 ' }
       ],
       juanneiInputSelect: '',
-      lengingVisible: false // 借阅
+      lengingVisible: false, // 借阅
+      stateOptions: [
+        { value: '0', label: '全部' },
+        { value: '1', label: '未装' },
+        { value: '2', label: '未入' },
+        { value: '3', label: '待入' },
+        { value: '4', label: '在库' },
+        { value: '5', label: '待借' },
+        { value: '6', label: '已借' }
+      ]
     }
   },
   computed: {
@@ -267,12 +280,17 @@ export default {
   created() {
     // 初始化带select的输入框的 - 搜索
     this.juanneiInputSelect = this.queryOption[0].value
-    this.query.queryType = null
+    this.query.queryType = this.stateOptions[0].value
     this.selections = []
   },
   mounted() {
   },
   methods: {
+    stateSelect(val) {
+      this.page.page = 1
+      this.query.queryType = val
+      this.getListCommon('junneiData', 'juanneiTableHeight', 2)
+    },
     // 档案列表获取显示列
     getTableDisplayFields(type) {
       this.getTableItemCommon(type)
@@ -317,7 +335,7 @@ export default {
       this.$refs.archivesInfo.isHasFile = true
       this.arcId = row.id
       this.$refs.archivesInfo.isDetailsInfo = true
-      this.$refs.archivesInfo.isTidOrBorrow = false
+      this.$refs.archivesInfo.isTidOrBorrow = true
       this.$refs.archivesInfo.detailTitle = '档案详情'
       this.$refs.archivesInfo.archivesInfoVisible = true
       this.$refs.archivesInfo.archivesTabIndex = 0

src/views/archivesManage/archivesList/archivesProject/index.vue

@@ -208,7 +208,7 @@ export default {
     tableDoubleClick(row) {
       this.$refs.archivesInfo.isHasFile = false
       this.$refs.archivesInfo.isDetailsInfo = false
-      this.$refs.archivesInfo.isTidOrBorrow = false
+      this.$refs.archivesInfo.isTidOrBorrow = true
       this.arcId = row.id
       this.$refs.archivesInfo.detailTitle = '项目详情'
       this.$refs.archivesInfo.archivesInfoVisible = true

src/views/archivesManage/archivesSearch/index.vue

@@ -300,11 +300,12 @@ export default {
       console.log(currentCategory.isType)
       if (currentCategory.isType === 3) {
         this.$refs.archivesInfo.isHasFile = false
-        this.$refs.archivesInfo.isTidOrBorrow = true
+        this.$refs.archivesInfo.isTidOrBorrow = false
       } else {
         this.$refs.archivesInfo.isHasFile = true
-        this.$refs.archivesInfo.isTidOrBorrow = false
+        this.$refs.archivesInfo.isTidOrBorrow = true
       }
+
       this.$refs.archivesInfo.isDetailsInfo = true
       this.$refs.archivesInfo.detailTitle = '档案详情'
       this.$refs.archivesInfo.archivesInfoVisible = true

src/views/archivesManage/caseManage/caseList/index.vue

@@ -189,9 +189,8 @@ export default {
         del: false,
         download: false,
         group: false
-      },
-      sort: ['case_name,asc']
-
+      }
+      // sort: ['case_name,asc']
     })
   },
   data() {

src/views/archivesManage/fileImport/importLog/index.vue

@@ -15,6 +15,7 @@
         <template slot-scope="scope">
           <div v-if="scope.row.status === 0" class="import-loading">导入中</div>
           <div v-if="scope.row.status === 1">已完成</div>
+          <div v-if="scope.row.status === 2" class="import-error">导入失败</div>
         </template>
       </el-table-column>
       <el-table-column prop="create_by" label="操作人" />
@@ -117,4 +118,7 @@ export default {
 .import-loading{
   color: #fd8042;
 }
+.import-error{
+  color: rgb(246, 81, 99);
+}
 </style>

src/views/archivesManage/fileImport/module/detail.vue

@@ -2,8 +2,8 @@
   <div class="import-detail-container">
     <div v-if="isLogOrPreview === 'log'" class="import-data-number">
       <p>导入方式：<span style="color: #339cff;">{{ importType }}</span></p>
-      <p>成功读取数据：<span style="color:rgb(246,81,99)">{{ readData }}</span> 条</p>
-      <p>成功导入数据：<span style="color: #1AAE93;">{{ importData }}</span> 条</p>
+      <p>成功读取数据：<span style="color:rgb(246,81,99)">{{ readData === null ? 0 : readData }}</span> 条</p>
+      <p>成功导入数据：<span style="color: #1AAE93;">{{ importData === null ? 0 : importData }}</span> 条</p>
     </div>
     <ul class="import-tab">
       <li :class="{'active': archivesTabIndex == 0}" @click="changeActiveTab(0)">案卷</li>