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

bug修复

This commit is contained in:
hongchao 2025-02-13 12:36:48 +08:00
parent 2ec0625da2
commit 17c9fe9185
5 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/views/claimAndreturn/picking/apply/component/home1.vue
View File

@ -124,7 +124,6 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="leaseAuditList" :data="leaseAuditList"
@selection-change="handleSelectionChange"
border border
> >
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
@ -163,6 +162,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.leaseType == 0">工程租赁</span> <span v-if="scope.row.leaseType == 0">工程租赁</span>
<span v-if="scope.row.leaseType == 1">长期领用</span> <span v-if="scope.row.leaseType == 1">长期领用</span>
</template> </template>
</el-table-column> </el-table-column>
@ -230,8 +230,8 @@
<span v-if="scope.row.taskStatus < 31"></span> <span v-if="scope.row.taskStatus < 31"></span>
<span <span
v-if=" v-if="
scope.row.taskStatus == 31 || (scope.row.taskStatus == 31 ||
scope.row.taskStatus == 98 scope.row.taskStatus == 98) && scope.row.leaseApplyInfoList
" "
>{{ >{{
scope.row.leaseApplyInfoList[0].companyAuditRemark scope.row.leaseApplyInfoList[0].companyAuditRemark
@ -239,28 +239,28 @@
</span> </span>
<span <span
v-if=" v-if="
scope.row.taskStatus == 32 || (scope.row.taskStatus == 32 ||
scope.row.taskStatus == 99 scope.row.taskStatus == 99) && scope.row.leaseApplyInfoList
" "
>{{ scope.row.leaseApplyInfoList[0].deptAuditRemark }} >{{ scope.row.leaseApplyInfoList[0].deptAuditRemark }}
</span> </span>
<span <span
v-if=" v-if="
scope.row.taskStatus == 33 || (scope.row.taskStatus == 33 ||
scope.row.taskStatus == 100 scope.row.taskStatus == 100) && scope.row.leaseApplyInfoList
" "
>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }} >{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}
</span> </span>
<span <span
v-if=" v-if="
scope.row.taskStatus > 33 && (scope.row.taskStatus > 33 &&
scope.row.taskStatus < 98 scope.row.taskStatus < 98) && scope.row.leaseApplyInfoList
" "
>{{ >{{
scope.row.leaseApplyInfoList[0].directAuditRemark scope.row.leaseApplyInfoList[0].directAuditRemark
}}</span }}</span
> >
<span v-if="scope.row.taskStatus > 100">{{ <span v-if="scope.row.taskStatus > 100 && scope.row.leaseApplyInfoList">{{
scope.row.leaseApplyInfoList[0].directAuditRemark scope.row.leaseApplyInfoList[0].directAuditRemark
}}</span> }}</span>
<!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> --> <!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
@ -272,7 +272,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.leaseApplyInfoList[0].remark }}</span> <span v-if="scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList.length > 0 && scope.row.leaseApplyInfoList[0].remark">{{ scope.row.leaseApplyInfoList[0].remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="160"> <el-table-column label="操作" align="center" width="160">
@ -370,7 +370,7 @@ export default {
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined, status: undefined,
keyWord: '',
time: null, //申请时间 time: null, //申请时间
unitId: null, //来往单位id unitId: null, //来往单位id
proId: null, //工程id proId: null, //工程id
@ -406,6 +406,7 @@ export default {
const res = await getLeaseAuditListAll(params) const res = await getLeaseAuditListAll(params)
this.loading = false this.loading = false
this.leaseAuditList = res.data.rows this.leaseAuditList = res.data.rows
console.log('333333333333333',this.leaseAuditList)
this.total = res.data.total this.total = res.data.total
}, },
@ -467,11 +468,11 @@ export default {
this.$emit('addPicking') this.$emit('addPicking')
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { // handleSelectionChange(selection) {
this.ids = selection.map((item) => item.dictId) // this.ids = selection.map((item) => item.dictId)
this.single = selection.length != 1 // this.single = selection.length != 1
this.multiple = !selection.length // this.multiple = !selection.length
}, // },
handleView(row) { handleView(row) {
// this.$tab.closeOpenPage({ // this.$tab.closeOpenPage({
// path: '/claimAndRefund/receiveByCq/receiveApplyAdd', // path: '/claimAndRefund/receiveByCq/receiveApplyAdd',

4
src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -222,7 +222,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.leaseApplyInfoList[0].remark }}</span> <span v-if="scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList.length > 0 && scope.row.leaseApplyInfoList[0].remark">{{ scope.row.leaseApplyInfoList[0].remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="160" align="center"> <el-table-column label="操作" width="160" align="center">
@ -594,7 +594,7 @@ export default {
status: '0', status: '0',
remark: undefined, remark: undefined,
} }
this.resetForm('form') this.resetForm('queryForm')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {

5
src/views/stquery/deviceInStoreQuery.vue
View File

@ -209,7 +209,7 @@ export default {
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined, status: undefined,
keyWord: '',
time: null, //申请时间 time: null, //申请时间
unitId: null, //来往单位id unitId: null, //来往单位id
proId: null, //工程id proId: null, //工程id
@ -276,8 +276,9 @@ export default {
dictType: undefined, dictType: undefined,
status: '0', status: '0',
remark: undefined, remark: undefined,
keyWord: undefined,
} }
this.resetForm('form') this.resetForm('queryForm')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {

5
src/views/stquery/deviceStatusRecord.vue
View File

@ -263,7 +263,8 @@ export default {
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined, status: undefined,
typeName: undefined,
typeModelName: undefined,
time: null, //申请时间 time: null, //申请时间
unitId: null, //来往单位id unitId: null, //来往单位id
proId: null, //工程id proId: null, //工程id
@ -332,7 +333,7 @@ export default {
status: '0', status: '0',
remark: undefined, remark: undefined,
} }
this.resetForm('form') this.resetForm('queryForm')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {

3
src/views/warehouseManage/machinery/personnel/index.vue
View File

@ -329,6 +329,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
typeName: undefined,
userName: undefined, userName: undefined,
status: undefined, status: undefined,
deptId: undefined, deptId: undefined,
@ -468,7 +469,7 @@ export default {
postIds: [], postIds: [],
roleIds: [], roleIds: [],
} }
this.resetForm('form') this.resetForm('queryForm')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {