diff --git a/src/views/material/basic/bmProject/index.vue b/src/views/material/basic/bmProject/index.vue index 34107ac2..cd728212 100644 --- a/src/views/material/basic/bmProject/index.vue +++ b/src/views/material/basic/bmProject/index.vue @@ -543,6 +543,7 @@ export default { this.reset() this.open = true this.title = '新增工程' + this.getType() this.getI8ProType() }, // 多选框选中数据 @@ -562,6 +563,7 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { + this.getType() this.getI8ProType() this.reset() getProjectListDetail(row.proId).then(response => { diff --git a/src/views/material/basic/bmUnit/index.vue b/src/views/material/basic/bmUnit/index.vue index 0029d9b0..4e5138f9 100644 --- a/src/views/material/basic/bmUnit/index.vue +++ b/src/views/material/basic/bmUnit/index.vue @@ -336,7 +336,7 @@ export default { methods: { //获取单位类型 getType() { - unitTypeList({ dictType: 'bm_unit_type'}).then((response) => { + unitTypeList({ dictType: 'bm_unit_type', pageSize: 9999}).then((response) => { let unitList = response.rows this.typeList = unitList.map((item) => { return { @@ -433,6 +433,8 @@ export default { this.reset() this.open = true this.title = '新建' + this.getType() + this.getTypeDept() }, handlePeople(row) { this.$router.push({ @@ -448,6 +450,8 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { + this.getType() + this.getTypeDept() this.reset() unitInfoAll(row.unitId).then((response) => { this.form = response.data diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue index 47820e51..1beed19a 100644 --- a/src/views/material/lease/protocol/index.vue +++ b/src/views/material/lease/protocol/index.vue @@ -1205,7 +1205,9 @@ export default { this.download( '/material/bm_agreement_info/export', { - ...this.queryParams + ...this.queryParams, + startTime: this.queryParams.time ? this.queryParams.time[0] : '', + endTime: this.queryParams.time ? this.queryParams.time[1] : '' }, `协议管理 _${currentTime}.xlsx` ) diff --git a/src/views/material/part/partAcceptTwo/detail.vue b/src/views/material/part/partAcceptTwo/detail.vue index 17b43f54..d75c58dc 100644 --- a/src/views/material/part/partAcceptTwo/detail.vue +++ b/src/views/material/part/partAcceptTwo/detail.vue @@ -353,7 +353,7 @@ export default { return { ...item, deptName: index == 0 ? '供应科' : item.deptName || '', - auditStatus: 1 + auditStatus: index == 0 ? 1 : item.auditStatus || 0 } }) const list = [ diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue index e89ca97f..f48340b9 100644 --- a/src/views/material/purchase/goodsAccept/detail.vue +++ b/src/views/material/purchase/goodsAccept/detail.vue @@ -375,7 +375,7 @@ export default { return { ...item, deptName: index == 0 ? '供应科' : item.deptName || '', - auditStatus: 1 + auditStatus: index == 0 ? 1 : item.auditStatus || 0 } }) const list = [ diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue index 4eace0c4..1a49a63d 100644 --- a/src/views/material/purchase/goodsAccept/index.vue +++ b/src/views/material/purchase/goodsAccept/index.vue @@ -101,6 +101,7 @@ 查看