diff --git a/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue b/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue index 976b3dde..a756e848 100644 --- a/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue +++ b/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue @@ -33,7 +33,7 @@
工序部位:
-
{{ row.workingPosition }}
+
{{ row.workingPositionFull }}
验收描述:
diff --git a/yanzhu-bigscreen/src/views/projectChecked.vue b/yanzhu-bigscreen/src/views/projectChecked.vue index d220ef9e..274507a8 100644 --- a/yanzhu-bigscreen/src/views/projectChecked.vue +++ b/yanzhu-bigscreen/src/views/projectChecked.vue @@ -2,17 +2,9 @@
- + @@ -172,13 +138,8 @@
@@ -294,7 +255,7 @@ export default { }, getCheckedCount(n) { let obj = this.groupData.find( - (item) => item.name == (n == 1 ? "已验收" : "未验收") + (item) => item.name == (n == 1 ? "已验收" : "待验收") ); return obj ? obj.value : 0; }, @@ -329,7 +290,7 @@ export default { pageSize: this.size, }; this.$api.checked.listProjectChecked(param).then((res) => { - this.total = res.total + 20; + this.total = res.total; this.listData = this.mapData(res); this.listKey++; }); @@ -351,9 +312,6 @@ export default { if (item.imageUrls) { item.images = item.imageUrls.split(","); item.image = item.images[0]; - for (let i = 0; i < 6; i++) { - item.images.push(item.images[0]); - } } else { item.image = ""; item.images = []; @@ -374,7 +332,10 @@ export default { item.checkResultName = "验收不通过"; item.checkResultColor = 2; } + let task = this.$tryToJson(item.workingPosition, {}) + item.workingPositionName = task.name; + item.workingPositionFull = task.full; return item; }); }, @@ -538,6 +499,7 @@ export default { } .chart1-group { + .chart-gif, .chart-text { left: 51px !important; @@ -641,6 +603,17 @@ export default { color: #32e1e4; } + .item-data { + max-width: calc(100% - 80px); + + .el-tooltip { + white-space: nowrap; + display: block; + overflow: hidden; + text-overflow: ellipsis; + } + } + .check-state { display: inline-block; line-height: 20px; @@ -669,9 +642,11 @@ export default { @media (min-width: 1921px) and (max-width: 2560px) { .no-data { - font-size: 16px; - } + font-size: 16px; + } + .chart1-group { + .chart-gif, .chart-text { left: 59px !important; @@ -719,7 +694,7 @@ export default { padding-left: 10px; .item-right-row { - line-height: 30px; + line-height: 34px; .check-state { line-height: 30px; @@ -732,10 +707,12 @@ export default { } @media (min-width: 2561px) { - .no-data { - font-size: 24px; - } + .no-data { + font-size: 24px; + } + .chart1-group { + .chart-gif, .chart-text { left: 79px !important; diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js index d74368da..908e7025 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js @@ -115,20 +115,16 @@ Page({ }, async submitSave(e) { let approveStatus = e.target.dataset.set; - if (!this.data.checkResult) { - app.toast("请选择审批结果!"); - return false; - } if (this.data.imageInfoData.length == 0) { app.toast("请上传图片!"); return; } let fileUrls = await uploadFiles(this.data.imageInfoData); - debugger + let postData = { id: this.data.rowData.id, approveStatus: approveStatus, - checkResult: this.data.checkResult, + checkResult: approveStatus == 3 ? 2 : 1, checkingFiles: fileUrls.join(","), }; try { diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml index 53de754b..5cfd2714 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml @@ -87,6 +87,7 @@ + 三方验收照片 diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js index ba0a2d1f..34cc7b4c 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js @@ -125,7 +125,7 @@ Page({ it.workingPositionFull = task.full; it.taskId = task.id; it.canEdit = (it.approveStatus == 1 || it.approveStatus == 3) && it.groupDeptUser == this.data.projectUserInfo.userPhone; - it.canApprove = (it.approveStatus == 1 || it.approveStatus == 3) && it.technicianUser == this.data.projectUserInfo.userPhone; + it.canApprove = (it.approveStatus == 1) && it.technicianUser == this.data.projectUserInfo.userPhone; return it; }); this.setData({ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_more/index.js b/yanzhu-ui-app/miniprogram/pageage/project_more/index.js index e220444e..2013b8a8 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_more/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_more/index.js @@ -71,7 +71,7 @@ Page({ * @param {*} proId */ getUserMenuList: function (proId) { - findUserMenuList(proId, 'gdgn').then(res => { + findUserMenuList(proId, this.data.active == 1 ? "" : 'gdgn').then(res => { if (res.code == 200) { this.setData({ menuList: res.data diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue index 19b64f4e..ae3980b3 100755 --- a/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue @@ -1,9 +1,12 @@