提交代码

js_sdk/http.js

@@ -33,6 +33,14 @@ export function getMeetingAppointListAppCount(data) {
         { states: '1,3' }, {}
     )
 }
+export function handleListNum(data) {
+
+    return $http.post(
+        '/wx/workPaneController/handleListNum',
+        data, {}
+    )
+}
+
 export function getReadSize(data) {
 
     return $http.post(
@@ -143,12 +151,32 @@ export function getRoomNameByCompanyId(data) {
     )
 
 }
+
+export function getAreaByIds(data) {
+    return $http.post(
+        '/wx/ParkRoomController/getAreaByIds',
+        data, {}
+    )
+}
 export function getTreeData2(data) {
     return $http.post(
         '/wx/ParkInfoController/getTreeData2',
         data, {}
     )
 }
+export function getTreeData3(data = {}) {
+    return $http.post(
+        '/wx/ParkInfoController/getTreeData3',
+        data, {}
+    )
+}
+export function getTreeData7() {
+    return $http.post(
+        '/wx/ParkInfoController/getTreeData7',
+        null, {}
+    )
+}
+
 export function getTreeData6(data) {
     return $http.post(
         '/wx/ParkInfoController/getTreeData6',
@@ -189,7 +217,7 @@ export function repairList(data) {
 }
 export function repairList2(data) {
     return $http.post(
-        '/wx/repair/list',
+        '/wx/repair/dispatchList',
         data, {}
     )
 }
@@ -207,13 +235,13 @@ export function updateSafetySelfCheckingManage(data) {
 }
 export function editRepair(data) {
     return $http.post(
-        '/wx/repair/edit',
+        '/wx/repair/handleReport',
         data, {}
     )
 }
 export function addRepair(data) {
     return $http.post(
-        '/wx/repair/add',
+        '/wx/repair/addReport',
         data, {}
     )
 }
@@ -224,12 +252,26 @@ export function getRepairDispatchById(id) {
     }, {}
     )
 }
+export function getInfoListByRepairId(id) {
+    return $http.post(
+        '/wx/repair/getInfoListByRepairId', {
+        reportRepairId: id
+    }, {}
+    )
+}
 export function getDispatchToPerson(data) {
     return $http.post(
         '/wx/repair/getDispatchToPerson',
         data, {}
     )
 }
+export function getHandleInfoById(data) {
+    return $http.post(
+        '/wx/repair/getHandleInfoById',
+        { id: data }, {}
+    )
+}
+
 export function getCompanyById(data) {
     return $http.post(
         '/wx/repair/getCompanyById', data, {},
@@ -379,7 +421,7 @@ export function findSafetySelfCheckingPlanById(e) {
         id: e
     }, {})
 }
-// 
+//
 export function findSafetySelfCheckingPlanList(e) {
     return $http.post(
         "/wx/SafetyController/findSafetySelfCheckingPlanList",
@@ -636,7 +678,46 @@ export function cancelAppoint(data) {
 // /wx/SaleController/
 export function getRepairList(data) {
     return $http.post(
-        '/wx/repair/list',
+        '/wx/repair/handleList',
         data, {}
     )
-}
+}
+
+
+
+export function confirmList(data) {
+    return $http.post(
+        '/wx/repair/confirmList',
+        data, {}
+    )
+}
+export function confirmReport(data) {
+    return $http.post(
+        '/wx/repair/confirmReport',
+        data, {}
+    )
+}
+export function handleReportBack(data) {
+    return $http.post(
+        '/wx/repair/handleReportBack',
+        data, {}
+    )
+}
+export function dispatchType(data) {
+    return $http.post(
+        '/wx/repair/dispatch',
+        data, {}
+    )
+}
+export function dispatchCancel(data) {
+    return $http.post(
+        '/wx/repair/dispatchCancel',
+        data, {}
+    )
+}
+export function editReportInfo(data) {
+    return $http.post(
+        '/wx/repair/editReportInfo',
+        data, {}
+    )
+}

pages.json

@@ -812,7 +812,9 @@
                             "van-icon": "/wxcomponents/weapp/dist/icon/index",
                             "van-tab": "/wxcomponents/weapp/dist/tab/index",
                             "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
-                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index"
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
                         }
                     }
                 },
@@ -852,6 +854,79 @@
                         }
                     }
                 },
+                {
+                    "path": "serve-confirm/index",
+                    "style": {
+                        "navigationBarTitleText": "服务确认",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-empty": "/wxcomponents/weapp/dist/empty/index",
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index"
+                        }
+                    }
+                },
+                {
+                    "path": "serve-confirm/detail",
+                    "style": {
+                        "navigationBarTitleText": "服务确认-确认",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-steps": "/wxcomponents/weapp/dist/steps/index",
+                            "van-radio": "/wxcomponents/weapp/dist/radio/index",
+                            "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
+                            "van-empty": "/wxcomponents/weapp/dist/empty/index",
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index"
+                        }
+                    }
+                },
                 {
                     "path": "repairprocessing-app/index",
                     "style": {
@@ -1753,6 +1828,43 @@
                         }
                     }
                 },
+                {
+                    "path": "companyHouseSee/companyHouseSee",
+                    "style": {
+                        "navigationBarTitleText": "企业查看",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
                 {
                     "path": "companyHouse/companyHouse",
                     "style": {
@@ -1790,6 +1902,43 @@
                         }
                     }
                 },
+                {
+                    "path": "companyDetailsSee/companyDetailsSee",
+                    "style": {
+                        "navigationBarTitleText": "企业详情查看",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
                 {
                     "path": "companyDetails/companyDetails",
                     "style": {
@@ -1860,7 +2009,8 @@
                             "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
                             "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
                             "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
-                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+                            "van-cascader": "/wxcomponents/weapp/dist/cascader/index"
                         }
                     }
                 },
@@ -1897,7 +2047,8 @@
                             "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
                             "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
                             "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
-                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+                            "van-cascader": "/wxcomponents/weapp/dist/cascader/index"
                         }
                     }
                 }

pages/index/index.vue

@@ -2,21 +2,19 @@
   <view>
     <image src="../../static/index/banner.png" class="banner"></image>
     <div class="map">
-      <div
-        class="mapdom"
-        style="float: left; position: relative"
-        v-for="(item, index) in mapList"
-        :key="index"
-        @click="jumpPage(item.path)"
-      >
+      <div class="mapdom" style="float: left; position: relative" v-for="(item, index) in mapList" :key="index"
+        @click="jumpPage(item.path)">
         <div class="jiaobiao" v-if="item.label == '会议室审核' && MeetingNum">
-          {{ MeetingNum }}
+          {{ MeetingNum > 99 ? '99+' : MeetingNum }}
         </div>
-        <div class="jiaobiao" v-if="item.label == '场馆审核' && MeetingNum">
-          {{ VenueNum }}
+        <div class="jiaobiao" v-if="item.label == '场馆审核' && VenueNum">
+          {{ VenueNum > 99 ? '99+' : VenueNum }}
         </div>
-        <div class="jiaobiao" v-if="item.label == '我的待阅' && MeetingNum">
-          {{ ReadSize }}
+        <div class="jiaobiao" v-if="item.label == '我的待阅' && ReadSize">
+          {{ ReadSize > 99 ? '99+' : ReadSize }}
+        </div>
+        <div class="jiaobiao" v-if="item.label == '我的待办' && handleListNumber">
+          {{ handleListNumber > 99 ? '99+' : handleListNumber }}
         </div>
         <img class="mapIcon" :src="item.url" />
         <div class="maptxt">{{ item.label }}</div>
