bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试bug修改2

This commit is contained in:
zzyuan 2024-12-02 12:10:24 +08:00
parent 8ba6fb2a13
commit 2c622722ac
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/material/lease/apply/component/homeApply.vue
View File

@ -626,10 +626,9 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
time: null, //申请时间
name: undefined,
typeId: "",
time: null, //申请时间
keyWord: "",
taskStatus: null, //申请时间
},
form: {
remark: "",
@ -693,12 +692,12 @@ export default {
this.loading = true;
const params = {
keyWord: this.queryParams.keyWord,
taskStatus: this.queryParams.taskStatus,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
typeId: this.queryParams.typeId,
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
statusList: [1, 2, 3, 4],
statusList:[this.queryParams.taskStatus]
};
getListLeaseApply(this.addDateRange(params)).then((response) => {
this.typeList = response.rows;

12
src/views/material/lease/outBound/component/homeOutBound.vue
View File

@ -32,9 +32,9 @@
/>
</el-form-item>
<el-form-item label="状态" prop="typeId">
<el-form-item label="状态" prop="taskStatus">
<el-select
v-model="queryParams.typeId"
v-model="queryParams.taskStatus"
placeholder="请选择状态"
clearable
filterable
@ -412,9 +412,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
time: null, //申请时间
name: undefined,
typeId: "",
time: null, //申请时间
taskStatus: "",
keyWord: "",
},
form: {
@ -475,7 +474,8 @@ export default {
keyWord: this.queryParams.keyWord,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
typeId: this.queryParams.typeId,
taskStatus: this.queryParams.taskStatus,
// statusList:[this.queryParams.taskStatus],
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
};

16
src/views/material/lease/outBound/index.vue
View File

@ -908,9 +908,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
time: null, //申请时间
name: undefined,
typeId: "",
time: null, //申请时间
taskStatus: "",
keyWord: "",
},
//出库的搜索栏
@ -978,12 +977,15 @@ export default {
const params = {
keyWord: this.queryParams.keyWord,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
typeId: this.queryParams.typeId,
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
statusList: [3, 4, 5],
pageNum: this.queryParams.pageNum,
};
if(!this.queryParams.taskStatus){
params.statusList=[3, 4, 5]
}else{
params.statusList=[this.queryParams.taskStatus]
}
getListLeaseApply(this.addDateRange(params)).then((response) => {
this.typeList = response.rows;
this.total = response.total;

4
src/views/material/purchase/goodsEntry/detail.vue
View File

@ -111,10 +111,10 @@
</el-table-column>
<el-table-column label="操作" align="center" width="180" v-if="!isView">
<template slot-scope="scope">
<el-button size="mini" type="success" @click="pass(scope.row)" v-if="(scope.row.status!=19&&scope.row.manageType==1)||scope.row.manageType==0">
<el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status!=14&&scope.row.status!=19">
入库
</el-button>
<el-button size="mini" type="danger" @click="reject(scope.row)" v-if="(scope.row.status!=19&&scope.row.manageType==1)||scope.row.manageType==0">
<el-button size="mini" type="danger" @click="reject(scope.row)" v-if="scope.row.status!=14&&scope.row.status!=19">
驳回
</el-button>
</template>

4
src/views/material/purchase/goodsEntry/index.vue
View File

@ -92,12 +92,12 @@
@selection-change="handleSelectionChange"
border
>
<el-table-column
<!-- <el-table-column
type="selection"
width="55"
align="center"
:reserve-selection="true"
/>
/> -->
<el-table-column
label="序号"
align="center"