提交代码

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,15 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="class" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

js_sdk/http.js

@@ -635,7 +635,13 @@ export function getCompanyAll(qymc) {
     }, {})
 
 }
+export function getCompanyListFy(data) {
+    return $http.post(
+        '/wx/company/list',
+        data
+        , {})
 
+}
 
 export function getByCodes(params) {
     // 用园区ID查询楼盘列表
@@ -721,3 +727,32 @@ export function editReportInfo(data) {
         data, {}
     )
 }
+export function findDetailByInfoAll(data) {
+    return $http.post(
+        '/wx/ParkContractManageController/findDetailByInfoAll',
+        data, {}
+    )
+}
+// https://hswkxc.idea-sf.com/gardenTestApi/wx/repair/dispatchListNum
+
+export function dispatchListNum(data) {
+    return $http.post(
+        '/wx/repair/dispatchListNum',
+        data, {}
+    )
+}
+
+// https://hswkxc.idea-sf.com/gardenTestApi/wx/repair/confirmListNum 
+export function confirmListNum(data) {
+    return $http.post(
+        '/wx/repair/confirmListNum',
+        data, {}
+    )
+}
+// https://hswkxc.idea-sf.com/gardenTestApi/wx/repair/handleListNum 
+export function handleListNum1(data) {
+    return $http.post(
+        '/wx/repair/handleListNum',
+        data, {}
+    )
+}

js_sdk/request/request.js

@@ -124,9 +124,18 @@ export default class request {
             }
         }
         // console.log(options.data)
+        let data = { ...options.data }
+        let copaData = {}
+
+        for (const key in data) {
+            if (data[key] !== null && data[key] !== undefined) {
+                copaData[key] = data[key]
+            }
+        }
+        // console.log(copaData)
         uni.request({
             url: options.httpUrl,
-            data: options.data,
+            data: copaData,
             method: ajaxType, //请求类型
             header: options.headers, //加入请求头
             success: (res) => {
@@ -271,4 +280,4 @@ export default class request {
             uni.uploadFile(config);
         }
     }
-}
+}

js_sdk/request/requestConfig.js