@@ -31,7 +29,7 @@ import {
   getUserLocalStorageInfo,
   getVenueAppointListAppCount,
   getMeetingAppointListAppCount,
-  getReadSize,
+  getReadSize, handleListNum
 } from "@/js_sdk/http";
 export default {
   data() {
@@ -52,6 +50,11 @@ export default {
           url: "https://hswkxc.idea-sf.com/fileService/static/slices/2@2x.png",
           path: "/pages/subPackages/companyHouse/companyHouse",
         },
+        {
+          label: "企业查看",
+          url: "https://hswkxc.idea-sf.com/fileService/static/slices/2@2x.png",
+          path: "/pages/subPackages/companyHouseSee/companyHouseSee",
+        },
         // {
         //   label: "走访上报",
         //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/3@2x.png",
@@ -104,9 +107,9 @@ export default {
           path: "/pages/subPackages/repairDispatch-app/index",
         },
         {
-          label: "服务派单",
+          label: "服务确认",
           url: "https://hswkxc.idea-sf.com/fileService/static/slices/11@2x.png",
-          path: "/pages/subPackages/repairDispatch-serve/index",
+          path: "/pages/subPackages/serve-confirm/index",
         },
         {
           label: "服务处理",
@@ -158,9 +161,10 @@ export default {
       MeetingNum: 0,
       VenueNum: 0,
       ReadSize: 0,
+      handleListNumber: 0
     };
   },
-  onShareAppMessage() {},
+  onShareAppMessage() { },
   mounted() {
     // demo();
   },
@@ -173,8 +177,17 @@ export default {
     this.getVenueAppointListAppCount();
     this.getMeetingAppointListAppCount();
     this.getReadSize();
+    this.handleListNum()
   },
   methods: {
+    async handleListNum() {
+      let data = await handleListNum({
+        types: '8,9,10,11',
+        userId: getUserLocalStorageInfo().user.id,
+      });
+      this.handleListNumber = data.data;
+      console.log('handleListNum', data);
+    },
     async getReadSize() {
       let data = await getReadSize({
         userId: getUserLocalStorageInfo().user.id,
@@ -209,7 +222,7 @@ export default {
     jumpPage(path) {
       uni.navigateTo({
         url: path,
-        fail: (fail) => {},
+        fail: (fail) => { },
       });
     },
   },
@@ -220,6 +233,7 @@ export default {
 page {
   background: white;
 }
+
 .jiaobiao {
   position: absolute;
   top: 10rpx;
@@ -234,16 +248,19 @@ page {
   color: white;
   line-height: 30rpx;
 }
+
 .banner {
   width: 100%;
   height: 450rpx;
   position: absolute;
   z-index: 1;
 }
+
 .mapdom {
   width: 25%;
   height: 184rpx;
 }
+
 .maptxt {
   width: 100%;
   height: 34rpx;
@@ -253,6 +270,7 @@ page {
   color: #333333;
   text-align: center;
 }
+
 .mapIcon {
   width: 160rpx;
   height: 160rpx;
@@ -260,6 +278,7 @@ page {
   display: block;
   margin: auto;
 }
+
 .map {
   position: absolute;
   z-index: 2;

pages/login/login.vue

@@ -7,66 +7,26 @@
     </div>
     <div class="loginBox">
       <div class="inputBox">
-        <img
-          src="../../common/assets/image/comicon.png"
-          alt=""
-          style="height: 60rpx"
-        />
-        <input
-          type="text"
-          placeholder="请输入账号"
-          v-model="loginForm.userName"
-        />
+        <img src="../../common/assets/image/comicon.png" alt="" style="height: 60rpx" />
+        <input type="text" placeholder="请输入账号" v-model="loginForm.userName" />
       </div>
       <div class="inputBox">
         <img src="../../common/assets/image/pswicon.svg" alt="" />
-        <input
-          type="password"
-          placeholder="请输入密码"
-          v-model="loginForm.password"
-        />
+        <input type="password" placeholder="请输入密码" v-model="loginForm.password" />
       </div>
       <div class="inputBox">
         <img src="../../common/assets/image/yzmicon.svg" alt="" />
-        <input
-          type="text"
-          placeholder="验证码"
-          class="yanzhengma"
-          v-model="loginForm.code"
-        />
-        <img
-          :src="loginForm.captchaImage"
-          @click="captchaImageRefresh(loginForm)"
-          class="yanzhengImg"
-        />
+        <input type="text" placeholder="验证码" class="yanzhengma" v-model="loginForm.code" />
+        <img :src="loginForm.captchaImage" @click="captchaImageRefresh(loginForm)" class="yanzhengImg" />
       </div>
       <div class="pswBox" @click="forgetPsw()">
         <p>忘记密码？</p>
       </div>
       <div>
-        <van-button
-          type="default"
-          class="loginbtn"
-          size="large"
-          color="#1f1fbe"
-          @click="login"
-          >登 录</van-button
-        >
-        <van-button
-          type="default"
-          class="loginbtn"
-          size="large"
-          color="#1f1fbe"
-          @click="wxlogin"
-          >微信账号一键登录</van-button
-        >
-        <van-button type="default" size="large" color="#1f1fbe" @click="goqy"
-          >前往企业端</van-button
-        >
-        <div
-          @click="gozhfw"
-          style="text-align: center; margin-top: 15rpx; color: #1f1fbe"
-        >
+        <van-button type="default" class="loginbtn" size="large" color="#1f1fbe" @click="login">登 录</van-button>
+        <van-button type="default" class="loginbtn" size="large" color="#1f1fbe" @click="wxlogin">微信账号一键登录</van-button>
+        <van-button type="default" size="large" color="#1f1fbe" @click="goqy">前往企业端</van-button>
+        <div @click="gozhfw" style="text-align: center; margin-top: 15rpx; color: #1f1fbe">
           前往智慧法务
         </div>
       </div>
@@ -90,7 +50,7 @@
 <script>
 import Dialog from "../..//wxcomponents/weapp/dist/dialog/dialog.js";
 import { login } from "@/js_sdk/http.js";
-
+import { hexMD5 } from './md5.js'
 export default {
   data() {
     return {
@@ -152,13 +112,13 @@ export default {
     forgetPsw() {
       wx.showModal({
         title: "提示！",
-        content: "管理端修改密码需要拨打客服电话15061150110咨询，是否拨打？",
+        content: "管理端修改密码需要拨打客服电话18168902013咨询，是否拨打？",
         success: function (res) {
           if (res.confirm) {
             uni.makePhoneCall({
-              phoneNumber: "15061150110", //电话号码
-              success: function (e) {},
-              fail: function (e) {},
+              phoneNumber: "18168902013", //电话号码
+              success: function (e) { },
+              fail: function (e) { },
             });
           }
         },
@@ -175,7 +135,9 @@ export default {
         });
         return;
       }
-      login(this.loginForm).then((res) => {
+      let loginForm = { ...this.loginForm }
+      loginForm.password = hexMD5(loginForm.password)
+      login(loginForm).then((res) => {
         if (res.errmsg == "成功") {
           uni.showToast({
             title: "登录成功",
@@ -195,7 +157,7 @@ export default {
 
       // this.$auth.setUserType(this.$auth.TYPE_FRAME);
     },
-    onShareAppMessage: function () {},
+    onShareAppMessage: function () { },
   },
 };
 </script>
@@ -204,6 +166,7 @@ export default {
   background: white;
   height: 100%;
   overflow: hidden;
+
   .logTit {
     width: 80vw;
     left: 10vw;
@@ -216,6 +179,7 @@ export default {
     z-index: 1;
     color: rgba(51, 51, 51, 1);
     font-size: 4vw;
+
     p {
       color: rgba(102, 102, 102, 1);
       font-size: 4vw;
@@ -228,6 +192,7 @@ export default {
       font-weight: bold;
       color: #333333;
     }
+
     .titletxt2 {
       font-size: 32rpx;
       font-family: PingFang SC-Regular, PingFang SC;
@@ -235,6 +200,7 @@ export default {
       color: #666666;
     }
   }
+
   .logobig {
     width: 100vw;
     height: 100vh;
@@ -249,25 +215,30 @@ export default {
     padding-top: 60vw;
     position: absolute;
   }
+
   .inputBox {
     position: relative;
     display: flex;
     align-items: center;
+
     img {
       position: absolute;
       width: 7vw;
       // padding-top: 40px;
     }
+
     .yanzhengImg {
       right: 0;
       width: 20vw;
       height: 10vw;
     }
+
     .yanzhengImgBox {
       height: 50px;
       display: flex;
       align-items: center;
     }
+
     input {
       background: black;
       width: 100%;
@@ -278,13 +249,16 @@ export default {
       margin: 5rpx 0;
       font-size: 4vw;
     }
+
     input::-webkit-input-placeholder {
       color: rgba(153, 153, 153, 1);
     }
+
     .yanzhengma {
       width: 60%;
     }
   }
+
   .pswBox {
     width: 100%;
     display: flex;
@@ -292,13 +266,16 @@ export default {
     margin: 20px 0;
     color: rgba(29, 24, 188, 1);
   }
+
   .van-button {
     margin-top: 15rpx;
     border-radius: 60px;
   }
+
   .loginbtn {
     margin-top: 50rpx;
   }
+
   .bottomTips {
     width: 100vw;
     position: fixed;
@@ -307,6 +284,7 @@ export default {
     color: #999999;
     font-size: 2vw;
   }
+
   @media screen and (max-height: 454px) {
     .bottomTips {
       display: none;

pages/mine/mine.vue

@@ -17,12 +17,7 @@
             <div class="border"></div>
           </div>
         </div>
-        <div
-          v-if="!bindFlag"
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="bindWxId()"
-        >
+        <div v-if="!bindFlag" class="labelpage_row" style="margin-top: 48rpx" @click="bindWxId()">
           <img height="44rpx" src="../../static/mine/versionicon.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">绑定微信账号</div>
@@ -30,12 +25,7 @@
             <div class="border"></div>
           </div>
         </div>
-        <div
-          v-if="bindFlag"
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="unbindWxId()"
-        >
+        <div v-if="bindFlag" class="labelpage_row" style="margin-top: 48rpx" @click="unbindWxId()">
           <img height="44rpx" src="../../static/mine/versionicon.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">解绑微信账号</div>
@@ -43,11 +33,7 @@
             <div class="border"></div>
           </div>
         </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="bindPush()"
-        >
+        <div class="labelpage_row" style="margin-top: 48rpx" @click="bindPush()">
           <img height="44rpx" src="../../static/mine/versionicon.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">绑定消息推送</div>
@@ -55,38 +41,22 @@
             <div class="border"></div>
           </div>
         </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="editPassWord()"
-        >
+        <div class="labelpage_row" style="margin-top: 48rpx" @click="editPassWord()">
           <img height="44rpx" src="../../static/mine/editpassword.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">密码修改</div>
             <div class="labelpage_value">
-              <img
-                src="../../static/mine/youjiantou.png"
-                style="width: 44rpx; height: 44rpx"
-                alt=""
-              />
+              <img src="../../static/mine/youjiantou.png" style="width: 44rpx; height: 44rpx" alt="" />
             </div>
             <div class="border"></div>
           </div>
         </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="outLogin()"
-        >
+        <div class="labelpage_row" style="margin-top: 48rpx" @click="outLogin()">
           <img height="44rpx" src="../../static/mine/outicon.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">退出账号</div>
             <div class="labelpage_value">
-              <img
-                src="../../static/mine/youjiantou.png"
-                style="width: 44rpx; height: 44rpx"
-                alt=""
-              />
+              <img src="../../static/mine/youjiantou.png" style="width: 44rpx; height: 44rpx" alt="" />
             </div>
           </div>
         </div>
@@ -133,6 +103,7 @@ export default {
         withSubscriptions: true,
         success(res) {
           var itemSettings = res.subscriptionsSetting.itemSettings;
+          console.log(res)
           console.log(itemSettings);
           // HL4csSthBOnLbntYxrs4QE_Nb94Im8lN62t4lvl65XY: "accept"
           // Zt7a0xK-gy0aBe0owXmHi98t46n9vxrlkiQwz3ThnfQ: "accept"
@@ -141,11 +112,11 @@ export default {
           if (
             !itemSettings ||
             itemSettings["HL4csSthBOnLbntYxrs4QE_Nb94Im8lN62t4lvl65XY"] !=
-              "accept" ||
+            "accept" ||
             itemSettings["Zt7a0xK-gy0aBe0owXmHi98t46n9vxrlkiQwz3ThnfQ"] !=
-              "accept" ||
+            "accept" ||
             itemSettings["iwqrwmxwjgQrGXFdZ3_kqYXOU52bfREK1cQJGwreKRE"] !=
-              "accept"
+            "accept"
           ) {
             wx.requestSubscribeMessage({
               tmplIds: [
@@ -154,16 +125,17 @@ export default {
                 "iwqrwmxwjgQrGXFdZ3_kqYXOU52bfREK1cQJGwreKRE",
               ],
               success: (res) => {
+                console.log('requestSubscribeMessage', res);
+
                 if (
                   itemSettings["HL4csSthBOnLbntYxrs4QE_Nb94Im8lN62t4lvl65XY"] &&
                   itemSettings["HL4csSthBOnLbntYxrs4QE_Nb94Im8lN62t4lvl65XY"] ==
-                    "reject"
+                  "reject"
                 ) {
                   that.$showToast("未绑定所有消息通知");
                 } else {
                   that.$showToast("绑定成功");
                 }
-                console.log(res);
               },
               fail(err) {
                 console.log("失败！！！！！！！！！！！！_:", err);
@@ -255,17 +227,20 @@ export default {
   position: absolute;
   z-index: 1;
 }
+
 .headerandwelcome {
   margin-bottom: 60rpx;
   height: 120rpx;
   width: 100%;
 }
+
 .info {
   position: absolute;
   width: calc(100% - 64rpx);
   margin: 60rpx 32rpx 0 32rpx;
   z-index: 2;
 }
+
 .header {
   height: 120rpx;
   width: 120rpx;
@@ -273,6 +248,7 @@ export default {
   border-radius: 50%;
   float: left;
 }
+
 .weltxt {
   height: 120rpx;
   line-height: 120rpx;
@@ -280,6 +256,7 @@ export default {
   margin-left: 32rpx;
   float: left;
 }
+
 .labelpage {
   width: calc(100% - 96rpx);
   // height: 308rpx;
@@ -287,21 +264,25 @@ export default {
   border-radius: 12rpx 12rpx 12rpx 12rpx;
   background: #ffffff;
 }
+
 .labelpage_row {
   height: 83rpx;
   width: 100%;
+
   img {
     height: 44rpx;
     width: 44rpx;
     float: left;
     margin-right: 12rpx;
   }
+
   .labelpage_text {
     width: calc(100% - 64rpx);
     height: 44rpx;
     line-height: 44rpx;
     float: left;
   }
+
   .labelpage_name {
     height: 44rpx;
     line-height: 44rpx;
@@ -310,6 +291,7 @@ export default {
     color: #081640;
     font-weight: 400;
   }
+
   .labelpage_value {
     height: 44rpx;
     line-height: 44rpx;
@@ -318,6 +300,7 @@ export default {
     color: #1d18bc;
     font-weight: 400;
   }
+
   .border {
     margin-top: 48rpx;
     width: 100%;
@@ -327,4 +310,3 @@ export default {
   }
 }
 </style>
-

pages/subPackages/announcement/detail.vue

@@ -3,11 +3,7 @@
     <div class="detail-body">
       <div class="detail-card top-tit-card">
         <div class="left">
-          <van-icon
-            name="bell"
-            style="font-size: 6.4vw; color: #60f"
-            custom-class="iconfont"
-          />
+          <van-icon name="bell" style="font-size: 6.4vw; color: #60f" custom-class="iconfont" />
         </div>
         <div class="right">
           <div class="top">
@@ -21,31 +17,19 @@
         <div></div>
       </div>
       <div class="detail-card info" v-html="content"></div>
-      <div
-        style="width: 100%; height: 100%"
-        class="img-list"
-        v-if="imgUrlList.length > 0"
-      >
-        <img
-          style="width: 100%; height: 100%"
-          v-for="item in imgUrlList"
-          :src="item.url"
-          alt=""
-        />
+      <div style="width: 100%; height: 100%" class="img-list" v-if="imgUrlList.length > 0">
+        <img style="width: 100%; height: 100%" v-for="item in imgUrlList" :src="item.url" alt="" />
       </div>
-      <div
-        v-for="item in fileUrlList"
-        style="font-size: 16px; margin: 10rpx; color: #0000ff"
-        @click="jumpFile(item.url)"
-      >
+      <div v-for="item in fileUrlList" style="font-size: 16px; margin: 10rpx; color: #0000ff"
+        @click="jumpFile(item.url)">
         {{ item.name }}
       </div>
     </div>
     <!--    <div class="white-bottom"></div>-->
   </div>
 </template>
-  
-  <script>
+
+<script>
 import { getParkNoticeById, updateReadStatus } from "@/js_sdk/api_park_notice";
 // import { addUserNotice } from "@/service/api_user_notice";
 // import auth from "@/service/auth";
@@ -64,7 +48,7 @@ export default {
       imgUrlList: [],
       createUserDept: "",
       reader: {
-        // companyId: auth.currUser().id,
+        companyId: null,
         id: "",
       },
     };
@@ -72,6 +56,8 @@ export default {
 
   onLoad(option) {
     this.readStatus = option.readStatus;
+    const token = uni.getStorageSync("laocui_user_info");
+    this.reader.companyId = JSON.parse(token).user.id;
     this.id = option.id;
     this.reader.id = this.id;
     this.selectById();
@@ -81,7 +67,7 @@ export default {
   },
   methods: {
     getRead() {
-      updateReadStatus(this.reader).then((res) => {});
+      updateReadStatus(this.reader).then((res) => { });
     },
     jumpFile(url) {
       uni.downloadFile({
@@ -187,13 +173,14 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss" type="text/scss">
+
+<style lang="scss" type="text/scss">
 .detail {
   box-sizing: border-box;
   background-color: #f2f2f2;
   padding: 20rpx 30rpx 140rpx;
   overflow-y: auto;
+
   .detail-body {
     .detail-card {
       display: flex;
@@ -214,13 +201,14 @@ export default {
     }
   }
 }
+
 .detail-card {
   img {
     width: 80vw !important;
   }
 }
 </style>
-  <style scoped lang="scss">
+<style scoped lang="scss">
 .detail-card {
   position: relative;
   left: 0;
@@ -228,6 +216,7 @@ export default {
   box-sizing: border-box;
   border: 1px solid rgba(242, 242, 242, 1);
   background: rgba(255, 255, 255, 1);
+
   .card-body {
     padding: 10px 30px;
   }

pages/subPackages/announcement/index.vue

@@ -2,40 +2,26 @@
   <div class="announcement">
     <div class="tap-part">
       <div class="info-list">
-        <div
-          class="info-item"
-          v-for="item in list1"
-          @click="goDetailPage(item)"
-        >
+        <div class="info-item" v-for="item in list1" @click="goDetailPage(item)">
           <div class="left">
             <i class="iconfont icon-tongzhi"></i>
-            <van-icon
-              name="bell"
-              style="font-size: 6.4vw; color: #60f"
-              custom-class="iconfont"
-            />
+            <van-icon name="bell" style="font-size: 6.4vw; color: #60f" custom-class="iconfont" />
           </div>
 
           <div class="center">
-            <div class="top" v-if="item.readStatus === '0'">
-              {{ item.noticeTitle }} {{ item.id }}
-            </div>
-            <div style="color: #acaaaa" class="top" v-else>
+            <div class="top">
               {{ item.noticeTitle }}
             </div>
+            <!-- <div style="color: #acaaaa" class="top" v-else>
+              {{ item.noticeTitle }}
+            </div> -->
             <div class="bottom">
               <span> {{ item.publishDate }}</span>
             </div>
           </div>
 
-          <div
-            class="icon-collect right"
-            @click.stop="changeCollectorsNoticeParkStatus(item)"
-          >
-            <i
-              class="iconfont icon-xinaixin blue"
-              v-if="item.collectorsStatus === '2'"
-            ></i>
+          <div class="icon-collect right" @click.stop="changeCollectorsNoticeParkStatus(item)">
+            <i class="iconfont icon-xinaixin blue" v-if="item.collectorsStatus === '2'"></i>
             <i class="iconfont icon-xinaixin" v-else></i>
           </div>
         </div>
@@ -43,8 +29,8 @@
     </div>
   </div>
 </template>
-  
-  <script>
+
+<script>
 import { noticeList, clickCollectParkNotice } from "@/js_sdk/api_park_notice";
 export default {
   data() {
@@ -168,10 +154,11 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss" type="text/scss" scoped>
+
+<style lang="scss" type="text/scss" scoped>
 .announcement {
   box-sizing: border-box;
+
   .tap-part {
     margin-top: 10rpx;
     height: calc(100vh - 10rpx);
@@ -185,13 +172,16 @@ export default {
       background-color: #fff;
       padding: 0 20rpx;
       overflow-y: auto;
+
       .info-item {
         display: flex;
         padding: 30rpx 0;
         border-bottom: 1px solid #dddddd;
+
         .left {
           text-align: center;
           width: 160rpx;
+
           i {
             font-size: 48rpx;
             color: rgba(102, 0, 255, 1);
@@ -213,10 +203,12 @@ export default {
             color: $text3;
             line-height: 1.3;
           }
+
           .bottom {
             span {
               font-size: 20rpx;
               color: #666666;
+
               &:first-child {
                 margin-right: 40rpx;
               }
@@ -229,13 +221,16 @@ export default {
           height: 100rpx;
           text-align: center;
           line-height: 100rpx;
+
           i {
             font-size: 3 2rpx;
             color: #dddddd;
+
             &.blue {
               color: rgba(102, 0, 255, 1);
             }
           }
+
           .collect {
             color: #ffd111;
           }
@@ -244,5 +239,4 @@ export default {
     }
   }
 }
-</style>
-  
+</style>

pages/subPackages/chosseHouse/chosseHouse.vue

@@ -7,14 +7,8 @@
             <div class="label">园区</div>
           </van-col>
           <van-col :span="20">
-            <uni-data-checkbox
-              v-model="form.groupIds"
-              mode="tag"
-              :localdata="yuanqu_loacldata"
-              selectedTextColor="#1D18BC"
-              selectedColor="rgba(29,24,188,0.05);"
-              @change="getSelectedYuanqu"
-            >
+            <uni-data-checkbox v-model="form.groupIds" mode="tag" :localdata="yuanqu_loacldata"
+              selectedTextColor="#1D18BC" selectedColor="rgba(29,24,188,0.05);" @change="getSelectedYuanqu">
             </uni-data-checkbox>
           </van-col>
         </van-row>
@@ -23,14 +17,8 @@
             <div class="label">楼盘</div>
           </van-col>
           <van-col class="labelcolmt26" :span="20">
-            <uni-data-checkbox
-              v-model="form.loupan_value"
-              mode="tag"
-              :localdata="loupan_loacldata"
-              selectedTextColor="#1D18BC"
-              selectedColor="rgba(29,24,188,0.05);"
-              @change="getSelectedLoupan"
-            >
+            <uni-data-checkbox v-model="form.loupan_value" mode="tag" :localdata="loupan_loacldata"
+              selectedTextColor="#1D18BC" selectedColor="rgba(29,24,188,0.05);" @change="getSelectedLoupan">
             </uni-data-checkbox>
           </van-col>
         </van-row>
@@ -39,14 +27,8 @@
             <div class="label">状态</div>
           </van-col>
           <van-col class="labelcolmt26 status" :span="20">
-            <uni-data-checkbox
-              v-model="form.statusArray"
-              :localdata="statusList"
-              :multiple="true"
-              selectedTextColor="#1D18BC"
-              selectedColor="rgba(29,24,188,0.05);"
-              @change="getSelectedStatus"
-            >
+            <uni-data-checkbox v-model="form.statusArray" :localdata="statusList" :multiple="true"
+              selectedTextColor="#1D18BC" selectedColor="rgba(29,24,188,0.05);" @change="getSelectedStatus">
             </uni-data-checkbox>
           </van-col>
         </van-row>
@@ -55,14 +37,8 @@
             <div class="label">朝向</div>
           </van-col>
           <van-col class="labelcolmt26 status" :span="20">
-            <uni-data-checkbox
-              v-model="form.chaoxiangArray"
-              :localdata="fangxiangList"
-              :multiple="true"
-              selectedTextColor="#1D18BC"
-              selectedColor="rgba(29,24,188,0.05);"
-              @change="getChaoxiang"
-            >
+            <uni-data-checkbox v-model="form.chaoxiangArray" :localdata="fangxiangList" :multiple="true"
+              selectedTextColor="#1D18BC" selectedColor="rgba(29,24,188,0.05);" @change="getChaoxiang">
             </uni-data-checkbox>
           </van-col>
         </van-row>
@@ -71,14 +47,8 @@
             <div class="label">载体性质</div>
           </van-col>
           <van-col class="labelcolmt26" :span="18">
-            <uni-data-checkbox
-              v-model="form.zaitiTypeArray"
-              mode="tag"
-              :localdata="xinzhiList"
-              selectedTextColor="#1D18BC"
-              selectedColor="rgba(29,24,188,0.05);"
-              @change="getSelectedXingZhi"
-            >
+            <uni-data-checkbox v-model="form.zaitiTypeArray" mode="tag" :localdata="xinzhiList"
+              selectedTextColor="#1D18BC" selectedColor="rgba(29,24,188,0.05);" @change="getSelectedXingZhi">
             </uni-data-checkbox>
           </van-col>
         </van-row>
@@ -87,21 +57,13 @@
             <div class="label">指导价</div>
           </van-col>
           <van-col class="labelcolmt26" :span="9">
-            <input
-              v-model="form.guidePrice1"
-              type="number"
-              placeholder="最低价"
-            />
+            <input v-model="form.guidePrice1" type="number" placeholder="最低价" />
           </van-col>
           <van-col :span="1">
             <div class="width100 txt_center" style="margin-top: 30rpx">-</div>
           </van-col>
           <van-col class="labelcolmt26" :span="9">
-            <input
-              v-model="form.guidePrice2"
-              type="number"
-              placeholder="最高价"
-            />
+            <input v-model="form.guidePrice2" type="number" placeholder="最高价" />
           </van-col>
         </van-row>
         <van-row>
@@ -109,35 +71,21 @@
             <div class="label">面积</div>
           </van-col>
           <van-col class="labelcolmt26" :span="9">
-            <input
-              v-model="form.roomSize1"
-              type="number"
-              placeholder="最小面积"
-            />
+            <input v-model="form.roomSize1" type="number" placeholder="最小面积" />
           </van-col>
           <van-col :span="1">
             <div class="width100 txt_center" style="margin-top: 30rpx">-</div>
           </van-col>
           <van-col class="labelcolmt26" :span="9">
-            <input
-              v-model="form.roomSize2"
-              type="number"
-              placeholder="最大面积"
-            />
+            <input v-model="form.roomSize2" type="number" placeholder="最大面积" />
           </van-col>
         </van-row>
         <van-row>
           <van-col class="labelcolmt26" :span="6">
-            <van-button color="#F1F2F9" custom-class="reset_btn" @click="reast"
-              >重置</van-button
-            >
+            <van-button color="#F1F2F9" custom-class="reset_btn" @click="reast">重置</van-button>
           </van-col>
           <van-col class="labelcolmt26" :span="18">
-            <van-button
-              color="#2527AA"
-              custom-class="search_btn"
-              @click="search"
-            >
+            <van-button color="#2527AA" custom-class="search_btn" @click="search">
               <van-icon name="search" />
               搜索
             </van-button>
@@ -146,19 +94,9 @@
       </div>
       <div class="list" style="padding-bottom: 200rpx">
         <div v-if="vamTabStatus">
-          <van-tabs
-            id="tabs"
-            @change="getSelectedLoudong"
-            @before-change="onBeforeChange"
-            line-width="80rpx"
-            title-active-color="#1D18BC"
-          >
-            <van-tab
-              v-for="(item, index) in loudongList"
-              :title="item.ldmc"
-              :name="item.id"
-              :key="index"
-            >
+          <van-tabs id="tabs" @change="getSelectedLoudong" @before-change="onBeforeChange" line-width="80rpx"
+            title-active-color="#1D18BC">
+            <van-tab v-for="(item, index) in loudongList" :title="item.ldmc" :name="item.id" :key="index">
             </van-tab>
           </van-tabs>
         </div>
@@ -168,18 +106,13 @@
           间
         </div>
         <van-checkbox-group :value="result" @change="onChange">
-          <div
-            class="list-row"
-            v-if="roomList.length != 0"
-            v-for="item in roomList"
-            :key="item.id"
-          >
+          <div class="list-row" v-if="roomList.length != 0" v-for="item in roomList" :key="item.id">
             <div class="cell_0">
               <van-checkbox :name="item.id"> </van-checkbox>
             </div>
             <div class="cell_1">
-              <div class="width100 height44rpx mb8rpx">
-                <div class="first_title" style="font-size: 30rpx">
+              <div class="width100 mb8rpx">
+                <div class="first_title" style="font-size: 30rpx;height: auto;">
                   {{
                     item.yuanquName +
                     item.quyuName +
@@ -216,10 +149,7 @@
                 </div>
               </div>
               <div class="width100 height50rpx mb14rpx">
-                <div
-                  class="roomstatus"
-                  v-if="getDicType('zaiti', item.zaitiType)"
-                >
+                <div class="roomstatus" v-if="getDicType('zaiti', item.zaitiType)">
                   {{ getDicType("zaiti", item.zaitiType) }}
                 </div>
                 <div class="roomstatus" v-if="item.currentState == 1">空置</div>
@@ -245,11 +175,7 @@
             </div> -->
           </div>
           <div class="list-row" v-if="roomList.length == 0">
-            <van-empty
-              class="disblock marginauto"
-              style="background: white"
-              description="暂无数据"
-            />
+            <van-empty class="disblock marginauto" style="background: white" description="暂无数据" />
           </div>
         </van-checkbox-group>
       </div>
@@ -433,7 +359,11 @@ export default {
       this.form.total = data.total;
     },
     onReachBottom() {
+      if (this.form.total == this.roomList.length) {
+        return
+      }
       this.form.pageNum += 1;
+
       this.searchMore();
       console.log("滑动到距离底部100px的时候触发,可以放 。。业务逻辑");
     }, //下拉执行的时候触发 （下拉刷新）
@@ -564,7 +494,7 @@ export default {
         return HOUSE_USAGE[index].label;
       }
     },
-    onLoadMore() {},
+    onLoadMore() { },
     onLoad: function (option) {
       //option为object类型，会序列化上个页面传递的参数
       console.log(option.isEnable);
@@ -598,9 +528,9 @@ export default {
       uni.navigateBack();
     },
 
-    change(e) {},
+    change(e) { },
 
-    getStatus() {},
+    getStatus() { },
     onChange(event) {
       this.result = event.detail;
     },
@@ -608,7 +538,7 @@ export default {
   onPullDownRefresh: function () {
     // 加载数据
   },
-  onReachBottom() {}, //下拉执行的时候触发 （下拉刷新）
+  onReachBottom() { }, //下拉执行的时候触发 （下拉刷新）
 };
 </script>
 
@@ -618,23 +548,28 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
 /deep/.van-cell {
   padding: 0 0 0 28rpx !important;
 }
+
 .inputClass {
   padding: 0 0 0 28rpx !important;
 }
+
 .chosseHouse {
   .search_btn {
     margin-left: 18rpx;
     width: calc(100% - 18rpx);
     height: 60rpx;
   }
+
   .reset_btn {
     color: #2628a9 !important;
     width: 100%;
     height: 60rpx;
   }
+
   .btn-view {
     width: 100%;
     height: 100rpx;
@@ -644,6 +579,7 @@ export default {
     bottom: 0;
     left: 0;
   }
+
   .btn {
     width: 80%;
     height: 90rpx;
@@ -653,9 +589,11 @@ export default {
     color: white;
     text-align: center;
   }
+
   .float_left {
     float: left;
   }
+
   .chuzu_label {
     width: 312rpx;
     height: 36rpx;
@@ -665,6 +603,7 @@ export default {
     color: #333333;
     line-height: 36rpx;
   }
+
   .chuzu_vlaue {
     width: 86rpx;
     font-size: 32rpx;
@@ -673,15 +612,19 @@ export default {
     color: #ec7359;
     line-height: 38rpx;
   }
+
   .mb14rpx {
     margin-bottom: 14rpx;
   }
+
   .height34rpx {
     height: 34rpx;
   }
+
   .height50rpx {
     height: 50rpx;
   }
+
   .roomstatus {
     height: 50rpx;
     line-height: 50rpx;
@@ -695,27 +638,35 @@ export default {
     border: 2rpx solid #1d18bc;
     margin-left: 16rpx;
   }
+
   .roomstatus:first-child {
     margin-left: 0 !important;
   }
+
   .height50px {
     height: 50rpx;
   }
+
   .mb8rpx {
     margin-bottom: 8rpx;
   }
+
   .width100 {
     width: 100%;
   }
+
   .height36rpx {
     height: 36rpx;
   }
+
   .height40rpx {
     height: 40rpx;
   }
+
   .height66rpx {
     height: 66rpx;
   }
+
   .height44rpx {
     height: 44rpx;
   }
@@ -739,9 +690,11 @@ export default {
     border: 2rpx solid #1d18bc;
     margin-left: 16rpx;
   }
+
   .roomstatus:first-child {
     margin-left: 0 !important;
   }
+
   .list-row {
     width: calc(100% - 64rpx);
     padding: 16rpx 32rpx 18rpx 32rpx;
@@ -751,6 +704,7 @@ export default {
     //height: 278rpx;
     border-radius: 8rpx 8rpx 8rpx 8rpx;
   }
+
   .second_title {
     float: left;
     width: 40%;
@@ -759,6 +713,7 @@ export default {
     font-weight: 500;
     color: #777777;
   }
+
   .second_title_1 {
     float: left;
     width: 60%;
@@ -767,17 +722,21 @@ export default {
     font-weight: 500;
     color: #777777;
   }
+
   .cell_0 {
     float: left;
     width: 10%;
   }
+
   .cell_1 {
     float: left;
-    width: 80%;
+    width: 90%;
   }
+
   .cell_2 {
     float: left;
     width: 10%;
+
     img {
       height: 60rpx;
       width: 60rpx;
@@ -785,6 +744,7 @@ export default {
       margin: 96rpx 0rpx 94rpx 0;
     }
   }
+
   .list {
     width: calc(100% - 64rpx);
 
@@ -814,6 +774,7 @@ export default {
       border: 2rpx solid #cccccc;
       text-align: center;
     }
+
     .van-col {
       margin-top: 26rpx !important;
     }

pages/subPackages/companyDetails/companyDetails.vue

@@ -8,34 +8,22 @@
               <div class="float_left width80">
                 <div>{{ form.qymc }}</div>
                 <span style="color: #aaaaaa; font-size: 24rpx">
-                  {{ "园区入住时间：" + form.rzsj }}
+                  {{ form.rzsj ? "园区入驻时间：" + form.rzsj : '园区入驻时间：暂无' }}
                 </span>
               </div>
               <div class="width20 float_left">
-                <div
-                  class="companystatus"
-                  style="margin-top: -7rpx; float: right; width: 100%"
-                >
-                  {{ getDicType("type", form.settleInType) }}
+                <div class="companystatus" v-if="form.settleInType"
+                  style="margin-top: -7rpx; float: right; width: 100%">
+                  {{ form.settleInType && form.settleInType.length > 0 ? getDicType("type", form.settleInType) : '暂无' }}
                   <!--									{{form.settleInType}}-->
                 </div>
               </div>
             </div>
           </van-col>
           <van-col :span="24">
-            <div
-              class="typestitle width100 mt24rpx mb16rpx border_bottom_ccc fontcolor251FCA"
-            >
-              <div
-                class="float_left"
-                style="width: 90%"
-                @click="jumpDeleteTgas()"
-              >
-                <span
-                  v-for="(item, index) in qymcString"
-                  :key="index"
-                  v-if="qymcString && qymcString.length > 0"
-                >
+            <div class="typestitle width100 mt24rpx mb16rpx border_bottom_ccc fontcolor251FCA">
+              <div class="float_left" style="width: 90%" @click="jumpDeleteTgas()">
+                <span v-for="(item, index) in qymcString" :key="index" v-if="qymcString && qymcString.length > 0">
                   {{ item }}
                   ·
                 </span>
@@ -43,12 +31,8 @@
                   暂无标签
                 </span>
               </div>
-              <van-icon
-                @click="jumpChosseTags()"
-                class="float_right"
-                style="font-size: 50rpx; width: 50rpx; margin-top: -12rpx"
-                name="edit"
-              />
+              <van-icon @click="jumpChosseTags()" class="float_right"
+                style="font-size: 50rpx; width: 50rpx; margin-top: -12rpx" name="edit" />
             </div>
           </van-col>
         </van-row>
@@ -56,7 +40,9 @@
           <van-col :span="8">
             <div class="yongtu_second_title">入驻状态</div>
             <div class="yongtu_first_title">
-              {{ getDicType("zt", form.entryStatus) }}
+              {{ form.entryStatus && form.entryStatus.length > 0 ? form.entryStatusgetDicType("zt", form.entryStatus) :
+                '暂无'
+              }}
             </div>
           </van-col>
           <!-- <van-col :span="6">
@@ -88,14 +74,12 @@
             </div>
           </van-col>
         </van-row>
-        <div
-          style="
+        <div style="
             border-top: 2rpx solid #cccccc;
 
             font-size: 24rpx;
             color: #777777;
-          "
-        >
+          ">
           <div style="margin: 16rpx 0">
             所属楼盘：{{ !form.areaName ? "暂无" : form.areaName }}
           </div>
@@ -110,122 +94,63 @@
       </div>
       <div class="list-row" style="padding-top: 0">
         <uni-collapse v-model="value" style="width: 100%">
-          <uni-collapse-item
-            title="基础信息"
-            :open="true"
-            @change="selectItems"
-          >
-            <view slot="title" class="uni-collapse-item__title-text"
-              >基础信息
-              <van-icon
-                @click="jumpEditCompanyDetails(id)"
-                name="edit"
-                style="
+          <uni-collapse-item title="基础信息" :open="true" @change="selectItems">
+            <view slot="title" class="uni-collapse-item__title-text">基础信息
+              <van-icon @click="jumpEditCompanyDetails(id)" name="edit" style="
                   color: #1d18bc;
                   z-index: 100;
                   font-size: 35rpx;
                   font-weight: bold;
                   margin-left: 10px;
-                "
-              />
+                " />
             </view>
             <div style="height: auto">
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
+                style="display: flex;height: auto;">
                 <view class="input_title float_left">公司名称：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.qymc"
-                />
+                <span class="input_value float_left" style="color: #777;height: auto;">{{ form.qymc }}</span>
+
               </view>
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">统一社会信用代码：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.shxydm"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.shxydm" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">注册资金（万元）：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.zczj"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.zczj" />
               </view>
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">币种</view>
                 <div style="color: #777" class="input_value float_left">
                   {{ getDicType("money", form.currency) }}
                 </div>
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">注册时间：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.zcsj"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.zcsj" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">法定代表人：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.fddbr"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.fddbr" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">法人电话 ：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.lxdh"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.legalPersonPhone" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">法人邮箱 ：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.frEmail"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.frEmail" />
               </view>
 
               <!-- <view
@@ -276,198 +201,150 @@
                   />
                 </view>
               </view> -->
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">企业联系人</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.qylxr"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.qylxr" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">联系人电话：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.lxdh"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.lxdh" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">联系人邮箱：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.email"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.email" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">财务负责人：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.cwfzr"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.cwfzr" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">负责人电话：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.cwfzrdh"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.cwfzrdh" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">入驻类型</view>
 
                 <div class="input_value float_left">
-                  {{ getDicType("type", form.settleInType) }}
-                  {{ form.settleInType }}
+                  {{ form.settleInType ? getDicType("type", form.settleInType) : '暂无' }}
+                  <!-- {{ form.settleInType }} -->
                 </div>
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date"
-                style="display: flex"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date" style="display: flex">
                 <view class="input_title float_left">招商经理：</view>
                 <view style="color: #777; font-size: 28rpx; width: 60%">
-                  {{ form.investmentManagerName }}
+                  {{ form.investmentManagerName == 'undefined' ? form.investmentManagerName : '暂无' }}
                 </view>
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">所属楼盘：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.areaName"
-                />
+                <input disabled="true" style="color: #777" class="input_value float_left" placeholder="暂无"
+                  v-model="form.areaName" />
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
+                style="display: flex;height: auto;">
                 <view class="input_title float_left">注册地址：</view>
-                <input
-                  disabled="true"
-                  style="color: #777"
-                  class="input_value float_left"
-                  placeholder="暂无"
-                  v-model="form.zcdz"
-                />
+                <span class="input_value float_left" style="color: #777;height: auto;">{{ form.zcdz }}</span>
+
+              </view>
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
+                <view class="input_title float_left">
+                  <span style="color: red">*&nbsp;</span>
+                  所属园区
+                </view>
+                <div style="width: 315rpx; float: left">{{ form.parkInfoName || '请选择' }}</div>
+                <!--                <img class="height40rpx width40rpx float_left" src="../../../static/mine/youjiantou.png" alt="" />-->
               </view>
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
+                <view class="input_title float_left">
+                  <span style="color: red">*&nbsp;</span>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date"
-                style="display: flex"
-              >
-                <view class="input_title mb16rpx">主营业务：</view>
+                  面积:
+                </view>
+                <input style="color: #777" class="input_value float_left" placeholder="请输入" v-model="form.areaSize" />
+              </view>
+
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
+                <view class="input_title float_left">
+                  <span style="color: red">*&nbsp;</span>
+                  经营地址：
+                </view>
+                <input style="color: #777" class="input_value float_left" placeholder="请输入" v-model="form.jydzValue" />
+              </view>
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date"
+                style="    display: flex;align-items: center;flex-direction: column;">
+                <view class="input_title float_left" style="width: 100%;display: flex;justify-content: space-between;">
+                  <div><span style="color: red">*&nbsp;</span> 经营地址载体：</div>
+                </view>
+                <div v-for="item in jydzAry" class="jydzList">
+                  <div class="jydzList-row">{{ item.name }}</div>
+                </div>
+              </view>
+              <textarea class="mt24rpx border_bottom_ccc" :maxlength="2000" placeholder="请输入经营地址说明"
+                v-model="form.jydzRemark" type="textarea" style="
+                height: 270rpx;
+                background: rgba(249, 249, 249, 1);
+                padding: 20rpx;
+                width: calc(100% - 40rpx);
+              " />
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date" style="display: flex">
+                <view class="input_title">主营业务：</view>
                 <div>
-                  <div
-                    style="display: flex; margin-bottom: 20rpx"
-                    v-for="(item, index) in form.jyfw"
-                    :key="index"
-                  >
+                  <span v-for="(item, index) in form.jyfw" :key="index">
                     {{ item }}
-                  </div>
+                    {{ form.jyfw && index != form.jyfw.length - 1 ? ',' : '' }}
+                  </span>
                 </div>
               </view>
               <view class="width100 mt24rpx list_date height40rpx">
-                <view class="input_title float_left" style="width: 52%"
-                  >营业执照副本：（限1张）</view
-                >
+                <view class="input_title float_left" style="width: 52%">营业执照副本：（限1张）</view>
               </view>
               <view class="custom-image-box" style="position: relative">
-                <img
-                  :src="
-                    !form.yyzzfbzp ||
-                    form.yyzzfbzp == 'null' ||
-                    form.yyzzfbzp == '暂无'
-                      ? '../../../static/unuploadzhizhao.png'
-                      : BASE_URI + '/FileController/download/' + form.yyzzfbzp
-                  "
-                  style="color: #777; width: 300rpx; height: 260rpx"
-                  placeholder="请输入"
-                />
+                <img :src="!form.yyzzfbzp ||
+                  form.yyzzfbzp == 'null' ||
+                  form.yyzzfbzp == '暂无'
+                  ? '../../../static/unuploadzhizhao.png'
+                  : BASE_URI + '/FileController/download/' + form.yyzzfbzp
+                  " style="color: #777; width: 300rpx; height: 260rpx" placeholder="请输入" />
               </view>
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpxs"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpxs">
                 <view class="input_title float_left">荣誉信息（限6张）</view>
-                <textarea
-                  :maxlength="2000"
-                  placeholder="请输入"
-                  v-model="form.honorInformation"
-                  type="textarea"
-                  style="
+                <textarea :maxlength="2000" placeholder="请输入" v-model="form.honorInformation" type="textarea" style="
                     height: 270rpx;
                     background: rgba(249, 249, 249, 1);
                     padding: 20rpx;
                     width: calc(100% - 40rpx);
-                  "
-                />
-                <div
-                  style="
+                  " />
+                <div style="
                     background: rgba(249, 249, 249, 1);
                     text-align: right;
                     padding-right: 10px;
                     padding-bottom: 10rpx;
                     margi-bottom: 10rpx;
-                  "
-                >
+                  ">
                   {{
                     form.honorInformation ? form.honorInformation.length : 0
                   }}/2000
                 </div>
-                <view
-                  class="custom-image-box"
-                  style="margin-top: 20rpx; display: flex"
-                >
-                  <img
-                    v-for="item in form.ryxxzp"
-                    :key="item"
-                    :src="BASE_URI + '/FileController/download/' + item"
-                    class="idclass margin12rpx float_left"
-                    placeholder="请输入"
-                  />
+                <view class="custom-image-box" style="margin-top: 20rpx; display: flex">
+                  <img v-for="item in form.ryxxzp" :key="item" :src="BASE_URI + '/FileController/download/' + item"
+                    class="idclass margin12rpx float_left" placeholder="请输入" />
                 </view>
               </view>
 
-              <view
-                class="width100 mt24rpx padb24rpx border_bottom_ccc list_date"
-                style="display: flex"
-              >
+              <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date" style="display: flex">
                 <view class="input_title float_left">关联企业：</view>
                 <div style="color: #777; width: 60%" class="float_left">
                   {{ form.associationCompanyName }}
@@ -479,19 +356,11 @@
       </div>
       <div class="list-row" style="padding-top: 0">
         <uni-collapse v-model="value2" style="width: 100%">
-          <uni-collapse-item
-            title="关联社会载体"
-            :open="true"
-            @change="selectItems"
-          >
-            <view slot="title" class="uni-collapse-item__title-text"
-              >关联社会载体
+          <uni-collapse-item title="关联社会载体" :open="true" @change="selectItems">
+            <view slot="title" class="uni-collapse-item__title-text">关联社会载体
             </view>
             <div style="height: auto">
-              <div
-                class="form_row pdt32 pdb32 border_bottom_ccc width100"
-                style="display: flex; height: auto"
-              >
+              <div class="form_row pdt32 pdb32 border_bottom_ccc width100" style="display: flex; height: auto">
                 <div class="width30 first_title">自有</div>
                 <div style="width: 60%" class="float_left font28rpx">
                   {{
@@ -502,10 +371,7 @@
                 </div>
               </div>
 
-              <div
-                class="form_row pdt32 pdb32 border_bottom_ccc width100"
-                style="display: flex; height: auto"
-              >
+              <div class="form_row pdt32 pdb32 border_bottom_ccc width100" style="display: flex; height: auto">
                 <div class="width30 first_title">租赁</div>
                 <div style="width: 60%" class="float_left font28rpx">
                   {{
@@ -516,10 +382,7 @@
                 </div>
               </div>
 
-              <div
-                class="form_row pdt32 pdb32 border_bottom_ccc width100"
-                style="display: flex; height: auto"
-              >
+              <div class="form_row pdt32 pdb32 border_bottom_ccc width100" style="display: flex; height: auto">
                 <div class="width30 first_title">未确定</div>
                 <div style="width: 60%" class="float_left font28rpx">
                   {{
@@ -535,19 +398,11 @@
       </div>
       <div class="list-row" style="padding-top: 0">
         <uni-collapse v-model="value2" style="width: 100%">
-          <uni-collapse-item
-            title="关联自有载体"
-            :open="true"
-            @change="selectItems"
-          >
-            <view slot="title" class="uni-collapse-item__title-text"
-              >关联自有载体
+          <uni-collapse-item title="关联自有载体" :open="true" @change="selectItems">
+            <view slot="title" class="uni-collapse-item__title-text">关联自有载体
             </view>
             <div style="height: auto">
-              <div
-                class="form_row pdt32 pdb32 border_bottom_ccc width100"
-                style="display: flex; height: auto"
-              >
+              <div class="form_row pdt32 pdb32 border_bottom_ccc width100" style="display: flex; height: auto">
                 <div class="width30 first_title">有合同</div>
                 <div style="width: 60%" class="float_left font28rpx">
                   {{
@@ -555,10 +410,7 @@
                   }}
                 </div>
               </div>
-              <div
-                class="form_row pdt32 pdb32 border_bottom_ccc width100"
-                style="display: flex; height: auto"
-              >
+              <div class="form_row pdt32 pdb32 border_bottom_ccc width100" style="display: flex; height: auto">
                 <div class="width30 first_title">无合同</div>
                 <div style="width: 60%" class="float_left font28rpx">
                   {{
@@ -702,6 +554,7 @@ import {
   findCompanyTags,
   selectByCompanyId,
   getRoomNameByCompanyId,
+  getAreaByIds
 } from "@/js_sdk/http";
 import handleReport from "../companyreport/components/handlereport.vue";
 export default {
@@ -710,6 +563,7 @@ export default {
   },
   data() {
     return {
+
       BASE_URI: this.$constant.BASE_URI,
       id: "",
       qymcString: [],
@@ -743,6 +597,7 @@ export default {
       mode: "default",
       dotsStyles: {},
       swiperDotIndex: 0,
+      jydzAry: []
     };
   },
 
@@ -755,6 +610,7 @@ export default {
     }
   },
   onShow() {
+    this.getByCodes();
     this.findCompanyTags(this.id);
   },
   methods: {
@@ -763,6 +619,9 @@ export default {
         companyId: this.id,
       });
       this.form.socialCarrierName = socialCarrierName;
+      let form = { ...this.form }
+      this.form = {}
+      this.form = form
     },
     async selectByCompanyId1() {
       let zaiti = await selectByCompanyId({ companyId: this.id });
@@ -834,7 +693,7 @@ export default {
         uni.navigateTo({
           url: "/pages/subPackages/chooseCompanyTags/index?id=" + this.form.id,
         });
-      } catch (error) {}
+      } catch (error) { }
     },
     openHandleReportDialog(item) {
       let that = this;
@@ -850,7 +709,7 @@ export default {
       if (type == "money" && this.dic_SelectList.CURRENCY) {
         let CURRENCY = this.dic_SelectList.CURRENCY;
         let index = CURRENCY.findIndex((e) => e.value == value);
-
+        console.log(index)
         if (index != -1) return CURRENCY[index].label;
         else return "暂无";
       }
@@ -905,13 +764,13 @@ export default {
       uni.previewImage({
         urls: [
           that.BASE_URI +
-            "/FileController/download/" +
-            that.form.frsfzh_zhenmian,
+          "/FileController/download/" +
+          that.form.frsfzh_zhenmian,
         ],
         longPressActions: {
           itemList: ["发送给朋友", "保存图片", "收藏"],
-          success: function (data) {},
-          fail: function (err) {},
+          success: function (data) { },
+          fail: function (err) { },
         },
       });
     },
@@ -921,13 +780,13 @@ export default {
       uni.previewImage({
         urls: [
           that.BASE_URI +
-            "/FileController/download/" +
-            that.form.frsfzh_fanmian,
+          "/FileController/download/" +
+          that.form.frsfzh_fanmian,
         ],
         longPressActions: {
           itemList: ["发送给朋友", "保存图片", "收藏"],
-          success: function (data) {},
-          fail: function (err) {},
+          success: function (data) { },
+          fail: function (err) { },
         },
       });
     },
@@ -936,6 +795,28 @@ export default {
         let that = this;
         let detail = await getCompanyHouseDetails(e);
         let qymcString = await getCompanyTagsByQybq(detail.data.qybq);
+        if (detail.data.jydz) {
+          const jydzAry = detail.data.jydzStr.split(',').map((e) => {
+            return {
+              name: e
+            }
+          })
+          const jydzIdAry = detail.data.jydz.split(',')
+          for (let i = 0; i < jydzIdAry.length; i++) {
+            jydzAry[i].id = jydzIdAry[i]
+            console.log(jydzIdAry)
+            console.log('jydzIdAry[i].id', jydzIdAry[i])
+            getAreaByIds({
+              ids: jydzIdAry[i]
+            }).then((e) => {
+              jydzAry[i].name += `；${e}㎡`
+            })
+          }
+          this.jydzAry = jydzAry
+          console.log(jydzAry)
+        } else {
+          this.jydzAry = []
+        }
         that.findCompanyTags(e);
         that.form = detail.data;
         console.log(detail.data.frsfzh);
@@ -961,7 +842,7 @@ export default {
         that.selectByCompanyId1();
         this.getRoomNameByCompanyId();
         that.$forceUpdate();
-      } catch (error) {}
+      } catch (error) { }
     },
     onChange(event) {
       this.activeNames = event.detail;
@@ -975,11 +856,13 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
 .form_row {
   height: 40rpx;
   font-weight: 400;
   font-size: 24rpx;
 }
+
 .dengjibutton {
   margin-top: 24rpx;
   margin-left: 60rpx;
@@ -991,9 +874,11 @@ export default {
   color: white;
   line-height: 60rpx;
 }
+
 .housedetails {
   margin-bottom: 200rpx;
 }
+
 .housedetails {
   .detailstitle {
     display: flex;
@@ -1002,6 +887,7 @@ export default {
     color: #333333;
     padding-bottom: 16rpx;
   }
+
   .typestitle {
     display: flex;
     font-size: 24rpx;
@@ -1011,17 +897,20 @@ export default {
   }
 }
 </style>
- <style lang="scss">
-::v-deep .is-open + .uni-collapse-item__wrap {
+<style lang="scss">
+::v-deep .is-open+.uni-collapse-item__wrap {
   height: auto !important;
 }
+
 ::v-deep .uni-collapse-item__wrap-content {
   height: auto !important;
 }
+
 .pageconfig {
   background: #ffffff;
   padding: 32rpx;
 }
+
 .input_title {
   min-width: 40%;
   font-size: 28rpx;
@@ -1029,6 +918,7 @@ export default {
   line-height: 40rpx;
   color: #333333;
 }
+
 .input_value {
   //   width: 60%;
   font-size: 28rpx;
@@ -1036,15 +926,18 @@ export default {
   line-height: 40rpx;
   color: #777777;
 }
+
 .uni-collapse-item__title-box {
   padding: 0 !important;
 }
+
 .uni-collapse-item__title-text {
   color: #1d18bc !important;
   font-size: 32rpx !important;
   margin: 32rpx 0;
   font-weight: bold;
 }
+
 .idclass {
   width: 147rpx;
   height: 100rpx;

pages/subPackages/companyHouse/companyHouse.vue

@@ -3,21 +3,12 @@
     <div class="searchbox">
       <van-row>
         <van-col :span="22">
-          <uni-search-bar
-            placeholder="请输入公司名称"
-            @confirm="confirm"
-            clearButton="none"
-            cancelButton="none"
-            v-model="search.qymc"
-          ></uni-search-bar>
+          <uni-search-bar placeholder="请输入公司名称" @confirm="confirm" clearButton="none" cancelButton="none"
+            v-model="search.qymc"></uni-search-bar>
         </van-col>
         <van-col :span="2">
-          <img
-            @click="jumpAddCompanyPage()"
-            src="../../../static/add_company.png"
-            style="height: 50rpx; width: 50rpx; margin-top: 25rpx"
-            alt=""
-          />
+          <img @click="jumpAddCompanyPage()" src="../../../static/add_company.png"
+            style="height: 50rpx; width: 50rpx; margin-top: 25rpx" alt="" />
         </van-col>
       </van-row>
     </div>
@@ -29,15 +20,8 @@
       <van-tab title="飞地" :name="4"></van-tab>
     </van-tabs>
     <div style="display: flex; background: white; padding: 0rpx 16rpx">
-      <uni-data-checkbox
-        v-model="entryArray"
-        mode="tag"
-        :multiple="true"
-        :localdata="dic_SelectList.SETTLE_IN_STATUS"
-        selectedTextColor="#1D18BC"
-        selectedColor="rgba(29,24,188,0.05);"
-        @change="getCompanyList"
-      >
+      <uni-data-checkbox v-model="entryArray" mode="tag" :multiple="true" :localdata="dic_SelectList.SETTLE_IN_STATUS"
+        selectedTextColor="#1D18BC" selectedColor="rgba(29,24,188,0.05);" @change="getCompanyList">
       </uni-data-checkbox>
     </div>
     <div class="list">
@@ -47,31 +31,26 @@
             <div class="width70 height44rpx mb8rpx float_left">
               <div class="first_title chaochuyincang">{{ item.qymc }}</div>
             </div>
-            <div class="width30 height44rpx mb8rpx float_left">
+            <div class="width30 height44rpx mb8rpx float_left" @click="jumpPage(item.id)">
               <div class="roomstatus1 txt_center" style="font-size: 24rpx">
                 {{ getDicType(item.settleInType) }}
               </div>
             </div>
             <div class="width100 height40rpx mb8rpx clear_both">
-              <div
-                class="second_title width50 height40rpx float_left"
-                style="
+              <div class="second_title width50 height40rpx float_left" style="
                   overflow: hidden;
                   text-overflow: ellipsis;
                   white-space: nowrap;
-                "
-              >
+                ">
                 所属楼盘：{{
                   item.area == null || !item.area ? "未知" : item.area
                 }}
               </div>
-              <div class="second_title_1 width50 height40rpx float_left">
+              <div class="second_title_1 width50 height40rpx float_left" @click="jumpPage(item.id)">
                 注册资本：{{ !item.zczj ? "暂无" : item.zczj + "万" }}
               </div>
             </div>
-            <div
-              class="width100 height28rpx font24rpx fontcolor251FCA chaochuyincang"
-            >
+            <div @click="jumpPage(item.id)" class="width100 height28rpx font24rpx fontcolor251FCA chaochuyincang">
               {{ item.qybq == null || !item.qybq ? "暂无标签" : item.qybq }}
             </div>
           </div>
@@ -81,17 +60,13 @@
         </div>
       </div>
       <div v-else>
-        <van-empty
-          class="disblock marginauto"
-          style="background: white"
-          description="暂无数据"
-        />
+        <van-empty class="disblock marginauto" style="background: white" description="暂无数据" />
       </div>
     </div>
   </div>
 </template>
-  
-  <script>
+
+<script>
 import { listVo, getByCodes, getUserLocalStorageInfo } from "@/js_sdk/http";
 import vanEmpty from "../../../wxcomponents/weapp/dist/empty/index";
 
@@ -184,14 +159,14 @@ export default {
         url: "/pages/subPackages/addCompany/addCompany",
       });
     },
-    blur(e) {},
+    blur(e) { },
     focus(e) {
       //   pages / subPackages / merchants / merchants;
     },
-    input(e) {},
-    cancel(e) {},
-    change(e) {},
-    clear(e) {},
+    input(e) { },
+    cancel(e) { },
+    change(e) { },
+    clear(e) { },
     confirm(e) {
       this.getCompanyList();
     },
@@ -203,18 +178,20 @@ export default {
   },
 };
 </script>
-  
-  
-  <style lang="scss">
+
+
+<style lang="scss">
 .searchbox {
   display: block;
   background: white;
 }
+
 .chaochuyincang {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
 .labelcolmt26 {
   input {
     font-size: 24rpx;
@@ -222,6 +199,7 @@ export default {
     border: 2rpx solid #cccccc;
     text-align: center;
   }
+
   .van-col {
     margin-top: 26rpx !important;
   }
@@ -237,7 +215,4 @@ export default {
     margin-top: -10rpx !important;
   }
 }
-</style>
-  
-  
-  
+</style>

pages/subPackages/parkActivities/detail.vue

@@ -6,22 +6,17 @@
       </div>
 
       <div class="collect-part">
-        <div
-          class="normal-tip by y-bg"
-          v-if="activityDetail.registrationStatus === '1'"
-        >
+        <div class="normal-tip by y-bg" v-if="activityDetail.registrationStatus === '1'">
           报名中
         </div>
         <div class="normal-tip by h-bg" v-else>报名已结束</div>
         <div class="right">
-          <span class="num">{{ activityDetail.partakeNumber }}人参与</span>
+          <span class="num">{{ !activityDetail.partakeNumber ? 0 : activityDetail.partakeNumber }}人参与</span>
           <div class="icon-collect" @click="changeCollectorsStatus()">
-            <i
-              :class="[
-                'iconfont icon-wujiaoxingxingxingshoucangdianji',
-                active && 'blue',
-              ]"
-            ></i>
+            <i :class="[
+              'iconfont icon-wujiaoxingxingxingshoucangdianji',
+              active && 'blue',
+            ]"></i>
           </div>
         </div>
       </div>
@@ -78,29 +73,20 @@
         <div class="info-item uploadBox">
           <div class="custom-item-tit"><span class="tit">附件查看</span></div>
           <div class="text" style="16rpx 0px">
-            <div
-              v-for="item in activityDetail.activityFile"
-              :key="item.uid"
-              @click="openFile(item.url)"
-            >
+            <div v-for="item in activityDetail.activityFile" :key="item.uid" @click="openFile(item.url)">
               {{ item.name }}
             </div>
           </div>
         </div>
       </div>
     </div>
-    <div
-      class="but-bottom"
-      @click="getApply()"
-      :signInfo="signInfo"
-      v-if="signInfo.signInStatus == 1"
-    >
+    <div class="but-bottom" @click="getApply()" :signInfo="signInfo" v-if="signInfo.signInStatus == 1">
       到场签到
     </div>
   </div>
 </template>
-    
-    <script>
+
+<script>
 import TelNum from "../../subPackages/components/tel-number";
 
 import {
@@ -129,6 +115,7 @@ export default {
   onLoad(option) {
     // this.getScanCode();
     console.log("option", option.id);
+    console.log(getUserLocalStorageInfo().user.id)
     this.id = option.id;
     this.getActivityById1();
   },
@@ -173,7 +160,7 @@ export default {
     },
     getActivityById1() {
       const _this = this;
-      getActivityById1(this.id, "SCNjNSP7LJ9aarv1cNw").then((res) => {
+      getActivityById1(this.id, "SCNjNSP7LJ9aarv1cNw", getUserLocalStorageInfo().user.id).then((res) => {
         if (res.data) {
           if (res.data.activityFile) {
             const files = JSON.parse(res.data.activityFile);
@@ -273,12 +260,13 @@ export default {
   },
 };
 </script>
-    
-    <style lang="scss" type="text/scss" >
+
+<style lang="scss" type="text/scss">
 .h-bg {
   background: #f87a7a;
   color: #fff;
 }
+
 // 底部按钮
 .but-bottom {
   position: fixed;
@@ -297,6 +285,7 @@ export default {
   color: $text5;
   margin-top: 32rpx;
 }
+
 .detail {
   box-sizing: border-box;
   background-color: #f2f2f2;
@@ -310,16 +299,19 @@ export default {
         width: 100%;
       }
     }
+
     .collect-part {
       background-color: #fff;
       height: 120rpx;
       padding: 0 30rpx;
       margin-bottom: 10rpx;
       @include flex;
-      .normal-tip {
-      }
+
+      .normal-tip {}
+
       .right {
         @include flex;
+
         .num {
           margin-right: 20rpx;
           font-size: 24rpx;
@@ -327,6 +319,7 @@ export default {
         }
       }
     }
+
     .tel-part {
       display: flex;
       width: 100%;
@@ -342,24 +335,29 @@ export default {
         font-size: 32rpx;
         font-weight: 700;
       }
+
       .custom-tel-component {
         width: 400rpx;
+
         .left {
           font-size: 26rpx;
         }
       }
     }
   }
+
   .info-part {
     background-color: #fff;
     overflow-y: auto;
     height: calc(100vh - 700rpx);
     box-sizing: border-box;
     padding: 40rpx 30rpx;
+
     .tit {
       padding-left: 2.667vw;
       position: relative;
       font-size: 4.267vw;
+
       &::after {
         content: "";
         width: 0.8vw;
@@ -373,20 +371,25 @@ export default {
         transform: translateY(-50%);
       }
     }
+
     .info-item {
       padding: 10rpx 0rpx;
       margin-bottom: 20rpx;
+
       .custom-item-tit {
         font-size: 32rpx;
         font-weight: 700;
       }
+
       .text {
         font-size: 24rpx;
         color: $text5;
         margin-top: 32rpx;
+
         .add {
           margin-right: 40rpx;
         }
+
         .dh {
           width: 100rpx;
           text-align: center;
@@ -395,6 +398,7 @@ export default {
           border-left: 1rpx solid #666666;
         }
       }
+
       &:last-child {
         margin-bottom: 0rpx;
       }
@@ -402,5 +406,4 @@ export default {
   }
 }
 </style>
-    <style lang="scss">
-</style>
+<style lang="scss"></style>

pages/subPackages/parkActivities/index.vue

@@ -2,42 +2,24 @@
   <div class="announcement">
     <div class="tap-part">
       <div class="tips-list">
-        <div
-          :class="[
-            'tip-item',
-            search.activityType == item.value ? 'active' : '',
-          ]"
-          v-for="(item, index) in tipList"
-          :key="index"
-          @click="selectChange(item.value)"
-        >
+        <div :class="[
+          'tip-item',
+          search.activityType == item.value ? 'active' : '',
+        ]" v-for="(item, index) in tipList" :key="index" @click="selectChange(item.value)">
           {{ item.label }}
         </div>
       </div>
 
       <div class="card-news-list">
-        <div
-          class="detail-card shadow-radius news-card"
-          v-for="(item, index) in activityList"
-          :key="index"
-        >
+        <div class="detail-card shadow-radius news-card" v-for="(item, index) in activityList" :key="index">
           <div class="image" v-if="item.annexArray">
-            <img
-              @click="getDetail(item)"
-              style="height: 8rem"
-              :src="item.annexArray[0]"
-              alt=""
-            />
+            <img @click="getDetail(item)" style="height: 8rem" :src="item.annexArray[0]" alt="" />
           </div>
           <div class="info-part">
             <p class="tit" @click="getDetail(item)">{{ item.activityName }}</p>
             <div class="bottom">
               <div class="left">
-                <span
-                  class="normal-tip by y-bg"
-                  v-if="item.registrationStatus === '1'"
-                  >报名中</span
-                >
+                <span class="normal-tip by y-bg" v-if="item.registrationStatus === '1'">报名中</span>
                 <span class="normal-tip by h-bg" v-else>报名已结束</span>
                 <!-- <span
                   class="normal-tip yd d-bg"
@@ -45,30 +27,17 @@
                   v-if="item.registrationStatus === '1'"
                   >活动风采</span
                 > -->
-                <span
-                  class="normal-tip yd z-bg"
-                  @click.stop="getStyle(item)"
-                  v-if="
-                    item.registrationStatus === '2' && item.styleStatus === '1'
-                  "
-                  >活动风采</span
-                >
+                <span class="normal-tip yd z-bg" @click.stop="getStyle(item)" v-if="
+                  item.registrationStatus === '2' && item.styleStatus === '1'
+                ">活动风采</span>
               </div>
 
               <div class="right">
-                <div class="num">{{ item.partakeNumber }}人参与</div>
-                <div
-                  class="icon-collect"
-                  @click.stop="changeCollectorsStatus(item)"
-                >
-                  <i
-                    class="iconfont icon-wujiaoxingxingxingshoucangdianji blue"
-                    v-if="item.collectorsStatus === '2'"
-                  ></i>
-                  <i
-                    class="iconfont icon-wujiaoxingxingxingshoucangdianji"
-                    v-else
-                  ></i>
+                <div class="num">{{ item.partakeNumber ? item.partakeNumber : 0 }}人参与</div>
+                <div class="icon-collect" @click.stop="changeCollectorsStatus(item)">
+                  <i class="iconfont icon-wujiaoxingxingxingshoucangdianji blue"
+                    v-if="item.collectorsStatus === '2'"></i>
+                  <i class="iconfont icon-wujiaoxingxingxingshoucangdianji" v-else></i>
                 </div>
               </div>
             </div>
@@ -78,8 +47,8 @@
     </div>
   </div>
 </template>
-  
-  <script>
+
+<script>
 import { getUserLocalStorageInfo, getByCodes } from "@/js_sdk/http";
 // import { ImagePreview, Toast } from "vant";
 
@@ -163,7 +132,7 @@ export default {
           });
           console.log(_this.regisSignList);
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     selectChange(value) {
       let tel = true;
@@ -232,51 +201,63 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss" type="text/scss" scoped>
+
+<style lang="scss" type="text/scss" scoped>
 .news-card {
   background: white;
   padding: 10rpx 30rpx;
   border-radius: 20px;
+
   .image {
     font-size: 0;
+
     img {
       width: 100%;
     }
   }
+
   .info-part {
     .tit {
       font-size: 24rpx;
       color: #666666;
       margin: 25rpx 0;
     }
+
     .top {
       @include flex;
       height: 75rpx;
+
       .text {
         font-size: 24rpx;
         color: #666666;
       }
+
       .tip-grid-bg {
         padding: 0 35rpx;
         font-size: 20rpx;
         line-height: 42rpx;
       }
     }
+
     .bottom {
       @include flex;
+
       .left {
         @include flex;
+
         span {
           margin-right: 10rpx;
         }
+
         i {
           font-size: 24rpx;
           color: rgba(102, 0, 255, 1);
         }
       }
+
       .right {
         @include flex;
+
         .num {
           font-size: 24rpx;
           color: #333333;
@@ -286,8 +267,10 @@ export default {
     }
   }
 }
+
 .announcement {
   box-sizing: border-box;
+
   .tap-part {
     margin-top: 10rpx;
     height: calc(100vh - 10rpx);
@@ -310,6 +293,7 @@ export default {
   margin-top: 20rpx;
   @include flex;
   flex-wrap: wrap;
+
   .tip-item {
     width: 120rpx;
     margin: 0 15rpx 20rpx;
@@ -321,6 +305,7 @@ export default {
     border-radius: 4rpx;
     background-color: rgba(215, 215, 215, 1);
   }
+
   .active {
     background-color: rgba(102, 0, 255, 1);
   }
@@ -328,9 +313,11 @@ export default {
 
 .card-news-list {
   padding: 20rpx 20rpx;
+
   .news-card {
     margin-bottom: 20rpx;
   }
+
   .record-card {
     margin-bottom: 10rpx;
     height: 346rpx;
@@ -338,14 +325,17 @@ export default {
     padding: 20rpx 30rpx;
     box-sizing: border-box;
     @include flex;
+
     .left {
       display: flex;
       flex-direction: column;
       justify-content: space-between;
       height: 100%;
+
       img {
         width: 244rpx;
       }
+
       .text {
         margin-bottom: 10rpx;
         text-align: center;
@@ -353,6 +343,7 @@ export default {
         color: #666666;
       }
     }
+
     .right {
       display: flex;
       flex-direction: column;
@@ -362,21 +353,24 @@ export default {
       height: 100%;
       color: #666666;
       padding-left: 100rpx;
+
       .title {
         font-weight: 700;
         margin-top: 20rpx;
       }
-      .time {
-      }
+
+      .time {}
 
       .add {
         p {
           word-break: break-word;
         }
       }
+
       .bottom {
         display: flex;
         justify-content: flex-end;
+
         p {
           width: 80rpx;
           text-align: center;

pages/subPackages/password/index.vue

@@ -5,11 +5,7 @@
         <div class="info-box">
           <div class="label">当前密码</div>
           <div class="input-box">
-            <input
-              :type="show1 ? 'text' : 'password'"
-              placeholder="请输入"
-              v-model="lastPassword"
-            />
+            <input :type="show1 ? 'text' : 'password'" placeholder="请输入" v-model="lastPassword" />
           </div>
           <div class="icon-box" @click="getShow('1')">
             <van-icon name="eye-o" v-if="show1" />
@@ -20,11 +16,7 @@
         <div class="info-box">
           <div class="label">修改密码</div>
           <div class="input-box">
-            <input
-              :type="show2 ? 'text' : 'password'"
-              placeholder="请输入"
-              v-model="password"
-            />
+            <input :type="show2 ? 'text' : 'password'" placeholder="请输入" v-model="password" />
           </div>
           <div class="icon-box" @click="getShow('2')">
             <van-icon name="eye-o" v-if="show2" />
@@ -35,11 +27,7 @@
         <div class="info-box">
           <div class="label">确认修改密码</div>
           <div class="input-box">
-            <input
-              :type="show3 ? 'text' : 'password'"
-              placeholder="请输入"
-              v-model="checkPassword"
-            />
+            <input :type="show3 ? 'text' : 'password'" placeholder="请输入" v-model="checkPassword" />
           </div>
           <div class="icon-box" @click="getShow('3')">
             <van-icon name="eye-o" v-if="show3" />
@@ -54,8 +42,10 @@
     </div>
   </div>
 </template>
-  
-  <script>
+
+<script>
+import { hexMD5 } from './md5.js'
+
 import { editPassword, getUserLocalStorageInfo } from "@/js_sdk/http";
 // import auth from "@/service/auth";
 export default {
@@ -70,8 +60,8 @@ export default {
       checkPassword: "",
     };
   },
-  created() {},
-  mounted() {},
+  created() { },
+  mounted() { },
   methods: {
     getShow(type) {
       this["show" + type] = !this["show" + type];
@@ -102,8 +92,8 @@ export default {
       }
       editPassword({
         userId: getUserLocalStorageInfo().user.id,
-        newPassword: this.password,
-        oldPassword: this.lastPassword,
+        newPassword: hexMD5(this.password),
+        oldPassword: hexMD5(this.lastPassword),
       }).then((res) => {
         if (res.errno === 0 && res.data) {
           uni.clearStorageSync();
@@ -119,7 +109,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 .mine-box {
   width: 100%;
   height: 100%;
@@ -130,6 +120,7 @@ export default {
   background-repeat: no-repeat;
   box-sizing: border-box;
   overflow: hidden;
+
   .mine-body {
     padding: 30rpx;
     box-sizing: border-box;
@@ -145,10 +136,12 @@ export default {
       margin-top: 160rpx;
       padding: 15rpx 30rpx;
       box-sizing: border-box;
+
       .info-box {
         height: 100rpx;
         @include flex;
         border-bottom: 1rpx solid #c6c5c9;
+
         .label {
           width: 200rpx;
           line-height: 100rpx;
@@ -156,8 +149,10 @@ export default {
           font-size: 30rpx;
           color: #262626;
         }
+
         .input-box {
           width: 260rpx;
+
           input {
             width: 100%;
             height: 100rpx;
@@ -166,14 +161,17 @@ export default {
             background: rgba(#fff, 0);
           }
         }
+
         .icon-box {
           width: 100rpx;
           text-align: center;
+
           i {
             font-size: 35rpx;
             color: #333;
           }
         }
+
         &:last-child {
           border-bottom: none;
         }
@@ -182,6 +180,7 @@ export default {
       .foot-box {
         margin-top: 200rpx;
         width: 100%;
+
         .but {
           text-align: center;
           background: rgba(102, 0, 255, 1);
@@ -194,5 +193,4 @@ export default {
     }
   }
 }
-</style>
-  
+</style>

pages/subPackages/repairDispatch-app/add.vue

@@ -7,12 +7,7 @@
         </div>
         <div class="custom-white-box-content">
           <div class="custom-input-box">
-            <input
-              type="text"
-              :maxlength="50"
-              placeholder="请输入"
-              v-model="form.companyName"
-            />
+            <input type="text" :maxlength="50" placeholder="请输入" v-model="form.companyName" />
           </div>
         </div>
         <!-- <div class="cell-item">
@@ -32,31 +27,19 @@
           <p class="label">服务选择</p>
           <div class="tit">
             <ul class="custom-select-list">
-              <li
-                v-for="item in dic_SelectList.QUICK_SELECTION"
-                v-if="item.value !== ''"
-                :key="item.value"
-                :class="{
-                  active: quickSleced.value && item.value === quickSleced.value,
-                }"
-                @click="quickSelect(item)"
-              >
+              <li v-for="item in dic_SelectList.QUICK_SELECTION" v-if="item.value !== ''" :key="item.value" :class="{
+                active: quickSleced.value && item.value === quickSleced.value,
+              }" @click="quickSelect(item)">
                 {{ item.label }}
               </li>
             </ul>
 
-            <uni-easyinput
-              type="textarea"
-              autoHeight
-              v-model="form.description"
-              maxlength="800"
-              class="bgcF9F9F9 height218rpx"
-              placeholder="请输入"
-            />
+            <uni-easyinput type="textarea" autoHeight v-model="form.description" maxlength="800"
+              class="bgcF9F9F9 height218rpx" placeholder="请输入" />
           </div>
         </div>
       </div>
-      <div class="white-box page-3" style="padding-bottom: 200rpx">
+      <div class="white-box page-3">
         <!-- <div class="cell-item">
           <p class="label required">位置</p>
           <div class="tit">
@@ -74,38 +57,62 @@
         </div> -->
         <div class="block-cell-item">
           <p class="label">
-            补充说明<span class="tips"
-              >（支持图片/视频上传限20M内，最多6张）</span
-            >
+            补充说明<span class="tips">（支持图片/视频上传限20M内，最多6张）</span>
           </p>
           <div class="tit">
-            <van-uploader
-              :multiple="true"
-              :file-list="fileUrlList"
-              :max-count="6"
-              @after-read="afterRead"
-              @before-delete="beforeDelete"
-              :show-upload="true"
-            >
+            <van-uploader :multiple="true" :file-list="fileUrlList" :max-count="6" @after-read="afterRead"
+              @before-delete="beforeDelete" :show-upload="true">
             </van-uploader>
           </div>
         </div>
         <div class="cell-item">
           <p class="label">联系方式</p>
           <p class="tit">
-            <input
-              type="text"
-              placeholder="请输入联系方式"
-              v-model="form.contact"
-            />
+            <input type="text" placeholder="请输入联系方式" v-model="form.contact" />
           </p>
         </div>
         <div class="cell-item">
           <p class="label">上报人</p>
           <p class="tit">{{ form.userId }}</p>
         </div>
+        <div class="cell-item flex-item" style="width: 100%; min-height: 88rpx; padding: 0" @click="openPicker()">
+          <div class="label">处理人</div>
+          <div class="tit">
+            {{ form.handleUserName != null ? form.handleUserName : "" }}
+            <!-- {{ detail.handleUserName == null }} -->
+          </div>
+        </div>
+        <div class="custom-item-tit">
+          <!-- <p class="tit">备注</p> -->
+          <span class="tit">
+            <div > 备注</div>
+
+          </span>
+        </div>
+        <div class="custom-textarea-box" style="padding-bottom: 15rpx">
+          <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" v-model="form.handleExplain" autoHeight
+                         placeholder="请填写" show-word-limit >
+          </uni-easyinput>
+        </div>
       </div>
+
     </div>
+    <van-popup :show="showPicker" position="bottom" round :closeable="false" :close-on-click-overlay="false">
+      <div style="display: flex; justify-content: space-between">
+        <div style="margin: 32rpx" @click="closePopup()">取消</div>
+        <div style="margin: 32rpx" @click="getSelectValue()">确认</div>
+      </div>
+      <uni-easyinput v-model="name" placeholder="请输入内容" @confirm="getName" @iconClick="getName"
+        suffixIcon="search"></uni-easyinput>
+
+      <div style="height: 50vh">
+        <div class="list-row1" v-for="(item, index) in columns" :key="index" style="justify-content: space-between">
+          {{ item.text }}
+          <van-checkbox :name="item.value" @change="onChange($event, index)" v-model="item.checked">
+          </van-checkbox>
+        </div>
+      </div>
+    </van-popup>
     <div class="repair-bottom bottom-button">
       <button class="btn" @click="submit()">提交</button>
     </div>
@@ -121,7 +128,7 @@ import {
   getCompanyById,
   addRepair,
   getByCodes,
-  getUserLocalStorageInfo,
+  getUserLocalStorageInfo, getDispatchToPerson
 } from "@/js_sdk/http";
 export default {
   components: {
@@ -130,12 +137,14 @@ export default {
   },
   data() {
     return {
+      name: '',
       dic_SelectList: {},
       dic_key: ["QUICK_SELECTION"],
       reportTypeSleced: "1",
       quickSleced: {},
       quickList: [],
       positionSleced: "1",
+      showPicker: false,
       positionList: [
         {
           val: "1",
@@ -160,6 +169,9 @@ export default {
         fileUrl: "",
         status: "unAcceptance",
       },
+      handleUserNames: "",
+      handleUserIds: "",
+      columns: [],
     };
   },
   onLoad() {
@@ -168,8 +180,53 @@ export default {
       getUserLocalStorageInfo().user.truename +
       "-" +
       getUserLocalStorageInfo().user.phone;
+    getDispatchToPerson({ groupId: "", name: "" }).then((res) => {
+      this.columns = res.data;
+    });
   },
   methods: {
+    closePopup() {
+      this.showPicker = false;
+    },
+    getSelectValue() {
+      let handleUserNames = [];
+      let handleUserIds = [];
+      for (let i = 0; i < this.columns.length; i++) {
+        const element = this.columns[i];
+        if (element.checked) {
+          handleUserNames.push(element.text);
+          handleUserIds.push(element.value);
+        }
+      }
+      console.log(this.handleUserNames.split(","));
+      let AllHandleUserNames = Array.from(
+        new Set(
+          handleUserNames.concat(
+            this.handleUserNames.length > 0
+              ? this.handleUserNames.split(",")
+              : []
+          )
+        )
+      );
+      console.log(AllHandleUserNames);
+      let AllHandleUserIds = Array.from(
+        new Set(
+          handleUserIds.concat(
+            this.handleUserIds.length > 0 ? this.handleUserIds.split(",") : []
+          )
+        )
+      );
+      this.form.handleUserName = AllHandleUserNames.toString();
+      this.form.handleUserId = AllHandleUserIds.toString();
+      console.log(this.columns);
+      this.$forceUpdate();
+      this.showPicker = false;
+    },
+    onChange(event, i) {
+      console.log(event);
+      console.log(i);
+      this.columns[i].checked = event.detail;
+    },
     async getByCodes() {
       let data = await getByCodes(JSON.stringify(this.dic_key));
       this.dic_SelectList = this.$common.handleDicList(data);
@@ -214,7 +271,20 @@ export default {
     /**
      * 上传图片
      */
-
+    openPicker() {
+      this.showPicker = true;
+    },
+    closePicker() {
+      this.showPicker = false;
+    },
+    getName() {
+      console.log(123, this.name);
+      let that = this;
+      getDispatchToPerson({ name: this.name, groupId: "" }).then((res) => {
+        that.columns = res.data;
+        that.$forceUpdate();
+      });
+    },
     afterRead(event) {
       let that = this;
       const { file } = event.detail;
@@ -238,7 +308,7 @@ export default {
           that.$forceUpdate();
           console.log(that.fileUrlList);
         },
-        fail(res) {},
+        fail(res) { },
       });
     },
     submit() {
@@ -262,12 +332,7 @@ export default {
       }
 
       that.form.fileUrl = fileUrlList ? fileUrlList.join(",") : [];
-      that.form.userId =
-        localStorageInfo.id +
-        "-" +
-        localStorageInfo.truename +
-        "-" +
-        localStorageInfo.phone;
+      that.form.userId = localStorageInfo.id
       that.form.serviceType = this.quickSleced.value;
       that.form.createdBy = localStorageInfo.id;
       addRepair(that.form).then((res) => {
@@ -278,7 +343,7 @@ export default {
         // });
       });
     },
-    changePosition(val) {},
+    changePosition(val) { },
   },
 };
 </script>
@@ -287,6 +352,15 @@ export default {
 //   width: 50%;
 //   float: left;
 // }
+.list-row1 {
+  width: calc(100% - 64rpx);
+  padding: 16rpx 32rpx 18rpx 32rpx;
+  background: #ffffff;
+  display: flex;
+  //height: 278rpx;
+  border-radius: 8rpx 8rpx 8rpx 8rpx;
+}
+
 .custom-item-tit {
   height: 13.333vw;
   font-size: 4.267vw;
@@ -301,9 +375,11 @@ export default {
   -ms-flex-align: center;
   align-items: center;
   box-sizing: border-box;
+
   .tit {
     padding-left: 2.667vw;
     position: relative;
+
     &::after {
       content: "";
       width: 0.8vw;
@@ -318,6 +394,7 @@ export default {
     }
   }
 }
+
 .fixed-page-content {
   width: 100%;
   height: 100%;
@@ -325,21 +402,26 @@ export default {
   box-sizing: border-box;
   overflow-y: auto;
 }
+
 .icon-daichulihetong:before {
   content: "\e639";
 }
+
 .repair-box-add {
   width: 100%;
   height: 100%;
+
   .page-1 {
     font-size: 30rpx;
     color: #6600ff;
     padding: 30rpx;
     box-sizing: border-box;
+
     .page-1-head {
       display: flex;
       align-items: center;
       justify-content: flex-end;
+
       i {
         font-size: 38rpx;
         margin-right: 10rpx;
@@ -353,12 +435,14 @@ export default {
       border-radius: 10rpx;
       background: $page-color-base;
       box-sizing: border-box;
+
       textarea {
         height: 60rpx;
       }
     }
   }
 }
+
 .custom-input-box {
   height: 80rpx;
   color: $text3;
@@ -374,6 +458,7 @@ export default {
     line-height: 80rpx;
     box-sizing: border-box;
   }
+
   input {
     width: 100%;
     height: 100%;
@@ -384,12 +469,14 @@ export default {
     box-sizing: border-box;
   }
 }
+
 .cell-item {
   color: #333;
   padding: 30rpx 0;
   display: flex;
   justify-content: space-between;
   position: relative;
+
   &::after {
     position: absolute;
     box-sizing: border-box;
@@ -402,15 +489,19 @@ export default {
     -webkit-transform: scaleY(0.5);
     transform: scaleY(0.5);
   }
+
   .label {
     flex: 1;
     width: 30%;
+
     .tips {
       font-size: 22rpx;
       color: #dddddd;
     }
+
     &.required {
       position: relative;
+
       &::after {
         content: "*";
         color: #fd4e4e;
@@ -421,6 +512,7 @@ export default {
       }
     }
   }
+
   .tit {
     color: #333;
     flex: 1;
@@ -428,32 +520,39 @@ export default {
     text-align: right;
   }
 }
+
 .white-box {
   width: 100%;
   font-size: 28rpx;
   padding: 0 40rpx;
   background-color: #ffffff;
   box-sizing: border-box;
+
   &:not(:last-child) {
     margin-bottom: 30rpx;
   }
+
   .flex-item {
     align-items: center;
+
     .tel-box {
       display: flex;
       align-items: center;
       justify-content: flex-end;
+
       .custom-tel-component {
         margin-left: 20rpx;
       }
     }
   }
+
   .cell-item {
     color: #333;
     padding: 30rpx 0;
     display: flex;
     justify-content: space-between;
     position: relative;
+
     &::after {
       position: absolute;
       box-sizing: border-box;
@@ -466,9 +565,11 @@ export default {
       -webkit-transform: scaleY(0.5);
       transform: scaleY(0.5);
     }
+
     .label {
       flex: 1;
       width: 30%;
+
       .tips {
         font-size: 22rpx;
         color: #dddddd;
@@ -476,6 +577,7 @@ export default {
 
       &.required {
         position: relative;
+
         &::after {
           content: "*";
           color: var#fd4e4e;
@@ -486,6 +588,7 @@ export default {
         }
       }
     }
+
     .tit {
       color: #333;
       flex: 1;
@@ -493,10 +596,12 @@ export default {
       text-align: right;
     }
   }
+
   .block-cell-item {
     color: #333;
     padding: 30rpx 0;
     position: relative;
+
     &::after {
       position: absolute;
       box-sizing: border-box;
@@ -509,11 +614,14 @@ export default {
       -webkit-transform: scaleY(0.5);
       transform: scaleY(0.5);
     }
+
     .label {
       width: 100%;
       padding-bottom: 30rpx;
+
       &.required {
         position: relative;
+
         &::after {
           content: "*";
           color: #fd4e4e;
@@ -523,11 +631,13 @@ export default {
           left: -15rpx;
         }
       }
+
       .tips {
         font-size: 22rpx;
         color: #dddddd;
       }
     }
+
     .tit {
       width: 100%;
       color: #333;
@@ -542,16 +652,19 @@ export default {
       }
     }
   }
+
   .custom-white-box-content {
     padding-bottom: 30rpx;
   }
 }
+
 .custom-select-list {
   color: $color4;
   width: 100%;
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
+
   li {
     font-size: 22rpx;
     margin-bottom: 25rpx;
@@ -563,12 +676,14 @@ export default {
     white-space: nowrap;
     border-radius: 10rpx;
     border: 2rpx solid $text4;
+
     &.active {
       color: $text6;
       border-color: $text6;
     }
   }
 }
+
 .bottom-button {
   position: fixed;
   bottom: 0;
@@ -581,6 +696,7 @@ export default {
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
+
   .btn {
     height: 100%;
     line-height: 80rpx;
@@ -603,8 +719,8 @@ export default {
       width: 100%;
       padding-left: 30rpx;
     }
-    .van-radio__label {
-    }
+
+    .van-radio__label {}
   }
 }
-</style>
+</style>

pages/subPackages/repairDispatch-app/detail.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="repair-detail-box">
-    <div
-      :class="[
-        'repair-content',
-        detailStatus === 'unAcceptance' ? 'fixed-page-content' : 'page-content',
-      ]"
-    >
+    <div :class="[
+      'repair-content',
+      detailStatus === 'unAcceptance' ? 'fixed-page-content' : 'page-content',
+    ]">
       <div class="white-box page-1">
         <div class="cell-item">
           <p class="label">当前企业</p>
@@ -37,12 +35,8 @@
           <p class="label">补充说明</p>
           <div class="tit">
             <ul class="annex-list-box">
-              <li
-                @click="lookLookpng(explainAnnexList, index)"
-                class="annex-item"
-                v-for="(item, index) in explainAnnexList"
-                :key="index"
-              >
+              <li @click="lookLookpng(explainAnnexList, index)" class="annex-item"
+                v-for="(item, index) in explainAnnexList" :key="index">
                 <img :src="item" alt="" />
               </li>
             </ul>
@@ -51,7 +45,7 @@
         <div class="cell-item flex-item">
           <p class="label">填单人</p>
           <p class="tit tel-box">
-            <span>{{ userId2 }}</span>
+            <span>{{ detail.reporter }}</span>
             <TelNum :num="detail.phone" v-if="detail.phone" :showTel="false" />
           </p>
         </div>
@@ -60,142 +54,98 @@
           <p class="tit">{{ detail.createdAt }}</p>
         </div>
       </div>
-      <div
-        class="white-box page-3 form-part"
-        style="margin-bottom: 100rpx; padding-bottom: 100rpx"
-      >
+      <div class="white-box page-3 form-part" style="margin-bottom: 100rpx; padding-bottom: 100rpx">
         <div class="custom-item-tit">
-          <p class="tit">处理情况</p>
+          <span class="tit">
+            <div style="margin-left: 15px;"> 处理情况</div>
+          </span>
         </div>
         <div class="block-cell-item">
           <p class="label">处理进展</p>
           <div class="tit">
-            <van-steps
-              :active="stepActive"
-              :active-color="'#6600FF'"
-              :steps="processSteps"
-            >
+            <van-steps :active="stepActive" :active-color="'#6600FF'" :steps="processSteps">
             </van-steps>
           </div>
         </div>
-        <div
-          v-if="detail.status == 'unAcceptance'"
-          class="cell-item flex-item"
-          style="width: 100%; min-height: 88rpx; padding: 0"
-        >
-          <div class="label">流转/派单</div>
-          <div class="tit">
-            <van-radio-group :value="radio" @change="getRadioStatuts">
-              <van-radio name="流转">流转</van-radio>
-              <van-radio name="派单">派单</van-radio>
-            </van-radio-group>
-          </div>
-        </div>
-        <div
-          v-if="detail.status == 'unAcceptance' && radio == '派单'"
-          class="cell-item flex-item"
-          style="width: 100%; min-height: 88rpx; padding: 0"
-          @click="openPicker()"
-        >
+
+        <div v-if="detail.status == 'unAcceptance'" class="cell-item flex-item"
+          style="width: 100%; min-height: 88rpx; padding: 0" @click="openPicker2()">
           <div class="label">处理人</div>
           <div class="tit">
             {{ detail.handleUserName != null ? detail.handleUserName : "" }}
             <!-- {{ detail.handleUserName == null }} -->
           </div>
         </div>
-        <div
-          v-if="detail.status != 'unAcceptance'"
-          class="cell-item flex-item"
-          style="width: 100%; min-height: 88rpx; padding: 0"
-        >
+        <div v-if="detail.status != 'unAcceptance'" class="cell-item flex-item"
+          style="width: 100%; min-height: 88rpx; padding: 0">
           <div class="label">处理人</div>
-          <div class="tit">
-            {{ detail.handleUserName != null ? detail.handleUserName : "" }}
-            <!-- {{ detail.handleUserName == null }} -->
-          </div>
-        </div>
-        <div
-          v-if="detail.wanderAboutStatus == '未流转' && radio == '流转'"
-          class="cell-item flex-item"
-          style="width: 100%; min-height: 88rpx; padding: 0"
-          @click="openPicker2()"
-        >
-          <div class="label">流转给</div>
-          <div class="tit">
-            {{ wanderAboutUserName != null ? wanderAboutUserName : "" }}
-            <!-- {{ detail.handleUserName == null }} -->
-          </div>
+           <div class="tit">
+           {{ detail.handleUserName != null ? detail.handleUserName : "" }}
+<!--           {{ detail.handleUserName == null }} -->
+           </div>
         </div>
-        <div
-          v-if="detail.wanderAboutStatus != '未流转'"
-          class="cell-item flex-item"
-          style="width: 100%; min-height: 88rpx; padding: 0"
-        >
-          <div class="label">流转给</div>
-          <div class="tit">
-            {{ wanderAboutUserName != null ? wanderAboutUserName : "" }}
-            <!-- {{ detail.handleUserName == null }} -->
+        <div class="hanlderList">
+          <div class="hanlderList-row" v-for="item in handleList">
+            <div>
+              {{ item.handleUserName }}
+            </div>
+            <div class="status-box color7ee47b" v-if="item.status == 1">
+              待处理
+            </div>
+            <div class="status-box color7ee47b" v-if="item.status == 2">
+              待确认
+            </div>
+            <div class="status-box color7ee47b" v-if="item.status == 3">
+              已完成
+            </div>
+            <div class="status-box coloreb8488" v-if="item.status == 4" @click="openPicker(item.id)">
+              已退回
+            </div>
+            <div class="status-box color7ee47b" v-if="item.status == 5">
+              待处理
+            </div>
+            <div class="status-box coloreb8488" v-if="item.status == 6">
+              已作废
+            </div>
           </div>
         </div>
-        <van-popup
-          :show="showPicker"
-          position="bottom"
-          round
-          :closeable="false"
-          :close-on-click-overlay="false"
-        >
+        <van-popup :show="showPicker" position="bottom" round :closeable="false" :close-on-click-overlay="false">
           <div style="display: flex; justify-content: space-between">
             <div style="margin: 32rpx" @click="closePopup()">取消</div>
             <div style="margin: 32rpx" @click="getSelectValue()">确认</div>
           </div>
-          <uni-easyinput
-            v-model="name"
-            placeholder="请输入内容"
-            @confirm="getName"
-            @iconClick="getName"
-            suffixIcon="search"
-          ></uni-easyinput>
+          <uni-easyinput v-model="name" placeholder="请输入内容" @confirm="getName" @iconClick="getName"
+            suffixIcon="search"></uni-easyinput>
 
           <div style="height: 50vh">
-            <div
-              class="list-row1"
-              v-for="(item, index) in columns"
-              :key="index"
-              style="justify-content: space-between"
-            >
+            <van-radio-group :value="theReplacer" @change="getReplacer">
+
+            <div class="list-row1" v-for="(item, index) in columns" :key="index" style="justify-content: space-between">
               {{ item.text }}
-              <van-checkbox
-                :name="item.value"
-                @change="onChange($event, index)"
-                v-model="item.checked"
-              >
-              </van-checkbox>
+              <van-radio  :name="item.value" :value="item.value" >
+<!--                {{item.text}}-->
+              </van-radio>
             </div>
+            </van-radio-group>
+
           </div>
         </van-popup>
 
         <div class="custom-item-tit">
-          <p class="tit">备注</p>
+          <!-- <p class="tit">备注</p> -->
+          <span class="tit">
+            <div style="margin-left: 15px;"> 备注</div>
+          </span>
         </div>
         <div class="custom-textarea-box">
-          <uni-easyinput
-            type="textarea"
-            class="bgcF9F9F9 height218rpx"
-            v-model="params.remark"
-            autoHeight
-            placeholder="请填写"
-            show-word-limit
-            :disabled="detail.status !== 'unAcceptance'"
-          >
+          <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" v-model="params.handleExplain" autoHeight
+            placeholder="请填写" show-word-limit :disabled="detail.status != 'unAcceptance'">
           </uni-easyinput>
         </div>
       </div>
       <!-- -->
-      <div
-        class="white-box page-4"
-        v-if="detailStatus === 'processed' && detail.isUser === 'true'"
-        style="padding-bottom: 120rpx"
-      >
+      <div class="white-box page-4" v-if="detailStatus === 'processed' && detail.isUser === 'true'"
+        style="padding-bottom: 120rpx">
         <div class="custom-item-tit">
           <p class="tit">服务评价</p>
         </div>
@@ -203,80 +153,35 @@
           <div class="evaluate-box">
             <p class="evaluate-left">企业对本次服务的评价</p>
             <div class="evaluate-right">
-              <van-rate
-                :vlaue="evaluateVal"
-                color="#ffd21e"
-                @change="getRate"
-              />
+              <van-rate :vlaue="evaluateVal" color="#ffd21e" @change="getRate" />
             </div>
           </div>
         </div>
       </div>
     </div>
     <!--       v-if="detailStatus === 'processed' && detail.isUser === 'true'" -->
-    <div
-      class="repair-bottom bottom-button"
-      v-if="detailStatus === 'processed' && detail.isUser === 'true'"
-    >
-      <button class="btn" @click="onPinConfirm">评价提交</button>
-    </div>
-    <div
-      class="repair-bottom bottom-button"
-      v-if="
-        detail.status === 'unAcceptance' && detail.wanderAboutStatus == '未流转'
-      "
-    >
-      <button class="btn" @click="onConfirm()" v-if="radio == '派单'">
-        派单
-      </button>
-
-      <button
-        class="btn"
-        @click="editWanderAboutStatus()"
-        v-if="radio == '流转'"
-      >
-        流转
-      </button>
+    <div class="repair-bottom bottom-button" v-if="stepActive==0">
+      <button class="btn" @click="submit">提交</button>
     </div>
-    <van-popup
-      :show="showPicker2"
-      position="bottom"
-      round
-      :closeable="false"
-      :close-on-click-overlay="false"
-    >
+    <van-popup :show="showPicker2" position="bottom" round :closeable="false" :close-on-click-overlay="false">
       <div style="display: flex; justify-content: space-between">
         <div style="margin: 32rpx" @click="closePopup2()">取消</div>
         <div style="margin: 32rpx" @click="getSelectValue2()">确认</div>
       </div>
-      <uni-easyinput
-        v-model="name2"
-        placeholder="请输入内容"
-        @confirm="getName2"
-        @iconClick="getName2"
-        suffixIcon="search"
-      ></uni-easyinput>
+      <uni-easyinput v-model="name2" placeholder="请输入内容" @confirm="getName2" @iconClick="getName2"
+                     suffixIcon="search"></uni-easyinput>
 
       <div style="height: 50vh">
-        <div
-          class="list-row1"
-          v-for="(item, index) in columns2"
-          :key="index"
-          style="justify-content: space-between"
-        >
+        <div class="list-row1" v-for="(item, index) in columns2" :key="index" style="justify-content: space-between">
           {{ item.text }}
-          <van-checkbox
-            :name="item.value"
-            @change="onChange($event, index)"
-            v-model="item.checked"
-          >
+          <van-checkbox :name="item.value" :value="item.value" @change="onChange($event, index)" v-model="item.checked">
           </van-checkbox>
         </div>
       </div>
     </van-popup>
   </div>
 </template>
-  <script>
+<script>
 import vanPopup from "../../../wxcomponents/weapp/dist/popup/index";
 import vanRate from "../../../wxcomponents/weapp/dist/rate/index";
 import TelNum from "../../subPackages/components/tel-number";
@@ -288,6 +193,10 @@ import {
   getDispatchToPerson,
   editRepair,
   editWanderAboutStatus,
+  getInfoListByRepairId,
+  dispatchType,
+  dispatchCancel,
+  handleList
 } from "@/js_sdk/http";
 import Toast from "../../../wxcomponents/weapp/dist/toast/toast";
 // import Base from "@/pages/base/base";
@@ -302,6 +211,8 @@ export default {
   },
   data() {
     return {
+
+      theReplacer:'',
       radio: "流转",
       columns2: [],
       name2: "",
@@ -347,11 +258,11 @@ export default {
           status: 1,
           text: "已处理",
         },
-        // {
-        //   id: 4,
-        //   status: 0,
-        //   text: "评价",
-        // },
+        {
+          id: 4,
+          status: 0,
+          text: "已确认",
+        },
       ], // 处理流程
       evaluateVal: 0, // 评分
       id: "",
@@ -367,6 +278,8 @@ export default {
       },
       lzPopuStatus: false,
       userId2: "",
+      handleList: [],
+      reportRepairInfoId:null,
       params: {
         id: "",
         status: "acceptance",
@@ -388,6 +301,7 @@ export default {
     this.id = option.id;
 
     this.getByCodes();
+    this.getInfoListByRepairId()
     getDispatchToPerson({ groupId: "", name: "" }).then((res) => {
       this.columns = res.data;
     });
@@ -396,8 +310,39 @@ export default {
       console.log(this.columns2);
       console.log(res.data);
     });
+
   },
   methods: {
+
+    async submit() {
+      let that = this
+      let ischeck = this.columns2.some(item => item.checked);
+      console.log(ischeck)
+
+      if(!ischeck){
+        that.$showToast("请至少选择一个处理人");
+        return
+      }
+      let param = {
+        dispatchType: 1,
+        id: that.id,
+        handleUserId: that.handleUserIds,
+        userId: getUserLocalStorageInfo().user.id,
+        handleExplain:that.params.handleExplain
+      }
+      let data = await dispatchType(param)
+      // that.getInfoListByRepairId()
+      console.log(data)
+      if(data.code == 200) {
+        that.$showToast('提交成功');
+        uni.navigateBack({});
+      }
+    },
+    async getInfoListByRepairId() {
+      let { data } = await getInfoListByRepairId(this.id)
+      console.log('getInfoListByRepairId', data)
+      this.handleList = data.length > 0 ? data : []
+    },
     getRadioStatuts(e) {
       this.radio = e.detail;
       console.log(e);
@@ -472,18 +417,44 @@ export default {
         },
       });
     },
-    openPicker() {
-      this.showPicker = true;
-    },
     openPicker2() {
       this.showPicker2 = true;
     },
+     openPicker(e=null) {
+      console.log(e);
+      let that = this;
+      that.reportRepairInfoId = e ? e : null;
+
+      uni.showModal({
+        title: '提示',
+        content: '当前派单已被退回，请完成后续处理',
+        confirmText:'重新派单',
+        cancelText:'任务作废',
+        cancelColor:'red',
+        success: async function (res) {
+          if (res.confirm) {
+            that.showPicker = true;
+          } else if (res.cancel) {
+            console.log('用户点击取消');
+            let data = await dispatchCancel({
+              dispatchType:2,
+              reportRepairId:that.id,
+              // handleUserId:that.theReplacer,
+              userId: getUserLocalStorageInfo().user.id,
+              id:that.reportRepairInfoId,
+            })
+            that.getInfoListByRepairId()
+            that.$showToast("派单已作废");
+          }
+        }
+      });
+
+    },
+
     closePicker() {
       this.showPicker = false;
     },
-    closePicker2() {
-      this.showPicker2 = false;
-    },
+
     async getByCodes() {
       let data = await getByCodes(JSON.stringify(this.dic_key));
       this.dic_SelectList = this.$common.handleDicList(data);
@@ -495,88 +466,75 @@ export default {
       this.params.handleUserId = val.value + "-" + val.text;
       this.showPicker = false;
     },
-    onChange2(event, i) {
-      console.log(event);
-      console.log(i);
-      this.columns2[i].checked = event.detail;
-    },
+
     onChange(event, i) {
-      console.log(event);
-      console.log(i);
-      this.columns[i].checked = event.detail;
+      console.log(event.detail);
+      // console.log(i);
+      this.columns2[i].checked = event.detail ;
     },
-    getSelectValue2() {
-      let that = this;
 
-      try {
-        let wanderAboutUserId = [];
-        let wanderAboutUserName = [];
-        for (let i = 0; i < that.columns2.length; i++) {
-          const element = that.columns2[i];
-          if (element.checked) {
-            wanderAboutUserName.push(element.text);
-            wanderAboutUserId.push(element.value);
-          }
-        }
-        let AllwanderAboutUserName = Array.from(
-          new Set(
-            wanderAboutUserName.concat(
-              that.wanderAboutUserName.length > 0
-                ? that.wanderAboutUserName.split(",")
-                : []
-            )
-          )
-        );
-        let AllHandleUserIds = Array.from(
-          new Set(
-            wanderAboutUserId.concat(
-              that.wanderAboutUserId.length > 0
-                ? that.wanderAboutUserId.split(",")
-                : []
-            )
-          )
-        );
-        that.wanderAboutUserName = AllwanderAboutUserName.toString();
-        that.wanderAboutUserId = AllHandleUserIds.toString();
-        that.$forceUpdate();
-        that.showPicker2 = false;
-      } catch (error) {
-        console.log(error);
-      }
-    },
-    getSelectValue() {
+async getSelectValue2() {
+      let that = this;
       let handleUserNames = [];
       let handleUserIds = [];
-      for (let i = 0; i < this.columns.length; i++) {
-        const element = this.columns[i];
+
+
+      for (let i = 0; i < this.columns2.length; i++) {
+        const element = this.columns2[i];
         if (element.checked) {
           handleUserNames.push(element.text);
+          console.log(element.value)
           handleUserIds.push(element.value);
         }
       }
-      console.log(this.handleUserNames.split(","));
-      let AllHandleUserNames = Array.from(
-        new Set(
-          handleUserNames.concat(
-            this.handleUserNames.length > 0
-              ? this.handleUserNames.split(",")
-              : []
-          )
-        )
-      );
-      console.log(AllHandleUserNames);
-      let AllHandleUserIds = Array.from(
-        new Set(
-          handleUserIds.concat(
-            this.handleUserIds.length > 0 ? this.handleUserIds.split(",") : []
-          )
-        )
-      );
-      this.detail.handleUserName = AllHandleUserNames.toString();
-      this.params.handleUserId = AllHandleUserIds.toString();
-      console.log(this.columns);
-      this.$forceUpdate();
-      this.showPicker = false;
+      that.handleUserIds=handleUserIds.join(",")
+      that.detail.handleUserName=handleUserNames.join(",")
+      that.showPicker2 = false;
+
+
+
+      // this.showPicker2 = false;
+
+    },
+    onChange2(event, i) {
+      console.log(event);
+      console.log(i);
+      this.columns2[i].checked = event.detail;
+    },
+    async getSelectValue() {
+
+      let that = this;
+      if(!that.theReplacer){
+        that.$showToast('请选择替换的处理人')
+        return
+      }
+      console.log(that.theReplacer)
+      let index = that.handleList.findIndex((row)=>{
+        return that.theReplacer===row.handleUserId
+      })
+      if(index != -1) {
+        that.$showToast('该处理人已在列表中请勿重复选择')
+        return
+      }
+      let param = {
+        dispatchType:2,
+        id:this.id,
+        handleUserId:that.theReplacer,
+        userId: getUserLocalStorageInfo().user.id,
+        reportRepairInfoId:that.reportRepairInfoId,
+      }
+      let {data } =await dispatchType(param)
+      that.getInfoListByRepairId()
+
+      that.showPicker = false;
+    },
+    getReplacer(e){
+      let that = this;
+      console.log(e.detail)
+      that.theReplacer=e.detail;
+      console.log(that.theReplacer)
+      // console.log(this.handleList)
+      // handleUserId
     },
     onPinConfirm(value) {
       this.pingParams.evaluateNum = this.pingParams.evaluateNum + 1;
@@ -628,18 +586,21 @@ export default {
           this.wanderAboutUserName = det.wanderAboutUserName
             ? det.wanderAboutUserName
             : "";
-          console.log("this.wanderAboutUserName", this.wanderAboutUserName);
           this.params.handleUserId = det.handleUserId;
+          console.log('det',det)
+          this.params.handleExplain=res.data.handleExplain
+          console.log("this.wanderAboutUserName", this.params.handleExplain);
+
           this.value = det.dispatchUserId;
           if (det.handleUserId != null && det.handleUserId !== "") {
             const test = det.handleUserId.split("-");
             this.value = test[1] + "-" + test[2];
           }
-          if (det.userId != null && det.userId !== "") {
-            const test = det.userId.split("-");
-            this.userId2 = test[1] + "-" + test[2];
-          }
-          this.params.remark = det.remark == "null" ? "" : det.remark;
+
+          // if (det.userId != null && det.userId !== "") {
+          //   const test = det.userId.split("-");
+          //   this.userId2 = test[1] + "-" + test[2];
+          // }
           this.pingParams = {
             id: det.id,
             evaluateNum: det.evaluateNum,
@@ -727,7 +688,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss" >
+<style lang="scss">
 .list-row1 {
   width: calc(100% - 64rpx);
   padding: 16rpx 32rpx 18rpx 32rpx;
@@ -736,6 +697,30 @@ export default {
   //height: 278rpx;
   border-radius: 8rpx 8rpx 8rpx 8rpx;
 }
+
+.hanlderList {
+  .hanlderList-row {
+    background-color: #fcf9ff;
+    display: flex;
+    padding: 10rpx 20rpx;
+    justify-content: space-between;
+  }
+
+  .status-box {
+    padding: 5rpx 10rpx;
+    border-radius: 1.5rem;
+    color: white;
+  }
+
+  .color7ee47b {
+    background-color: #7ee47b;
+  }
+
+  .coloreb8488 {
+    background-color: #eb8488;
+  }
+}
+
 .bottom-button {
   position: fixed;
   z-index: 99;
@@ -749,6 +734,7 @@ export default {
   align-items: center;
   justify-content: space-around;
   box-sizing: border-box;
+
   .btn {
     height: 100%;
     line-height: 80rpx;
@@ -759,11 +745,14 @@ export default {
     border-radius: 10rpx;
   }
 }
+
 .titname {
   margin-top: 10rpx;
   margin-bottom: 10rpx;
 }
+
 .repair-detail-box {
+
   //   width: 100%;
   //   height: 100%;
   .page-1 {
@@ -777,9 +766,11 @@ export default {
 
   .page-3 {
     padding-bottom: 100rpx;
+
     .input-item {
       padding: 0;
     }
+
     .custom-item-tit {
       height: 13.333vw;
       font-size: 4.267vw;
@@ -797,6 +788,7 @@ export default {
       align-items: center;
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
+
       .tit {
         &::after {
           content: "";
@@ -812,11 +804,13 @@ export default {
         }
       }
     }
+
     .tit {
-      padding-left: 2.667vw;
+      // padding-left: 2.667vw;
       position: relative;
     }
   }
+
   .page-4 {
     .custom-item-tit {
       height: 13.333vw;
@@ -835,6 +829,7 @@ export default {
       align-items: center;
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
+
       .tit {
         &::after {
           content: "";
@@ -850,10 +845,12 @@ export default {
         }
       }
     }
+
     .tit {
       padding-left: 2.667vw;
       position: relative;
     }
+
     s .evaluate-box {
       padding: 20rpx 30rpx;
       background: $page-color-base;
@@ -865,15 +862,18 @@ export default {
       box-sizing: border-box;
     }
   }
+
   .annex-list-box {
     display: flex;
     flex-wrap: wrap;
+
     &::after {
       display: block;
       content: "";
       width: 30%;
       height: 0rpx;
     }
+
     .annex-item {
       width: 240rpx;
       height: 240rpx;
@@ -881,7 +881,8 @@ export default {
       margin-bottom: 20rpx;
       position: relative;
       overflow: hidden;
-      > img {
+
+      >img {
         width: 240rpx;
         height: 240rpx;
         position: absolute;
@@ -892,22 +893,25 @@ export default {
         margin: auto;
         display: block;
       }
+
       video {
         width: 100%;
         height: 100%;
       }
     }
   }
+
   .tel-box {
     display: flex;
     align-items: center;
+
     /deep/ .custom-tel-component {
       margin-left: 20rpx;
     }
   }
 }
 </style>
-  <style lang="scss">
+<style lang="scss">
 .image-repairDispatch-box {
   .van-image-preview__close-icon {
     color: #fff;
@@ -915,4 +919,3 @@ export default {
   }
 }
 </style>
-  

pages/subPackages/repairDispatch-app/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="repair">
     <div class="top-add" @click="goNavigator()">
@@ -6,18 +5,14 @@
       <span class="txt">新增派单</span>
     </div>
     <div class="info-repairList2">
-      <div
-        class="info-item"
-        v-for="item in recordList"
-        :key="item.id"
-        @click="jumpPageDetails(item.id)"
-      >
-        <div v-if="item.wanderAboutStatus == '未流转'" class="lz-status-no">
-          {{ item.wanderAboutStatus }}
-        </div>
-        <div class="lz-status" v-if="item.wanderAboutStatus == '已流转'">
-          {{ item.wanderAboutStatus }}
+      <div class="info-item" v-for="item in recordList" :key="item.id" @click="jumpPageDetails(item.id)">
+        <div   class="lz-status-no" v-if="item.returnFlag=='1'">
+          有退回
         </div>
+<!--        <div class="lz-status" v-if>-->
+<!--          有退回-->
+
+<!--        </div>-->
 
         <div class="info-top">
           <div class="left">
@@ -38,16 +33,8 @@
             </span>
           </div>
           <div class="right">
-            <span
-              v-if="item.status == 'unAcceptance'"
-              class="normal-tip yd h-bg"
-              >待派单</span
-            >
-            <span
-              v-if="item.status != 'unAcceptance'"
-              class="normal-tip yd z-bg"
-              >已派单</span
-            >
+            <span v-if="item.status == 'unAcceptance'" class="normal-tip yd h-bg">待派单</span>
+            <span v-if="item.status != 'unAcceptance'" class="normal-tip yd z-bg">已派单</span>
           </div>
         </div>
       </div>
@@ -65,8 +52,8 @@ export default {
       dic_SelectList: {},
       recordList: [],
       params: {
-        // pageNum: 1,
-        // pageSize: 10,
+        pageNum: 1,
+        pageSize: 10,
         // groupId: "870261874875170816",
         // createdBy: '877225455206268928' // auth.currUser().id
       },
@@ -97,7 +84,7 @@ export default {
     //   window.addEventListener("popstate", this.goBack, false);
     // }
   },
-  onLoad() {},
+  onLoad() { },
   onShow() {
     this.getByCodes();
   },
@@ -126,7 +113,7 @@ export default {
       repairList2(this.params).then((res) => {
         if (res.data) {
           _this.recordList = [];
-          res.data.forEach(function (item) {
+          res.data.rows.forEach(function (item) {
             const jsonMap = _this.getItemJson(item);
 
             _this.recordList.push(jsonMap);
@@ -239,8 +226,9 @@ export default {
     text-align: center;
     font-size: 20rpx;
   }
+
   .lz-status-no {
-    background-color: rgb(207, 207, 110);
+    background-color: #eb8488;
     padding: 5px;
     width: 50px;
     position: absolute;
@@ -249,17 +237,20 @@ export default {
     text-align: center;
     font-size: 20rpx;
   }
+
   .top-add {
     background-color: #fff;
     padding: 30rpx;
     margin-bottom: 20rpx;
     text-align: right;
     box-shadow: 0rpx 5rpx 10rpx 0rpx rgba(0, 0, 0, 0.05);
+
     i {
       font-size: 36rpx;
       color: $text6;
       margin-right: 15rpx;
     }
+
     .txt {
       font-size: 32rpx;
       color: $text6;
@@ -269,27 +260,33 @@ export default {
   .info-repairList2 {
     height: calc(100vh - 124rpx);
     overflow-y: auto;
+
     .info-item {
       position: relative;
       background-color: #fff;
       padding: 20rpx 30rpx;
       margin-bottom: 20rpx;
+
       .info-top {
         @include flex;
+
         .left {
           width: 286rpx;
           height: 168rpx;
           font-size: 0;
           border-radius: 10rpx;
           overflow: hidden;
+
           img {
             width: 100%;
             height: 100%;
           }
         }
+
         .right {
           align-self: flex-start;
           width: 380rpx;
+
           .tit {
             width: 380rpx;
             font-size: 32rpx;
@@ -299,6 +296,7 @@ export default {
             @include line-clamp;
             margin-bottom: 20rpx;
           }
+
           .txt {
             font-size: 28rpx;
             color: #666;
@@ -311,19 +309,21 @@ export default {
         padding-top: 20rpx;
         border-top: 1rpx dashed #dbdbdb;
         @include flex;
+
         .left {
           i {
             font-size: 30rpx;
             color: #999999;
             margin-left: 10rpx;
           }
+
           span {
             font-size: 28rpx;
             color: #999999;
           }
         }
-        .right {
-        }
+
+        .right {}
       }
     }
   }

pages/subPackages/repairprocessing-app/detail.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="repair-detail-box">
-    <div
-      :class="[
-        'repair-content',
-        detailStatus === 'unAcceptance' ? 'fixed-page-content' : 'page-content',
-      ]"
-    >
+    <div :class="[
+      'repair-content',
+      detailStatus === 'unAcceptance' ? 'fixed-page-content' : 'page-content',
+    ]">
       <div class="white-box page-1">
         <div class="cell-item">
           <p class="label">当前企业</p>
@@ -36,16 +34,14 @@
         <div class="block-cell-item">
           <p class="label">补充说明</p>
           <div class="tit">
-            <ul class="annex-list-box">
-              <li
-                class="annex-item"
-                v-for="(item, index) in explainAnnexList"
-                :key="index"
-              >
-                {{ item }}
-                <img :src="item" alt="" />
-              </li>
-            </ul>
+<!--            <ul class="annex-list-box">-->
+<!--              <li class="annex-item" v-for="(item, index) in explainAnnexList" :key="index">-->
+<!--&lt;!&ndash;                {{ item }}&ndash;&gt;-->
+<!--                <img :src="item" alt="" />-->
+<!--              </li>-->
+              <van-uploader :file-list="explainAnnexList" disabled class="infoUpload"/>
+
+<!--            </ul>-->
           </div>
         </div>
         <div class="cell-item flex-item">
@@ -53,19 +49,15 @@
           <p class="tit tel-box">
             <span>{{ detail.contact }}</span>
             <!-- {{ detail.phone }} -->
-            <TelNum
-              :num="detail.contact"
-              :showTel="false"
-              v-if="detail.contact && detail.contact.length > 0"
-            />
+            <TelNum :num="detail.contact" :showTel="false" v-if="detail.contact && detail.contact.length > 0" />
           </p>
         </div>
         <div class="cell-item flex-item">
-          <p class="label">报事人</p>
+          <p class="label">报事人</p>，
           <p class="tit tel-box">
-            <span>{{ userId2 }}</span>
+            <span>{{ detail.reporter }}</span>
             <!-- {{ detail.phone }} -->
-            <TelNum :num="detail.phone" :showTel="false" />
+            <!-- <TelNum :num="detail.phone" :showTel="false" /> -->
           </p>
         </div>
         <div class="cell-item">
@@ -75,16 +67,22 @@
       </div>
       <div class="white-box page-3 form-part" style="padding-bottom: 120px">
         <div class="custom-item-tit">
-          <p class="tit">处理情况</p>
+          <div class="tit">
+            <div style="padding-left: 15rpx;">
+              处理情况
+            </div>
+          </div>
         </div>
         <div class="block-cell-item">
-          <p class="label">处理进展</p>
+          <div class="label" style="    display: flex;
+    justify-content: space-between;
+    align-items: center;">
+            <p>处理进展</p>
+            <van-button type="warning" size="mini" @click="orderOut()">处理退回</van-button>
+
+          </div>
           <div>
-            <van-steps
-              :active="stepActive"
-              :active-color="'#6600FF'"
-              :steps="processSteps"
-            >
+            <van-steps :active="stepActive" :active-color="'#6600FF'" :steps="processSteps">
             </van-steps>
           </div>
         </div>
@@ -102,7 +100,7 @@
           <p class="label">备注</p>
           <div class="tit">
             <div class="textarea">
-              {{ detail.remark == "null" ? "暂无" : detail.remark }}
+              {{ detail.handleExplain == "null"||!detail.handleExplain || detail.handleExplain == "undefind" ? "暂无" : detail.handleExplain }}
             </div>
           </div>
         </div>
@@ -111,41 +109,23 @@
           <p class="label">
             处理后拍照<span class="tips">（支持图片上传限20M内，最多6张）</span>
           </p>
-          <div class="tit" v-if="detail.status === 'acceptance'">
-            <van-uploader
-              @delete="deleteRYXXZP"
-              :file-list="handleUrlList"
-              :max-count="6"
-              @after-read="afterRead"
-              :show-upload="true"
-            >
+          <div class="tit" >
+            <van-uploader @delete="deleteRYXXZP"   :file-list="handleUrlList" :max-count="6" @after-read="afterRead"
+              :show-upload="true">
             </van-uploader>
           </div>
-          <div class="tit" v-else>
-            <ul class="annex-list-box">
-              <li
-                class="annex-item"
-                v-for="(item, index) in handleUrlList"
-                :key="index"
-              >
-                <img :src="item.url" alt="" />
-              </li>
-            </ul>
-          </div>
+
         </div>
         <div class="custom-item-tit">
-          <p class="tit">处理说明</p>
+          <div class="tit">
+            <div style="margin-left: 15rpx;">
+              处理说明
+            </div>
+          </div>
         </div>
         <div class="custom-textarea-box">
-          <uni-easyinput
-            :disabled="detail.status !== 'acceptance'"
-            type="textarea"
-            class="bgcF9F9F9 height218rpx"
-            v-model="detail.handleExplain"
-            autoHeight
-            placeholder="请填写"
-            show-word-limit
-          >
+          <uni-easyinput :disabled="detail.status !== '1'&&detail.status!=2" type="textarea" class="bgcF9F9F9 height218rpx"
+            v-model="params.remark" autoHeight placeholder="请填写" show-word-limit>
           </uni-easyinput>
         </div>
         <div class="cell-item">
@@ -159,11 +139,8 @@
         </div>
       </div>
     </div>
-    <div
-      class="repair-bottom bottom-button"
-      v-if="detail.status === 'acceptance'"
-    >
-      <button class="btn" @click="onConfirm">提交</button>
+    <div class="repair-bottom bottom-button" v-if="detail.status == '1'||detail.status==2">
+      <button class="btn" @click="onConfirm">{{detail.status==2?'编辑':'提交'}}</button>
     </div>
   </div>
 </template>
@@ -172,10 +149,12 @@ import TelNum from "../../subPackages/components/tel-number";
 import vanRate from "../../../wxcomponents/weapp/dist/rate";
 import {
   editRepair,
-  getRepairDispatchById,
+  getHandleInfoById,
   getByCodes,
   getUserLocalStorageInfo,
+  handleReportBack
 } from "@/js_sdk/http";
+import {editReportInfo} from "../../../js_sdk/http";
 // import Base from '@/pages/base/base'
 // import { editRepair } from '@/service/api_repair'
 // import { Toast } from 'vant'
@@ -217,11 +196,11 @@ export default {
           status: 1,
           text: "已处理",
         },
-        // {
-        //   id: 4,
-        //   status: 0,
-        //   text: "评价",
-        // },
+        {
+          id: 4,
+          status: 0,
+          text: "已确认",
+        },
       ], // 处理流程
       evaluateVal: 0, // 评分
       id: "",
@@ -240,6 +219,42 @@ export default {
     this.getByCodes();
   },
   methods: {
+    deleteRYXXZP(e){
+      console.log(e.detail.file.id)
+      let index = this.handleUrlList.findIndex((row)=>{
+        return row.id == e.detail.file.id;
+      });
+      console.log('deleteRYXXZP',index)
+      let handleUrlList= JSON.parse(JSON.stringify(this.handleUrlList));
+      handleUrlList.splice(index, 1);
+      this.handleUrlList= handleUrlList
+    },
+    async orderOut() {
+      let _this = this
+      console.log(_this.detail.reportRepairId)
+      wx.showModal({
+        title: '提示',
+        confirmText: '退回',
+        content: '是否退回到派单阶段？',
+        success: async function (e) {
+          if (e.confirm) {
+            let outData = {
+              id: _this.id,
+              reportRepairId: _this.detail.reportRepairId,
+              userId: getUserLocalStorageInfo().user.id
+            }
+            let data = await handleReportBack(outData)
+            if (data.code == 200) {
+              _this.$showToast('退回成功');
+              uni.navigateBack({});
+            }
+            // 用户点击了确定 可以调用删除方法了
+          } else if (e.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    },
     async getByCodes() {
       let data = await getByCodes(JSON.stringify(this.dic_key));
       this.dic_SelectList = this.$common.handleDicList(data);
@@ -251,44 +266,76 @@ export default {
       this.showPicker = false;
     },
     onConfirm(value) {
-      if (!this.detail.handleExplain || this.detail.handleExplain.length == 0) {
-        this.$showToast("请填写处理说明");
-        return;
-      }
-      this.params.id = this.id;
-      //   handleUrlList
-      this.params.handleTime = this.detail.handleTime;
-      //   this.params.handleUrlList = this.params.handleUrlList.join(",");
-      let handleUrlList = [];
-      if (this.handleUrlList && this.handleUrlList.length > 0) {
-        handleUrlList = this.handleUrlList.map((e) => {
-          return e.id;
-        });
-      }
-      this.params.handleExplain = this.detail.handleExplain;
-      this.params.updatedBy = getUserLocalStorageInfo().user.id;
-      this.params.handleUrl = handleUrlList.join(",");
-      editRepair(this.params).then((res) => {
-        this.$showToast("结案成功");
-        uni.switchTab({
-          url: "/pages/index/index",
-        });
-        // this.$router.push({ path: "/repairprocessing-app" });
+      let that = this;
+      uni.showModal({
+        title: '提示',
+        content: '是否确认提交',
+        success: function (res) {
+          if (res.confirm) {
+            if (!that.params.remark || that.params.remark.length == 0) {
+              that.$showToast("请填写处理说明");
+              return;
+            }
+            that.params.id = that.id;
+            //   handleUrlList
+            that.params.handleTime = that.detail.handleTime;
+            //   this.params.handleUrlList = this.params.handleUrlList.join(",");
+            let handleUrlList = [];
+            if (that.handleUrlList && that.handleUrlList.length > 0) {
+              handleUrlList = that.handleUrlList.map((e) => {
+                return e.id;
+              });
+            }
+            // console.log(this.handleUrlList);
+            // console.log(handleUrlList.join(","))
+            // return;
+            that.params.handleExplain = that.detail.handleExplain;
+            that.params.updatedBy = getUserLocalStorageInfo().user.id;
+            that.params.handleUrl = handleUrlList.join(",");
+            that.params.userId = getUserLocalStorageInfo().user.id;
+            if(that.detail.status==2){
+              let params = {...that.params}
+              delete params.status;
+              editReportInfo(params).then((res) => {
+                debugger
+                that.$showToast("结案成功");
+                uni.switchTab({
+                  url: "/pages/index/index",
+                });
+                // this.$router.push({ path: "/repairprocessing-app" });
+              });
+            }else{
+              let params = {...that.params}
+              delete params.status;
+              editRepair(params).then((res) => {
+                that.$showToast("结案成功");
+                uni.switchTab({
+                  url: "/pages/index/index",
+                });
+                // this.$router.push({ path: "/repairprocessing-app" });
+              });
+            }
+          } else if (res.cancel) {
+            console.log('用户点击取消');
+          }
+        }
       });
+
+
     },
     getDetailById() {
       const _this = this;
-      getRepairDispatchById(_this.id).then((res) => {
+      getHandleInfoById(_this.id).then((res) => {
         console.log(res.data);
         if (res.data) {
           let det = _this.getItemJson(res.data);
           this.detail = det;
           this.detail.handleExplain = det.handleExplain;
-          if (det.userId != null && det.userId !== "") {
-            const test = det.userId.split("-");
-            this.detail.phone = test[2];
-            this.userId2 = test[1] + "-" + test[2];
-          }
+          // if (det.userId != null && det.userId !== "") {
+          //   const test = det.userId.split("-");
+          //   this.detail.phone = test[2];
+          //   this.userId2 = test[1] + "-" + test[2];
+          // }
           if (det.dispatchUserId != null && det.dispatchUserId !== "") {
             const test = det.dispatchUserId.split("-");
             console.log(test);
@@ -300,10 +347,21 @@ export default {
 
             this.handleUserId2 = det.handleUserName;
           }
-
+          console.log('det.handleUrlList',det.handleUrlList)
           this.handleUrlList = det.handleUrlList;
-          console.log("asodmqowndonq", this.handleUrlList);
-          this.explainAnnexList = det.fileUrlViewList;
+          if(det.fileUrl&&det.fileUrl.length > 0) {
+            this.explainAnnexList = det.fileUrl.split(',').map(e => {
+              return{
+                url:this.$constant.BASE_URI + "/wx/fileController/download/" + e,
+                id:e,
+                isImage: true,
+                deletable: false,
+              }
+            });
+          }
+
+          console.log("asodmqowndonq", this.explainAnnexList);
+
           //   this.processedAnnexList = det.handleUrlList;
           this.detailStatus = det.status;
           this.params.remark = det.remark;
@@ -311,50 +369,58 @@ export default {
       });
     },
     getItemJson: function (item) {
-      const fileUrls = item.fileUrl ? item.fileUrl.split(",") : [];
-
-      const fileUrlViews = [];
-      if (fileUrls !== null && fileUrls.length > 0) {
-        fileUrls.forEach((item) => {
-          item =
-            this.$constant.BASE_URI + "/wx/fileController/download/" + item;
-          fileUrlViews.push(item);
-        });
-      }
-      item.fileUrlViewList = fileUrlViews;
+      // const fileUrls = item.fileUrl ? item.fileUrl.split(",") : [];
+      //
+      // const fileUrlViews = [];
+      // if (fileUrls !== null && fileUrls.length > 0) {
+      //   fileUrls.forEach((item) => {
+      //     item =
+      //       this.$constant.BASE_URI + "/wx/fileController/download/" + item;
+      //     fileUrlViews.push(item);
+      //   });
+      // }
+      // item.fileUrlViewList = fileUrlViews;
       if (!item.handleTime) {
         item.handleTime = this.$common.transServDate(new Date());
       }
 
-      const handleUrls = item.handleUrl ? item.handleUrl.split(",") : [];
+      const handleUrl = item.handleUrl ? item.handleUrl.split(",") : [];
 
       const handleUrlViews = [];
-      if (handleUrls !== null && handleUrls.length > 0) {
-        handleUrls.forEach((item) => {
+      if (handleUrl !== null && handleUrl.length > 0) {
+        handleUrl.forEach((item) => {
           handleUrlViews.push({
             url:
               this.$constant.BASE_URI + "/wx/fileController/download/" + item,
             isImage: true,
+            id:item
           });
         });
       }
       item.handleUrlList = handleUrlViews;
-      console.log(item);
+      console.log(item.handleUrlList);
       item.serviceType =
         this.dic_SelectList.QUICK_SELECTION[item.serviceType - 1].label;
 
       switch (item.status) {
-        case "unAcceptance":
+        // console.log(status)
+        case "0":
           this.stepActive = 0;
           break;
-        case "acceptance":
+        case "1":
           this.stepActive = 1;
           break;
-        case "evaluated":
+        case "2":
+          this.stepActive = 2;
+          break;
+        case "3":
           this.stepActive = 3;
           break;
-        case "processed":
-          this.stepActive = 2;
+        case "4":
+          this.stepActive = 0;
+          break;
+        case "5":
+          this.stepActive = 5;
           break;
       }
 
@@ -380,14 +446,15 @@ export default {
               url:
                 that.$constant.BASE_URI + "/FileController/download/" + data[0],
               isImage: true,
+
             });
             that.handleUrlList = [...that.handleUrlList];
             that.$forceUpdate();
             console.log(that.fileUrlList);
           },
-          fail(res) {},
+          fail(res) { },
         });
-      } catch (error) {}
+      } catch (error) { }
     },
     beforeDelete(file, detail) {
       // this.handleImagUrlList = []
@@ -440,7 +507,12 @@ export default {
   },
 };
 </script>
-<style lang="scss" >
+<style lang="scss">
+.infoUpload{
+  .van-uploader__upload--disabled{
+    display: none;
+  }
+}
 .bottom-button {
   position: fixed;
   bottom: 0;
@@ -454,6 +526,7 @@ export default {
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
+
   .btn {
     height: 100%;
     line-height: 80rpx;
@@ -464,6 +537,7 @@ export default {
     border-radius: 10rpx;
   }
 }
+
 .repair-detail-box {
   .page-4 {
     .evaluate-box {
@@ -477,8 +551,10 @@ export default {
       box-sizing: border-box;
     }
   }
+
   width: 100%;
   height: 100%;
+
   .page-1 {
     .textarea {
       padding: 20rpx;
@@ -490,9 +566,11 @@ export default {
 
   .page-3 {
     padding-bottom: 100rpx;
+
     .input-item {
       padding: 0;
     }
+
     .custom-item-tit {
       height: 13.333vw;
       font-size: 4.267vw;
@@ -510,6 +588,7 @@ export default {
       align-items: center;
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
+
       .tit {
         &::after {
           content: "";
@@ -525,11 +604,13 @@ export default {
         }
       }
     }
+
     .tit {
-      padding-left: 2.667vw;
+      // padding-left: 2.667vw;
       position: relative;
     }
   }
+
   .page-4 {
     .custom-item-tit {
       height: 13.333vw;
@@ -548,6 +629,7 @@ export default {
       align-items: center;
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
+
       .tit {
         &::after {
           content: "";
@@ -563,10 +645,12 @@ export default {
         }
       }
     }
+
     .tit {
       padding-left: 2.667vw;
       position: relative;
     }
+
     s .evaluate-box {
       padding: 20px 30px;
       background: $page-color-base;
@@ -578,24 +662,28 @@ export default {
       box-sizing: border-box;
     }
   }
+
   .annex-list-box {
     display: flex;
-    // flex-wrap: wrap;
-    // justify-content: space-between;
+
+     flex-wrap: wrap;
+     justify-content: space-between;
     &::after {
       display: block;
       content: "";
       width: 30%;
       height: 0px;
     }
+
     .annex-item {
-      width: 240rpx;
+      width: 30%;
       height: 240rpx;
       border: 1px solid $text4;
       margin-bottom: 20px;
       position: relative;
       overflow: hidden;
-      > img {
+
+      >img {
         width: 240rpx;
         height: 240rpx;
         position: absolute;
@@ -606,26 +694,29 @@ export default {
         margin: auto;
         display: block;
       }
+
       video {
         width: 100%;
         height: 100%;
       }
     }
   }
+
   .tel-box {
     display: flex;
     align-items: center;
+
     /deep/ .custom-tel-component {
       margin-left: 20px;
     }
   }
 }
 </style>
-  <style lang="scss">
+<style lang="scss">
 .image-repairDispatch-box {
   .van-image-preview__close-icon {
     color: #fff;
     font-size: 64px;
   }
 }
-</style>s
+</style>s

pages/subPackages/repairprocessing-app/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="repair">
     <!--    <div class="top-add" @click="goNavigator('repairprocessing-add-app')">-->
@@ -6,12 +5,7 @@
     <!--      <span class="txt">新增报修</span>-->
     <!--    </div>-->
     <div class="info-list">
-      <div
-        class="info-item"
-        v-for="item in recordList"
-        :key="item.id"
-        @click="goNavigator(item.id)"
-      >
+      <div class="info-item" v-for="item in recordList" :key="item.id" @click="goNavigator(item.id)">
         <div class="info-top">
           <div class="left">
             <img :src="item.fileUrl != null ? item.fileUrl.url : ''" alt="" />
@@ -31,12 +25,12 @@
             </span>
           </div>
           <div class="right">
-            <span
-              v-if="item.status == 'acceptance'"
-              class="normal-tip yd h-bg"
-              >{{ item.statusName }}</span
-            >
-            <span v-else class="normal-tip yd z-bg">{{ item.statusName }}</span>
+            <span v-if="item.status == '1'" class="normal-tip yd h-bg">待处理</span>
+            <span v-if="item.status == '2'" class="normal-tip yd z-bg">已处理 </span>
+            <span v-if="item.status == '3'" class="normal-tip yd z-bg">已确认 </span>
+            <span v-if="item.status == '4'" class="normal-tip yd z-bg">已退回 </span>
+            <span v-if="item.status == '5'" class="normal-tip yd z-bg">确认退回 </span>
+
           </div>
         </div>
       </div>
@@ -119,7 +113,7 @@ export default {
       getRepairList(this.params).then((res) => {
         console.log(res.data);
         if (res.data) {
-          res.data.forEach(function (item) {
+          res.data.rows.forEach(function (item) {
             const jsonMap = _this.getItemJson(item);
             _this.recordList.push(jsonMap);
           });
@@ -128,9 +122,14 @@ export default {
     },
     getItemJson: function (item) {
       item.createdAt = this.$common.transServDate(item.createdAt);
-      let index = this.dic_SelectList.REPAIR_STATUS.findIndex(
-        (e) => e.value == item.status
-      );
+      console.log(item.status)
+      // let index = this.dic_SelectList.REPAIR_STATUS.findIndex((e) => {
+      //   console.log('e.value, item.status', e.value == item.status)
+      //   console.log('e.value, item.status', e.value, item.status)
+      //   return e.value == item.status
+      // }
+      // );
+      // console.log(index)
       const fileUrls =
         item.fileUrl && item.fileUrl.length > 0 ? item.fileUrl.split(",") : [];
       console.log(fileUrls);
@@ -142,7 +141,7 @@ export default {
       };
       item.fileUrl = fileUrl;
       console.log(this.dic_SelectList.REPAIR_STATUS);
-      item.statusName = this.dic_SelectList.REPAIR_STATUS[index].label;
+      // item.statusName = this.dic_SelectList.REPAIR_STATUS[index].label;
       return item;
     },
     /**
@@ -219,11 +218,13 @@ export default {
     margin-bottom: 20rpx;
     text-align: right;
     box-shadow: 0rpx 5rpx 10rpx 0rpx rgba(0, 0, 0, 0.05);
+
     i {
       font-size: 36rpx;
       color: $text6;
       margin-right: 15rpx;
     }
+
     .txt {
       font-size: 32rpx;
       color: $text6;
@@ -233,26 +234,32 @@ export default {
   .info-list {
     height: calc(100vh - 124rpx);
     overflow-y: auto;
+
     .info-item {
       background-color: #fff;
       padding: 20rpx 30rpx;
       margin-bottom: 20rpx;
+
       .info-top {
         @include flex;
+
         .left {
           width: 286rpx;
           height: 168rpx;
           font-size: 0;
           border-radius: 10rpx;
           overflow: hidden;
+
           img {
             width: 100%;
             height: 100%;
           }
         }
+
         .right {
           align-self: flex-start;
           width: 380rpx;
+
           .tit {
             width: 380rpx;
             font-size: 32rpx;
@@ -262,6 +269,7 @@ export default {
             @include line-clamp;
             margin-bottom: 20rpx;
           }
+
           .txt {
             font-size: 28rpx;
             color: #666;
@@ -274,19 +282,21 @@ export default {
         padding-top: 20rpx;
         border-top: 1rpx dashed #dbdbdb;
         @include flex;
+
         .left {
           i {
             font-size: 30rpx;
             color: #999999;
             margin-left: 10rpx;
           }
+
           span {
             font-size: 28rpx;
             color: #999999;
           }
         }
-        .right {
-        }
+
+        .right {}
       }
     }
   }

pages/subPackages/secureselftest/report.vue

@@ -3,67 +3,44 @@
     <div class="list">
       <div class="list-row" style="padding-top: 0">
         <div style="height: auto" class="width100">
-          <div
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-          >
+          <div class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
             <div class="input_title float_left">
               <span style="color: red">*&nbsp;</span>检查类型
             </div>
-            <div
-              class="float_left width60 whitespacenowrap first_title height50rpx font28rpx"
-              style="color: #777"
-            >
-              <picker
-                @change="bindPickerChange"
-                :value="form.testTypeIndex"
-                :range="dic_SelectList.safety_inspection_type"
-                range-key="label"
-              >
+            <div class="float_left width60 whitespacenowrap first_title height50rpx font28rpx" style="color: #777">
+              <picker @change="bindPickerChange" :value="form.testTypeIndex"
+                :range="dic_SelectList.safety_inspection_type" range-key="label">
                 {{
                   !dic_SelectList.safety_inspection_type[form.testTypeIndex]
                     .label
                     ? "未知类型"
                     : dic_SelectList.safety_inspection_type[form.testTypeIndex]
-                        .label
+                      .label
                 }}
               </picker>
             </div>
           </div>
-          <div
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-          >
+          <div class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
             <div class="input_title float_left">
               <span style="color: red">*&nbsp;</span>
               归属年度
             </div>
-            <div
-              class="float_left width60 whitespacenowrap first_title height50rpx font28rpx"
-              style="color: #777"
-            >
+            <div class="float_left width60 whitespacenowrap first_title height50rpx font28rpx" style="color: #777">
               <picker mode="date" fields="year" @change="selectYear">
                 {{ form.attributiveYear ? form.attributiveYear : "请选择" }}
               </picker>
             </div>
           </div>
 
-          <div
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-          >
+          <div class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
             <div class="input_title float_left">
               <span style="color: red">*&nbsp;</span>
               检查人
             </div>
-            <input
-              style="color: #777"
-              class="input_value float_left"
-              placeholder="请输入"
-              v-model="form.checkUser"
-            />
+            <input style="color: #777" class="input_value float_left" placeholder="请输入" v-model="form.checkUser" />
           </div>
-          <div
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-            style="display: flex; align-items: center; color: #777"
-          >
+          <div class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
+            style="display: flex; align-items: center; color: #777">
             <div class="input_title float_left">
               <span style="color: red">*&nbsp;</span>
               检查对象
@@ -72,47 +49,31 @@
               {{ form.checkCompanyName ? form.checkCompanyName : "请选择" }}
             </div>
           </div>
-          <div
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
-          >
+          <div class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
             <div class="input_title float_left">
               <span style="color: red">*&nbsp;</span>检查日期
             </div>
-            <div
-              class="float_left width60 whitespacenowrap first_title height50rpx font28rpx"
-              style="color: #777"
-            >
+            <div class="float_left width60 whitespacenowrap first_title height50rpx font28rpx" style="color: #777">
               <picker mode="date" @change="selectCarDate">
                 {{ form.checkTime ? form.checkTime : "请选择" }}
               </picker>
             </div>
           </div>
 
-          <div
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpx"
-            style="height: 325rpx"
-          >
+          <div class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpx" style="height: 325rpx">
             <div class="input_title mb16rpx">检查详情：</div>
-            <textarea
-              v-model="form.checkInfo"
-              :maxlength="2000"
-              placeholder="请输入"
-              type="textarea"
-              style="
+            <textarea v-model="form.checkInfo" :maxlength="2000" placeholder="请输入" type="textarea" style="
                 height: 200rpx;
                 background: rgba(249, 249, 249, 1);
                 padding: 20rpx;
                 width: calc(100% - 40rpx);
-              "
-            />
-            <div
-              style="
+              " />
+            <div style="
                 background: rgba(249, 249, 249, 1);
                 text-align: right;
                 padding-right: 10px;
                 padding-bottom: 10rpx;
-              "
-            >
+              ">
               {{
                 form.checkInfo && form.checkInfo.length
                   ? form.checkInfo.length
@@ -125,26 +86,15 @@
               <span style="color: red">*&nbsp;</span>自检表：
             </div>
             <div style="margin-top: 24rpx">（支持图片上传10M内，最多6张）</div>
-            <div
-              class="custom-image-box"
-              style="margin-top: 20rpx; margin-bottom: 36rpx"
-            >
-              <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP()"
-                :file-list="form.uploadAddressExcel"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-              />
+            <div class="custom-image-box" style="margin-top: 20rpx; margin-bottom: 36rpx">
+              <van-uploader :max-count="6" @delete="deleteRYXXZP()" :file-list="form.uploadAddressExcel"
+                @after-read="uploadRYXXZP" :show-upload="true" />
             </div>
           </div>
           <div class="width100 mt24rpx border_bottom_ccc list_date">
             <div class="input_title">其他附件</div>
             <!-- <div style="margin-top: 24rpx">（支持图片上传10M内，最多6张）</div> -->
-            <div
-              style="margin-top: 20rpx; margin-bottom: 36rpx"
-              class="choosefile"
-            >
+            <div style="margin-top: 20rpx; margin-bottom: 36rpx" class="choosefile">
               <!-- <van-uploader
                 accept="all"
                 :max-count="6"
@@ -153,95 +103,53 @@
                 @after-read="uploadRYXXZP2"
                 :show-upload="true"
               /> -->
-              <van-uploader
-                limit="5"
-                @delete="deleteRYXXZP2"
-                @after-read="uploadRYXXZP2"
-                :file-list="form.uploadAddressExcel2"
-                accept="file"
-                file-extname="docx,pdf,xls,xlsx,txt"
-                title="最多选择5个文件"
-              >
-                <van-button
-                  type="primary"
-                  size="small"
-                  style="margin-bottom: 15rpx"
-                  >文件选择</van-button
-                >
+              <van-uploader limit="5" @delete="deleteRYXXZP2" @after-read="uploadRYXXZP2"
+                :file-list="form.uploadAddressExcel2" accept="file" file-extname="docx,pdf,xls,xlsx,txt"
+                title="最多选择5个文件">
+                <van-button type="primary" size="small" style="margin-bottom: 15rpx">文件选择</van-button>
               </van-uploader>
-              <div
-                @click="openFile(item)"
-                class="file"
-                v-for="(item, index) in form.uploadAddressExcel2"
-                :key="index"
-              >
+              <div @click="openFile(item)" class="file" v-for="(item, index) in form.uploadAddressExcel2" :key="index">
                 <div style="width: 90%">{{ item.name }}</div>
 
-                <uni-icons
-                  type="closeempty"
-                  size="20"
-                  @click="deleteRYXXZP2(index)"
-                ></uni-icons>
+                <uni-icons type="closeempty" size="20" @click="deleteRYXXZP2(index)"></uni-icons>
               </div>
             </div>
           </div>
-          <div
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpx"
-            style="height: 325rpx"
-          >
+          <div class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpx" style="height: 325rpx">
             <div class="input_title mb16rpx">备注：</div>
-            <textarea
-              v-model="form.remark"
-              :maxlength="2000"
-              placeholder="请输入"
-              type="textarea"
-              style="
+            <textarea v-model="form.remark" :maxlength="2000" placeholder="请输入" type="textarea" style="
                 height: 200rpx;
                 background: rgba(249, 249, 249, 1);
                 padding: 20rpx;
                 width: calc(100% - 40rpx);
-              "
-            />
-            <div
-              style="
+              " />
+            <div style="
                 background: rgba(249, 249, 249, 1);
                 text-align: right;
                 padding-right: 10px;
                 padding-bottom: 10rpx;
-              "
-            >
+              ">
               {{
                 form.remark && form.remark.length ? form.remark.length : 0
               }}/2000
             </div>
           </div>
-          <div
-            v-if="form.handlingFeedback.length > 0"
-            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpx"
-            style="height: 325rpx"
-          >
+          <div v-if="form.handlingFeedback && form.handlingFeedback.length > 0"
+            class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpx" style="height: 325rpx">
             <div class="input_title mb16rpx">反馈记录</div>
-            <textarea
-              v-model="form.handlingFeedback"
-              :maxlength="2000"
-              placeholder="请输入"
-              type="textarea"
-              style="
+            <textarea v-model="form.handlingFeedback" :maxlength="2000" placeholder="请输入" type="textarea" style="
                 height: 200rpx;
                 background: rgba(249, 249, 249, 1);
                 padding: 20rpx;
                 width: calc(100% - 40rpx);
-              "
-            />
-            <div
-              style="
+              " />
+            <div style="
                 background: rgba(249, 249, 249, 1);
                 text-align: right;
                 padding-right: 10px;
                 padding-bottom: 10rpx;
-              "
-            >
-              {{ form.handlingFeedback.length }}/2000
+              ">
+              {{ form.handlingFeedback && form.handlingFeedback.length > 0 ? form.handlingFeedback.length : 0 }}/2000
             </div>
           </div>
         </div>
@@ -264,40 +172,24 @@
           />
         </div>
       </div> -->
-      <van-popup
-        position="bottom"
-        closeable
-        :show="finisherPopupStatus"
-        @close="onClose"
-        custom-style="height:1000rpx;"
-      >
+      <van-popup position="bottom" closeable :show="finisherPopupStatus" @close="onClose"
+        custom-style="height:1000rpx;">
         <div style="margin-top: 70rpx">
-          <input
-            type="text"
-            v-model="qymc"
-            @keydown.enter="findAllSimpleCompanies()"
-            @confirm="findAllSimpleCompanies()"
-            style="margin: 10rpx 15rpx"
-            placeholder="请输入园区用户模糊查询"
-          />
+          <input type="text" v-model="qymc" @keydown.enter="findAllSimpleCompanies()"
+            @confirm="findAllSimpleCompanies()" style="margin: 10rpx 15rpx" placeholder="请输入园区用户模糊查询" />
           <div class="tabsbox">
             <div class="tabsbox-item" v-for="item in companyUserList">
               <div style="width: 70%; overflow: hidden">
                 {{ item.text }}
               </div>
-              <div
-                @click="getFinishUserName(item.value, item.text, 2)"
-                :class="[
-                  'people-select',
+              <div @click="getFinishUserName(item.value, item.text, 2)" :class="[
+                'people-select',
+                form.checkCompanyName == item.value ? 'ischecked' : '',
+              ]">
+                <div :class="[
+                  'select-point',
                   form.checkCompanyName == item.value ? 'ischecked' : '',
-                ]"
-              >
-                <div
-                  :class="[
-                    'select-point',
-                    form.checkCompanyName == item.value ? 'ischecked' : '',
-                  ]"
-                ></div>
+                ]"></div>
               </div>
             </div>
           </div>
@@ -306,27 +198,15 @@
       <div class="save_button" v-if="!saveBtnStatus" @click="save()">保存</div>
     </div>
 
-    <select-dengjiyuan
-      ref="selectDengjiyuan"
-      :multiple="true"
-      :range="range"
-      :selectParent="true"
-      :foldAll="true"
-      rangeKey="name"
-      idKey="id"
-      @selectDengjiyuan="selectDengjiyuan"
-    >
+    <select-dengjiyuan ref="selectDengjiyuan" :multiple="true" :range="range" :selectParent="true" :foldAll="true"
+      rangeKey="name" idKey="id" @selectDengjiyuan="selectDengjiyuan">
     </select-dengjiyuan>
-    <multiple-select
-      v-model="show"
-      :data="companyAllList"
-      :default-selected="defaultSelected"
-      @confirm="confirm"
-    ></multiple-select>
+    <multiple-select v-model="show" :data="companyAllList" :default-selected="defaultSelected"
+      @confirm="confirm"></multiple-select>
   </div>
 </template>
-        
-    <script>
+
+<script>
 const form = {
   uploadAddressExcel: [],
   uploadAddressExcel2: [],
@@ -412,7 +292,7 @@ export default {
     // this.getByCodes();
     // this.getCompanyAll();
   },
-  onShow() {},
+  onShow() { },
   methods: {
     getFinishUserName(id, name, pushType) {
       this.form.checkCompanyId = id;
@@ -488,7 +368,7 @@ export default {
             isImage: true,
           });
         },
-        fail(res) {},
+        fail(res) { },
       });
     },
     uploadRYXXZP2(e) {
@@ -523,7 +403,7 @@ export default {
           });
           console.log(that.form.uploadAddressExcel2);
         },
-        fail(res) {},
+        fail(res) { },
       });
     },
     confirm(e) {
@@ -613,8 +493,8 @@ export default {
       );
       that.$refs[key]._show();
     },
-    binddata() {},
-    submit() {},
+    binddata() { },
+    submit() { },
     async save() {
       let that = this;
 
@@ -666,12 +546,13 @@ export default {
     },
   },
 };
-</script>   
-    <style scoped lang="scss" scpoed>
+</script>
+<style scoped lang="scss" scpoed>
 .tabsbox {
   height: 680rpx;
   overflow-y: auto;
   padding: 10rpx;
+
   .tabsbox-item {
     margin: 5rpx;
 
@@ -691,6 +572,7 @@ export default {
   align-items: center;
   display: flex;
   justify-content: center;
+
   .select-point {
     height: 15rpx;
     width: 15rpx;
@@ -698,6 +580,7 @@ export default {
     border-radius: 50%;
   }
 }
+
 .save_button {
   width: calc(100% - 64rpx);
   margin: 64rpx 32rpx 0 32rpx;
@@ -708,30 +591,36 @@ export default {
   text-align: center;
   line-height: 88rpx;
 }
+
 .form {
   width: calc(100% - 64rpx);
   background: #ffffff;
   padding: 32rpx;
   margin-top: 64rpx;
+
   .label {
     height: 53rpx;
     line-height: 53rpx;
   }
 }
+
 .form_row {
   height: 40rpx;
   font-weight: 400;
   font-size: 24rpx;
 }
+
 .zaiti_list {
   width: 100%;
   height: 50rpx;
   line-height: 50rpx;
 }
+
 .idclass {
   width: 147rpx;
   height: 100rpx;
 }
+
 .dengjibutton {
   margin-top: 24rpx;
   margin-left: 60rpx;
@@ -743,9 +632,11 @@ export default {
   color: white;
   line-height: 60rpx;
 }
+
 .addcompany {
   margin-bottom: 200rpx;
 }
+
 .addcompany {
   .detailstitle {
     height: 42rpx;
@@ -754,6 +645,7 @@ export default {
     color: #333333;
     padding-bottom: 16rpx;
   }
+
   .typestitle {
     height: 42rpx;
     font-size: 24rpx;
@@ -763,14 +655,16 @@ export default {
   }
 }
 </style>
-     <style lang="scss">
+<style lang="scss">
 .choosefile {
   .van-uploader__preview {
     display: none;
   }
+
   .is-text-box {
     display: none !important;
   }
+
   .file {
     display: flex;
     width: 100%;
@@ -783,16 +677,20 @@ export default {
     margin-bottom: 15rpx;
   }
 }
-::v-deep .is-open + .uni-collapse-item__wrap {
+
+::v-deep .is-open+.uni-collapse-item__wrap {
   height: auto !important;
 }
+
 ::v-deep .uni-collapse-item__wrap-content {
   height: auto !important;
 }
+
 .pageconfig {
   background: #ffffff;
   padding: 32rpx;
 }
+
 .input_title {
   width: 40%;
   font-size: 28rpx;
@@ -800,6 +698,7 @@ export default {
   line-height: 40rpx;
   color: #333333;
 }
+
 .input_value {
   width: 60%;
   font-size: 28rpx;
@@ -807,15 +706,17 @@ export default {
   line-height: 40rpx;
   color: #777777;
 }
+
 .uni-collapse-item__title-box {
   padding: 0 !important;
 }
+
 .uni-collapse-item__title-text {
   color: #1d18bc !important;
   font-size: 32rpx !important;
 }
 </style>
-  <style lang="scss">
+<style lang="scss">
 .example-body {
   padding: 10px;
   padding-top: 0;
@@ -834,13 +735,16 @@ export default {
   font-size: 14px;
   color: #333;
 }
+
 .uni-file-picker__item {
   display: none;
 }
+
 .uploadbutton {
   width: 162rpx;
   height: 44rpx;
 }
+
 .ischecked {
   background: rgb(7, 193, 96);
   border: 5rpx solid rgb(7, 193, 96);

pages/subPackages/todo/index.vue

@@ -2,12 +2,8 @@
   <div class="secureselftest">
     <div class="list">
       <!-- <div v-if="todoList.length == 0"> -->
-      <div
-        class="list-row"
-        v-for="(item, index) in todoList"
-        @click="junmpMyMechantsDetails(item.routeParam, item.handleType)"
-        :key="index"
-      >
+      <div class="list-row" v-for="(item, index) in todoList"
+        @click="junmpMyMechantsDetails(item.routeParam, item.handleType)" :key="index">
         <div class="cell_1">
           <div class="width100 height44rpx mb16rpx">
             <div class="first_title">
@@ -23,18 +19,13 @@
       </div>
       <!-- </div> -->
       <!-- <div v-else> -->
-      <van-empty
-        v-if="todoList.length == 0"
-        class="disblock marginauto"
-        style="background: white"
-        description="暂无数据"
-      />
+      <van-empty v-if="todoList.length == 0" class="disblock marginauto" style="background: white" description="暂无数据" />
       <!-- </div> -->
     </div>
   </div>
 </template>
-      
-      <script>
+
+<script>
 import { handleList, getByCodes, getUserLocalStorageInfo } from "@/js_sdk/http";
 import vanEmpty from "../../../wxcomponents/weapp/dist/empty/index";
 
@@ -81,8 +72,9 @@ export default {
       console.log(routeParam, type);
       if (type == 8) {
         uni.navigateTo({
-          rl: "/pages/subPackages/repairprocessing-app/detail?id=" + routeParam,
+          url: "/pages/subPackages/repairprocessing-app/detail?id=" + routeParam,
         });
+        return
       }
       if (type == 9) {
         let param = routeParam.split(",");
@@ -90,17 +82,17 @@ export default {
         if (param[0] == "报事报修待派单") {
           console.log("报事报修待派单");
           uni.navigateTo({
-            url: "/pages/subPackages/repairDispatch-app/detail?id=" + param[1],
-          });
-        }
-        if (param[0] == "报事报修待处理") {
-          console.log("报事报修待处理");
-          uni.navigateTo({
-            url:
-              "/pages/subPackages/repairprocessing-app/detail?id=" + param[1],
+            url: "/pages/subPackages/repairDispatch-app/detail?id=" + param[0],
           });
         }
+        // if (param[0] == "报事报修待处理") {
+        console.log("报事报修待处理");
+        uni.navigateTo({
+          url:
+            "/pages/subPackages/repairprocessing-app/detail?" + param,
+        });
       }
+      // }
       if (type == 11) {
         uni.navigateTo({
           url:
@@ -191,9 +183,9 @@ export default {
   },
 };
 </script>
-      
-      
-      <style lang="scss">
+
+
+<style lang="scss">
 .chooseyears {
   width: 326rpx;
   height: 56rpx;
@@ -204,21 +196,21 @@ export default {
   display: flex;
   color: #1d18bc;
 }
+
 .searchbox {
   display: block;
   background: white;
 }
+
 .chaochuyincang {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
 .secureselftest {
   .custom-class {
     background: white;
   }
 }
-</style>
-      
-      
-      
+</style>

pages/subPackages/toread/index.vue

@@ -2,18 +2,13 @@
   <div class="secureselftest">
     <div class="list">
       <!-- <div v-if="readList.length == 0"> -->
-      <div
-        class="list-row"
-        v-for="(item, index) in readList"
-        @click="
-          junmpMyMechantsDetails(
-            item.routeParam,
-            item.handleType,
-            item.readType
-          )
-        "
-        :key="index"
-      >
+      <div class="list-row" v-for="(item, index) in readList" @click="
+        junmpMyMechantsDetails(
+          item.routeParam,
+          item.handleType,
+          item.readType
+        )
+        " :key="index">
         <div class="cell_1">
           <div class="width100 height44rpx mb16rpx">
             <div class="first_title">
@@ -29,18 +24,13 @@
       </div>
       <!-- </div> -->
       <!-- <div v-else> -->
-      <van-empty
-        v-if="readList.length == 0"
-        class="disblock marginauto"
-        style="background: white"
-        description="暂无数据"
-      />
+      <van-empty v-if="readList.length == 0" class="disblock marginauto" style="background: white" description="暂无数据" />
       <!-- </div> -->
     </div>
   </div>
 </template>
-      
-      <script>
+
+<script>
 import { readList, getByCodes, getUserLocalStorageInfo } from "@/js_sdk/http";
 import vanEmpty from "../../../wxcomponents/weapp/dist/empty/index";
 
@@ -201,9 +191,9 @@ export default {
   },
 };
 </script>
-      
-      
-      <style lang="scss">
+
+
+<style lang="scss">
 .chooseyears {
   width: 326rpx;
   height: 56rpx;
@@ -214,21 +204,21 @@ export default {
   display: flex;
   color: #1d18bc;
 }
+
 .searchbox {
   display: block;
   background: white;
 }
+
 .chaochuyincang {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
 .secureselftest {
   .custom-class {
     background: white;
   }
 }
-</style>
-      
-      
-      
+</style>

pages/utils/constant.js

@@ -1,6 +1,6 @@
-// 系统常量
-export const BASE_URI = "https://hswkxc.idea-sf.com/gardenTestApi"; // 测试
-// export const BASE_URI = "http://192.168.2.109:9012"; // 许峰本地
+// // 系统常量
+// export const BASE_URI = "https://hswkxc.idea-sf.com/gardenTestApi"; // 测试
+export const BASE_URI = "https://hswkxc.idea-sf.com/gardenTestApi"; // 许峰本地
 
 // export const BASE_URI = "https://hswkxc.idea-sf.com/gardenApi"; // 正式
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
@@ -14,4 +14,4 @@ export default {
     // 基础地址
     BASE_URI,
 
-};
+};

unpackage/dist/build/mp-weixin/app.json

@@ -31,6 +31,8 @@
         "repairDispatch-serve/index",
         "repairDispatch-app/add",
         "repairprocessing-app/detail",
+        "serve-confirm/index",
+        "serve-confirm/detail",
         "repairprocessing-app/index",
         "modifySend/index",
         "modifyReport/index",
@@ -57,7 +59,9 @@
         "chosseHouse/chosseHouse",
         "companyreport/components/reportDetails",
         "companyreport/companyreport",
+        "companyHouseSee/companyHouseSee",
         "companyHouse/companyHouse",
+        "companyDetailsSee/companyDetailsSee",
         "companyDetails/companyDetails",
         "addCompany/addCompany",
         "companyDetailsEdit/companyDetailsEdit"

unpackage/dist/build/mp-weixin/components/zaiti-tree2/index.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/subPackages/addCompany/addCompany.json

@@ -19,6 +19,7 @@
     "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
     "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
     "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+    "van-cascader": "/wxcomponents/weapp/dist/cascader/index",
     "multiple-select": "/pages/subPackages/addCompany/momo-multipleSelect",
     "tki-tree": "/pages/subPackages/components/tkitree/tkitree"
   }

unpackage/dist/build/mp-weixin/pages/subPackages/companyDetailsEdit/companyDetailsEdit.json

@@ -20,6 +20,7 @@
     "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
     "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
     "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+    "van-cascader": "/wxcomponents/weapp/dist/cascader/index",
     "handle-report": "/pages/subPackages/companyreport/components/handlereport",
     "select-dengjiren": "/pages/subPackages/components/select_dengjiren/tkitree",
     "multiple-select": "/pages/subPackages/companyDetailsEdit/momo-multipleSelect",

unpackage/dist/build/mp-weixin/pages/subPackages/components/momo-multipleSelect/momo-multipleSelect.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }