1

miniprogram/app.json

@@ -82,7 +82,6 @@
     "pages/reportRepair/assign/detail/detail",
     "pages/reportRepair/assign/feedback/feedback",
     "pages/reportRepair/assign/affirm/affirm",
-    "pages/reportRepair/assign/personList/personList",
     "pages/reportRepair/assign/again/again",
     "pages/reportRepair/assign/nullify/nullify",
     "pages/reportRepair/repair/index/index",

miniprogram/pages/reportRepair/assign/detail/detail.js

@@ -53,6 +53,14 @@ Page({
                 item.url = app.IMG_NAME + item.url
                 return item
             })
+            files.feedback = files.feedback.map(item => {
+                item.url = app.IMG_NAME + item.url
+                return item
+            })
+            files.eval = files.eval.map(item => {
+                item.url = app.IMG_NAME + item.url
+                return item
+            })
             files.voice = files.voice.map(item => {
                 item.url = app.IMG_NAME + item.url
                 return item

miniprogram/pages/reportRepair/assign/detail/detail.wxml

@@ -70,7 +70,7 @@
                 </view>
             </view>
             <view class="itemView">
-                <view class="label">故障图片/视频</view>
+                <view class="label">附件</view>
                 <view class="content">
                     <view class="imgContentView">
                         <van-uploader file-list="{{ files.repair }}" show-upload="{{false}}" deletable="{{false}}" />
@@ -92,6 +92,44 @@
             </view>
         </view>
 
+        <view class="reportView" wx:if="{{detail.status == 7}}">
+            <view class="topTitle">维修反馈</view>
+            <view class="selfLine"></view>
+            <view class="repairProgressView">
+                <van-icon name="logistics" size="80rpx" color="#76aef9" />
+                <view class="label">处理中</view>
+            </view>
+        </view>
+
+        <view class="reportView" wx:if="{{detail.status == 9 || detail.status == 13}}">
+            <view class="topTitle">维修反馈</view>
+            <view class="selfLine"></view>
+            <view class="itemView">
+                <view class="label">分析原因</view>
+                <view class="content">{{detail.cause}}</view>
+            </view>
+            <view class="itemView">
+                <view class="label">解决方案</view>
+                <view class="content">{{detail.solution}}</view>
+            </view>
+            <view class="itemView">
+                <view class="label">故障类型</view>
+                <view class="content">{{detail.failureTypeName}}</view>
+            </view>
+            <view class="itemView">
+                <view class="label">是否解决</view>
+                <view class="content">{{detail.resolve == '1' ? '已解决' : '未解决'}}</view>
+            </view>
+            <view class="itemView">
+                <view class="label">附件</view>
+                <view class="content">
+                    <view class="imgContentView">
+                        <van-uploader file-list="{{ files.feedback }}" show-upload="{{false}}" deletable="{{false}}" />
+                    </view>
+                </view>
+            </view>
+        </view>
+
     </view>
 
     <view class="bottomFixView">

miniprogram/pages/reportRepair/assign/detail/detail.wxss

@@ -197,6 +197,20 @@
     word-break: break-all;
 }
 
+.mainView .reportView .repairProgressView{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 60rpx 0 30rpx;
+}
+
+.mainView .reportView .repairProgressView .label{
+    margin-top: 10rpx;
+    font-size: 26rpx;
+    color: #76aef9;
+}
+
 .bottomFixView {
     position: fixed;
     z-index: 999;

miniprogram/pages/reportRepair/assign/personList/personList.js

@@ -1,181 +0,0 @@
-import {
-    visitorListRq,
-    visitorSelectUserByCustomerRq,
-} from "../../../../api/meeting/visitorIinvitation.js"
-
-Page({
-
-    data: {
-        title: '',
-        id: null,
-        /** 索引栏*/
-        indexList: [],
-        /** 数据*/
-        dataList: [],
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-        let _this = this;
-        _this.setData({
-            ...options
-        })
-        // 获取所有的企业
-        _this.getVisitorList()
-    },
-
-    // 获取所有的企业
-    getVisitorList() {
-        let _this = this;
-        visitorListRq().then(res => {
-            console.log('getVisitorList', res);
-            let filterDataList = res.rows.map(item => {
-                return {
-                    label: item.name,
-                    otherData: JSON.stringify({
-                        id: item.id,
-                        name: item.name,
-                    })
-                }
-            })
-            // 赋值并且格式化数据
-            _this.setAndFormatData(filterDataList)
-        })
-    },
-
-    // 格式化数据
-    setAndFormatData(transferList) {
-        let _this = this;
-        // 索引列
-        let indexList = _this.getFirstCharacterList(transferList)
-        // 对应每个索引的数据列表
-        let dataList = indexList.map(item => {
-            let title = item;
-            let collectList = [];
-            for (let i = 0; i < transferList.length; i++) {
-                let transferData = transferList[i];
-                if (title == transferData.label.substring(0, 1)) {
-                    collectList.push(transferData)
-                }
-            }
-            return {
-                title,
-                list: collectList
-            }
-        })
-        _this.setData({
-            indexList,
-            dataList
-        })
-    },
-
-    // 获取第一个字符数组，不重复
-    getFirstCharacterList(list) {
-        let firstNameList = list.map(item => {
-            return {
-                name: item.label.substring(0, 1),
-                exist: false
-            }
-        });
-        for (let i = 0; i < firstNameList.length; i++) {
-            for (let j = i + 1; j < firstNameList.length; j++) {
-                // 已重复的数据直接跳过
-                if (firstNameList[j].exist) {
-                    continue;
-                }
-                // 数据重复
-                if (firstNameList[i].name == firstNameList[j].name) {
-                    firstNameList[j].exist = true;
-                }
-            }
-        }
-        return firstNameList.filter(item => !item.exist).map(item => item.name)
-    },
-
-
-
-
-    // 选择
-    selectClick(e) {
-        console.log('selectClick', e);
-        let _this = this;
-        // 获取点击行数据
-        let label = e.currentTarget.dataset.label
-        let otherdata = JSON.parse(e.currentTarget.dataset.otherdata)
-        // 
-        let pages = getCurrentPages(); //获取page
-        let prevPage = pages[pages.length - 2]; //上一个页面（父页面）
-        // 上个页面数据
-        let detail = prevPage.data.detail;
-        // 更新上个页面对应的数据
-        if (_this.data.title == '单位') {
-            detail.customerId = otherdata.id //企业id
-            detail.customerName = otherdata.name //企业名称
-            detail.userId = null //被访人id
-            detail.username = null //被访人姓名
-            detail.mobile = null //被访人手机号
-        }
-        if (_this.data.title == '人员') {
-            detail.userId = otherdata.id //被访人id
-            detail.username = otherdata.username //被访人姓名
-            detail.mobile = otherdata.mobile //被访人手机号
-        }
-        // 赋值上个页面的数据
-        prevPage.setData({
-            detail
-        })
-        // 后退页面
-        wx.navigateBack();
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

miniprogram/pages/reportRepair/assign/personList/personList.json

@@ -1,9 +0,0 @@
-{
-    "navigationBarTitleText": "人员列表",
-    "usingComponents": {
-        "van-cell": "@vant/weapp/cell/index",
-        "van-index-bar": "@vant/weapp/index-bar/index",
-        "van-index-anchor": "@vant/weapp/index-anchor/index",
-        "van-divider": "@vant/weapp/divider/index"
-    }
-}

miniprogram/pages/reportRepair/assign/personList/personList.wxml

@@ -1,8 +0,0 @@
-<van-index-bar index-list="{{ indexList }}" highlight-color="#4e96f8">
-    <view wx:for="{{dataList}}" wx:key="*this" wx:for-item="indexData">
-        <van-index-anchor index="{{indexData.title}}"></van-index-anchor>
-        <van-cell title="{{data.label}}" wx:for="{{indexData.list}}" wx:key="*this" wx:for-item="data" data-label="{{data.label}}" data-otherData="{{data.otherData}}" bind:tap="selectClick" clickable />
-    </view>
-</van-index-bar>
-
-<van-divider wx:if="{{indexList.length == 0}}" contentPosition="center" customStyle="font-size: 28rpx; margin-top:120rpx;">暂无数据</van-divider>