Big-Data-Lab
/
RMS-VUE
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增购置日期查询

This commit is contained in:
xbx 2024-01-08 15:53:06 +08:00
parent a7440715fb
commit 89263fb8ba
9 changed files with 80 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -1,5 +1,5 @@
NODE_ENV=development NODE_ENV=development
VUE_APP_API_BASE_URL=http://82.157.76.162:8888/jeecg-boot VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

4
.env.production
View File

@ -1,4 +1,4 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_API_BASE_URL=http://82.157.76.162:8888/jeecg-boot VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
VUE_APP_CAS_BASE_URL=http://82.157.76.162:8888/cas VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

13
src/views/rms/FurnitureCollegeList/RmsFurnitureCollegeList.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<a-card :bordered="false" style="height: 770px;"> <a-card :bordered="false" style="height: 770px;">
<a-row> <a-row>
<a-col :span="5"> <a-col :span="4">
<locationaTree ref="locationaTree" :height="600" @onSelect="onSelectTree"></locationaTree> <locationaTree ref="locationaTree" :height="600" @onSelect="onSelectTree"></locationaTree>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="20">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -13,7 +13,14 @@
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人" <a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
@select="onSelect" @search="onSearch" @change="onChange" /> @select="onSelect" @search="onSearch" @change="onChange" />
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="7" :lg="7" :md="8" :sm="24">
<a-form-item label="购置日期">
<j-date placeholder="开始日期" class="query-group-cust" v-model="queryParam.purchaseDate_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date placeholder="结束日期" class="query-group-cust" v-model="queryParam.purchaseDate_end"></j-date>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>

19
src/views/rms/FurnitureList/RmsFurnitureList.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<a-card :bordered="false" style="height: 770px;"> <a-card :bordered="false" style="height: 770px;">
<a-row> <a-row>
<a-col :span="5"> <a-col :span="4">
<locationaTree ref="locationaTree" :height="600" @onSelect="onSelectTree"></locationaTree> <locationaTree ref="locationaTree" :height="600" @onSelect="onSelectTree"></locationaTree>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="20">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -13,7 +13,14 @@
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" <a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource"
placeholder="请选择领用人" @select="onSelect" @search="onSearch" @change="onChange" /> placeholder="请选择领用人" @select="onSelect" @search="onSearch" @change="onChange" />
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="7" :lg="7" :md="8" :sm="24">
<a-form-item label="购置日期">
<j-date placeholder="开始日期" class="query-group-cust" v-model="queryParam.purchaseDate_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date placeholder="结束日期" class="query-group-cust" v-model="queryParam.purchaseDate_end"></j-date>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@ -85,13 +92,13 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a> <!-- <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical" /> <a-divider type="vertical" /> -->
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record)">详情</a>
</span> </span>
@ -248,7 +255,7 @@ export default {
dataIndex: 'action', dataIndex: 'action',
align: "center", align: "center",
fixed: "right", fixed: "right",
width: 160, width: 110,
scopedSlots: { customRender: 'action' } scopedSlots: { customRender: 'action' }
} }
], ],

13
src/views/rms/InstrumentCollegeList/RmsInstrumentCollegeList.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<a-row> <a-row>
<a-col :span="5"> <a-col :span="4">
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree> <locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="20">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -13,7 +13,14 @@
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人" <a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
@select="onSelect" @search="onSearch" @change="onChange" /> @select="onSelect" @search="onSearch" @change="onChange" />
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="7" :lg="7" :md="8" :sm="24">
<a-form-item label="购置日期">
<j-date placeholder="开始日期" class="query-group-cust" v-model="queryParam.purchaseDate_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date placeholder="结束日期" class="query-group-cust" v-model="queryParam.purchaseDate_end"></j-date>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>

