Merge branch 'master' of http://8.210.64.198:30000/sunran/asd-mobild

src/views/weibao/views/consultation/index.vue

@@ -101,11 +101,9 @@ export default {
       arr.forEach((item, index) => {
         if (item.indexOf('.jpg') || item.indexOf('.png')) {
           url = arr[index]
-          console.log(url, 'url')
           return
         }
       })
-      console.log(url, 'url')
       return url
     },
   },

src/views/weibao/views/consultation/initiateConsultation.vue

@@ -45,13 +45,13 @@
           <van-col span="6">参与单位：</van-col>
           <van-col span="18">
             <van-field v-model="form.participateOrgName" :rules="[{ required: true}]" @click="ownerShow=true" placeholder="请选择参与单位" disabled />
-            <van-popup v-model="ownerShow" position="bottom" :style="{ height: '30%' }">
+            <van-popup v-model="ownerShow" position="bottom" :style="{ height: '50%' }">
               <div class="popup">
                 <div class="btn">
                   <div @click="ownerShow=false" class="cancle">取消</div>
                   <div @click="ownerConfirm" class="confirm">确定</div>
                 </div>
-                <van-checkbox-group v-model="result">
+                <van-checkbox-group class="group" v-model="result">
                   <van-cell-group>
                     <van-cell v-for="(item,index) in orgform" clickable :key="index" :title="item.name" @click="toggle(item,index)">
                       <template #right-icon>
