Commit e3acb912 by liangzhen

后评估修复查询问题

1 parent 67efc8a7
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm('ruleForm')"> <el-button @click="resetForm('ruleForm')">
...@@ -328,7 +328,7 @@ export default { ...@@ -328,7 +328,7 @@ export default {
}, },
mounted() { mounted() {
this.ruleForm.batchName = this.$route.query.batchName this.ruleForm.batchName = this.$route.query.batchName
this.ruleForm.projectCode = this.$route.query.projCode this.ruleForm.projectId = this.$route.query.projCode
this.submitForm() this.submitForm()
}, },
methods: { methods: {
...@@ -342,7 +342,10 @@ export default { ...@@ -342,7 +342,10 @@ export default {
this.ruleForm.createEndTime = '' this.ruleForm.createEndTime = ''
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm('ruleForm')"> <el-button @click="resetForm('ruleForm')">
...@@ -728,7 +728,10 @@ export default { ...@@ -728,7 +728,10 @@ export default {
} }
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm()"> <el-button @click="resetForm()">
...@@ -725,7 +725,10 @@ export default { ...@@ -725,7 +725,10 @@ export default {
this.ruleForm.createEndTime = '' this.ruleForm.createEndTime = ''
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm()"> <el-button @click="resetForm()">
...@@ -595,7 +595,10 @@ export default { ...@@ -595,7 +595,10 @@ export default {
this.ruleForm.createEndTime = '' this.ruleForm.createEndTime = ''
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm()"> <el-button @click="resetForm()">
...@@ -768,7 +768,10 @@ export default { ...@@ -768,7 +768,10 @@ export default {
controlSwitch(val, row) { controlSwitch(val, row) {
console.log('333', val, row) console.log('333', val, row)
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm('ruleForm')"> <el-button @click="resetForm('ruleForm')">
...@@ -328,7 +328,7 @@ export default { ...@@ -328,7 +328,7 @@ export default {
}, },
mounted() { mounted() {
this.ruleForm.batchName = this.$route.query.batchName this.ruleForm.batchName = this.$route.query.batchName
this.ruleForm.projectCode = this.$route.query.projCode this.ruleForm.projectId = this.$route.query.projCode
this.submitForm() this.submitForm()
}, },
methods: { methods: {
...@@ -342,7 +342,10 @@ export default { ...@@ -342,7 +342,10 @@ export default {
this.ruleForm.createEndTime = '' this.ruleForm.createEndTime = ''
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm('ruleForm')"> <el-button @click="resetForm('ruleForm')">
...@@ -727,7 +727,10 @@ export default { ...@@ -727,7 +727,10 @@ export default {
} }
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm()"> <el-button @click="resetForm()">
...@@ -728,7 +728,10 @@ export default { ...@@ -728,7 +728,10 @@ export default {
this.ruleForm.createEndTime = '' this.ruleForm.createEndTime = ''
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm()"> <el-button @click="resetForm()">
...@@ -587,7 +587,10 @@ export default { ...@@ -587,7 +587,10 @@ export default {
this.ruleForm.createEndTime = '' this.ruleForm.createEndTime = ''
} }
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm()"> <el-button @click="resetForm()">
...@@ -767,7 +767,10 @@ export default { ...@@ -767,7 +767,10 @@ export default {
controlSwitch(val, row) { controlSwitch(val, row) {
console.log('333', val, row) console.log('333', val, row)
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
></el-input> ></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm('999')">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm()"> <el-button @click="resetForm()">
...@@ -551,7 +551,10 @@ export default { ...@@ -551,7 +551,10 @@ export default {
this.pageSize = 10 this.pageSize = 10
this.submitForm() this.submitForm()
}, },
async submitForm() { async submitForm(info) {
if(info==999){
this.currentPage=1
}
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
......
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规则状态:" prop="ruleStatus" class="fromItem"> <!-- <el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
<el-select <el-select
v-model="ruleFormRule.ruleStatus" v-model="ruleFormRule.ruleStatus"
placeholder="请选择" placeholder="请选择"
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<el-option label="开启" value="0"></el-option> <el-option label="开启" value="0"></el-option>
<el-option label="关闭" value="1"></el-option> <el-option label="关闭" value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="创建人:" prop="creator" class="fromItem"> <el-form-item label="创建人:" prop="creator" class="fromItem">
<el-input <el-input
...@@ -662,7 +662,7 @@ export default { ...@@ -662,7 +662,7 @@ export default {
let params = { let params = {
current: this.currentPageRule, current: this.currentPageRule,
pageSize: this.pageSizeRule, pageSize: this.pageSizeRule,
// ruleStatus: 0, ruleStatus: 0,
}; };
Object.assign(params, this.ruleFormRule); Object.assign(params, this.ruleFormRule);
console.log(params); console.log(params);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!