wilson
/
xujiecloud-vue
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

searchData

master
han\hanst 2 months ago
parent
5455a5c512
commit
da88a09f2a
4 changed files with 73 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/views/modules/erf/approvalCycleReport.vue
  2. 48
      src/views/modules/erf/expApplyApproval.vue
  3. 30
      src/views/modules/erf/expApplyList.vue
  4. 36
      src/views/modules/erf/sampleCycleReport.vue

32
src/views/modules/erf/approvalCycleReport.vue
View File

@ -4,7 +4,7 @@
<el-form :inline="true" label-position="top" class="query-form"> <el-form :inline="true" label-position="top" class="query-form">
<el-form-item label="试验单号"> <el-form-item label="试验单号">
<el-input <el-input
v-model="queryHeaderData.applyNo"
v-model="searchData.applyNo"
placeholder="请输入试验单号" placeholder="请输入试验单号"
clearable clearable
style="width: 150px"> style="width: 150px">
@ -13,7 +13,7 @@
<el-form-item label="事业部"> <el-form-item label="事业部">
<el-select <el-select
v-model="queryHeaderData.buNo"
v-model="searchData.buNo"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 120px"> style="width: 120px">
@ -25,7 +25,7 @@
<el-form-item label="试验类型"> <el-form-item label="试验类型">
<el-select <el-select
v-model="queryHeaderData.experimentType"
v-model="searchData.experimentType"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 120px"> style="width: 120px">
@ -37,7 +37,7 @@
<el-form-item label="试验负责人"> <el-form-item label="试验负责人">
<el-input <el-input
v-model="queryHeaderData.projectLeader"
v-model="searchData.projectLeader"
placeholder="请输入试验负责人姓名" placeholder="请输入试验负责人姓名"
clearable clearable
style="width: 120px"> style="width: 120px">
@ -46,7 +46,7 @@
<el-form-item label="发起日"> <el-form-item label="发起日">
<el-date-picker <el-date-picker
v-model="queryHeaderData.submitStartDate"
v-model="searchData.submitStartDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -57,7 +57,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-date-picker <el-date-picker
v-model="queryHeaderData.submitEndDate"
v-model="searchData.submitEndDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -68,7 +68,7 @@
<el-form-item label="审批完成日"> <el-form-item label="审批完成日">
<el-date-picker <el-date-picker
v-model="queryHeaderData.allApproveStartDate"
v-model="searchData.allApproveStartDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -79,7 +79,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-date-picker <el-date-picker
v-model="queryHeaderData.allApproveEndDate"
v-model="searchData.allApproveEndDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -90,7 +90,7 @@
<el-form-item label="审批周期（天）"> <el-form-item label="审批周期（天）">
<el-input <el-input
v-model="queryHeaderData.cycleDaysMin"
v-model="searchData.cycleDaysMin"
placeholder="最小值" placeholder="最小值"
style="width: 90px"> style="width: 90px">
</el-input> </el-input>
@ -98,7 +98,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-input <el-input
v-model="queryHeaderData.cycleDaysMax"
v-model="searchData.cycleDaysMax"
placeholder="最大值" placeholder="最大值"
style="width: 90px"> style="width: 90px">
</el-input> </el-input>
@ -346,7 +346,7 @@ export default {
data() { data() {
return { return {
// 查询条件 // 查询条件
queryHeaderData: {
searchData: {
applyNo: '', applyNo: '',
buNo: '', buNo: '',
experimentType: '', experimentType: '',
@ -425,12 +425,12 @@ export default {
this.pageIndex = 1 this.pageIndex = 1
} }
this.queryHeaderData.page = this.pageIndex
this.queryHeaderData.limit = this.pageSize
this.searchData.page = this.pageIndex
this.searchData.limit = this.pageSize
this.dataListLoading = true this.dataListLoading = true
getApprovalCycleReportList(this.queryHeaderData).then(({data}) => {
getApprovalCycleReportList(this.searchData).then(({data}) => {
this.dataListLoading = false this.dataListLoading = false
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list || [] this.dataList = data.page.list || []
@ -450,7 +450,7 @@ export default {
* 重置查询条件 * 重置查询条件
*/ */
resetQuery() { resetQuery() {
this.queryHeaderData = {
this.searchData = {
applyNo: '', applyNo: '',
buNo: '', buNo: '',
experimentType: '', experimentType: '',
@ -474,7 +474,7 @@ export default {
exportReport() { exportReport() {
this.exportLoading = true this.exportLoading = true
const exportParams = { ...this.queryHeaderData }
const exportParams = { ...this.searchData }
delete exportParams.page delete exportParams.page
delete exportParams.limit delete exportParams.limit

48
src/views/modules/erf/expApplyApproval.vue
View File

@ -49,11 +49,11 @@
</template> </template>
<el-form :inline="true" label-position="top" class="search-form"> <el-form :inline="true" label-position="top" class="search-form">
<el-form-item label="试验单号"> <el-form-item label="试验单号">
<el-input v-model="queryHeaderData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="事业部"> <el-form-item label="事业部">
<el-select v-model="queryHeaderData.buNo" placeholder="请选择" clearable style="width: 120px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option <el-option
v-for="i in buList" v-for="i in buList"
@ -65,7 +65,7 @@
</el-form-item> </el-form-item>
<el-form-item label="试验类型"> <el-form-item label="试验类型">
<el-select v-model="queryHeaderData.experimentType" placeholder="请选择" clearable style="width: 120px">
<el-select v-model="searchData.experimentType" placeholder="请选择" clearable style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="High Risk" value="High Risk"></el-option> <el-option label="High Risk" value="High Risk"></el-option>
<el-option label="Low Risk" value="Low Risk"></el-option> <el-option label="Low Risk" value="Low Risk"></el-option>
@ -73,24 +73,24 @@
</el-form-item> </el-form-item>
<el-form-item label="试验名称"> <el-form-item label="试验名称">
<el-input v-model="queryHeaderData.title" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.title" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编号"> <el-form-item label="项目编号">
<el-input v-model="queryHeaderData.projectNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.projectNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="产品型号"> <el-form-item label="产品型号">
<el-input v-model="queryHeaderData.productType" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.productType" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="试验负责人"> <el-form-item label="试验负责人">
<el-input v-model="queryHeaderData.projectLeader" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
<el-input v-model="searchData.projectLeader" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请开始日期"> <el-form-item label="申请开始日期">
<el-date-picker <el-date-picker
v-model="queryHeaderData.createStartDate"
v-model="searchData.createStartDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -100,7 +100,7 @@
<el-form-item label="申请结束日期"> <el-form-item label="申请结束日期">
<el-date-picker <el-date-picker
v-model="queryHeaderData.createEndDate"
v-model="searchData.createEndDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -462,7 +462,7 @@ export default {
searchExpanded: ['0'], // 搜索条件默认展开 searchExpanded: ['0'], // 搜索条件默认展开
// 查询条件 // 查询条件
queryHeaderData: {
searchData: {
applyNo: '', applyNo: '',
buNo: '', buNo: '',
experimentType: '', experimentType: '',
@ -555,14 +555,14 @@ export default {
this.pageIndex = 1 this.pageIndex = 1
} }
this.queryHeaderData.page = this.pageIndex
this.queryHeaderData.limit = this.pageSize
this.queryHeaderData.currentUserId = this.$store.state.user.id
this.queryHeaderData.pageType = 'MANAGER' // 经理审批页面，只查询经理审批节点
this.searchData.page = this.pageIndex
this.searchData.limit = this.pageSize
this.searchData.currentUserId = this.$store.state.user.id
this.searchData.pageType = 'MANAGER' // 经理审批页面，只查询经理审批节点
this.dataListLoading = true this.dataListLoading = true
getPendingApplyList(this.queryHeaderData).then(({data}) => {
getPendingApplyList(this.searchData).then(({data}) => {
this.dataListLoading = false this.dataListLoading = false
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list || [] this.dataList = data.page.list || []
@ -606,15 +606,15 @@ export default {
* 重置查询条件 * 重置查询条件
*/ */
resetQuery() { resetQuery() {
this.queryHeaderData.applyNo = ''
this.queryHeaderData.buNo = ''
this.queryHeaderData.experimentType = ''
this.queryHeaderData.title = ''
this.queryHeaderData.projectNo = ''
this.queryHeaderData.productType = ''
this.queryHeaderData.creatorName = ''
this.queryHeaderData.createStartDate = ''
this.queryHeaderData.createEndDate = ''
this.searchData.applyNo = ''
this.searchData.buNo = ''
this.searchData.experimentType = ''
this.searchData.title = ''
this.searchData.projectNo = ''
this.searchData.productType = ''
this.searchData.creatorName = ''
this.searchData.createStartDate = ''
this.searchData.createEndDate = ''
this.getDataList('Y') this.getDataList('Y')
}, },

30
src/views/modules/erf/expApplyList.vue
View File

@ -6,15 +6,15 @@
<!-- 查询条件表单 --> <!-- 查询条件表单 -->
<el-form :inline="true" label-position="top" class="query-form"> <el-form :inline="true" label-position="top" class="query-form">
<el-form-item label="试验单号"> <el-form-item label="试验单号">
<el-input v-model="queryHeaderData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.applyNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="试验负责人"> <el-form-item label="试验负责人">
<el-input v-model="queryHeaderData.projectLeader" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
<el-input v-model="searchData.projectLeader" placeholder="支持模糊查询" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="事业部"> <el-form-item label="事业部">
<el-select v-model="queryHeaderData.buNo" placeholder="请选择" clearable style="width: 120px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option <el-option
v-for="i in buList" v-for="i in buList"
@ -26,7 +26,7 @@
</el-form-item> </el-form-item>
<el-form-item label="试验类型"> <el-form-item label="试验类型">
<el-select v-model="queryHeaderData.experimentType" placeholder="请选择" clearable style="width: 120px">
<el-select v-model="searchData.experimentType" placeholder="请选择" clearable style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="High Risk" value="High Risk"></el-option> <el-option label="High Risk" value="High Risk"></el-option>
<el-option label="Low Risk" value="Low Risk"></el-option> <el-option label="Low Risk" value="Low Risk"></el-option>
@ -34,19 +34,19 @@
</el-form-item> </el-form-item>
<el-form-item label="试验名称"> <el-form-item label="试验名称">
<el-input v-model="queryHeaderData.title" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.title" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编号"> <el-form-item label="项目编号">
<el-input v-model="queryHeaderData.projectNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.projectNo" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<!-- <!--
<el-form-item label="产品型号"> <el-form-item label="产品型号">
<el-input v-model="queryHeaderData.productType" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
<el-input v-model="searchData.productType" placeholder="支持模糊查询" clearable style="width: 150px"></el-input>
</el-form-item>--> </el-form-item>-->
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="queryHeaderData.status" placeholder="请选择" clearable style="width: 120px">
<el-select v-model="searchData.status" placeholder="请选择" clearable style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="草稿" value="草稿"></el-option> <el-option label="草稿" value="草稿"></el-option>
<el-option label="已下达" value="已下达"></el-option> <el-option label="已下达" value="已下达"></el-option>
@ -60,7 +60,7 @@
<el-form-item label="创建日期"> <el-form-item label="创建日期">
<el-date-picker <el-date-picker
v-model="queryHeaderData.createStartDate"
v-model="searchData.createStartDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -71,7 +71,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-date-picker <el-date-picker
v-model="queryHeaderData.createEndDate"
v-model="searchData.createEndDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -701,7 +701,7 @@ export default {
sendLoading: false, // 发送邮件的加载状态 sendLoading: false, // 发送邮件的加载状态
buList: [], buList: [],
// 查询条件 // 查询条件
queryHeaderData: {
searchData: {
applyNo: '', applyNo: '',
buNo: '', buNo: '',
experimentType: '', experimentType: '',
@ -852,12 +852,12 @@ export default {
this.pageIndex = 1 this.pageIndex = 1
} }
this.queryHeaderData.page = this.pageIndex
this.queryHeaderData.limit = this.pageSize
this.searchData.page = this.pageIndex
this.searchData.limit = this.pageSize
this.dataListLoading = true this.dataListLoading = true
searchExpApplyList(this.queryHeaderData).then(({data}) => {
searchExpApplyList(this.searchData).then(({data}) => {
this.dataListLoading = false this.dataListLoading = false
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list || [] this.dataList = data.page.list || []
@ -901,7 +901,7 @@ export default {
* 重置查询条件 * 重置查询条件
*/ */
resetQuery() { resetQuery() {
this.queryHeaderData = {
this.searchData = {
applyNo: '', applyNo: '',
buNo: '', buNo: '',
experimentType: '', experimentType: '',

36
src/views/modules/erf/sampleCycleReport.vue
View File

@ -4,7 +4,7 @@
<el-form :inline="true" label-position="top" class="query-form"> <el-form :inline="true" label-position="top" class="query-form">
<el-form-item label="试验单号"> <el-form-item label="试验单号">
<el-input <el-input
v-model="queryHeaderData.applyNo"
v-model="searchData.applyNo"
placeholder="请输入试验单号" placeholder="请输入试验单号"
clearable clearable
style="width: 150px"> style="width: 150px">
@ -13,7 +13,7 @@
<el-form-item label="事业部"> <el-form-item label="事业部">
<el-select <el-select
v-model="queryHeaderData.buNo"
v-model="searchData.buNo"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 120px"> style="width: 120px">
@ -25,7 +25,7 @@
<el-form-item label="试验类型"> <el-form-item label="试验类型">
<el-select <el-select
v-model="queryHeaderData.experimentType"
v-model="searchData.experimentType"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 120px"> style="width: 120px">
@ -37,7 +37,7 @@
<el-form-item label="试验负责人"> <el-form-item label="试验负责人">
<el-input <el-input
v-model="queryHeaderData.projectLeader"
v-model="searchData.projectLeader"
placeholder="请输入试验负责人姓名" placeholder="请输入试验负责人姓名"
clearable clearable
style="width: 120px"> style="width: 120px">
@ -46,7 +46,7 @@
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
v-model="queryHeaderData.createStartDate"
v-model="searchData.createStartDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -57,7 +57,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-date-picker <el-date-picker
v-model="queryHeaderData.createEndDate"
v-model="searchData.createEndDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -68,7 +68,7 @@
<el-form-item label="期望完成时间"> <el-form-item label="期望完成时间">
<el-date-picker <el-date-picker
v-model="queryHeaderData.expectedFinishStartDate"
v-model="searchData.expectedFinishStartDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -79,7 +79,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-date-picker <el-date-picker
v-model="queryHeaderData.expectedFinishEndDate"
v-model="searchData.expectedFinishEndDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -90,7 +90,7 @@
<el-form-item label="实际完成时间"> <el-form-item label="实际完成时间">
<el-date-picker <el-date-picker
v-model="queryHeaderData.actualFinishStartDate"
v-model="searchData.actualFinishStartDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -101,7 +101,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-date-picker <el-date-picker
v-model="queryHeaderData.actualFinishEndDate"
v-model="searchData.actualFinishEndDate"
type="date" type="date"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -112,7 +112,7 @@
<el-form-item label="周期差异（天）"> <el-form-item label="周期差异（天）">
<el-input <el-input
v-model="queryHeaderData.cycleDifferenceMin"
v-model="searchData.cycleDifferenceMin"
placeholder="最小值" placeholder="最小值"
:controls="false" :controls="false"
style="width: 100px"> style="width: 100px">
@ -121,7 +121,7 @@
<el-form-item label="至"> <el-form-item label="至">
<el-input <el-input
v-model="queryHeaderData.cycleDifferenceMax"
v-model="searchData.cycleDifferenceMax"
placeholder="最大值" placeholder="最大值"
:controls="false" :controls="false"
style="width: 100px"> style="width: 100px">
@ -293,7 +293,7 @@ export default {
data() { data() {
return { return {
// 查询条件 // 查询条件
queryHeaderData: {
searchData: {
applyNo: '', applyNo: '',
buNo: '', buNo: '',
experimentType: '', experimentType: '',
@ -351,12 +351,12 @@ export default {
this.pageIndex = 1 this.pageIndex = 1
} }
this.queryHeaderData.page = this.pageIndex
this.queryHeaderData.limit = this.pageSize
this.searchData.page = this.pageIndex
this.searchData.limit = this.pageSize
this.dataListLoading = true this.dataListLoading = true
getSampleCycleReportList(this.queryHeaderData).then(({data}) => {
getSampleCycleReportList(this.searchData).then(({data}) => {
this.dataListLoading = false this.dataListLoading = false
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list || [] this.dataList = data.page.list || []
@ -376,7 +376,7 @@ export default {
* 重置查询条件 * 重置查询条件
*/ */
resetQuery() { resetQuery() {
this.queryHeaderData = {
this.searchData = {
applyNo: '', applyNo: '',
buNo: '', buNo: '',
experimentType: '', experimentType: '',
@ -402,7 +402,7 @@ export default {
exportReport() { exportReport() {
this.exportLoading = true this.exportLoading = true
const exportParams = { ...this.queryHeaderData }
const exportParams = { ...this.searchData }
delete exportParams.page delete exportParams.page
delete exportParams.limit delete exportParams.limit

Write Preview
Loading…
Cancel
Save