@@ -213,7 +213,6 @@ export default {
     },
     getPositionList() {},
     async afterRead(file) {
-      console.log(file.file)
       file.status = 'uploading'
       file.message = '上传中...'
       let formDate = new FormData()
@@ -275,6 +274,11 @@ export default {
   height: calc(100vh - 220px);
   overflow: auto;
 }
+.group {
+  margin-top: 30px;
+  height: calc(100% - 180px);
+  overflow: auto;
+}
 .tx {
   width: 160px;
   height: 160px;
@@ -384,6 +388,7 @@ export default {
   -webkit-text-fill-color: unset;
 }
 .popup {
+  height: 100%;
   padding: 0 30px;
   .btn {
     padding: 16px 0;

src/views/weibao/views/followUp/addfollow.vue

@@ -54,7 +54,7 @@
         <van-row class="cell">
           <van-col span="9">监护人联系方式：</van-col>
           <van-col span="15">
-            <van-field v-model="form.guardianOutVO" placeholder="监护人联系方式" disabled />
+            <van-field v-model="form.guardianPhone" placeholder="监护人联系方式" disabled />
           </van-col>
         </van-row>
         <van-row class="cell">
@@ -128,7 +128,6 @@
 import {
   saveFollowUp,
   getStreetList,
-  uploadImage,
   listChildInfoByName,
 } from '../../api/index.js'
 import vanUploader from '../../components/vanUploader.vue'
@@ -215,6 +214,8 @@ export default {
       this.form.healthStatus = value.healthStatus
       this.form.address = value.address
       this.form.tutelageName = value.tutelageName
+      this.form.guardianName = value.guardianName
+      this.form.guardianPhone = value.guardianPhone
       this.searchshow = false
     },
     dateConfirm(v) {

src/views/weibao/views/followUp/director.vue

@@ -54,14 +54,11 @@ export default {
   },
   methods: {
     async followUpPage() {
-      console.log(this.followUpform.pageNum, 'this.followUpform.pageNum')
       const res = await followUpPage(this.followUpform)
       this.loading = false
       if (this.followUpform.pageNum == 1) {
-        console.log(this.followUpform.pageNum, 'this.followUpform.pageNum')
         this.planList = res.data.records
       } else {
-        console.log(this.followUpform.pageNum, 'this.followUpform.pageNum')
         this.planList = this.planList.concat(res.data.records)
       }
       if (this.planList.length >= res.data.total) {

src/views/weibao/views/followUp/history.vue

@@ -63,9 +63,11 @@ export default {
       font-size: 30px;
     }
     .adress {
+      width: 100%;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
+      display: block !important;
     }
     .mes {
       font-size: 26px;

src/views/weibao/views/followUp/historySupervisor.vue

@@ -47,10 +47,8 @@ export default {
     async historyFollowUp() {
       const res = await historyFollowUp(this.historyform)
       this.loading = false
-      console.log(this.historyform.pageNum, 'this.historyList')
       if (this.historyform.pageNum == 1) {
         this.historyList = res.data.records
-        console.log(this.historyList, 'this.historyList')
       } else {
         this.historyList = this.historyList.concat(res.data.records)
       }

src/views/weibao/views/loveHelp/details.vue

@@ -51,7 +51,8 @@
                 </div>
               </div>
               <van-search placeholder="请输入姓名查询" @input="listChildInfoByName" v-model="positionSearch" />
-              <van-picker cancel-button-text='取消' value-key="title" show-toolbar :columns="childList" @confirm="onConfirmPicker" @cancel="serviceTargetShow = false">
+              <van-picker cancel-button-text='取消' :confirm-button-text='childList.length>0?"选择":"确定"' value-key="title" show-toolbar :columns="childList" @confirm="onConfirmPicker"
+                @cancel="serviceTargetShow = false">
                 <template #option="item">
                   <span>{{item.name}}</span>
                   <span>({{item.idCard}})</span>
@@ -220,6 +221,11 @@ export default {
       this.dateshow = false
     },
     onConfirmPicker(value) {
+      if (!value) {
+        console.log(value)
+        this.serviceTargetShow = !this.serviceTargetShow
+        return
+      }
       this.serviceTarget.push(value.name)
       this.$set(this.form, 'helpChildren', this.serviceTarget.join(','))
       this.childList = []

src/views/weibao/views/reporting/details.vue

@@ -191,7 +191,7 @@ export default {
   //   justify-content: space-between;
   .van-image {
     max-width: 200px;
-    max-height: 200px;
+    // max-height: 200px;
     margin: 0 10px;
     //   margin-right: 16px;
     margin-bottom: 16px;

src/views/weibao/views/reporting/index.vue

@@ -11,7 +11,7 @@
             <van-list v-model="loading" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
               <div class="list" v-for="item in historyList" :key="item.id" @click="$router.push({path:'/reporting/details',query:{id:item.id}})">
                 <div class="img">
-                  <van-image fit="cover" :src="getpics(item.appendFile)" alt="" />
+                  <van-image fit="cover" :src="getpics(item.pics)" alt="" />
                 </div>
                 <div class="text">
                   <p class="title">报告事件：{{item.event}}</p>
@@ -162,6 +162,7 @@ export default {
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
+      font-size: 26px;
     }
   }
 }

src/views/weibao/views/specialServices/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
     <van-nav-bar title="专项服务" @click-left="$router.back()" left-arrow fixed placeholder safe-area-inset-top />
-    <div class="box" v-if="roleIdStr==21">
-      <van-tabs v-model="active" @change="changetabs">
+    <div class="box">
+      <van-tabs v-if="roleIdStr==21" v-model="active" @change="changetabs">
         <van-tab title="服务计划"></van-tab>
         <van-tab title="服务完成"></van-tab>
       </van-tabs>
-      <van-search v-show="active==1" v-model="historyform.name" shape="round" show-action placeholder="请输入姓名 项目内容" @search="onSearch">
+      <van-search v-show="active==1||roleIdStr!=21" v-model="historyform.name" shape="round" show-action placeholder="请输入姓名 项目内容" @search="onSearch">
         <template #action>
           <div @click="onSearch">搜索</div>
         </template>
@@ -16,7 +16,7 @@
       <servicePlan v-if="active==0" :planformList='planformList'></servicePlan>
       <serviceComplete v-if="active==1" :historyList="historyList"></serviceComplete>
     </van-list>
-    <van-list v-else v-model="loading" style="margin-top: 16px;" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
+    <van-list v-else v-model="loading" class="his" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
       <serviceComplete :historyList="historyList"></serviceComplete>
     </van-list>
   </div>
@@ -120,4 +120,7 @@ export default {
 .mt {
   margin-top: 80px;
 }
+.his {
+  margin-top: 100px;
+}
 </style>

src/views/weibao/views/specialServices/startServiceplay.vue

@@ -26,7 +26,8 @@
                 </div>
               </div>
               <van-search placeholder="请输入姓名查询" @input="listChildInfoByName" v-model="positionSearch" />
-              <van-picker cancel-button-text='取消' value-key="title" show-toolbar :columns="childList" @confirm="onConfirmPicker" @cancel="serviceTargetShow = false">
+              <van-picker cancel-button-text='取消' :confirm-button-text='childList.length>0?"选择":"确定"' value-key="title" show-toolbar :columns="childList" @confirm="onConfirmPicker"
+                @cancel="serviceTargetShow = false">
                 <template #option="item">
                   <span>{{item.name}}</span>
                   <span>({{item.idCard}})</span>
@@ -218,6 +219,11 @@ export default {
       this.serviceShow = false
     },
     onConfirmPicker(value) {
+      if (!value) {
+        console.log(value)
+        this.serviceTargetShow = !this.serviceTargetShow
+        return
+      }
       this.serviceTarget.push(value.name)
       //   this.form.serviceTarget = this.serviceTarget.join(',')
       this.$set(this.form, 'serviceTarget', this.serviceTarget.join(','))

vue.config.js

@@ -25,8 +25,6 @@ function getEntry() {
             var filepath = items[i];
             var fileList = filepath.split("/");
             var fileName = fileList[fileList.length - 2];
-            console.log('fileName===')
-            console.log(fileName)
             publicPath = '/' + fileName + '/'
             entries[fileName] = {
                 entry: `src/views/${fileName}/main.js`,