Merge remote-tracking branch 'origin/master'

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-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-row>
         </el-form-item>
       </el-form>
     </div>

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">
+          <el-table-column align="center" type="index" label="序号" width="40" />
-            <template slot-scope="scope">
-              <span v-text="getIndex(scope.$index)" />
-            </template>
-          </el-table-column>
           <el-table-column
             align="center"
             label="设备种类"
@@ -2001,20 +1997,6 @@ export default {
       if (this.addRowIndex !== null && this.addRowIndex.length > 0) {
         let baseIds = ''
         for (let i = 0; i < this.addRowIndex.length; i++) {
-          for (let i = 0; i < this.tableData.length; i++) {
-            if (
-              this.tableData[i].zhucedaima ===
-              this.baseList[this.addRowIndex[i]].zhucedaima
-            ) {
-              return true
-            }
-            if (
-              this.tableData[i].shiyongdengjibianhao ===
-              this.baseList[this.addRowIndex[i]].shiyongdengjibianhao
-            ) {
-              return true
-            }
-          }
           baseIds += this.baseList[this.addRowIndex[i]].id + ','
         }
         if (this.formState === 'update') {

src/views/borrow/borrow.vue

@@ -127,15 +127,15 @@ 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' }
       ],
       permission: {
-        add: ['instrument:add'],
+        add: ['borrow:jybg-list:add'],
         edit: ['borrow:jybg-list:update'],
-        del: ['instrument:delete']
+        del: ['borrow:jybg-list:delete']
       },
       options: [],
       form: {
@@ -251,7 +251,7 @@ export default {
       addBorrowFn(this.form).then(res => {
         this.$message({ message: '借阅成功', type: 'success' })
         this.visible = false
-        // crud.refresh()
+        this.crud.refresh()
       })
     },
     // EXCEL上传方法

src/views/ysjl/3000/common/inspection-items.vue

@@ -66,7 +66,7 @@ export default {
   },
   data() {
     return {
-      jyjgList: [{ value: '√' }, { value: '×' }, { value: '/' }]
+      jyjgList: [{ value: '√' }, { value: '×' }, { value: '/' }, { value: '○' }]
     }
   },
   created() {