@@ -16,7 +16,7 @@ let $http = new request({
     fileUrl: config.baseUrl,
     //设置请求头
     headers: {
-        'Content-Type': 'application/x-www-form-urlencoded;',
+        'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
         'ApiVersion': config.version,
         'Device': config.device,
         'Platform': config.platform,
@@ -126,4 +126,4 @@ $http.dataFactory = function (options, resolve) {
     uni.stopPullDownRefresh();
     return callback;
 };
-export default $http;
+export default $http;

pages.json

@@ -1898,7 +1898,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/downloadfile/index.vue

@@ -11,6 +11,7 @@ export default {
 
     wx.downloadFile({
       url: options.url,
+      showMenu: true,
       // filePath: file,
       success(res) {
         console.log(res);
@@ -18,6 +19,7 @@ export default {
         console.log("成功");
         wx.openDocument({
           filePath: rr,
+          showMenu: true,
           success() {
             wx.navigateBack();
           },
@@ -35,5 +37,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

pages/gocompnay/index.vue

@@ -7,8 +7,9 @@
     frameborder="0"
   >
   </iframe> -->
-  <web-view src="https://hswkxc.idea-sf.com/mnpH5#/"></web-view>
-  <!-- <web-view src="http://192.168.2.111:9528/gardenTestH5/#/login"></web-view> -->
+  <web-view src="https://hswkxc.idea-sf.com/mnpH5/#/login"></web-view>
+  <!--  http://192.168.3.44:9528/gardenTestH5/-->
+  <!-- <web-view src="https://hswkxc.idea-sf.com/gardenTestH5/#/login"></web-view> -->
 </template>
 
 <script>
@@ -19,5 +20,5 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>
+	

pages/index/index.vue

@@ -16,6 +16,17 @@
         <div class="jiaobiao" v-if="item.label == '我的待办' && handleListNumber">
           {{ handleListNumber > 99 ? '99+' : handleListNumber }}
         </div>
+
+        <div class="jiaobiao" v-if="item.label == '政企服务' && zqfwNum">
+          {{ zqfwNum > 99 ? '99+' : zqfwNum }}
+        </div>
+        <div class="jiaobiao" v-if="item.label == '服务确认' && fwqrNum">
+          {{ fwqrNum > 99 ? '99+' : fwqrNum }}
+        </div>
+        <div class="jiaobiao" v-if="item.label == '服务处理' && fwclNum">
+          {{ fwclNum > 99 ? '99+' : fwclNum }}
+        </div>
+
         <img class="mapIcon" :src="item.url" />
         <div class="maptxt">{{ item.label }}</div>
       </div>
@@ -29,7 +40,7 @@ import {
   getUserLocalStorageInfo,
   getVenueAppointListAppCount,
   getMeetingAppointListAppCount,
-  getReadSize, handleListNum
+  getReadSize, handleListNum, dispatchListNum, confirmListNum, handleListNum1,
 } from "@/js_sdk/http";
 export default {
   data() {
@@ -132,11 +143,11 @@ export default {
           url: "https://hswkxc.idea-sf.com/fileService/static/slices/13@2x.png",
           path: "/pages/subPackages/modifyHandle/index",
         },
-        {
-          label: "活动核销",
-          url: "https://hswkxc.idea-sf.com/fileService/static/slices/1@2x.png",
-          path: "/pages/subPackages/activity/index",
-        },
+        // {
+        //   label: "活动核销",
+        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/1@2x.png",
+        //   path: "/pages/subPackages/activity/index",
+        // },
         {
           label: "可视化大屏",
           url: "https://hswkxc.idea-sf.com/fileService/static/slices/1@2x.png",
@@ -161,7 +172,10 @@ export default {
       MeetingNum: 0,
       VenueNum: 0,
       ReadSize: 0,
-      handleListNumber: 0
+      handleListNumber: 0,
+      zqfwNum: 0,
+      fwqrNum: 0,
+      fwclNum: 0
     };
   },
   onShareAppMessage() { },
@@ -178,8 +192,28 @@ export default {
     this.getMeetingAppointListAppCount();
     this.getReadSize();
     this.handleListNum()
+    this.dispatchListNum()
+    this.confirmListNum()
+
+    this.handleListNum1()
+
   },
   methods: {
+    async dispatchListNum() {
+      let data = await dispatchListNum()
+      console.log('政企服务', data)
+      this.zqfwNum = data
+    },
+    async confirmListNum() {
+      let data = await confirmListNum({ userId: getUserLocalStorageInfo().user.id })
+      console.log('服务确认', data)
+      this.fwqrNum = data
+    },
+    async handleListNum1() {
+      let data = await handleListNum1({ handleUserId: getUserLocalStorageInfo().user.id })
+      console.log('服务处理', data)
+      this.fwclNum = data
+    },
     async handleListNum() {
       let data = await handleListNum({
         types: '8,9,10,11',

pages/subPackages/activity/index.vue

@@ -1,27 +1,22 @@
 <template>
   <div class="detail">
     <div class="detail-body">
-      <div class="img-text">
+      <!-- <div class="img-text">
         <img :src="activityDetail.annexArray[0]" alt="" />
-      </div>
+      </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>
           <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>
@@ -43,6 +38,8 @@
         <div class="info-item">
           <div class="custom-item-tit"><span class="tit">活动内容</span></div>
           <div class="text vhtml" v-html="activityDetail.activityContent"></div>
+          <img v-for="item in imageList" :src="item" alt="" style="    max-width: 100%;">
+
         </div>
 
         <div class="info-item">
@@ -89,23 +86,14 @@
         <div class="info-item">
           <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>
 
@@ -113,8 +101,8 @@
     <apply-popup ref="apply" />
   </div>
 </template>
-  
-  <script>
+
+<script>
 import TelNum from "../../subPackages/components/tel-number";
 import ApplyPopup from "./apply-popup.vue";
 import {
@@ -137,6 +125,7 @@ export default {
       activityDetail: {
         referenceId: "",
       },
+      imageList: [],
       number: 0,
     };
   },
@@ -166,14 +155,10 @@ export default {
               tempFilePath: data.tempFilePath, //临时路径
               success: function (res) {
                 // 保存路径
-
-                setTimeout(() => {
-                  //打开文档查看
-                  uni.openDocument({
-                    filePath: res.savedFilePath,
-                    success: function (res) {},
-                  });
-                }, 3000);
+                uni.openDocument({
+                  filePath: res.savedFilePath,
+                  success: function (res) { },
+                });
               },
             });
           }
@@ -185,6 +170,17 @@ export default {
         },
       });
     },
+    extractImagePathsFromString(str) {
+      const regex = /<img[^>]+src="([^">]+)"/g;
+      const paths = [];
+      let match;
+
+      while ((match = regex.exec(str)) !== null) {
+        paths.push(match[1]);
+      }
+
+      return paths;
+    },
     getActivityById(a, b, c) {
       const _this = this;
       getActivityById(
@@ -200,6 +196,7 @@ export default {
               "<img",
               `<img style="max-width:100%;"`
             );
+          this.imageList = this.extractImagePathsFromString(res.data.info.activityContent)
           _this.activityDetail.registrationStartTime =
             this.$common.transBaseDateTime(
               _this.activityDetail.registrationStartTime
@@ -272,8 +269,8 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss" type="text/scss" >
+
+<style lang="scss" type="text/scss">
 // 底部按钮
 .but-bottom {
   position: fixed;
@@ -292,6 +289,7 @@ export default {
   color: $text5;
   margin-top: 32rpx;
 }
+
 .detail {
   box-sizing: border-box;
   background-color: #f2f2f2;
@@ -305,16 +303,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;
@@ -322,35 +323,44 @@ export default {
         }
       }
     }
+
     .tel-part {
       display: flex;
       width: 100%;
       background-color: #fff;
       margin-bottom: 10rpx;
       padding: 0 30rpx;
+      box-sizing: border-box;
+      align-items: center;
+
       .tel-name {
         color: #333;
         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);
+    //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;
@@ -364,20 +374,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;
@@ -386,6 +401,7 @@ export default {
           border-left: 1rpx solid #666666;
         }
       }
+
       &:last-child {
         margin-bottom: 0rpx;
       }
@@ -393,5 +409,4 @@ export default {
   }
 }
 </style>
-  <style lang="scss">
-</style>
+<style lang="scss"></style>

pages/subPackages/addCompany/momo-multipleSelect.vue

@@ -1,47 +1,21 @@
 <template>
   <view class="select-container" v-show="show" @touchmove.stop.prevent>
-    <view
-      class="mask"
-      :class="activeClass ? 'mask-show' : ''"
-      @tap="onCancel(true)"
-    ></view>
+    <view class="mask" :class="activeClass ? 'mask-show' : ''" @tap="onCancel(true)"></view>
     <view class="select-box" :class="activeClass ? 'select-box-show' : ''">
       <div style="height: 900rpx">
         <div style="display: flex">
-          <uni-easyinput
-            type="text"
-            class="searchinput"
-            v-model="formData.qymc"
-            placeholder="输入关联企业名称（模糊查询）"
-            style="height: 70rpx"
-          />
-          <van-button
-            class="searchbutton"
-            style="height: 70rpx"
-            type="primary"
-            @click="getCompaynList()"
-            >搜索</van-button
-          >
+          <uni-easyinput type="text" class="searchinput" v-model="formData.qymc" placeholder="输入关联企业名称（模糊查询）"
+            style="height: 70rpx" />
+          <van-button class="searchbutton" style="height: 70rpx" type="primary"
+            @click="getCompaynList()">搜索</van-button>
         </div>
         <div class="chooseCompanyTags">
-          <scroll-view
-            class="body"
-            scroll-y="true"
-            style="position: absolute; z-index: 1000"
-          >
-            <div
-              v-for="(item, index) in companyList"
-              :key="index"
-              class="selectlist"
-            >
+          <scroll-view class="body" scroll-y="true" style="position: absolute; z-index: 1000">
+            <div v-for="(item, index) in companyList" :key="index" class="selectlist">
               <div class="title_2">
                 {{ item.label }}
               </div>
-              <div
-                v-if="!item.isSelected"
-                class="title_1"
-                @click="chosseTags(item, index)"
-              >
+              <div v-if="!item.isSelected" class="title_1" @click="chosseTags(item, index)">
                 <uni-icons type="plusempty" size="30rpx"></uni-icons>
               </div>
             </div>
@@ -50,40 +24,27 @@
       </div>
 
       <view class="btn-view">
-        <button
-          class="btn"
-          @click="openTagsDialog()"
-          style="
+        <button class="btn" @click="openTagsDialog()" style="
             border-top-left-radius: 5rem;
             border-bottom-left-radius: 5rem;
             background: white;
             color: #1d18bc;
             border: 1px solid;
-          "
-        >
+          ">
           已选择（{{ isSelectedList.length }}）<van-icon name="arrow-down" />
         </button>
-        <button
-          style="
+        <button style="
             border-radius: 0;
             border: 1px solid #1d18bc;
             border-top-right-radius: 5rem;
             border-bottom-right-radius: 5rem;
-          "
-          class="btn"
-          @click="updown()"
-        >
+          " class="btn" @click="updown()">
           确认提交
         </button>
       </view>
     </view>
-    <is-selected-tags
-      ref="isSelectedTags"
-      :isSelectedList="isSelectedList"
-      @clearAll="clearAll"
-      @updown="updown"
-      @spiliceIsSelectedList="spiliceIsSelectedList"
-    />
+    <is-selected-tags ref="isSelectedTags" :isSelectedList="isSelectedList" @clearAll="clearAll" @updown="updown"
+      @spiliceIsSelectedList="spiliceIsSelectedList" />
   </view>
 </template>
 <!-- 多选组件 -->
@@ -342,6 +303,7 @@ export default {
     line-height: 69rpx;
   }
 }
+
 .searchinput {
   .uni-easyinput__content-input {
     height: 70rpx;
@@ -357,6 +319,7 @@ export default {
   bottom: 0;
   left: 0;
   z-index: 1000;
+
   button {
     &::after {
       border: none;
@@ -371,6 +334,7 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+
 .chooseCompanyTags {
   .title_1 {
     font-size: 28rpx;
@@ -380,6 +344,7 @@ export default {
     height: 64rpx;
     line-height: 64rpx;
   }
+
   .title_2 {
     font-size: 26rpx;
     font-weight: 500;
@@ -388,22 +353,26 @@ export default {
     line-height: 64rpx;
     text-align: left;
   }
+
   .title_3 {
     margin-bottom: 12rpx;
     font-size: 26rpx;
     font-weight: 500;
     color: #777777;
   }
+
   .cell_1 {
     float: left;
     width: 10%;
   }
+
   .checkbox {
     border: 1px solid #cccccc;
-    border-radius: 4rpx  4rpx  4rpx  4rpx;
+    border-radius: 4rpx 4rpx 4rpx 4rpx;
     height: 30rpx;
     width: 30rpx;
   }
+
   .cell_2 {
     float: left;
     width: 90%;
@@ -424,17 +393,20 @@ export default {
     color: white;
     float: left;
   }
+
   .jichuback {
     width: calc(100% - 64rpx);
     margin: 32rpx;
     background: white;
     border-bottom: 2rpx solid #cccccc;
   }
+
   .tags_type {
     width: calc(100% - 64rpx);
     margin: 16rpx;
   }
 }
+
 .btn-view {
   width: 100%;
   height: 100rpx;
@@ -445,6 +417,7 @@ export default {
   left: 0;
   z-index: 1000;
 }
+
 .btn {
   width: 40%;
   height: 90rpx;
@@ -453,6 +426,7 @@ export default {
   color: white;
   float: left;
 }
+
 .select-container {
   width: 100vw;
   height: 100vh;
@@ -461,16 +435,19 @@ export default {
   top: 0;
   z-index: 999;
   $paddingLR: 18rpx;
+
   .mask {
     width: 100%;
     height: 100%;
     background-color: $uni-bg-color-mask;
     opacity: 0;
     transition: opacity 0.3s;
+
     &.mask-show {
       opacity: 1;
     }
   }
+
   // 选择器内容区域
   .select-box {
     width: 100%;
@@ -480,9 +457,11 @@ export default {
     transform: translate3d(0px, 100%, 0px);
     background-color: $uni-bg-color;
     transition: all 0.3s;
+
     &.select-box-show {
       transform: translateZ(0);
     }
+
     .header {
       display: flex;
       box-sizing: border-box;
@@ -492,9 +471,11 @@ export default {
       line-height: 76rpx;
       font-size: 30rpx;
       padding: 0 $paddingLR;
+
       .cancel {
         color: $uni-text-color-grey;
       }
+
       .all {
         .all-active {
           &::after {
@@ -504,21 +485,25 @@ export default {
           }
         }
       }
+
       .confirm {
         color: $uni-color-primary;
       }
     }
+
     .body-warp {
       width: 100%;
       height: 30vh;
       box-sizing: border-box;
       padding: 20rpx $paddingLR;
     }
+
     .body {
       width: 96%;
       height: 70%;
       overflow-y: auto;
       padding: 2%;
+
       .empty-tips {
         margin-top: 25%;
         text-align: center;

pages/subPackages/announcement/detail.vue

@@ -79,22 +79,20 @@ export default {
               success: function (res) {
                 // 保存路径
                 console.log(res);
-                setTimeout(() => {
-                  //打开文档查看
-                  uni.openDocument({
-                    filePath: res.savedFilePath,
-                    success: function (res) {
-                      console.log("res", res);
-                    },
-                    fail: function (error) {
-                      console.log(error);
-                      wx.previewImage({
-                        current: "", // 当前显示图片的http链接
-                        urls: [url], // 需要预览的图片http链接列表
-                      });
-                    },
-                  });
-                }, 3000);
+                uni.openDocument({
+                  showMenu: true,
+                  filePath: res.savedFilePath,
+                  success: function (res) {
+                    console.log("res", res);
+                  },
+                  fail: function (error) {
+                    console.log(error);
+                    wx.previewImage({
+                      current: "", // 当前显示图片的http链接
+                      urls: [url], // 需要预览的图片http链接列表
+                    });
+                  },
+                });
               },
             });
           }
@@ -221,4 +219,4 @@ export default {
     padding: 10px 30px;
   }
 }
-</style>
+</style>

pages/subPackages/companyDetails/companyDetails.vue

@@ -332,7 +332,7 @@
                     text-align: right;
                     padding-right: 10px;
                     padding-bottom: 10rpx;
-                    margi-bottom: 10rpx;
+                    margin-bottom: 10rpx;
                   ">
                   {{
                     form.honorInformation ? form.honorInformation.length : 0
@@ -354,6 +354,36 @@
           </uni-collapse-item>
         </uni-collapse>
       </div>
+      <div class="list-row" style="padding-top: 0">
+        <uni-collapse v-model="value3" style="width: 100%">
+          <uni-collapse-item title="经发数据" @change="selectItems">
+            <view slot="title" class="uni-collapse-item__title-text">经发数据</view>
+            <div style="margin-bottom: 15rpx;">
+              <picker @change="selectYears" :range="nowYearArry">
+                <div class="jfsjBox fontcolor251FCA" style="margin-bottom: 15rpx;">
+                  <div>{{ selectYear.length === 0 ? '请选择' : selectYear }}</div>
+                  <van-icon name="arrow" />
+                </div>
+              </picker>
+              <div style="display: flex;">
+                <div style="width: 33%;text-align: center;" class="border1pxCCCCC pad15rpx">年月</div>
+                <div style="width: 33%;text-align: center;" class="border1pxCCCCC pad15rpx">营收(万元)</div>
+                <div style="width: 33%;text-align: center;" class="border1pxCCCCC pad15rpx">税收(万元)</div>
+
+              </div>
+              <div v-for="item in jfList" style="display: flex;">
+                <div style="width: 33%;text-align: center;" class="border1pxCCCCC pad15rpx">{{ item.yearmonth }}</div>
+                <div style="width: 33%;text-align: center;" class="border1pxCCCCC pad15rpx">{{ item.revenue || '-' }}
+                </div>
+                <div style="width: 33%;text-align: center;" class="border1pxCCCCC pad15rpx">{{ item.taxation }}</div>
+
+              </div>
+              <div></div>
+            </div>
+          </uni-collapse-item>
+
+        </uni-collapse>
+      </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">
@@ -554,7 +584,8 @@ import {
   findCompanyTags,
   selectByCompanyId,
   getRoomNameByCompanyId,
-  getAreaByIds
+  getAreaByIds,
+  findDetailByInfoAll
 } from "@/js_sdk/http";
 import handleReport from "../companyreport/components/handlereport.vue";
 export default {
@@ -563,7 +594,8 @@ export default {
   },
   data() {
     return {
-
+      selectYear: '',
+      value3: true,
       BASE_URI: this.$constant.BASE_URI,
       id: "",
       qymcString: [],
@@ -597,7 +629,10 @@ export default {
       mode: "default",
       dotsStyles: {},
       swiperDotIndex: 0,
-      jydzAry: []
+      jydzAry: [],
+      nowYear: null,
+      nowYearArry: [],
+      jfList: [],
     };
   },
 
@@ -611,9 +646,37 @@ export default {
   },
   onShow() {
     this.getByCodes();
+
+    const nowYear = (new Date()).getFullYear();
+    console.log(nowYear)
+    this.nowYear = nowYear
+    let nowYearArry = []
+    nowYearArry.push(nowYear)
+    for (let i = 1; i < 6; i++) {
+      // console.log(nowYear - i)
+      nowYearArry.push(nowYear - i)
+    }
+    // console.log(nowYearArry)
+    this.selectYear = nowYear
+    this.nowYearArry = nowYearArry
     this.findCompanyTags(this.id);
+    this.findDetailByInfoAll()
   },
   methods: {
+    selectYears(e) {
+      this.selectYear = this.nowYearArry[e.detail.value]
+      console.log(this.nowYearArry[e.detail.value])
+      console.log(e)
+      this.findDetailByInfoAll()
+    },
+    async findDetailByInfoAll() {
+      let data = await findDetailByInfoAll({
+        yearmonth: this.selectYear,
+        companyId: this.id
+      })
+      this.jfList = data || []
+      console.log('经发数据列表', data)
+    },
     async getRoomNameByCompanyId() {
       let socialCarrierName = await getRoomNameByCompanyId({
         companyId: this.id,
@@ -625,7 +688,7 @@ export default {
     },
     async selectByCompanyId1() {
       let zaiti = await selectByCompanyId({ companyId: this.id });
-      console.log("zaitizaitizaitizaiti", zaiti);
+      // console.log("zaitizaitizaitizaiti", zaiti);
       let socialCarrierStr = [];
       let socialCarrierStrName = [];
       let socialCarrierLeaseStr = [];
@@ -636,7 +699,7 @@ export default {
       let contractCarrierNoStrName = [];
       for (let i = 0; i < zaiti.length; i++) {
         let item = zaiti[i];
-        console.log(item.propertyNature, item.socialType);
+        // console.log(item.propertyNature, item.socialType);
         if (item.propertyNature === "2" && item.socialType === "1") {
           socialCarrierStr.push(item.houseId);
           socialCarrierStrName.push(
@@ -670,7 +733,7 @@ export default {
       this.form.socialCarrierNoTrueName = socialCarrierNoTrueName.join(",");
       this.form.contractCarrierNoStr = contractCarrierNoStr.join(",");
       this.form.contractCarrierNoStrName = contractCarrierNoStrName.join(",");
-      console.log(this.form);
+      // console.log(this.form);
     },
     async findCompanyTags(id) {
       let data = await findCompanyTags(id);
@@ -709,7 +772,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)
+        // console.log(index)
         if (index != -1) return CURRENCY[index].label;
         else return "暂无";
       }
@@ -804,8 +867,7 @@ export default {
           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) => {
@@ -813,15 +875,15 @@ export default {
             })
           }
           this.jydzAry = jydzAry
-          console.log(jydzAry)
+          // console.log(jydzAry)
         } else {
           this.jydzAry = []
         }
         that.findCompanyTags(e);
         that.form = detail.data;
-        console.log(detail.data.frsfzh);
+        // console.log(detail.data.frsfzh);
         that.form.qymcString = qymcString;
-        console.log(that.form.jyfw.split(","));
+        // console.log(that.form.jyfw.split(","));
         that.form.jyfw = that.form.jyfw.split(",");
         if (detail.data.ryxxzp && detail.data.ryxxzp.length > 0) {
           that.form.ryxxzp = detail.data.ryxxzp.split(",");
@@ -857,6 +919,27 @@ export default {
   text-overflow: ellipsis;
 }
 
+.housedetails {
+  .pad15rpx {
+    padding: 15rpx;
+  }
+
+  .border1pxCCCCC {
+    border: 1px solid #cccccc;
+  }
+
+  .jfsjBox {
+    height: 50rpx;
+    padding: 5rpx 15rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: #cccc;
+    width: 130rpx;
+    border-radius: 0.5rem;
+  }
+}
+
 .form_row {
   height: 40rpx;
   font-weight: 400;

pages/subPackages/companyDetailsEdit/companyDetailsEdit.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="housedetailsedit">
-    <div class="list">
-      <div class="list-row" style="padding-top: 0">
+  <view class="housedetailsedit">
+    <view class="list">
+      <view class="list-row" style="padding-top: 0">
         <uni-collapse v-model="value" style="width: 100%">
           <uni-collapse-item title="基础信息">
-            <div style="height: auto; padding-bottom: 200rpx">
+            <view style="height: auto; padding-bottom: 200rpx">
               <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx">
                 <view class="input_title float_left">公司名称：</view>
                 <input style="color: #777" class="input_value float_left" placeholder="暂无" v-model="form.qymc" />
@@ -22,13 +22,13 @@
                 <view class="input_title float_left">币别：</view>
                 <picker style="float: left; width: 360rpx; height: 40rpx; color: #777" @change="getBizhongtype"
                   range-key="label" :range="dic_SelectList.CURRENCY">
-                  <div style="width: 315rpx; float: left">
+                  <view style="width: 315rpx; float: left">
                     {{
                       bizhongIndex == null
                         ? "请选择"
                         : dic_SelectList.CURRENCY[bizhongIndex].label
                     }}
-                  </div>
+                  </view>
                   <img class="height40rpx width40rpx float_left" src="../../../static/mine/youjiantou.png" alt="" />
                 </picker>
               </view>
@@ -36,13 +36,13 @@
                 <view class="input_title float_left">注册时间：</view>
                 <picker style="float: left; width: 360rpx; height: 40rpx; color: #777" mode="date" :value="form.zcsj"
                   @change="getZcsj">
-                  <div style="width: 315rpx; float: left">
+                  <view style="width: 315rpx; float: left">
                     {{
                       form.zcsj == "" || form.zcsj == null
                         ? "请选择"
                         : form.zcsj
                     }}
-                  </div>
+                  </view>
                   <img class="height40rpx width40rpx float_left" src="../../../static/mine/youjiantou.png" alt="" />
                 </picker>
               </view>
@@ -210,7 +210,7 @@
                   <span style="color: red">*&nbsp;</span>
                   所属园区
                 </view>
-                <div style="width: 315rpx; float: left">{{ form.parkInfoName || '请选择' }}</div>
+                <view style="width: 315rpx; float: left">{{ form.parkInfoName || '请选择' }}</view>
                 <!--                <img class="height40rpx width40rpx float_left" src="../../../static/mine/youjiantou.png" alt="" />-->
               </view>
 
@@ -233,14 +233,14 @@
               <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>经营地址载体：</div>
+                  <view>经营地址载体：</view>
                   <van-button type="default" size="mini" color="#1f1fbe" @click="addJydzAry()">添加</van-button>
                 </view>
-                <div v-for="item in jydzAry" class="jydzList">
-                  <div class="jydzList-row">{{ item.name }}</div>
+                <view v-for="item in jydzAry" class="jydzList">
+                  <view class="jydzList-row">{{ item.name }}</view>
                   <van-button type="default" size="mini" color="rgba(236, 128, 141, 1)"
                     @click="deletZt(index)">删除</van-button>
-                </div>
+                </view>
               </view>
 
               <textarea class="mt24rpx border_bottom_ccc" :maxlength="2000" placeholder="请输入经营地址说明"
@@ -256,16 +256,16 @@
                 <view class="input_title float_left">
                   <span style="color: red">*&nbsp;</span> 主营业务：
                 </view>
-                <div>
-                  <div style="display: flex" v-for="(item, index) in form.jyfwAry" :key="index">
+                <view>
+                  <view style="display: flex" v-for="(item, index) in form.jyfwAry" :key="index">
                     <input style="color: #050505; width: 80%" class="input_value" placeholder="请输入"
                       v-model="item.name" />
                     <van-button v-if="index == 0" type="default" size="mini" color="#1f1fbe"
                       @click="addJyfw()">添加</van-button>
                     <van-button v-if="index != 0" type="default" size="mini" color="rgba(236, 128, 141, 1)"
                       @click="deleteJyfw(index)">删除</van-button>
-                  </div>
-                </div>
+                  </view>
+                </view>
               </view> -->
 
               <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height300rpxs">
@@ -276,7 +276,7 @@
                     padding: 20rpx;
                     width: calc(100% - 40rpx);
                   " />
-                <div style="
+                <view style="
                     background: rgba(249, 249, 249, 1);
                     text-align: right;
                     padding-right: 10px;
@@ -286,7 +286,7 @@
                   {{
                     form.honorInformation ? form.honorInformation.length : 0
                   }}/2000
-                </div>
+                </view>
                 <view class="custom-image-box" style="margin-top: 20rpx">
                   <van-uploader :max-count="6" @delete="deleteRYXXZP" :file-list="form.RYXXZPList"
                     @after-read="uploadRYXXZP" :show-upload="true" />
@@ -294,19 +294,20 @@
               </view>
               <view class="width100 mt24rpx padb24rpx border_bottom_ccc list_date" style="display: flex">
                 <view class="input_title mb16rpx float_left" style="width: 30%">经营范围：</view>
-                <div style="width: 100%">
-                  <div style="display: flex; justify-self: flex-end" v-for="(item, index) in form.jyfwAry" :key="index">
+                <view style="width: 100%">
+                  <view style="display: flex; justify-self: flex-end" v-for="(item, index) in form.jyfwAry"
+                    :key="index">
                     <textarea type="textare" style="color: #050505; width: 80%;height: 270rpx;" class="input_value"
                       placeholder="请输入" v-model="form.jyfwAry[index].name">
                       </textarea>
-                    <div>
+                    <view>
                       <van-button v-if="index == 0" type="default" size="small" color="#1f1fbe"
                         @click="addJyfw()">添加</van-button>
                       <van-button v-if="index != 0" type="default" size="small" color="rgba(236, 128, 141, 1)"
                         @click="deleteJyfw(index)">删除</van-button>
-                    </div>
-                  </div>
-                </div>
+                    </view>
+                  </view>
+                </view>
               </view>
 
               <view class="width100 mt24rpx list_date height40rpx">
@@ -331,129 +332,132 @@
                 @click="chosseAboutCompany()">
                 <view class="input_title float_left">关联企业：</view>
 
-                <div style="color: #777; width: 60%" class="float_left">
+                <view style="color: #777; width: 60%" class="float_left">
                   {{
                     form.associationCompanyName
                       ? form.associationCompanyName
                       : "请选择"
                   }}
-                </div>
+                </view>
               </view>
 
-              <div class="form border_bottom_ccc">
-                <div class="width100 mt24rpx padb24rpx list_date">附件：</div>
-                <div class="width100 mt24rpx padb24rpx list_date _div data-v-6c6f8f24">
-                  <div class="fujian">
+              <view class="form border_bottom_ccc">
+                <view class="width100 mt24rpx padb24rpx list_date">附件：</view>
+                <view class="width100 mt24rpx padb24rpx list_date _view data-v-6c6f8f24">
+                  <view class="fujian">
                     <van-uploader accept="all" :max-count="6" :file-list="form.fileList" @after-read="uploadFileList"
                       :show-upload="false">
                       <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.fileList" :key="index">
-                      <div class="filename">{{ item.name }}</div>
+                    <view @click="openFile(item)" class="file" v-for="(item, index) in form.fileList" :key="index">
+                      <view class="filename">{{ item.name }}</view>
 
                       <uni-icons type="closeempty" size="20" @click="deleteFileList(index)"></uni-icons>
-                    </div>
-                  </div>
-                </div>
-                <div class="first_title" style="height: auto">
+                    </view>
+                  </view>
+                </view>
+                <view class="first_title" style="height: auto">
                   关联社会载体：
-                </div>
+                </view>
 
-                <div class="form_row pdt32 pdb32 border_bottom_ccc width100"
+                <view class="form_row pdt32 pdb32 border_bottom_ccc width100"
                   style="display: flex; height: auto; align-items: center">
-                  <div class="width30 first_title" style="height: auto">
+                  <view class="width30 first_title" style="height: auto">
                     自有：
-                  </div>
-                  <div @click="jumpChosseHouse('自有')" style="width: 65%" class="float_left font28rpx color292d98">
+                  </view>
+                  <view @click="jumpChosseHouse('自有')" style="width: 65%" class="float_left font28rpx color292d98">
                     {{
                       form.socialCarrierStrName
                         ? form.socialCarrierStrName
                         : "请选择"
                     }}
-                  </div>
+                  </view>
                   <img @click="jumpChosseHouse('自有')" class="height40rpx width40rpx"
                     src="../../../static/mine/youjiantou.png" alt="" />
-                </div>
-                <div class="form_row pdt32 pdb32 border_bottom_ccc width100"
+                </view>
+                <view class="form_row pdt32 pdb32 border_bottom_ccc width100"
                   style="display: flex; height: auto; align-items: center">
-                  <div class="width30 first_title" style="height: auto">
+                  <view class="width30 first_title" style="height: auto">
                     租赁：
-                  </div>
-                  <div @click="jumpChosseHouse('租赁')" style="width: 65%" class="float_left font28rpx color292d98">
+                  </view>
+                  <view @click="jumpChosseHouse('租赁')" style="width: 65%" class="float_left font28rpx color292d98">
                     {{
                       form.socialCarrierLeaseStrName
                         ? form.socialCarrierLeaseStrName
                         : "请选择"
                     }}
-                  </div>
+                  </view>
                   <img @click="jumpChosseHouse('租赁')" class="height40rpx width40rpx"
                     src="../../../static/mine/youjiantou.png" alt="" />
-                </div>
-                <div class="form_row pdt32 pdb32 border_bottom_ccc width100"
+                </view>
+                <view class="form_row pdt32 pdb32 border_bottom_ccc width100"
                   style="display: flex; height: auto; align-items: center">
-                  <div class="width30 first_title" style="height: auto">
+                  <view class="width30 first_title" style="height: auto">
                     未确定：
-                  </div>
-                  <div @click="jumpChosseHouse('未确定')" style="width: 65%" class="float_left font28rpx color292d98">
+                  </view>
+                  <view @click="jumpChosseHouse('未确定')" style="width: 65%" class="float_left font28rpx color292d98">
                     {{
                       form.socialCarrierNoTrueName
                         ? form.socialCarrierNoTrueName
                         : "请选择"
                     }}
-                  </div>
+                  </view>
                   <img @click="jumpChosseHouse('未确定')" class="height40rpx width40rpx"
                     src="../../../static/mine/youjiantou.png" alt="" />
-                </div>
-                <div class="first_title" style="height: auto; margin-top: 32rpx">
+                </view>
+                <view class="first_title" style="height: auto; margin-top: 32rpx">
                   关联自有载体：
-                </div>
-                <div class="form_row pdt32 pdb32 border_bottom_ccc width100"
+                </view>
+                <view class="form_row pdt32 pdb32 border_bottom_ccc width100"
                   style="display: flex; height: auto; align-items: center">
-                  <div class="width30 first_title">有合同：</div>
-                  <div style="width: 65%" class="float_left font28rpx color292d98">
+                  <view class="width30 first_title">有合同：</view>
+                  <view style="width: 65%" class="float_left font28rpx color292d98">
                     {{ form.socialCarrierName ? form.socialCarrierName : '请选择' }}
-                  </div>
+                  </view>
                   <img @click="jumpChosseHouse('有合同：')" class="height40rpx width40rpx"
                     src="../../../static/mine/youjiantou.png" alt="" />
-                </div>
-                <div class="form_row pdt32 pdb32 border_bottom_ccc width100"
+                </view>
+                <view class="form_row pdt32 pdb32 border_bottom_ccc width100"
                   style="display: flex; height: auto; align-items: center">
-                  <div class="width30 first_title" style="height: auto">
+                  <view class="width30 first_title" style="height: auto">
                     无合同：
-                  </div>
-                  <div @click="jumpChosseHouse('无合同')" style="width: 65%" class="float_left font28rpx color292d98">
+                  </view>
+                  <view @click="jumpChosseHouse('无合同')" style="width: 65%" class="float_left font28rpx color292d98">
                     {{
                       form.contractCarrierNoStrName
                         ? form.contractCarrierNoStrName
                         : "请选择"
                     }}
-                  </div>
+                  </view>
                   <img @click="jumpChosseHouse('无合同')" class="height40rpx width40rpx"
                     src="../../../static/mine/youjiantou.png" alt="" />
-                </div>
-              </div>
-            </div>
-            <div class="form">
-              <!-- <div
+                </view>
+              </view>
+            </view>
+            <view class="form">
+              <!-- <view
           style="height: 45px; width: 500px; background: black"
 
-        ></div> -->
-            </div>
+        ></view> -->
+            </view>
           </uni-collapse-item>
         </uni-collapse>
-      </div>
-    </div>
+      </view>
+    </view>
     <view class="‘btn-view‘">
-      <div class="btn" @click="edit()">编辑</div>
+      <view class="btn" @click="edit()">编辑</view>
     </view>
+    <compnay-select v-show="show" @colseSelectPage="colseSelectPage" @getCompanyAll="getCompanyListFy"
+      @addPageNum="addPageNum" :data="companyAllList" :default-selected="defaultSelected" @confirm="confirm"
+      ref="compnaySelect" />
     <handle-report ref="handleReport" @changeActive="changeActive" />
     <select-dengjiren ref="selectDengjiren" :multiple="true" :range="range" :selectParent="true" :foldAll="true"
       rangeKey="name" idKey="id" @xiangmudengji="selectDengjiren">
     </select-dengjiren>
-    <multiple-select v-model="show" @getCompanyAll="getCompanyAll" :data="companyAllList"
-      :default-selected="defaultSelected" @confirm="confirm" ref="multipleSelect"></multiple-select>
+
     <zaiti-tree ref="zaitiTree" :multiple="true" :range="range" :selectParent="true" :foldAll="true" rangeKey="label"
       idKey="id" @confirm="selectZaiti" />
+
     <van-popup :show="treeData3DialogVisible" position="bottom">
 
       <van-cascader :options="treeData3List" :title="null" :field-names="{ text: 'label', value: 'value' }"
@@ -464,7 +468,7 @@
       <van-cascader :options="trueData7List" :title="null" :field-names="{ text: 'label', value: 'value' }"
         @close="onClose" @finish="onFinishTreeData7" />
     </van-popup>
-  </div>
+  </view>
 </template>
 
 <script>
@@ -476,7 +480,6 @@ const form = {
   frsfzh_zhenmian: "../../../static/idzhengmian.png",
   frsfzh_fanmian: "../../../static/idfanmian.png",
   RYXXZPList: [],
-  id: "",
   qymc: "",
   shxydm: "",
   zczj: "",
@@ -484,7 +487,6 @@ const form = {
   lxdh: "",
   frsfzh: "",
   qylxr: "",
-  lxdh: "",
   email: "",
   cwfzr: "",
   cwfzrdh: "",
@@ -496,7 +498,6 @@ const form = {
   ryxxzp: "",
   rdInvestment: "",
   jgInvestment: "",
-  jgInvestment: "",
   fourOpennessAmount: "",
   fourTransferenceAmount: "",
   fourServiceAmount: "",
@@ -514,7 +515,7 @@ import {
   companyECdit,
   interviewEscalationListAll,
   getSelectUserTwo,
-  getCompanyAll,
+  getCompanyListFy,
   selectByCompanyId,
   getTreeData6,
   findRoomInfoListByIds,
@@ -523,8 +524,7 @@ import {
   getTreeData3,
   getTreeData7,
 } from "@/js_sdk/http";
-// import multipleSelect from "../../subPackages/components/momo-multipleSelect/momo-multipleSelect";
-import multipleSelect from "./momo-multipleSelect.vue";
+import compnaySelect from "./compnaySelect.vue";
 import zaitiTree from "@/components/zaiti-tree/index.vue";
 import handleReport from "../companyreport/components/handlereport.vue";
 import selectDengjiren from "../../subPackages/components/select_dengjiren/tkitree.vue";
@@ -533,11 +533,12 @@ export default {
   components: {
     handleReport,
     selectDengjiren,
-    multipleSelect,
+    compnaySelect,
     zaitiTree,
   },
   data() {
     return {
+      defaultSelected: [],
       treeData3List: [],
       trueData7List: [],
       jydzAry: [],
@@ -561,13 +562,16 @@ export default {
       activeNames: [],
       StatusBar: 0,
       search: {
-        pageSize: 10,
+        pageSize: 20,
         pageNum: 1,
       },
       form: {
         ...form,
       },
-      value: true,
+      companySearchData: {
+        pageNum: 1,
+        pageSize: 20,
+      },
       value1: true,
       list: [],
       value: ["0"],
@@ -582,45 +586,59 @@ export default {
   onShow() {
     let that = this;
     uni.$on("getuser", function (e) {
-      console.log(e);
-      findRoomInfoListByIds(e.result.join(",")).then((data) => {
-        let roomString = data.map((e) => {
-          return e.roomString;
-        });
-        let ids = data.map((e) => {
-          return e.id;
+      if (e) {
+        findRoomInfoListByIds(e.result.join(",")).then((data) => {
+          let roomString = data.map((e) => {
+            return e.roomString;
+          });
+          let ids = data.map((e) => {
+            return e.id;
+          });
+          if (e.housetype == "自有") {
+            that.form.socialCarrierStr = ids.join(",");
+            that.form.socialCarrierStrName = roomString.join(",");
+            console.log(roomString);
+          }
+          if (e.housetype == "租赁") {
+            that.form.socialCarrierLeaseStr = ids.join(",");
+            that.form.socialCarrierLeaseStrName = roomString.join(",");
+            console.log(roomString);
+          }
+          if (e.housetype == "未确定") {
+            that.form.socialCarrierNoTrue = ids.join(",");
+            that.form.socialCarrierNoTrueName = roomString.join(",");
+            console.log(roomString);
+          }
+          if (e.housetype == "无合同") {
+            that.form.contractCarrierNoStr = ids.join(",");
+            that.form.contractCarrierNoStrName = roomString.join(",");
+            console.log("无合同", roomString);
+          }
         });
-        if (e.housetype == "自有") {
-          that.form.socialCarrierStr = ids.join(",");
-          that.form.socialCarrierStrName = roomString.join(",");
-          console.log(roomString);
-        }
-        if (e.housetype == "租赁") {
-          that.form.socialCarrierLeaseStr = ids.join(",");
-          that.form.socialCarrierLeaseStrName = roomString.join(",");
-          console.log(roomString);
-        }
-        if (e.housetype == "未确定") {
-          that.form.socialCarrierNoTrue = ids.join(",");
-          that.form.socialCarrierNoTrueName = roomString.join(",");
-          console.log(roomString);
-        }
-        if (e.housetype == "无合同") {
-          that.form.contractCarrierNoStr = ids.join(",");
-          that.form.contractCarrierNoStrName = roomString.join(",");
-          console.log("无合同", roomString);
-        }
-      });
+      }
+      console.log(e);
+
     });
   },
   onLoad(option) {
     this.id = option.id;
-    this.getCompanyAll();
+    this.getCompanyListFy();
     this.getByCodes();
     this.getTreeData3()
     this.getTreeData7()
   },
   methods: {
+    clearCompaynList() {
+      this.companySearchData.pageNum = 1
+    },
+    addPageNum() {
+      this.companySearchData.pageNum += 1
+      this.getCompanyListFy();
+    },
+    colseSelectPage() {
+      console.log(9)
+      this.show = false
+    },
     async getTreeData7() {
       let that = this
       let datdepartmentList = await getTreeData7()
@@ -824,14 +842,17 @@ export default {
       this.form.jyfwAry = jyfwAry
       this.$forceUpdate();
     },
+
+
     chosseAboutCompany() {
-      console.log(123);
-      try {
-        this.show = true;
-        this.$refs.multipleSelect.getAllList(this.companyAllList);
-      } catch (error) {
-        console.log("error", error);
-      }
+      console.log(123111);
+      // try {
+      let that = this
+      that.show = true;
+      that.$refs.compnaySelect.getAllList(this.companyAllList);
+      // } catch (error) {
+      // console.log("error", error);
+      // }
     },
     confirm(e) {
       console.log(e);
@@ -845,16 +866,20 @@ export default {
       this.form.associationCompanyName = associationCompanyString.join(",");
       this.form.associationCompany = associationCompany.join(",");
       console.log(associationCompanyString.join(","));
+      this.show = false
       this.$forceUpdate();
     },
-    async getCompanyAll() {
-      let companyAllList = await getCompanyAll();
-      this.companyAllList = companyAllList.map((e) => {
+    async getCompanyListFy(qymc = null) {
+      this.companySearchData.qymc = qymc
+      let companyAllList = await getCompanyListFy(this.companySearchData);
+      this.companyAllList = companyAllList.rows.map((e) => {
         return {
           label: e.qymc,
           value: e.id,
         };
       });
+      console.log('companyAllList11', this.companyAllList)
+      this.$refs.compnaySelect.getAllList(this.companyAllList);
     },
     deleteFileList(i) {
       this.form.fileList.splice(i, 1);
@@ -1141,14 +1166,12 @@ export default {
           ? that.form.shareCertificateCode
           : "",
         leaseArea: that.form.leaseArea ? that.form.leaseArea : 0,
-        zcdz: that.form.zcdz,
         areaSize: this.form.areaSize,
         jydzValue: this.form.jydzValue,
         qymc: that.form.qymc,
         shxydm: that.form.shxydm,
         zczj: that.form.zczj ? that.form.zczj : 0,
         fddbr: that.form.fddbr,
-        lxdh: that.form.lxdh,
         jyfw: jyfwAry.join(","),
         frsfzh: that.form.frsfzh_zhenmian + "," + that.form.frsfzh_fanmian,
         qylxr: that.form.qylxr ? that.form.qylxr : "",
@@ -1425,6 +1448,8 @@ export default {
 }
 
 .housedetailsedit {
+  position: relative;
+
   .btn-view {
     width: 100%;
     height: 100rpx;

pages/subPackages/companyDetailsEdit/momo-multipleSelect.vue

@@ -1,47 +1,23 @@
 <template>
-  <view class="select-container" v-show="show" @touchmove.stop.prevent>
-    <view
-      class="mask"
-      :class="activeClass ? 'mask-show' : ''"
-      @tap="onCancel(true)"
-    ></view>
+
+  <view class="select-container" @touchmove.stop.prevent>
+    <view class="mask" :class="activeClass ? 'mask-show' : ''" @tap="onCancel(true)"></view>
     <view class="select-box" :class="activeClass ? 'select-box-show' : ''">
       <div style="height: 900rpx">
         <div style="display: flex">
-          <uni-easyinput
-            type="text"
-            class="searchinput"
-            v-model="formData.qymc"
-            placeholder="输入关联企业名称（模糊查询）"
-            style="height: 70rpx"
-          />
-          <van-button
-            class="searchbutton"
-            style="height: 70rpx"
-            type="primary"
-            @click="getCompaynList()"
-            >搜索</van-button
-          >
+          <uni-easyinput type="text" class="searchinput" v-model="formData.qymc" placeholder="输入关联企业名称（模糊查询）"
+            style="height: 70rpx" />
+          <van-button class="searchbutton" style="height: 70rpx" type="primary"
+            @click="getCompaynList()">搜索</van-button>
         </div>
         <div class="chooseCompanyTags">
-          <scroll-view
-            class="body"
-            scroll-y="true"
-            style="position: absolute; z-index: 1000"
-          >
-            <div
-              v-for="(item, index) in companyList"
-              :key="index"
-              class="selectlist"
-            >
+          <scroll-view class="body" @scrolltolower="scrolltolower" scroll-y="true"
+            style="position: absolute; z-index: 1000">
+            <div v-for="(item, index) in companyList" :key="index" class="selectlist">
               <div class="title_2">
                 {{ item.label }}
               </div>
-              <div
-                v-if="!item.isSelected"
-                class="title_1"
-                @click="chosseTags(item, index)"
-              >
+              <div v-if="!item.isSelected" class="title_1" @click="chosseTags(item, index)">
                 <uni-icons type="plusempty" size="30rpx"></uni-icons>
               </div>
             </div>
@@ -50,41 +26,29 @@
       </div>
 
       <view class="btn-view">
-        <button
-          class="btn"
-          @click="openTagsDialog()"
-          style="
+        <button class="btn" @click="openTagsDialog()" style="
             border-top-left-radius: 5rem;
             border-bottom-left-radius: 5rem;
             background: white;
             color: #1d18bc;
             border: 1px solid;
-          "
-        >
+          ">
           已选择（{{ isSelectedList.length }}）<van-icon name="arrow-down" />
         </button>
-        <button
-          style="
+        <button style="
             border-radius: 0;
             border: 1px solid #1d18bc;
             border-top-right-radius: 5rem;
             border-bottom-right-radius: 5rem;
-          "
-          class="btn"
-          @click="updown()"
-        >
+          " class="btn" @click="updown()">
           确认提交
         </button>
       </view>
     </view>
-    <is-selected-tags
-      ref="isSelectedTags"
-      :isSelectedList="isSelectedList"
-      @clearAll="clearAll"
-      @updown="updown"
-      @spiliceIsSelectedList="spiliceIsSelectedList"
-    />
+    <is-selected-tags ref="isSelectedTags" :isSelectedList="isSelectedList" @clearAll="clearAll" @updown="updown"
+      @spiliceIsSelectedList="spiliceIsSelectedList" />
   </view>
+
 </template>
 <!-- 多选组件 -->
 <script>
@@ -97,7 +61,7 @@ export default {
       isSelectList: [],
       formData: {},
       show: false, //是否显示
-      activeClass: false, //激活样式状态
+      activeClass: true, //激活样式状态
       selectedArr: [], //选择对照列表
       selectedArrOld: [], //选择对照列表上一次的数据
     };
@@ -109,10 +73,12 @@ export default {
     this.show = this.value;
   },
   methods: {
+
     async updown() {
       console.log(this.isSelectedList);
       this.$emit("confirm", this.isSelectedList);
       this.show = false;
+      this.emit('colseSelectPage')
     },
     clearAll() {
       this.isSelectedList = [];
@@ -149,13 +115,20 @@ export default {
       this.$refs.isSelectedTags.onOpen([]);
     },
     getAllList(data) {
-      this.companyList = data;
+      console.log(data)
+      this.companyList = [...this.companyList, ...data];
     },
     getCompaynList() {
+      this.companyList = []
+      this.$emit('clearCompaynList')
       console.log(this.companyList);
       console.log(this.selectedArr);
       this.$emit("getCompanyAll", this.formData.qymc);
     },
+    scrolltolower(e) {
+      console.log(e)
+      this.$emit('addPageNum')
+    },
     // 设置默认选中通用办法
     setItemActiveState() {
       if (this.companyList.length && this.defaultSelected.length) {
@@ -312,8 +285,8 @@ export default {
   },
   watch: {
     async value(newVal) {
+      console.log(newVal)
       this.show = newVal;
-      await this.$nextTick();
       this.activeClass = newVal;
       if (newVal) {
         this.selectedArrOld = JSON.parse(JSON.stringify(this.selectedArr));
@@ -341,6 +314,7 @@ export default {
     line-height: 69rpx;
   }
 }
+
 .searchinput {
   .uni-easyinput__content-input {
     height: 70rpx;
@@ -356,6 +330,7 @@ export default {
   bottom: 0;
   left: 0;
   z-index: 1000;
+
   button {
     &::after {
       border: none;
@@ -370,6 +345,7 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+
 .chooseCompanyTags {
   .title_1 {
     font-size: 28rpx;
@@ -379,6 +355,7 @@ export default {
     height: 64rpx;
     line-height: 64rpx;
   }
+
   .title_2 {
     font-size: 26rpx;
     font-weight: 500;
@@ -387,22 +364,26 @@ export default {
     line-height: 64rpx;
     text-align: left;
   }
+
   .title_3 {
     margin-bottom: 12rpx;
     font-size: 26rpx;
     font-weight: 500;
     color: #777777;
   }
+
   .cell_1 {
     float: left;
     width: 10%;
   }
+
   .checkbox {
     border: 1px solid #cccccc;
-    border-radius: 4rpx  4rpx  4rpx  4rpx;
+    border-radius: 4rpx 4rpx 4rpx 4rpx;
     height: 30rpx;
     width: 30rpx;
   }
+
   .cell_2 {
     float: left;
     width: 90%;
@@ -423,17 +404,20 @@ export default {
     color: white;
     float: left;
   }
+
   .jichuback {
     width: calc(100% - 64rpx);
     margin: 32rpx;
     background: white;
     border-bottom: 2rpx solid #cccccc;
   }
+
   .tags_type {
     width: calc(100% - 64rpx);
     margin: 16rpx;
   }
 }
+
 .btn-view {
   width: 100%;
   height: 100rpx;
@@ -444,6 +428,7 @@ export default {
   left: 0;
   z-index: 1000;
 }
+
 .btn {
   width: 40%;
   height: 90rpx;
@@ -452,6 +437,7 @@ export default {
   color: white;
   float: left;
 }
+
 .select-container {
   width: 100vw;
   height: 100vh;
@@ -460,16 +446,19 @@ export default {
   top: 0;
   z-index: 999;
   $paddingLR: 18rpx;
+
   .mask {
     width: 100%;
     height: 100%;
     background-color: $uni-bg-color-mask;
     opacity: 0;
     transition: opacity 0.3s;
+
     &.mask-show {
       opacity: 1;
     }
   }
+
   // 选择器内容区域
   .select-box {
     width: 100%;
@@ -479,9 +468,11 @@ export default {
     transform: translate3d(0px, 100%, 0px);
     background-color: $uni-bg-color;
     transition: all 0.3s;
+
     &.select-box-show {
       transform: translateZ(0);
     }
+
     .header {
       display: flex;
       box-sizing: border-box;
@@ -491,9 +482,11 @@ export default {
       line-height: 76rpx;
       font-size: 30rpx;
       padding: 0 $paddingLR;
+
       .cancel {
         color: $uni-text-color-grey;
       }
+
       .all {
         .all-active {
           &::after {
@@ -503,21 +496,25 @@ export default {
           }
         }
       }
+
       .confirm {
         color: $uni-color-primary;
       }
     }
+
     .body-warp {
       width: 100%;
       height: 30vh;
       box-sizing: border-box;
       padding: 20rpx $paddingLR;
     }
+
     .body {
       width: 96%;
       height: 70%;
       overflow-y: auto;
       padding: 2%;
+
       .empty-tips {
         margin-top: 25%;
         text-align: center;
@@ -527,4 +524,4 @@ export default {
     }
   }
 }
-</style>
+</style>

pages/subPackages/companyDetailsEdit/isSelectedTags.vue

@@ -3,69 +3,47 @@
     <div class="vanpoup_1">
       <div style="display: flex">
         <div class="vanpoup_1_1">
-          <span style="font-size: 30rpx; color: #333333"
-            >已选择（{{ isSelectedList.length }}）</span
-          >
-          <span
-            @click="clearAll()"
-            style="float: right; color: #1d18bc; font-size: 30rpx"
-          >
-            清空</span
-          >
+          <span style="font-size: 30rpx; color: #333333">已选择（{{ isSelectedList.length }}）</span>
+          <span @click="clearAll()" style="float: right; color: #1d18bc; font-size: 30rpx">
+            清空</span>
         </div>
       </div>
       <scroll-view scroll-y="true" style="height: 50vh">
-        <div
-          style="display: flex"
-          v-for="(item, index) in isSelectedList"
-          :key="index"
-        >
+        <div style="display: flex" v-for="(item, index) in isSelectedList" :key="index">
           <div class="vanpoup_1_1">
             <span style="font-size: 30rpx; color: #333333">
               {{ item.label }}
             </span>
 
-            <span
-              @click="spiliceIsSelectedList(item, index)"
-              style="float: right; color: #1d18bc; font-size: 30rpx"
-            >
-              <van-icon name="cross"
-            /></span>
+            <span @click="spiliceIsSelectedList(item, index)" style="float: right; color: #1d18bc; font-size: 30rpx">
+              <van-icon name="cross" /></span>
           </div>
         </div>
       </scroll-view>
       <view class="btn-view">
-        <button
-          class="btn"
-          @click="closeTagsDialog()"
-          style="
+        <button class="btn" @click="closeTagsDialog()" style="
             border-top-left-radius: 5rem;
             border-bottom-left-radius: 5rem;
             background: white;
             color: #1d18bc;
             border: 1px solid;
-          "
-        >
+          ">
           已选择（{{ isSelectedList.length }}）<van-icon name="arrow-down" />
         </button>
-        <button
-          style="
+        <button style="
             border-radius: 0;
             border: 1px solid #1d18bc;
             border-top-right-radius: 5rem;
             border-bottom-right-radius: 5rem;
-          "
-          class="btn"
-          @click="updown()"
-        >
+          " class="btn" @click="updown()">
           确认提交
         </button>
       </view>
     </div>
   </van-popup>
 </template>
-  
-  <script>
+
+<script>
 import vanPopup from "../../../wxcomponents/weapp/dist/popup/index";
 import vanDatetimePicker from "../../../wxcomponents/weapp/dist/datetime-picker/index";
 export default {
@@ -120,8 +98,8 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss">
+
+<style lang="scss">
 .btn-view {
   width: 100%;
   height: 100rpx;
@@ -131,12 +109,14 @@ export default {
   bottom: 0;
   left: 0;
   z-index: 1000;
+
   button {
     &::after {
       border: none;
     }
   }
 }
+
 .btn {
   width: 40%;
   height: 90rpx;
@@ -145,6 +125,7 @@ export default {
   color: white;
   float: left;
 }
+
 .vanpoup_1 {
   height: 50vh;
   width: 100%;
@@ -152,6 +133,7 @@ export default {
   margin-bottom: 74rpx;
   padding: 64rpx;
 }
+
 .vanpoup_1_1 {
   width: 100%;
   border-bottom: 2rpx solid #cccccc;

pages/subPackages/companyHouse/companyHouse.vue

@@ -1,16 +1,21 @@
 <template>
   <div class="companyhouse">
     <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>
-        </van-col>
-        <van-col :span="2">
-          <img @click="jumpAddCompanyPage()" src="../../../static/add_company.png"
-            style="height: 50rpx; width: 50rpx; margin-top: 25rpx" alt="" />
-        </van-col>
-      </van-row>
+
+      <div style="display: flex;align-items: center;justify-content: space-around;">
+        <uni-search-bar style="width: 40%" placeholder="请输入公司名称" @confirm="confirm" clearButton="none"
+          cancelButton="none" v-model="search.qymc">
+
+        </uni-search-bar>
+        <div style="width: 40%" @click="openParkSelect">
+          <uni-search-bar style="width: 100%" class="parkIconHidden" placeholder="请所属园区" clearButton="none"
+            cancelButton="none" v-model="search.parkInfoName" readonly searchIcon="none">
+          </uni-search-bar>
+        </div>
+        <img @click="jumpAddCompanyPage()" src="../../../static/add_company.png" style="height: 50rpx; width: 50rpx;"
+          alt="" />
+      </div>
+
     </div>
     <van-tabs :active="active" @change="onChange">
       <van-tab title="全部" :name="null"></van-tab>
@@ -47,7 +52,7 @@
                 }}
               </div>
               <div class="second_title_1 width50 height40rpx float_left" @click="jumpPage(item.id)">
-                注册资本：{{ !item.zczj ? "暂无" : item.zczj + "万" }}
+                注册资金：{{ !item.zczj ? "暂无" : item.zczj + "万" }}
               </div>
             </div>
             <div @click="jumpPage(item.id)" class="width100 height28rpx font24rpx fontcolor251FCA chaochuyincang">
@@ -63,19 +68,29 @@
         <van-empty class="disblock marginauto" style="background: white" description="暂无数据" />
       </div>
     </div>
+
+    <van-popup :show="show" @close="onClose" position="bottom" round>
+      <van-cascader :value="treeData3List" :title="null" :field-names="{ text: 'label', value: 'value' }"
+        :options="treeData3List" @close="onClose" @finish="onFinish" />
+    </van-popup>
   </div>
 </template>
 
 <script>
-import { listVo, getByCodes, getUserLocalStorageInfo } from "@/js_sdk/http";
+import { listVo, getByCodes, getUserLocalStorageInfo, getTreeData3 } from "@/js_sdk/http";
 import vanEmpty from "../../../wxcomponents/weapp/dist/empty/index";
+import vanCascader from '../../../wxcomponents/weapp/dist/cascader/index';
 
 export default {
   components: {
     vanEmpty,
+    vanCascader,
   },
   data() {
     return {
+      cascaderValue: '',
+      treeData3List: [],
+      show: false,
       entryArray: [],
       dic_key: ["MNP_BUILDING_TYPE", "SETTLE_IN_STATUS"],
       dic_SelectList: {},
@@ -102,8 +117,29 @@ export default {
     this.search.userId = getUserLocalStorageInfo().user.id;
     this.getByCodes();
     this.getCompanyList();
+    this.getTreeData3()
   },
   methods: {
+    onFinish(e) {
+      console.log(e)
+      console.log(e.detail.selectedOptions[e.detail.selectedOptions.length - 1].id)
+      console.log(e.detail.selectedOptions[e.detail.selectedOptions.length - 1].label)
+      this.search.parkInfoId = e.detail.selectedOptions[e.detail.selectedOptions.length - 1].id
+      this.search.parkInfoName = e.detail.selectedOptions[e.detail.selectedOptions.length - 1].label
+      this.show = false
+      this.getCompanyList();
+      // search
+      // this.form.parkInfoId = e.detail.selectedOptions[e.detail.selectedOptions.length - 1].id
+      // this.form.parkInfoName = e.detail.selectedOptions[e.detail.selectedOptions.length - 1].label
+      // this.treeData3DialogVisible = false
+    },
+    openParkSelect() {
+      console.log(123123123)
+      this.show = true
+    },
+    onClose() {
+      this.show = false
+    },
     async getMoreListData() {
       let that = this;
 
@@ -118,6 +154,12 @@ export default {
         });
       }
     },
+    async getTreeData3() {
+      let that = this
+      let datdepartmentList = await getTreeData3()
+      console.log(datdepartmentList)
+      that.treeData3List = datdepartmentList.data
+    },
     onReachBottom() {
       this.getMoreListData();
     }, //下拉执行的时候触发 （下拉刷新）
@@ -181,11 +223,28 @@ export default {
 
 
 <style lang="scss">
+.companyhouse {
+  .uni-searchbar {
+    padding: 0;
+  }
+}
+
 .searchbox {
   display: block;
   background: white;
 }
 
+.parkIconHidden {
+  .uni-searchbar__box-icon-search {
+    display: none;
+  }
+
+  .uni-searchbar__box {
+    justify-content: left;
+    padding: 5px 8px 5px 15px;
+  }
+}
+
 .chaochuyincang {
   white-space: nowrap;
   overflow: hidden;
@@ -215,4 +274,4 @@ export default {
     margin-top: -10rpx !important;
   }
 }
-</style>
+</style>

pages/subPackages/companyHouseSee/companyHouseSee.vue

@@ -47,7 +47,7 @@
                 }}
               </div>
               <div @click="jumpPage(item.id)" class="second_title_1 width50 height40rpx float_left">
-                注册资本：{{ !item.zczj ? "暂无" : item.zczj + "万" }}
+                注册资金：{{ !item.zczj ? "暂无" : item.zczj + "万" }}
               </div>
             </div>
             <div @click="jumpPage(item.id)" class="width100 height28rpx font24rpx fontcolor251FCA chaochuyincang">

pages/subPackages/parkActivities/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="detail">
     <div class="detail-body">
-      <div class="img-text">
+      <!-- <div class="img-text">
         <img :src="activityDetail.annexArray[0]" alt="" />
-      </div>
+      </div> -->
 
       <div class="collect-part">
         <div class="normal-tip by y-bg" v-if="activityDetail.registrationStatus === '1'">
@@ -27,6 +27,12 @@
       </div>
 
       <div class="info-part">
+        <div class="info-item">
+          <div class="custom-item-tit">
+            <span class="tit">活动名称</span>
+          </div>
+          <div class="text">{{ activityDetail.activityName }}</div>
+        </div>
         <div class="info-item">
           <div class="custom-item-tit">
             <span class="tit">活动举办</span>
@@ -35,7 +41,10 @@
         </div>
         <div class="info-item">
           <div class="custom-item-tit"><span class="tit">活动详情</span></div>
-          <div class="text" v-html="activityDetail.activityContent"></div>
+          <rich-text class="text" :nodes="activityDetail.activityContent"></rich-text>
+          <img v-for="item in imageList" :src="item" alt="" style="    max-width: 100%;">
+          <!--          <image style="max-width:100%;" src="https://hswkxc.idea-sf.com/gardenTestApi/FileController/download/1402691710487625728">-->
+          <!--          <image style="width:120rpx;height:120rpx;" src="https://hswkxc.idea-sf.com/gardenTestApi/FileController/download/1403409204810612736"></image>-->
         </div>
 
         <div class="info-item">
@@ -109,6 +118,7 @@ export default {
         referenceId: "",
       },
       number: 0,
+      imageList: []
     };
   },
 
@@ -118,11 +128,13 @@ export default {
     console.log(getUserLocalStorageInfo().user.id)
     this.id = option.id;
     this.getActivityById1();
+
   },
 
   methods: {
     openFile(url) {
       uni.downloadFile({
+
         url: url, // 网络文档地址
         success: (data) => {
           if (data.statusCode === 200) {
@@ -131,22 +143,20 @@ export default {
               success: function (res) {
                 // 保存路径
                 console.log(res);
-                setTimeout(() => {
-                  //打开文档查看
-                  uni.openDocument({
-                    filePath: res.savedFilePath,
-                    success: function (res) {
-                      console.log("res", res);
-                    },
-                    fail: function (error) {
-                      console.log(error);
-                      wx.previewImage({
-                        current: "", // 当前显示图片的http链接
-                        urls: [url], // 需要预览的图片http链接列表
-                      });
-                    },
-                  });
-                }, 3000);
+                uni.openDocument({
+                  showMenu: true,
+                  filePath: res.savedFilePath,
+                  success: function (res) {
+                    console.log("res", res);
+                  },
+                  fail: function (error) {
+                    console.log(error);
+                    wx.previewImage({
+                      current: "", // 当前显示图片的http链接
+                      urls: [url], // 需要预览的图片http链接列表
+                    });
+                  },
+                });
               },
             });
           }
@@ -158,6 +168,18 @@ export default {
         },
       });
     },
+    extractImagePathsFromString(str) {
+      const regex = /<img[^>]+src="([^">]+)"/g;
+      const paths = [];
+      let match;
+
+      while ((match = regex.exec(str)) !== null) {
+        paths.push(match[1]);
+      }
+
+      return paths;
+    },
+
     getActivityById1() {
       const _this = this;
       getActivityById1(this.id, "SCNjNSP7LJ9aarv1cNw", getUserLocalStorageInfo().user.id).then((res) => {
@@ -182,11 +204,22 @@ export default {
             "_this.activityDetail.activityFile",
             _this.activityDetail.activityFile
           );
-          _this.activityDetail.activityContent =
-            res.data.activityContent.replaceAll(
-              "<img",
-              `<img style="max-width:100%;"`
-            );
+          // let  activityContent=
+          //   res.data.activityContent.replaceAll(
+          //     "<img",
+          //     `<image style="width:120rpx;height:120rpx;"`
+          //   );
+          // activityContent=activityContent.replaceAll(
+          //     "</figure>",
+          //     `</image></figure>`
+          // );
+          console.log()
+          this.imageList = this.extractImagePathsFromString(_this.activityDetail.activityContent)
+          _this.activityDetail.activityContent = res.data.activityContent.replaceAll(
+            "<img",
+            `<img style="width:120rpx;height:120rpx;"`
+          );
+          // </figure>
           console.log("registrationStatus", res.data.registrationStatus);
           if (
             _this.activityDetail.annexArray &&
@@ -349,7 +382,7 @@ export default {
   .info-part {
     background-color: #fff;
     overflow-y: auto;
-    height: calc(100vh - 700rpx);
+    height: 100vh;
     box-sizing: border-box;
     padding: 40rpx 30rpx;
 
@@ -406,4 +439,4 @@ export default {
   }
 }
 </style>
-<style lang="scss"></style>
+<style lang="scss"></style>

pages/subPackages/parkActivities/index.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="announcement">
+    <div class="top-add" @click="goNavigator()">
+      <i class="iconfont icon-xinzeng"></i>
+      <span class="txt">活动核销</span>
+    </div>
     <div class="tap-part">
       <div class="tips-list">
         <div :class="[
@@ -12,9 +16,9 @@
 
       <div class="card-news-list">
         <div class="detail-card shadow-radius news-card" v-for="(item, index) in activityList" :key="index">
-          <div class="image" v-if="item.annexArray">
+          <!-- <div class="image" v-if="item.annexArray">
             <img @click="getDetail(item)" style="height: 8rem" :src="item.annexArray[0]" alt="" />
-          </div>
+          </div> -->
           <div class="info-part">
             <p class="tit" @click="getDetail(item)">{{ item.activityName }}</p>
             <div class="bottom">
@@ -79,6 +83,11 @@ export default {
   },
 
   methods: {
+    goNavigator(id) {
+      uni.navigateTo({
+        url: "/pages/subPackages/activity/index",
+      });
+    },
     async getByCodes() {
       let data = await getByCodes(JSON.stringify(this.dic_key));
       let dic = this.$common.handleDicList(data);
@@ -218,9 +227,12 @@ export default {
 
   .info-part {
     .tit {
-      font-size: 24rpx;
-      color: #666666;
-      margin: 25rpx 0;
+      font-size: 30rpx;
+      color: #3e3e3e;
+      font-weight: bold;
+      margin: 15rpx 0;
+      margin-top: 10rpx;
+      margin-bottom: 15px;
     }
 
     .top {
@@ -271,6 +283,25 @@ export default {
 .announcement {
   box-sizing: border-box;
 
+  .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;
+    }
+  }
+
   .tap-part {
     margin-top: 10rpx;
     height: calc(100vh - 10rpx);

pages/subPackages/repairDispatch-app/add.vue

@@ -60,16 +60,16 @@
             补充说明<span class="tips">（支持图片/视频上传限20M内，最多6张）</span>
           </p>
           <div class="tit">
-            <van-uploader :multiple="true" :file-list="fileUrlList" :max-count="6" @after-read="afterRead"
+            <van-uploader :multiple="true" :file-list="fileUrlList" @delete="deletefileUrlList"  :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">
+          <span class="label">联系方式</span>
+          <span class="tit" style="position: relative">
             <input type="text" placeholder="请输入联系方式" v-model="form.contact" />
-          </p>
+          </span>
         </div>
         <div class="cell-item">
           <p class="label">上报人</p>
@@ -90,7 +90,7 @@
           </span>
         </div>
         <div class="custom-textarea-box" style="padding-bottom: 15rpx">
-          <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" v-model="form.handleExplain" autoHeight
+          <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" v-model="form.remark" autoHeight
                          placeholder="请填写" show-word-limit >
           </uni-easyinput>
         </div>
@@ -274,6 +274,11 @@ export default {
     openPicker() {
       this.showPicker = true;
     },
+    deletefileUrlList(event){
+    //   fileUrlList
+      this.fileUrlList.splice(event.detail.index, 1);
+
+    },
     closePicker() {
       this.showPicker = false;
     },
@@ -313,6 +318,10 @@ export default {
     },
     submit() {
       let that = this;
+      if(!that.form.handleUserName||that.form.handleUserName.length==0){
+        this.$showToast("请选择处理人");
+        return;
+      }
       if (that.quickSleced.value == null || that.quickSleced.value === "") {
         this.$showToast("请选择服务类型");
         return;

pages/subPackages/repairDispatch-app/detail.vue

@@ -35,10 +35,11 @@
           <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">
-                <img :src="item" alt="" />
-              </li>
+              <!--              <li @click="lookLookpng(explainAnnexList, index)" class="annex-item"-->
+              <!--                v-for="(item, index) in explainAnnexList" :key="index">-->
+              <!--                <img :src="item" alt="" />-->
+              <!--              </li>-->
+              <van-uploader :deletable="false" :max-count="6" :file-list="explainAnnexList" :show-upload="false" />
             </ul>
           </div>
         </div>
@@ -79,10 +80,10 @@
         <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 class="tit">
+            {{ detail.handleUserName != null ? detail.handleUserName : "" }}
+            <!--           {{ detail.handleUserName == null }} -->
+          </div>
         </div>
         <div class="hanlderList">
           <div class="hanlderList-row" v-for="item in handleList">
@@ -120,12 +121,13 @@
           <div style="height: 50vh">
             <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-radio  :name="item.value" :value="item.value" >
-<!--                {{item.text}}-->
-              </van-radio>
-            </div>
+              <div class="list-row1" v-for="(item, index) in columns" :key="index"
+                style="justify-content: space-between">
+                {{ item.text }}
+                <van-radio :name="item.value" :value="item.value">
+                  <!--                {{item.text}}-->
+                </van-radio>
+              </div>
             </van-radio-group>
 
           </div>
@@ -138,7 +140,7 @@
           </span>
         </div>
         <div class="custom-textarea-box">
-          <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" v-model="params.handleExplain" autoHeight
+          <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" v-model="detail.remark" autoHeight
             placeholder="请填写" show-word-limit :disabled="detail.status != 'unAcceptance'">
           </uni-easyinput>
         </div>
@@ -160,7 +162,7 @@
       </div>
     </div>
     <!--       v-if="detailStatus === 'processed' && detail.isUser === 'true'" -->
-    <div class="repair-bottom bottom-button" v-if="stepActive==0">
+    <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">
@@ -169,7 +171,7 @@
         <div style="margin: 32rpx" @click="getSelectValue2()">确认</div>
       </div>
       <uni-easyinput v-model="name2" placeholder="请输入内容" @confirm="getName2" @iconClick="getName2"
-                     suffixIcon="search"></uni-easyinput>
+        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">
@@ -212,7 +214,7 @@ export default {
   data() {
     return {
 
-      theReplacer:'',
+      theReplacer: '',
       radio: "流转",
       columns2: [],
       name2: "",
@@ -279,7 +281,7 @@ export default {
       lzPopuStatus: false,
       userId2: "",
       handleList: [],
-      reportRepairInfoId:null,
+      reportRepairInfoId: null,
       params: {
         id: "",
         status: "acceptance",
@@ -319,7 +321,7 @@ export default {
       let ischeck = this.columns2.some(item => item.checked);
       console.log(ischeck)
 
-      if(!ischeck){
+      if (!ischeck) {
         that.$showToast("请至少选择一个处理人");
         return
       }
@@ -328,12 +330,13 @@ export default {
         id: that.id,
         handleUserId: that.handleUserIds,
         userId: getUserLocalStorageInfo().user.id,
-        handleExplain:that.params.handleExplain
+        handleExplain: that.params.handleExplain,
+        remark:that.detail.remark
       }
       let data = await dispatchType(param)
       // that.getInfoListByRepairId()
       console.log(data)
-      if(data.code == 200) {
+      if (data.code == 200) {
         that.$showToast('提交成功');
         uni.navigateBack({});
       }
@@ -420,7 +423,7 @@ export default {
     openPicker2() {
       this.showPicker2 = true;
     },
-     openPicker(e=null) {
+    openPicker(e = null) {
       console.log(e);
       let that = this;
       that.reportRepairInfoId = e ? e : null;
@@ -428,20 +431,20 @@ export default {
       uni.showModal({
         title: '提示',
         content: '当前派单已被退回，请完成后续处理',
-        confirmText:'重新派单',
-        cancelText:'任务作废',
-        cancelColor:'red',
+        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,
+              dispatchType: 2,
+              reportRepairId: that.id,
               // handleUserId:that.theReplacer,
               userId: getUserLocalStorageInfo().user.id,
-              id:that.reportRepairInfoId,
+              id: that.reportRepairInfoId,
             })
             that.getInfoListByRepairId()
             that.$showToast("派单已作废");
@@ -470,10 +473,10 @@ export default {
     onChange(event, i) {
       console.log(event.detail);
       // console.log(i);
-      this.columns2[i].checked = event.detail ;
+      this.columns2[i].checked = event.detail;
     },
 
-async getSelectValue2() {
+    async getSelectValue2() {
       let that = this;
       let handleUserNames = [];
       let handleUserIds = [];
@@ -487,8 +490,8 @@ async getSelectValue2() {
           handleUserIds.push(element.value);
         }
       }
-      that.handleUserIds=handleUserIds.join(",")
-      that.detail.handleUserName=handleUserNames.join(",")
+      that.handleUserIds = handleUserIds.join(",")
+      that.detail.handleUserName = handleUserNames.join(",")
       that.showPicker2 = false;
 
 
@@ -504,34 +507,34 @@ async getSelectValue2() {
     async getSelectValue() {
 
       let that = this;
-      if(!that.theReplacer){
+      if (!that.theReplacer) {
         that.$showToast('请选择替换的处理人')
         return
       }
       console.log(that.theReplacer)
-      let index = that.handleList.findIndex((row)=>{
-        return that.theReplacer===row.handleUserId
+      let index = that.handleList.findIndex((row) => {
+        return that.theReplacer === row.handleUserId
       })
-      if(index != -1) {
+      if (index != -1) {
         that.$showToast('该处理人已在列表中请勿重复选择')
         return
       }
       let param = {
-        dispatchType:2,
-        id:this.id,
-        handleUserId:that.theReplacer,
+        dispatchType: 2,
+        id: this.id,
+        handleUserId: that.theReplacer,
         userId: getUserLocalStorageInfo().user.id,
-        reportRepairInfoId:that.reportRepairInfoId,
+        reportRepairInfoId: that.reportRepairInfoId,
       }
-      let {data } =await dispatchType(param)
+      let { data } = await dispatchType(param)
       that.getInfoListByRepairId()
 
       that.showPicker = false;
     },
-    getReplacer(e){
+    getReplacer(e) {
       let that = this;
       console.log(e.detail)
-      that.theReplacer=e.detail;
+      that.theReplacer = e.detail;
       console.log(that.theReplacer)
       // console.log(this.handleList)
       // handleUserId
@@ -581,14 +584,16 @@ async getSelectValue2() {
           this.detail = det;
 
           this.explainAnnexList = det.fileUrlViewList;
+          console.log('det.fileUrlViewList', det.fileUrlViewList)
+          console.log(this.explainAnnexList)
           this.processedAnnexList = det.handleUrlList;
           this.detailStatus = det.status;
           this.wanderAboutUserName = det.wanderAboutUserName
             ? det.wanderAboutUserName
             : "";
           this.params.handleUserId = det.handleUserId;
-          console.log('det',det)
-          this.params.handleExplain=res.data.handleExplain
+          console.log('det', det)
+          this.params.handleExplain = res.data.handleExplain
           console.log("this.wanderAboutUserName", this.params.handleExplain);
 
           this.value = det.dispatchUserId;
@@ -631,23 +636,30 @@ async getSelectValue2() {
         case "acceptance":
           this.stepActive = 1;
           break;
-        case "evaluated":
-          this.stepActive = 3;
-          break;
         case "processed":
           this.stepActive = 2;
           break;
+        case "confirmed":
+          this.stepActive = 3;
+          break;
+
       }
       const fileUrls = item.fileUrl ? item.fileUrl.split(",") : [];
       console.log("files你到底是干嘛的", fileUrls);
-      const fileUrlViews = [];
+      let fileUrlViews = [];
       if (fileUrls !== null && fileUrls.length > 0) {
-        fileUrls.forEach((item) => {
-          item =
-            this.$constant.BASE_URI + "/wx/fileController/download/" + item;
-          fileUrlViews.push(item);
+        fileUrlViews = fileUrls.map((item) => {
+          console.log(item)
+          return {
+            url: this.$constant.BASE_URI + "/wx/fileController/download/" + item,
+            isImage: true
+          }
+          // item =
+          //   this.$constant.BASE_URI + "/wx/fileController/download/" + item;
+          // fileUrlViews.push(item);
         });
       }
+      console.log('123123123123', fileUrlViews)
       item.fileUrlViewList = fileUrlViews;
 
       const handleUrls = item.handleUrl ? item.handleUrl.split(",") : [];

pages/subPackages/repairDispatch-app/index.vue

@@ -6,13 +6,13 @@
     </div>
     <div class="info-repairList2">
       <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 class="lz-status-no" v-if="item.returnFlag == '1'">
           有退回
         </div>
-<!--        <div class="lz-status" v-if>-->
-<!--          有退回-->
+        <!--        <div class="lz-status" v-if>-->
+        <!--          有退回-->
 
-<!--        </div>-->
+        <!--        </div>-->
 
         <div class="info-top">
           <div class="left">
@@ -77,19 +77,29 @@ export default {
     };
   },
 
-  mounted() {
-    // if (window.history && window.history.pushState) {
-    //   // 向历史记录中插入了当前页
-    //   history.pushState(null, null, document.URL);
-    //   window.addEventListener("popstate", this.goBack, false);
-    // }
-  },
   onLoad() { },
   onShow() {
-    this.getByCodes();
+    this.recordList = []
+    this.params.pageNum = 1
+    this.selectData();
   },
-
+  //下拉执行的时候触发 （下拉刷新）
   methods: {
+    onReachBottom() {
+      let that = this
+      console.log("滑动到距离底部100px的时候触发,可以放 。。业务逻辑");
+      console.log(that.params)
+      console.log(that.params.total)
+      console.log(that.recordList)
+      console.log(that.params.pageNum)
+      if (that.params.total == that.recordList.length) {
+        return
+      }
+      that.params.pageNum += 1;
+
+      that.selectData();
+
+    },
     goNavigator(id) {
       uni.navigateTo({
         url: "/pages/subPackages/repairDispatch-app/add",
@@ -112,7 +122,8 @@ export default {
       const _this = this;
       repairList2(this.params).then((res) => {
         if (res.data) {
-          _this.recordList = [];
+          this.params.total = res.data.total
+          // _this.recordList = [];
           res.data.rows.forEach(function (item) {
             const jsonMap = _this.getItemJson(item);
 
@@ -258,8 +269,8 @@ export default {
   }
 
   .info-repairList2 {
-    height: calc(100vh - 124rpx);
-    overflow-y: auto;
+    // height: calc(100vh - 124rpx);
+    // overflow-y: auto;
 
     .info-item {
       position: relative;

pages/subPackages/repairprocessing-app/detail.vue

@@ -34,14 +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">-->
-<!--&lt;!&ndash;                {{ item }}&ndash;&gt;-->
-<!--                <img :src="item" alt="" />-->
-<!--              </li>-->
-              <van-uploader :file-list="explainAnnexList" disabled class="infoUpload"/>
-
-<!--            </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 :max-count="6" :file-list="explainAnnexList" :show-upload="false" />
+
+            <!--            </ul>-->
           </div>
         </div>
         <div class="cell-item flex-item">
@@ -53,7 +53,7 @@
           </p>
         </div>
         <div class="cell-item flex-item">
-          <p class="label">报事人</p>，
+          <p class="label">报事人</p>
           <p class="tit tel-box">
             <span>{{ detail.reporter }}</span>
             <!-- {{ detail.phone }} -->
@@ -77,8 +77,10 @@
           <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>
+            <p>处理进展
+<!--              {{stepActive}}-->
+            </p>
+            <van-button type="warning" size="mini" @click="orderOut()" v-if="detail.status==1">处理退回</van-button>
 
           </div>
           <div>
@@ -89,7 +91,7 @@
 
         <div class="cell-item">
           <p class="label">派单人</p>
-          <p class="tit">{{ dispatchUserId2 }}</p>
+          <p class="tit">{{ detail.dispatchUserName }}</p>
         </div>
         <div class="cell-item">
           <p class="label">派单时间</p>
@@ -97,10 +99,11 @@
         </div>
 
         <div class="block-cell-item">
-          <p class="label">备注</p>
+          <p class="label">派单备注</p>
           <div class="tit">
             <div class="textarea">
-              {{ detail.handleExplain == "null"||!detail.handleExplain || detail.handleExplain == "undefind" ? "暂无" : detail.handleExplain }}
+              {{ detail.dispatchRemark == "null" || !detail.dispatchRemark || detail.dispatchRemark == "undefind" ? "暂无" :
+                detail.dispatchRemark }}
             </div>
           </div>
         </div>
@@ -109,8 +112,8 @@
           <p class="label">
             处理后拍照<span class="tips">（支持图片上传限20M内，最多6张）</span>
           </p>
-          <div class="tit" >
-            <van-uploader @delete="deleteRYXXZP"   :file-list="handleUrlList" :max-count="6" @after-read="afterRead"
+          <div class="tit">
+            <van-uploader @delete="deleteRYXXZP" :file-list="handleUrlList" :max-count="6" @after-read="afterRead"
               :show-upload="true">
             </van-uploader>
           </div>
@@ -124,8 +127,8 @@
           </div>
         </div>
         <div class="custom-textarea-box">
-          <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 :disabled="detail.status !== '1' && detail.status != 2 && detail.status != 5&&detail.status != '3'&& detail.status != '4'" type="textarea"
+            class="bgcF9F9F9 height218rpx" v-model="params.handleExplain" autoHeight placeholder="请填写" show-word-limit>
           </uni-easyinput>
         </div>
         <div class="cell-item">
@@ -139,8 +142,8 @@
         </div>
       </div>
     </div>
-    <div class="repair-bottom bottom-button" v-if="detail.status == '1'||detail.status==2">
-      <button class="btn" @click="onConfirm">{{detail.status==2?'编辑':'提交'}}</button>
+    <div class="repair-bottom bottom-button" v-if="detail.status == '1' || detail.status == '2'|| detail.status == '3'|| detail.status == '4' || detail.status == '5'">
+      <button class="btn" @click="onConfirm">{{ detail.status == 2 ||detail.status == 3 ? '编辑' : '提交' }}</button>
     </div>
   </div>
 </template>
@@ -154,7 +157,7 @@ import {
   getUserLocalStorageInfo,
   handleReportBack
 } from "@/js_sdk/http";
-import {editReportInfo} 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'
@@ -219,15 +222,15 @@ export default {
     this.getByCodes();
   },
   methods: {
-    deleteRYXXZP(e){
+    deleteRYXXZP(e) {
       console.log(e.detail.file.id)
-      let index = this.handleUrlList.findIndex((row)=>{
+      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));
+      console.log('deleteRYXXZP', index)
+      let handleUrlList = JSON.parse(JSON.stringify(this.handleUrlList));
       handleUrlList.splice(index, 1);
-      this.handleUrlList= handleUrlList
+      this.handleUrlList = handleUrlList
     },
     async orderOut() {
       let _this = this
@@ -272,7 +275,7 @@ export default {
         content: '是否确认提交',
         success: function (res) {
           if (res.confirm) {
-            if (!that.params.remark || that.params.remark.length == 0) {
+            if (!that.params.handleExplain || that.params.handleExplain.length == 0) {
               that.$showToast("请填写处理说明");
               return;
             }
@@ -289,23 +292,22 @@ export default {
             // console.log(this.handleUrlList);
             // console.log(handleUrlList.join(","))
             // return;
-            that.params.handleExplain = that.detail.handleExplain;
+            // 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}
+            if (that.detail.status == 2 || that.detail.status == 3) {
+              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}
+            } else {
+              let params = { ...that.params }
               delete params.status;
               editRepair(params).then((res) => {
                 that.$showToast("结案成功");
@@ -330,7 +332,7 @@ export default {
         if (res.data) {
           let det = _this.getItemJson(res.data);
           this.detail = det;
-          this.detail.handleExplain = det.handleExplain;
+          this.params.handleExplain = !det.handleExplain == 'null' || det.handleExplain == 'null' ? '' : det.handleExplain
           // if (det.userId != null && det.userId !== "") {
           //   const test = det.userId.split("-");
           //   this.detail.phone = test[2];
@@ -347,24 +349,27 @@ export default {
 
             this.handleUserId2 = det.handleUserName;
           }
-          console.log('det.handleUrlList',det.handleUrlList)
+          console.log('det.handleUrlList', det.handleUrlList)
           this.handleUrlList = det.handleUrlList;
-          if(det.fileUrl&&det.fileUrl.length > 0) {
+          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,
+              return {
+                url: this.$constant.BASE_URI + "/wx/fileController/download/" + e,
+                id: e,
                 isImage: true,
                 deletable: false,
               }
             });
+            console.log("asodmqowndonq", this.explainAnnexList);
+
           }
 
-          console.log("asodmqowndonq", this.explainAnnexList);
 
           //   this.processedAnnexList = det.handleUrlList;
           this.detailStatus = det.status;
           this.params.remark = det.remark;
+          // this.detail.status = this.detail.status ==5 ? 2 : this.detail.status
+
         }
       });
     },
@@ -393,7 +398,7 @@ export default {
             url:
               this.$constant.BASE_URI + "/wx/fileController/download/" + item,
             isImage: true,
-            id:item
+            id: item
           });
         });
       }
@@ -508,11 +513,12 @@ export default {
 };
 </script>
 <style lang="scss">
-.infoUpload{
-  .van-uploader__upload--disabled{
+.infoUpload {
+  .van-uploader__upload--disabled {
     display: none;
   }
 }
+
 .bottom-button {
   position: fixed;
   bottom: 0;
@@ -666,8 +672,9 @@ export default {
   .annex-list-box {
     display: flex;
 
-     flex-wrap: wrap;
-     justify-content: space-between;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
     &::after {
       display: block;
       content: "";

pages/subPackages/repairprocessing-app/index.vue

@@ -28,8 +28,8 @@
             <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>
+            <span v-if="item.status == '4'" class="normal-tip yd z-bg" style="background: #7f7f7f">已退回 </span>
+            <span v-if="item.status == '5'" class="normal-tip yd z-bg" style="background: #7f7f7f">确认退回 </span>
 
           </div>
         </div>

pages/subPackages/serve-confirm/detail.vue

@@ -82,31 +82,31 @@
           </div>
         </div>
 
-        <!-- <div class="cell-item">
+       <div class="cell-item">
           <p class="label">派单人</p>
-          <p class="tit">{{ dispatchUserId2 }}</p>
+          <p class="tit">{{ detail.dispatchUserName }}</p>
         </div>
         <div class="cell-item">
           <p class="label">派单时间</p>
           <p class="tit">{{ detail.dispatchTime }}</p>
-        </div> -->
+        </div>
 
         <div class="block-cell-item">
-          <p class="label">备注</p>
+          <p class="label">派单备注</p>
           <div class="tit">
             <div class="textarea">
-              {{ detail.remark == "null" || detail.remark == "undefind" ? "暂无" : detail.remark }}
+              {{ !detail.dispatchRemark || detail.dispatchRemark == "null" || detail.dispatchRemark == "undefind" ? "暂无" : detail.dispatchRemark }}
             </div>
           </div>
         </div>
 
         <div class="block-cell-item">
           <p class="label">
-            处理后拍照{{ detail.status }}<span class="tips">（支持图片上传限20M内，最多6张）</span>
+            处理后拍照<span class="tips">（支持图片上传限20M内，最多6张）</span>
           </p>
           <div class="tit">
             <van-uploader @delete="deleteRYXXZP" :file-list="handleUrlList" :max-count="6" @after-read="afterRead"
-              :disabled="detail.status == 3" :show-upload="true">
+              :disabled="detail.status == 3||detail.status == 5" :show-upload="false" :deletable="false">
             </van-uploader>
           </div>
 
@@ -141,14 +141,14 @@
         </div>
         <div>
           <div style="margin-bottom: 15rpx;">
-            <van-radio-group :value="confirmForm.status" :disabled="detail.status == 3||detail.status == 4" direction="horizontal" @change="getConfirmFormStatus"
+            <van-radio-group :value="confirmForm.status" :disabled="detail.status == 3||detail.status == 4||detail.status == 5" direction="horizontal" @change="getConfirmFormStatus"
               bind:change="getConfirmStatus">
               <van-radio name="3">通过</van-radio>
-              <van-radio name="4">退回</van-radio>
+              <van-radio name="5">退回</van-radio>
             </van-radio-group>
           </div>
           <div class="custom-textarea-box">
-            <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" :disabled="detail.status == 3||detail.status == 4"
+            <uni-easyinput type="textarea" class="bgcF9F9F9 height218rpx" :disabled="detail.status == 3||detail.status == 4||detail.status == 5"
               v-model="confirmForm.confirmRemark" autoHeight placeholder="请填写" show-word-limit>
             </uni-easyinput>
           </div>
@@ -255,7 +255,7 @@ export default {
     },
     async onConfirm() {
       let that = this
-      if(that.confirmForm.status==4&&(!that.confirmForm.confirmRemark||that.confirmForm.confirmRemark.length==0)){
+      if(that.confirmForm.status==5&&(!that.confirmForm.confirmRemark||that.confirmForm.confirmRemark.length==0)){
         that.$showToast('如选择退回派单请填写原因')
         return
       }
@@ -307,7 +307,11 @@ export default {
           this.detailStatus = det.status;
           this.params.remark = det.remark;
           this.confirmForm.confirmRemark = det.confirmRemark=='null'?'':det.confirmRemark
-          this.confirmForm.status = det.status
+          // console.log('det.remark;',det.remark)
+          if(det.status==3||det.status==5){
+            this.confirmForm.status = det.status
+
+          }
 
         }
       });

pages/subPackages/serve-confirm/index.vue

@@ -25,10 +25,10 @@
             </span>
           </div>
           <div class="right">
-            <span v-if="item.status == '2'" class="normal-tip yd z-bg">待确认 </span>
+            <span v-if="item.status == '2'" class="normal-tip yd h-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>
+<!--            <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" style="background: #7f7f7f">已退回 </span>
 
           </div>
         </div>

pages/utils/constant.js

@@ -1,17 +1,18 @@
 // // 系统常量
-// 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/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"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
 // export const BASE_URI = "http://192.168.2.106:9011"; // 许峰本地
-// export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
+// export const BASE_URI = "http://192.168.2.108:9012"; // 陈凡本地
 
 export default {
     /* 系统常量*/
     // 基础地址
     BASE_URI,
 
+
 };

unpackage/dist/build/mp-weixin/pages/gocompnay/index.wxml

@@ -1 +1 @@
-<web-view src="https://hswkxc.idea-sf.com/mnpH5#/"></web-view>
+<web-view src="https://hswkxc.idea-sf.com/mnpH5/#/login"></web-view>

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

@@ -23,7 +23,7 @@
     "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",
+    "compnay-select": "/pages/subPackages/companyDetailsEdit/compnaySelect",
     "zaiti-tree": "/components/zaiti-tree/index"
   }
 }

unpackage/dist/build/mp-weixin/pages/subPackages/companyHouse/companyHouse.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",
     "van-empty": "/wxcomponents/weapp/dist/empty/index"
   }
 }

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

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