27
src/views/rms/InstrumentList/RmsInstrumentList.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<a-row> <a-row>
<a-col :span="5"> <a-col :span="4">
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree> <locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="20">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
@ -14,10 +14,18 @@
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人" <a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
@select="onSelect" @search="onSearch" @change="onChange" /> @select="onSelect" @search="onSearch" @change="onChange" />
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="7" :lg="7" :md="8" :sm="24">
<a-form-item label="购置日期">
<j-date placeholder="开始日期" class="query-group-cust" v-model="queryParam.purchaseDate_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date placeholder="结束日期" class="query-group-cust" v-model="queryParam.purchaseDate_end"></j-date>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<!-- <instrument-select ref="instrumentSelect" @instrumentSelect="instrumentSelect"></instrument-select> -->
</span> </span>
</a-col> </a-col>
<a-col :xl="2" :lg="7" :md="8" :sm="24"> <a-col :xl="2" :lg="7" :md="8" :sm="24">
@ -75,13 +83,13 @@
@change="handleTableChange"> @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a> <!-- <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm> -->
<a-divider type="vertical" /> <!-- <a-divider type="vertical" /> -->
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record)">详情</a>
</span> </span>
</a-table> </a-table>
@ -100,13 +108,16 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import RmsInstrumentModal from './modules/RmsInstrumentModal' import RmsInstrumentModal from './modules/RmsInstrumentModal'
import RmsLocationModal from '../LocationList/modules/RmsLocationModal' import RmsLocationModal from '../LocationList/modules/RmsLocationModal'
import locationaTree from '../components/locationaTree' import locationaTree from '../components/locationaTree'
import instrumentSelect from '../components/instrumentSelect'
export default { export default {
name: 'RmsInstrumentList', name: 'RmsInstrumentList',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
RmsInstrumentModal, RmsInstrumentModal,
RmsLocationModal, RmsLocationModal,
locationaTree locationaTree,
instrumentSelect
}, },
data() { data() {
return { return {
@ -223,7 +234,7 @@ export default {
dataIndex: 'action', dataIndex: 'action',
align: "center", align: "center",
fixed: "right", fixed: "right",
width: 160, width: 110,
scopedSlots: { customRender: 'action' } scopedSlots: { customRender: 'action' }
} }
], ],

13
src/views/rms/IntangibleCollegeList/RmsIntangibleCollegeList.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<a-row> <a-row>
<a-col :span="5"> <a-col :span="4">
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree> <locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="20">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -13,7 +13,14 @@
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人" <a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
@select="onSelect" @search="onSearch" @change="onChange" /> @select="onSelect" @search="onSearch" @change="onChange" />
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="7" :lg="7" :md="8" :sm="24">
<a-form-item label="购置日期">
<j-date placeholder="开始日期" class="query-group-cust" v-model="queryParam.purchaseDate_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date placeholder="结束日期" class="query-group-cust" v-model="queryParam.purchaseDate_end"></j-date>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>

1
src/views/rms/IntangibleCollegeList/modules/RmsIntangibleCollegeForm.vue
View File

@ -213,6 +213,7 @@ export default {
created() { created() {
//备份model原始值 //备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model)); this.modelDefault = JSON.parse(JSON.stringify(this.model));
this.getTreeData();
}, },
methods: { methods: {
getTreeData() { getTreeData() {

19
src/views/rms/IntangibleList/RmsIntangibleList.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<a-row> <a-row>
<a-col :span="5"> <a-col :span="4">
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree> <locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="20">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -13,7 +13,14 @@
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" <a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource"
placeholder="请选择领用人" @select="onSelect" @search="onSearch" @change="onChange" /> placeholder="请选择领用人" @select="onSelect" @search="onSearch" @change="onChange" />
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="7" :lg="7" :md="8" :sm="24">
<a-form-item label="购置日期">
<j-date placeholder="开始日期" class="query-group-cust" v-model="queryParam.purchaseDate_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date placeholder="结束日期" class="query-group-cust" v-model="queryParam.purchaseDate_end"></j-date>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@ -94,13 +101,13 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a> <!-- <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical" /> <a-divider type="vertical" /> -->
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record)">详情</a>
</span> </span>
@ -276,7 +283,7 @@ export default {
dataIndex: 'action', dataIndex: 'action',
align: "center", align: "center",
fixed: "right", fixed: "right",
width: 147, width: 110,
scopedSlots: { customRender: 'action' } scopedSlots: { customRender: 'action' }
} }
], ],