Browse Source

fix:[表单管理]优化

ouqian
15881625488@163.com 1 month ago
parent
commit
2c0d66c878
12 changed files with 170 additions and 293 deletions
  1. +1
    -1
      src/lang/zh/business/study/studyFormFill.js
  2. +38
    -60
      src/views/business/form/drug/comp/tbbdList.vue
  3. +29
    -46
      src/views/business/form/drug/comp/ytbdList.vue
  4. +38
    -60
      src/views/business/form/nonTrial/comp/tbbdList.vue
  5. +30
    -47
      src/views/business/form/nonTrial/comp/ytbdList.vue
  6. +1
    -1
      src/views/business/resource/gyzj/comps/gyzjList.vue
  7. +1
    -1
      src/views/business/resource/mjy/comps/mjyList.vue
  8. +5
    -17
      src/views/business/study/comp/jhbdList.vue
  9. +16
    -33
      src/views/business/study/comp/tbbdList.vue
  10. +1
    -1
      src/views/business/study/comp/wzlb/gyzjList.vue
  11. +1
    -1
      src/views/business/study/comp/wzlb/mjyList.vue
  12. +9
    -25
      src/views/business/study/comp/ytbdList.vue

+ 1
- 1
src/lang/zh/business/study/studyFormFill.js View File

@ -31,7 +31,7 @@ export default {
bzyy: '备注原因', bzyy: '备注原因',
jcgj: '稽查轨迹', jcgj: '稽查轨迹',
cjjl: '创建记录', cjjl: '创建记录',
sfbl: '是否补录',
sfbl: '是否补录',
yes: '是', yes: '是',
no: '否', no: '否',
tjjl: '提交记录', tjjl: '提交记录',

+ 38
- 60
src/views/business/form/drug/comp/tbbdList.vue View File

@ -3,65 +3,43 @@
<div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh"> <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search"> <div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px"> <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<div style="margin-left: 100px;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
@change="search">
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 150px" clearable @change="search">
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="tbbd-content"> <div class="tbbd-content">
@ -326,7 +304,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0] this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.searchForm.cjsjks = '' this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = '' this.searchForm.cjsjjs = ''

+ 29
- 46
src/views/business/form/drug/comp/ytbdList.vue View File

