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 @@ - - - - - - - - @@ -34,18 +26,10 @@ - - - - - + + 查询 + - - - - - 查询 - diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue index 6a2ef42..25ee282 100644 --- a/src/views/bjd/dj_input.vue +++ b/src/views/bjd/dj_input.vue @@ -1370,11 +1370,7 @@ @row-click="checkSelection" > - - - + 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') { diff --git a/src/views/borrow/borrow.vue b/src/views/borrow/borrow.vue index 69bbc26..b7e49dc 100644 --- a/src/views/borrow/borrow.vue +++ b/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上传方法 diff --git a/src/views/ysjl/3000/common/inspection-items.vue b/src/views/ysjl/3000/common/inspection-items.vue index bf8ddb0..3ae98ca 100644 --- a/src/views/ysjl/3000/common/inspection-items.vue +++ b/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() {