Browse Source

name/借阅管理bug

master
xuhuajiao 3 years ago
parent
commit
481ae5d755
  1. 14
      src/views/archivesManage/lendManage/borrowerManage/index.vue
  2. 3
      src/views/archivesManage/lendManage/borrowerManage/module/addBorrower.vue
  3. 1
      src/views/archivesManage/lendManage/components/archiveDetail.vue
  4. 1
      src/views/archivesManage/lendManage/components/delConfirm.vue
  5. 1
      src/views/archivesManage/lendManage/components/lendArchivesList.vue
  6. 4
      src/views/archivesManage/lendManage/components/releaseAlarm.vue
  7. 8
      src/views/archivesManage/lendManage/lendConfirm/index.vue
  8. 1
      src/views/archivesManage/lendManage/lendProcess/index.vue
  9. 3
      src/views/archivesManage/lendManage/lendQuery/index.vue
  10. 3
      src/views/archivesManage/lendManage/mixins/lending.js
  11. 10
      src/views/archivesManage/lendManage/returnArchives/index.vue
  12. 10
      src/views/archivesManage/lendManage/toLend/index.vue
  13. 1
      src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue
  14. 34
      src/views/archivesManage/lendManage/toLend/module/lendRecord.vue
  15. 2
      src/views/environmentalScreen/index.vue
  16. 1
      src/views/environmentalScreen/module/lineChart.vue

14
src/views/archivesManage/lendManage/borrowerManage/index.vue

