From 1c8bcfac5efbbd24443c33802784421a602b8b60 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 30 Aug 2021 16:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/archive/list.vue                    | 22 +++----------------
 src/views/bjd/dj_input.vue                    |  6 +----
 src/views/borrow/borrow.vue                   |  2 +-
 .../device_management/components/Move.vue     |  2 +-
 4 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/views/archive/list.vue b/src/views/archive/list.vue
index e6f8883..e6dfc75 100644
--- a/src/views/archive/list.vue
+++ b/src/views/archive/list.vue
@@ -17,14 +17,6 @@
             <el-col :span="2.5">
               <el-input v-model="listQuery.archiveNum" placeholder="归档单号" clearable style="width: 175px" size="small" @keyup.enter.native="handleFilter" />
             </el-col>
-            <el-col :span="2.5">
-              <el-input v-model="listQuery.baogaobianhao" placeholder="报告编号" clearable style="width: 180px" size="small" @keyup.enter.native="handleFilter" />
-            </el-col>
-            <el-col :span="3">
-              <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 250px" size="small" @keyup.enter.native="handleFilter" />
-            </el-col>
-          </el-row>
-          <el-row :gutter="10">
             <el-col :span="2.5">
               <el-input v-model="listQuery.frameNum" placeholder="归档架号" clearable style="width: 130px" size="small" @keyup.enter.native="handleFilter" />
             </el-col>
@@ -34,18 +26,10 @@
             <el-col :span="2.5">
               <el-input v-model="listQuery.boxNum" placeholder="归档盒号" clearable style="width: 130px" size="small" @keyup.enter.native="handleFilter" />
             </el-col>
-            <el-col :span="2.5">
-              <el-select v-model="listQuery.shebeizhonglei" placeholder="请选择设备种类" style="width: 200px" size="small" clearable>
-                <el-option v-for="item in sbzlList" :key="item.label" :label="item.label" :value="item.label" />
-              </el-select>
-            </el-col>
+            <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">
+              查询
+            </el-button>
           </el-row>
-          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 180px" size="small" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证编号" clearable style="width: 180px" size="small" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.chanpinbianhao" placeholder="产品编号" clearable style="width: 180px" size="small" @keyup.enter.native="handleFilter" />
-          <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">
-            查询
-          </el-button>
         </el-form-item>
       </el-form>
     </div>
diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue
index 6a2ef42..1f4abc9 100644
--- a/src/views/bjd/dj_input.vue
+++ b/src/views/bjd/dj_input.vue
@@ -1370,11 +1370,7 @@
           @row-click="checkSelection"
         >
           <el-table-column type="selection" width="45" />
-          <el-table-column align="center" label="序号" width="40">
-            <template slot-scope="scope">
-              <span v-text="getIndex(scope.$index)" />
-            </template>
-          </el-table-column>
+          <el-table-column align="center" type="index" label="序号" width="40" />
           <el-table-column
             align="center"
             label="设备种类"
diff --git a/src/views/borrow/borrow.vue b/src/views/borrow/borrow.vue
index 9694dc0..b7e49dc 100644
--- a/src/views/borrow/borrow.vue
+++ b/src/views/borrow/borrow.vue
@@ -127,7 +127,7 @@ export default {
         { prop: 'shiyongdanwei', label: '使用单位', align: 'center' },
         { prop: 'shigongdanwei', label: '施工单位', align: 'center' },
         { prop: 'zhizaodanwei', label: '制造单位', align: 'center' },
-        { prop: 'jianyanrenyuan', label: '检验人员', align: 'center' },
+        { prop: 'jianyanrenyuan', label: '检验人员', align: 'center', formatter: this.formatter.getChineseName },
         { prop: 'zhucedaima', label: '注册代码', align: 'center' },
         { prop: 'shiyongdengjibianhao', label: '使用登记证编号', align: 'center' },
         { slot: 'operation' }
diff --git a/src/views/device_management/components/Move.vue b/src/views/device_management/components/Move.vue
index f21b1a8..ffa87b7 100644
--- a/src/views/device_management/components/Move.vue
+++ b/src/views/device_management/components/Move.vue
@@ -168,7 +168,7 @@ const defaultCrud = presenter(CRUD({
   title: '领用、借用管理',
   url: '/move/list',
   orderBy: ['id desc'],
-  crudMethod: { ...InstrumentMove },
+  crudMethod: { ...InstrumentMove }
 }))
 
 // 设置初始form