diff --git a/pages/mbwa/mbwa.vue b/pages/mbwa/mbwa.vue index 1e327f1..3b37fd3 100644 --- a/pages/mbwa/mbwa.vue +++ b/pages/mbwa/mbwa.vue @@ -222,7 +222,6 @@ export default { userInfo = JSON.parse(userInfo); if (userInfo) { this.useInfo = JSON.parse(JSON.stringify(userInfo)); - console.log("this.useInfo", this.useInfo); } // 拿到服务区的数据 this.handleGetServerpartList(); @@ -230,7 +229,6 @@ export default { methods: { // 跳转详情进行操作 handleGoDetail(obj) { - console.log("obj", obj); // 判断是否是异常的 if (obj.situation === 1) { this.$util.toNextRoute( diff --git a/pages/walkAroundManager/detail.vue b/pages/walkAroundManager/detail.vue index bfe6372..1dd0daf 100644 --- a/pages/walkAroundManager/detail.vue +++ b/pages/walkAroundManager/detail.vue @@ -7,29 +7,123 @@ : '100%', }" :scroll-y="true"> - - - {{ detailObj.placeName || "-" }} - + + + + {{ detailObj.placeName || "-" }} + + {{ extendObj.situation === 0 - ? '#139942' + ? "正常情况" : extendObj.situation === 1 - ? '#F75031' - : '', - background: - extendObj.situation === 0 - ? '#EBF7EF' - : extendObj.situation === 1 - ? '#FEF0ED' - : '', - }">{{ - extendObj.situation === 0 - ? "正常情况" - : extendObj.situation === 1 - ? "急需处理" - : "-" - }} + ? "急需处理" + : "-" + }} + + + + + + 巡检进度 + + + + + + + + + + {{ detailObj.userName || "-" }} + {{ + detailObj.createdAt + ? $moment(detailObj.createdAt).format( + "YYYY-MM-DD HH:mm:ss" + ) + : "-" + }} + + + {{ extendObj.uploadResult }} + 提交 + + + + + + + + + + + + {{ + extendObj.personMemberShipName || "-" + }} + {{ + extendObj.suggestTime + ? $moment(extendObj.suggestTime).format( + "YYYY-MM-DD HH:mm:ss" + ) + : "-" + }} + + + {{ extendObj.suggestion }} + + 更换指派人 + 指派 + + + + + + + + + + + + + + {{ + extendObj.personMemberShipName || "-" + }} + {{ + extendObj.feedbackTime + ? $moment(extendObj.feedbackTime).format( + "YYYY-MM-DD HH:mm:ss" + ) + : "-" + }} + + + {{ extendObj.feedbackContent }} + 反馈 + + + + + + + + + + 整改意见* + +
+ +
+ + + 指派异常处理人* + + + + + + + + + + + + + 反馈内容* + + +
+ +
+ + + + 巡检内容* @@ -105,24 +240,51 @@ - {{ item.question.title - }}* + - + 巡检进度 @@ -281,7 +443,7 @@ - + @@ -851,7 +1013,8 @@ export default { }, // 指派 handleAssign() { - this.isShowPopup = true; + // this.isShowPopup = true; + this.handleGetUpdate() }, // 关闭 handleClosePopup() { @@ -862,6 +1025,18 @@ export default { deleteImgFunc(item, index) { this.feedbackImgList.splice(index, 1); }, + // 新的 在碗面的选择异常处理人 + handleNewChangePerson(e) { + console.log('eeeee', e); + let index = Number(e.detail.value); + this.selectPersonIndex = index; + console.log('this.selectPersonIndexthis.selectPersonIndex', this.selectPersonIndex); + + let list = JSON.parse(JSON.stringify(this.selectPersonList)); + let personObj = list[this.selectPersonIndex] + + this.selectPersonObj = personObj; + }, // 修改选择的异常处理人 handleChangePerson(e) { let index = Number(e.detail.value); @@ -1011,6 +1186,18 @@ export default { // 判断是不是反馈人 this.isFeedback = true; } + + if (extend.errorStatus === 2) { + // 赋值上反馈的图片 + if (requestionRadioList && requestionRadioList.length > 0) { + requestionRadioList.forEach((item) => { + if (extend.newFeedbackImgList[item.id]) { + item.feedbackImg = extend.newFeedbackImgList[item.id] + } + }) + } + this.requestionRadioList = requestionRadioList; + } } @@ -1099,7 +1286,7 @@ export default { let req = {}; if (this.extendObj.errorStatus === 0) { - if (!this.selectPersonObj) { + if (!this.selectPersonObj.MEMBERSHIP_ID) { uni.showToast({ title: "请选择处理人！", icon: "none", @@ -1127,6 +1314,11 @@ export default { personMemberShipName: this.user.Membership_Name, personId: this.user.UserId, personName: this.user.UserName, + suggestMemberShipId: this.detailObj.suggestMemberShipId || personObj.MEMBERSHIP_ID, + suggestMemberShipName: this.detailObj.suggestMemberShipName || personObj.MEMBERSHIP_NAME, + suggestPersonId: this.detailObj.suggestPersonId || personObj.STAFF_ID, + suggestPersonName: this.detailObj.suggestPersonName || personObj.STAFF_NAME, + // suggestPerson: { // STAFF_NAME: this.user.UserName, // STAFF_ID: this.user.UserId, @@ -1144,6 +1336,10 @@ export default { // 这个是新的 要带上key 回显的时候好匹配 let newResImgList = {}; let list = this.detailObj.questionResponses; + + console.log('listlistlistlistlistlist', list); + + if (list && list.length > 0) { list.forEach((item) => { if (!(item.score > 0)) { @@ -1218,9 +1414,9 @@ export default { // // id: this.detailObj.id, // // extend: JSON.stringify(req) // } - // ) + // ) console.log('req', req); - + // return const data = await this.$request.$webJavaPOST( `questionnaire-responses/extend/update`, { @@ -1306,6 +1502,16 @@ export default { `https://es.eshangtech.com/${data.data.path}`, ]; } + + // if (obj.feedbackImg && obj.feedbackImg.length > 0) { + // obj.feedbackImg.push( + // `https://es.eshangtech.com/${data.data.path}` + // ); + // } else { + // obj.feedbackImg = [ + // `https://es.eshangtech.com/${data.data.path}`, + // ]; + // } _this.$forceUpdate(); console.log("objobjobjobj21321", obj); } else { @@ -1357,6 +1563,15 @@ export default { `https://es.eshangtech.com/${data.data.path}`, ]; } + // if (obj.feedbackImg && obj.feedbackImg.length > 0) { + // obj.feedbackImg.push( + // `https://es.eshangtech.com/${data.data.path}` + // ); + // } else { + // obj.feedbackImg = [ + // `https://es.eshangtech.com/${data.data.path}`, + // ]; + // } console.log("objobjobjobj21321", obj); } else { _this.feedbackImgList.push( @@ -1408,41 +1623,166 @@ export default { padding: 24rpx; border-radius: 16rpx; background: #fff; - background-image: url("https://eshangtech.com/minTestImg/placeBg.png"); + background-image: url("https://eshangtech.com/minTestImg/errorBg.png"); background-size: 100% 100%; - background-position: 2rpx 2rpx; + // background-position: 2rpx 2rpx; background-repeat: no-repeat; - display: flex; - align-items: center; - .itemIcon { - width: 36rpx; - height: 36rpx; - margin-right: 4rpx; + .placeBoxTop { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + + .placeLeft { + display: flex; + align-items: center; + + .itemIcon { + width: 24rpx; + height: 24rpx; + margin-right: 10rpx; + } + + .placeName { + font-family: "PingFangSC"; + font-weight: 400; + font-size: 30rpx; + color: #010b18; + line-height: 40rpx; + text-align: left; + font-style: normal; + } + } + + .statusBox { + margin-left: 12rpx; + font-family: "PingFangSC"; + font-weight: 400; + font-size: 24rpx; + color: #139942; + line-height: 36rpx; + text-align: left; + font-style: normal; + padding: 2rpx 8rpx; + border-radius: 4rpx; + } } - .placeName { - font-family: "PingFangSC"; - font-weight: 400; - font-size: 30rpx; - color: #010b18; - line-height: 40rpx; - text-align: left; - font-style: normal; + .placeBoxBottom { + width: 100%; + border-radius: 16rpx; + box-sizing: border-box; + // padding: 24rpx; + margin-top: 20rpx; + + .topBox { + font-family: "PingFangSC"; + font-weight: 400; + font-size: 28rpx; + color: #676d74; + line-height: 40rpx; + text-align: left; + font-style: normal; + } + + .progressContent { + width: 100%; + margin-top: 24rpx; + + .progressItem { + width: 100%; + display: flex; + align-items: center; + + .itemLeft { + width: 80rpx; + height: 80rpx; + margin-right: 16rpx; + position: relative; + + .img { + width: 80rpx; + height: 80rpx; + border-radius: 50%; + } + + .successIcon { + width: 32rpx; + height: 32rpx; + position: absolute; + right: 0; + bottom: 4rpx; + } + } + + .itemRight { + width: 100%; + + .itemTop { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + + .name { + font-family: "PingFangSC"; + font-weight: 500; + font-size: 26rpx; + color: #010b18; + line-height: 40rpx; + text-align: left; + font-style: normal; + } + + .time { + font-family: "PingFangSC"; + font-weight: 400; + font-size: 24rpx; + color: #676d74; + line-height: 32rpx; + text-align: left; + font-style: normal; + } + } + + .itemBottom { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 8rpx; + + .itemBottonLeft { + font-family: "PingFangSC"; + font-weight: 400; + font-size: 24rpx; + color: #676d74; + line-height: 32rpx; + text-align: left; + font-style: normal; + margin-top: 4rpx; + } + + .itemBottonRight { + font-family: "PingFangSC"; + font-weight: 500; + font-size: 22rpx; + color: #425EA4; + text-align: center; + font-style: normal; + text-transform: none; + padding: 0 14rpx; + background-color: #D9E4FF; + border-radius: 8rpx; + } + } + } + } + } } - .statusBox { - margin-left: 12rpx; - font-family: "PingFangSC"; - font-weight: 400; - font-size: 24rpx; - color: #139942; - line-height: 36rpx; - text-align: left; - font-style: normal; - padding: 2rpx 8rpx; - border-radius: 4rpx; - } + .userBox { width: 100%; @@ -1498,6 +1838,57 @@ export default { } } + .assignedPerson { + width: 100%; + margin-top: 24rpx; + background: #fff; + border-radius: 16rpx; + box-sizing: border-box; + padding: 24rpx; + + .contentTop { + font-family: "PingFangSC"; + font-weight: 400; + font-size: 28rpx; + color: #676d74; + line-height: 40rpx; + text-align: left; + font-style: normal; + + .required { + font-family: "PingFangSC"; + font-weight: 400; + font-size: 24rpx; + color: #ff0000; + line-height: 40rpx; + text-align: left; + font-style: normal; + margin-left: 4rpx; + } + } + + .inputBox { + width: 100%; + margin-top: 8rpx; + } + + .radioSelectPersonBox { + .radioGroup { + width: 100%; + display: flex; + flex-wrap: wrap; + margin-top: 30rpx; + + .choiceItem { + width: 33%; + display: flex; + align-items: flex-start; + padding-right: 0; + } + } + } + } + .inspectionContent { width: 100%; margin-top: 24rpx; @@ -1672,6 +2063,21 @@ export default { } } + .beforeRectification { + font-family: "PingFangSC"; + font-weight: 500; + font-size: 24rpx; + line-height: 30rpx; + color: #FF0004; + text-align: center; + font-style: normal; + padding: 2rpx 4rpx; + background-color: #FFD9D9; + border-radius: 8rpx; + display: inline-block; + margin-bottom: 10rpx; + } + .imgItem { width: 148rpx; height: 148rpx; @@ -1703,6 +2109,79 @@ export default { } } } + + .afterRectification { + font-family: "PingFangSC"; + font-weight: 500; + font-size: 24rpx; + line-height: 30rpx; + color: #00AC4F; + text-align: center; + font-style: normal; + padding: 2rpx 4rpx; + background-color: #D9FFEB; + border-radius: 8rpx; + display: inline-block; + margin-bottom: 10rpx; + } + + .uploadImgBox { + width: 100%; + margin-top: 16rpx; + display: flex; + align-items: center; + flex-wrap: wrap; + + .submitImgBox { + width: 148rpx; + height: 148rpx; + background: #f7f7f8; + border-radius: 8rpx; + display: flex; + align-items: center; + justify-content: center; + margin-right: 16rpx; + + .addIcon { + width: 48rpx; + height: 48rpx; + color: #b4b5ba; + } + } + + .imgItem { + width: 148rpx; + height: 148rpx; + margin-right: 16rpx; + position: relative; + border-radius: 8rpx; + overflow: hidden; + + image { + width: 100%; + height: 100%; + } + + .closeBox { + width: 32rpx; + height: 32rpx; + border-radius: 0rpx 8rpx 0rpx 8rpx; + background: rgba(6, 10, 25, 0.5); + display: flex; + align-items: center; + justify-content: center; + position: absolute; + top: 0; + right: 0; + + .closeIcon { + width: 24rpx; + height: 24rpx; + } + } + } + } + } .requestionCheckedItem { diff --git a/pages/walkAroundManager/index.vue b/pages/walkAroundManager/index.vue index 9246f33..33e99b8 100644 --- a/pages/walkAroundManager/index.vue +++ b/pages/walkAroundManager/index.vue @@ -21,32 +21,17 @@ 巡检内容* - +
- +
- + - +
@@ -59,135 +44,83 @@ - - + + + {{ item.question.title }}* - - 请选择 - - + + + + + + + - - + -
- +
+
-
- - - +
+ + +
- - - + + - - - + + + - 情况类型* + 情况类型* + + @@ -244,11 +179,7 @@
- +

{{ detailObj.title || "-" }}

@@ -261,51 +192,33 @@
  • - +
    -
    +
    *巡查内容
    - +
    - + {{ tags.question.title || "" }} *
    -
    +
    {{ tag.text }}
    @@ -317,32 +230,15 @@
    - -
    + +
    *请上传现场图片
    -
    - × - +
    + × +
    @@ -354,33 +250,17 @@
  • - +
    - -
    - + - - - {{ item.text || "" }} + + + {{ item.text || "" }} - -