新增购置日期查询
This commit is contained in:
parent
a7440715fb
commit
89263fb8ba
|
@ -1,5 +1,5 @@
|
|||
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_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
NODE_ENV=production
|
||||
VUE_APP_API_BASE_URL=http://82.157.76.162:8888/jeecg-boot
|
||||
VUE_APP_CAS_BASE_URL=http://82.157.76.162:8888/cas
|
||||
VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
|
||||
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
|
||||
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<a-card :bordered="false" style="height: 770px;">
|
||||
<a-row>
|
||||
<a-col :span="5">
|
||||
<a-col :span="4">
|
||||
<locationaTree ref="locationaTree" :height="600" @onSelect="onSelectTree"></locationaTree>
|
||||
</a-col>
|
||||
<a-col :span="19">
|
||||
<a-col :span="20">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
|
@ -13,7 +13,14 @@
|
|||
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
|
||||
@select="onSelect" @search="onSearch" @change="onChange" />
|
||||
</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">
|
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<a-card :bordered="false" style="height: 770px;">
|
||||
<a-row>
|
||||
<a-col :span="5">
|
||||
<a-col :span="4">
|
||||
<locationaTree ref="locationaTree" :height="600" @onSelect="onSelectTree"></locationaTree>
|
||||
</a-col>
|
||||
<a-col :span="19">
|
||||
<a-col :span="20">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
|
@ -13,7 +13,14 @@
|
|||
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource"
|
||||
placeholder="请选择领用人" @select="onSelect" @search="onSearch" @change="onChange" />
|
||||
</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">
|
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
||||
|
@ -85,13 +92,13 @@
|
|||
</template>
|
||||
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleEdit(record)">编辑</a>
|
||||
<!-- <a @click="handleEdit(record)">编辑</a>
|
||||
|
||||
<a-divider type="vertical" />
|
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
|
||||
<a>删除</a>
|
||||
</a-popconfirm>
|
||||
<a-divider type="vertical" />
|
||||
<a-divider type="vertical" /> -->
|
||||
<a @click="handleDetail(record)">详情</a>
|
||||
</span>
|
||||
|
||||
|
@ -248,7 +255,7 @@ export default {
|
|||
dataIndex: 'action',
|
||||
align: "center",
|
||||
fixed: "right",
|
||||
width: 160,
|
||||
width: 110,
|
||||
scopedSlots: { customRender: 'action' }
|
||||
}
|
||||
],
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<a-card :bordered="false">
|
||||
<a-row>
|
||||
<a-col :span="5">
|
||||
<a-col :span="4">
|
||||
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
|
||||
</a-col>
|
||||
<a-col :span="19">
|
||||
<a-col :span="20">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
|
@ -13,7 +13,14 @@
|
|||
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
|
||||
@select="onSelect" @search="onSearch" @change="onChange" />
|
||||
</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">
|
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<a-card :bordered="false">
|
||||
<a-row>
|
||||
<a-col :span="5">
|
||||
<a-col :span="4">
|
||||
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
|
||||
</a-col>
|
||||
<a-col :span="19">
|
||||
<a-col :span="20">
|
||||
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
|
@ -14,17 +14,25 @@
|
|||
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
|
||||
@select="onSelect" @search="onSearch" @change="onChange" />
|
||||
</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">
|
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</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>
|
||||
</a-col>
|
||||
<a-col :xl="2" :lg="7" :md="8" :sm="24">
|
||||
<img style="height: 55px;" src="@/assets/schoollogo.jpg" alt="image">
|
||||
</a-col>
|
||||
<a-col :xl="4" :lg="7" :md="8" :sm="24">
|
||||
<p style="font-size: 20px; padding-top: 10px;">学校资产信息</p>
|
||||
<p style="font-size: 20px; padding-top: 10px;">学校资产信息</p>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
|
@ -75,13 +83,13 @@
|
|||
@change="handleTableChange">
|
||||
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleEdit(record)">编辑</a>
|
||||
<!-- <a @click="handleEdit(record)">编辑</a>
|
||||
|
||||
<a-divider type="vertical" />
|
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
|
||||
<a>删除</a>
|
||||
</a-popconfirm>
|
||||
<a-divider type="vertical" />
|
||||
</a-popconfirm> -->
|
||||
<!-- <a-divider type="vertical" /> -->
|
||||
<a @click="handleDetail(record)">详情</a>
|
||||
</span>
|
||||
</a-table>
|
||||
|
@ -100,13 +108,16 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|||
import RmsInstrumentModal from './modules/RmsInstrumentModal'
|
||||
import RmsLocationModal from '../LocationList/modules/RmsLocationModal'
|
||||
import locationaTree from '../components/locationaTree'
|
||||
import instrumentSelect from '../components/instrumentSelect'
|
||||
|
||||
export default {
|
||||
name: 'RmsInstrumentList',
|
||||
mixins: [JeecgListMixin, mixinDevice],
|
||||
components: {
|
||||
RmsInstrumentModal,
|
||||
RmsLocationModal,
|
||||
locationaTree
|
||||
locationaTree,
|
||||
instrumentSelect
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
@ -223,7 +234,7 @@ export default {
|
|||
dataIndex: 'action',
|
||||
align: "center",
|
||||
fixed: "right",
|
||||
width: 160,
|
||||
width: 110,
|
||||
scopedSlots: { customRender: 'action' }
|
||||
}
|
||||
],
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<a-card :bordered="false">
|
||||
<a-row>
|
||||
<a-col :span="5">
|
||||
<a-col :span="4">
|
||||
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
|
||||
</a-col>
|
||||
<a-col :span="19">
|
||||
<a-col :span="20">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
|
@ -13,7 +13,14 @@
|
|||
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource" placeholder="请选择领用人"
|
||||
@select="onSelect" @search="onSearch" @change="onChange" />
|
||||
</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">
|
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
||||
|
|
|
@ -213,6 +213,7 @@ export default {
|
|||
created() {
|
||||
//备份model原始值
|
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model));
|
||||
this.getTreeData();
|
||||
},
|
||||
methods: {
|
||||
getTreeData() {
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<a-card :bordered="false">
|
||||
<a-row>
|
||||
<a-col :span="5">
|
||||
<a-col :span="4">
|
||||
<locationaTree ref="locationaTree" :height="640" @onSelect="onSelectTree"></locationaTree>
|
||||
</a-col>
|
||||
<a-col :span="19">
|
||||
<a-col :span="20">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
|
@ -13,7 +13,14 @@
|
|||
<a-auto-complete v-model="queryParam.recipient" :dataSource="UserdataSource"
|
||||
placeholder="请选择领用人" @select="onSelect" @search="onSearch" @change="onChange" />
|
||||
</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">
|
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
||||
|
@ -94,13 +101,13 @@
|
|||
</template>
|
||||
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleEdit(record)">编辑</a>
|
||||
<!-- <a @click="handleEdit(record)">编辑</a>
|
||||
|
||||
<a-divider type="vertical" />
|
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
|
||||
<a>删除</a>
|
||||
</a-popconfirm>
|
||||
<a-divider type="vertical" />
|
||||
<a-divider type="vertical" /> -->
|
||||
<a @click="handleDetail(record)">详情</a>
|
||||
</span>
|
||||
|
||||
|
@ -276,7 +283,7 @@ export default {
|
|||
dataIndex: 'action',
|
||||
align: "center",
|
||||
fixed: "right",
|
||||
width: 147,
|
||||
width: 110,
|
||||
scopedSlots: { customRender: 'action' }
|
||||
}
|
||||
],
|
||||
|
|
Loading…
Reference in New Issue