@ -2,9 +2,6 @@
<div class="to-lend">
<div class="head-container head-archives clearfix">
<div class="archives-crud">
<!-- <el-button icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
<el-button icon="el-icon-edit" size="mini" :disabled="selections.length===1 ? false : true " @click="handelEdit">修改</el-button>
<el-button icon="el-icon-delete" size="mini" :disabled="!selections.length" @click="deleteVisible = true">删除</el-button> -->
<el-button v-permission="permission.add" size="mini" icon="el-icon-plus" @click="crud.toAdd">
新增
</el-button>
@ -70,8 +67,8 @@
<script>
import CRUD, { presenter, crud } from '@crud/crud'
import { lendingCrud } from '../mixins/lending'
import crudMethod from '@/api/archivesManage/lendManage'
import { lendingCrud } from '../mixins/lending'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import addBorrower from './module/addBorrower.vue'
@ -104,7 +101,7 @@ export default {
},
editFormVisible: false,
deleteVisible: false,
eleteData: {},
deleteData: {},
queryOption: [
{ value: 'query', label: '借阅人' },
{ value: 'phone', label: '电话号码' }
@ -134,7 +131,12 @@ export default {
handleDelConfirm() {
this.deleteVisible = false
this.crud.delAllLoading = true
this.crud.doDelete(this.deleteData)
this.crud.doDelete(this.deleteData).then(() => {
this.$message({
message: '删除成功',
type: 'success'
})
})
},
toDelete(data) {
this.deleteData = data

3
src/views/archivesManage/lendManage/borrowerManage/module/addBorrower.vue

@ -47,8 +47,11 @@
import { form } from '@crud/crud'
import { lendingCrud } from '../../mixins/lending'
import { validatePhone } from '@/utils/validate'
const defaultForm = { borrowerName: '', cardType: '', department: '', id: '', idcard: '', phone: '' }
export default {
name: 'AddBorrower',
mixins: [
form(defaultForm),
lendingCrud

1
src/views/archivesManage/lendManage/components/archiveDetail.vue

@ -40,6 +40,7 @@ import { FetchInitBillDetails } from '@/api/archivesManage/lendManage'
import { lendingCrud } from '../mixins/lending'
import { parseTime } from '@/utils/index.js'
export default {
name: 'ArchiveDetail',
mixins: [lendingCrud],
data() {
return {

1
src/views/archivesManage/lendManage/components/delConfirm.vue

@ -23,6 +23,7 @@
import { FetchDelWaitBorrow, FetchRemoveWaitBorrow } from '@/api/archivesManage/lendManage'
import { header } from '@crud/crud'
export default {
name: 'ArchiveDetail',
mixins: [header()],
props: {
listName: {

1
src/views/archivesManage/lendManage/components/lendArchivesList.vue

@ -30,6 +30,7 @@
import { FetchInitArchivesByOrderNo } from '@/api/archivesManage/lendManage'
import { lendingCrud } from '../mixins/lending'
export default {
name: 'LendArchivesList',
mixins: [lendingCrud],
props: {
archivesOrderNum: {

4
src/views/archivesManage/lendManage/components/releaseAlarm.vue

@ -33,9 +33,11 @@
<script>
import { FetchReadyBorrowShowTid, FetchReadyReturnShowTid } from '@/api/archivesManage/lendManage'
import { lendingCrud } from '../mixins/lending'
import { form } from '@crud/crud'
import { lendingCrud } from '../mixins/lending'
export default {
name: 'ReleaseAlarm',
mixins: [lendingCrud, form({})],
data() {
return {

8
src/views/archivesManage/lendManage/lendConfirm/index.vue

@ -66,6 +66,7 @@ import delConfirm from '../components/delConfirm'
import archiveDetail from '../components/archiveDetail'
import releaseAlarm from '../components/releaseAlarm'
export default {
name: 'LendConfirm',
components: { pagination, archiveDetail, delConfirm, releaseAlarm },
mixins: [presenter(), lendingCrud],
cruds() {
@ -84,11 +85,9 @@ export default {
},
data() {
return {
tableData: [],
selections: [],
lendForm: {},
listName: '借出确认',
isListType: 2,
isListType: 2, // 1 / 2
lendDates: null
}
},
@ -117,7 +116,8 @@ export default {
clickRowHandler(row) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(row)
// this.selections.push(row)
this.selections = []
this.selections.push(row)
this.$emit('getSelections', row)
},
//

1
src/views/archivesManage/lendManage/lendProcess/index.vue

@ -19,6 +19,7 @@
import { FetchUpdateBorrowRule } from '@/api/archivesManage/lendManage'
import { lendingCrud } from '../mixins/lending'
export default {
name: 'LendProcess',
mixins: [lendingCrud],
data() {
return {

3
src/views/archivesManage/lendManage/lendQuery/index.vue

@ -85,6 +85,7 @@ import { lendingCrud } from '../mixins/lending'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import archiveDetail from '../components/archiveDetail'
export default {
name: 'LendQuery',
components: { pagination, rrOperation, archiveDetail },
@ -106,7 +107,6 @@ export default {
},
data() {
return {
tableData: [],
selections: [],
lendStateOptions: [
{ value: '全部', label: '全部' },
@ -149,7 +149,6 @@ export default {
clickRowHandler(row) {
this.$refs.table.toggleRowSelection(row)
}
}
}
</script>

3
src/views/archivesManage/lendManage/mixins/lending.js

@ -28,7 +28,6 @@ export const lendingCrud = {
}
}
},
// 组件共用属性
data() {
return {
@ -43,7 +42,7 @@ export const lendingCrud = {
{ value: '士官证', label: '士官证' },
{ value: '文职人员证', label: '文职人员证' }
],
// ecp
// epc
btnDisabled: false,
devId: 'D001',
timer: null,

10
src/views/archivesManage/lendManage/returnArchives/index.vue

@ -66,13 +66,15 @@
</template>
<script>
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import CRUD, { presenter } from '@crud/crud'
import { lendingCrud } from '../mixins/lending'
import archiveDetail from '../components/archiveDetail'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import releaseAlarm from '../components/releaseAlarm'
import archiveDetail from '../components/archiveDetail'
export default {
name: 'ReturnArchives',
components: { pagination, rrOperation, archiveDetail, releaseAlarm },
mixins: [presenter(), lendingCrud],
cruds() {
@ -91,9 +93,7 @@ export default {
},
data() {
return {
tableData: [],
selections: [],
returnVisible: false,
queryOption: [
{ value: 'orderNo', label: '单据号' },
{ value: 'borrowerName', label: '借阅人' }

10
src/views/archivesManage/lendManage/toLend/index.vue

@ -46,15 +46,17 @@
</template>
<script>
import CRUD, { presenter, crud } from '@crud/crud'
import CRUD, { presenter } from '@crud/crud'
import { lendingCrud } from '../mixins/lending'
import pagination from '@crud/Pagination'
import lendRecord from './module/lendRecord.vue'
import delConfirm from '../components/delConfirm.vue'
import archiveDetail from './module/archiveDetail.vue'
import lendRecord from './module/lendRecord.vue'
export default {
name: 'ToLend',
components: { pagination, delConfirm, archiveDetail, lendRecord },
mixins: [presenter(), crud(), lendingCrud],
mixins: [presenter(), lendingCrud],
cruds() {
return CRUD({
url: 'api/borrow/initWaitRegisterList',
@ -72,7 +74,7 @@ export default {
return {
selections: [],
listName: '待借列表',
isListType: 1
isListType: 1 // 移出框类型判断 待借1 / 借阅2
}
},
created() {

1
src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue

@ -19,6 +19,7 @@
<script>
import { lendingCrud } from '../../mixins/lending'
export default {
name: 'RecordArchiveDetail',
mixins: [lendingCrud],
data() {
return {

34
src/views/archivesManage/lendManage/toLend/module/lendRecord.vue

@ -4,14 +4,7 @@
<span class="dialog-right-top" />
<span class="dialog-left-bottom" />
<div class="setting-dialog">
<el-form
ref="recordFormDom"
:model="recordForm"
:rules="rules"
size="small"
label-width="80px"
style="margin-left:85px"
>
<el-form ref="recordFormDom" :model="recordForm" :rules="rules" size="small" label-width="80px" style="margin-left:85px">
<el-form-item label="借阅人" prop="borrowerName">
<el-select
v-model="recordForm.borrowerName"
@ -34,10 +27,7 @@
<el-input v-model.number="recordForm.phone" />
</el-form-item>
<el-form-item label="所属部门" prop="department" class="down-select">
<el-select
v-model="recordForm.department"
placeholder="请选择"
>
<el-select v-model="recordForm.department" placeholder="请选择">
<el-option
v-for="(item,index) in departOptions"
:key="index"
@ -47,10 +37,7 @@
</el-select>
</el-form-item>
<el-form-item label="证件类型" prop="cardType" class="down-select">
<el-select
v-model="recordForm.cardType"
placeholder="请选择"
>
<el-select v-model="recordForm.cardType" placeholder="请选择">
<el-option
v-for="(item,index) in idTypeOptions"
:key="index"
@ -66,10 +53,7 @@
<date-range-picker v-model="recordForm.lendDates" />
</el-form-item>
<el-form-item label="借阅目的" prop="purpose" class="down-select">
<el-select
v-model="recordForm.purpose"
placeholder="请选择"
>
<el-select v-model="recordForm.purpose" placeholder="请选择">
<el-option
v-for="(item,index) in borrowGoalOptions"
:key="index"
@ -88,14 +72,16 @@
</template>
<script>
import { header } from '@crud/crud'
import DateRangePicker from '@/components/DateRangePicker'
import { validatePhone } from '@/utils/validate'
import { FetchFindBorrowerByQuery, FetchRegisterBorrow } from '@/api/archivesManage/lendManage'
import { form } from '@crud/crud'
import { validatePhone } from '@/utils/validate'
import { lendingCrud } from '../../mixins/lending'
import DateRangePicker from '@/components/DateRangePicker'
export default {
name: 'LendRecord',
components: { DateRangePicker },
mixins: [header(), lendingCrud],
mixins: [form({}), lendingCrud],
data() {
return {
recordSelections: [],

2
src/views/environmentalScreen/index.vue

@ -233,7 +233,7 @@ const lineChartData = {
}
}
export default {
name: 'Dashboard',
name: 'EnvironmentalScreen',
components: {
LineChart,
Video

1
src/views/environmentalScreen/module/lineChart.vue

@ -6,6 +6,7 @@
import echarts from 'echarts'
import resize from '@/views/dashboard/mixins/resize'
export default {
name: 'LineEcharts',
mixins: [resize],
props: {
className: {

Loading…
Cancel
Save