@ -2,48 +2,31 @@
<div> <div>
<div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit"> <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
<div class="ytbd-search"> <div class="ytbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-form :model="searchForm" ref="searchForm" :inline="true">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" @change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="ytbd-content"> <div class="ytbd-content">
@ -114,11 +97,11 @@
</template> </template>
<template v-if="scope.row.bdzt === 5 && id == scope.row.userId"> <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
<el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi') <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
}}</el-button>
}}</el-button>
</template> </template>
<template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId"> <template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
<el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb') <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
}}</el-button>
}}</el-button>
</template> </template>
</template> </template>
</template> </template>
@ -396,7 +379,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.startDate = this.daterange[0] this.searchForm.startDate = this.daterange[0]
this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.searchForm.startDate = '' this.searchForm.startDate = ''
this.searchForm.endDate = '' this.searchForm.endDate = ''
@ -444,7 +427,7 @@ export default {
detail(row) { detail(row) {
this.showDetail = true this.showDetail = true
this.$emit('showDetail', this.showDetail) this.$emit('showDetail', this.showDetail)
this.$refs.Xq.show(row, true,this.searchForm)
this.$refs.Xq.show(row, true, this.searchForm)
}, },
audit(row) { audit(row) {
this.showAudit = true this.showAudit = true

+ 38
- 60
src/views/business/form/nonTrial/comp/tbbdList.vue View File

@ -2,65 +2,43 @@
<div> <div>
<div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh"> <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search"> <div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<div style="margin-left: 100px;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable>
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form :model="searchForm" ref="searchForm" :inline="true">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 150px" clearable>
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="tbbd-content"> <div class="tbbd-content">
@ -391,7 +369,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0] this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.searchForm.cjsjks = '' this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = '' this.searchForm.cjsjjs = ''

+ 30
- 47
src/views/business/form/nonTrial/comp/ytbdList.vue View File

@ -2,48 +2,31 @@
<div> <div>
<div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit"> <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
<div class="ytbd-search"> <div class="ytbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-form :model="searchForm" ref="searchForm" :inline="true">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" style="width: 150px" @change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="ytbd-content"> <div class="ytbd-content">
@ -113,11 +96,11 @@
</template> </template>
<template v-if="scope.row.bdzt === 5 && id == scope.row.userId"> <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
<el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi') <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
}}</el-button>
}}</el-button>
</template> </template>
<template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId"> <template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
<el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb') <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
}}</el-button>
}}</el-button>
</template> </template>
</template> </template>
</template> </template>
@ -265,7 +248,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
studyId: -1, studyId: -1,
studyStatus:5,
studyStatus: 5,
studySn: '', studySn: '',
studyMc: '', studyMc: '',
bdbh: '', bdbh: '',
@ -424,7 +407,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.startDate = this.daterange[0] this.searchForm.startDate = this.daterange[0]
this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.searchForm.startDate = '' this.searchForm.startDate = ''
this.searchForm.endDate = '' this.searchForm.endDate = ''
@ -481,7 +464,7 @@ export default {
detail(row) { detail(row) {
this.showDetail = true this.showDetail = true
this.$emit('showDetail', this.showDetail) this.$emit('showDetail', this.showDetail)
this.$refs.Xq.show(row, true,this.searchForm)
this.$refs.Xq.show(row, true, this.searchForm)
}, },
audit(row) { audit(row) {
this.showAudit = true this.showAudit = true

+ 1
- 1
src/views/business/resource/gyzj/comps/gyzjList.vue View File

@ -522,7 +522,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0] this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.queryParams.startDate = '' this.queryParams.startDate = ''
this.queryParams.endDate = '' this.queryParams.endDate = ''

+ 1
- 1
src/views/business/resource/mjy/comps/mjyList.vue View File

@ -521,7 +521,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0] this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.queryParams.startDate = '' this.queryParams.startDate = ''
this.queryParams.endDate = '' this.queryParams.endDate = ''

+ 5
- 17
src/views/business/study/comp/jhbdList.vue View File

@ -2,41 +2,29 @@
<div class="tbbd-list"> <div class="tbbd-list">
<div v-show="!showDetail && !showEdit && !showAudit && !showFh"> <div v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search"> <div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
<el-row>
<el-col :span="5">
<el-form :model="searchForm" ref="searchForm" :inline="true" >
<el-form-item :label="$t('page.business.form.bdmc')" prop="name" <el-form-item :label="$t('page.business.form.bdmc')" prop="name"
:label-width="$i18n.locale === 'zh_CN' ? '100px' : '120px'"> :label-width="$i18n.locale === 'zh_CN' ? '100px' : '120px'">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 160px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn"> <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 160px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId"> <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 160px" :name="searchForm.userMc" key="userId"
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" /> @change="userChange" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('page.business.form.cjsj')"> <el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')" :start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button> <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button> <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</div> </div>
<div class="tbbd-content"> <div class="tbbd-content">
@ -239,7 +227,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0] this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.searchForm.cjsjks = '' this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = '' this.searchForm.cjsjjs = ''

+ 16
- 33
src/views/business/study/comp/tbbdList.vue View File

@ -2,65 +2,48 @@
<div> <div>
<div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh"> <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search"> <div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form :model="searchForm" ref="searchForm" :inline="true" >
<el-form-item :label="$t('page.business.form.bdmc')" prop="name"> <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn"> <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId"> <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" /> @change="userChange" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<div style="margin-left: 100px;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName"> <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')"> <el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')" :start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.tjsj')"> <el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-" <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')" :start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')"> <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable>
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable style="width: 150px">
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" /> <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" /> <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="tbbd-content"> <div class="tbbd-content">
@ -386,7 +369,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0] this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.searchForm.cjsjks = '' this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = '' this.searchForm.cjsjjs = ''

+ 1
- 1
src/views/business/study/comp/wzlb/gyzjList.vue View File

@ -255,7 +255,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0] this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.queryParams.startDate = '' this.queryParams.startDate = ''
this.queryParams.endDate = '' this.queryParams.endDate = ''

+ 1
- 1
src/views/business/study/comp/wzlb/mjyList.vue View File

@ -233,7 +233,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0] this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.queryParams.startDate = '' this.queryParams.startDate = ''
this.queryParams.endDate = '' this.queryParams.endDate = ''

+ 9
- 25
src/views/business/study/comp/ytbdList.vue View File

@ -2,48 +2,32 @@
<div> <div>
<div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit"> <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
<div class="ytbd-search"> <div class="ytbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form :model="searchForm" ref="searchForm" :inline="true" >
<el-form-item :label="$t('page.business.form.bdmc')" prop="name"> <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn"> <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId"> <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
@change="userChange" /> @change="userChange" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName"> <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')"> <el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')" :start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="ytbd-content"> <div class="ytbd-content">
@ -430,7 +414,7 @@ export default {
getList() { getList() {
if (this.daterange != null && this.daterange.length > 0) { if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.startDate = this.daterange[0] this.searchForm.startDate = this.daterange[0]
this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else { } else {
this.searchForm.startDate = '' this.searchForm.startDate = ''
this.searchForm.endDate = '' this.searchForm.endDate = ''

Loading…
Cancel
Save