Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.4

src/views/menu/resumption/detail.vue

@@ -2,7 +2,7 @@
   <div class="page_box">
     <van-form ref="resumption_form">
       <div class="panel">
-        <NavBar :go="{ type: 'push', path: '/resumption' }" />
+        <NavBar @click-left="goBack" />
         <van-panel :title="resumptionData.taskName">
           <div class="tts">
             <van-row>
@@ -191,20 +191,35 @@
                   type="textarea"
                   :placeholder="enable ? '请输入情况描述' : ''"
                 />
-                <div class="upload-box">
-                  <uploader :maxCount="5" v-if="enable" v-model="point.imgs" />
-                  <van-cell v-else>
-                    <div
-                      class="nfc-img van-hairline--surround"
-                      v-for="(v, i) in point.imgs"
-                      :key="v.imgPath"
-                      @click="clickWarnImage(point.imgs, i)"
-                    >
-                      <img :src="imgUrl(v.imgPath)" alt="" />
-                      <span>{{ v.checkName }}</span>
+                <van-field
+                  :required="enable"
+                  :readonly="!enable"
+                  rows="1"
+                  name="uploader"
+                  autosize
+                  autofocus="true"
+                  label="上传图片"
+                  type="textarea"
+                >
+                  <template #input>
+                    <div class="upload-box">
+
+                      <uploader :maxCount="5" v-if="enable" v-model="point.imgs" />
+                      <van-cell v-else>
+                        <div
+                          class="nfc-img van-hairline--surround"
+                          v-for="(v, i) in point.imgs"
+                          :key="v.imgPath"
+                          @click="clickWarnImage(point.imgs, i)"
+                        >
+                          <img :src="imgUrl(v.imgPath)" alt="" />
+                          <span>{{ v.checkName }}</span>
+                        </div>
+                      </van-cell>
                     </div>
-                  </van-cell>
-                </div>
+                  </template>
+                </van-field>
+
                 <select-cell
                   :required="enable"
                   :disabled="!enable"
@@ -316,6 +331,9 @@ export default {
     })
   },
   methods: {
+    goBack(){
+      this.$router.go(-1);
+    },
     showButtoFun(vel){
       if( val === 1){
         this.showButton = false;

src/views/menu/resumption/list.vue

@@ -8,7 +8,7 @@
         <div class="list-item">
           <p>每日履职</p>
           <van-tabs>
-            <van-tab title="待完成" :badge="dayList.unfinished.length === 0 ? false :dayList.unfinished.length">
+            <van-tab title="待完成" :badge="dayList.unfinished.length === 0 ? '' :dayList.unfinished.length">
               <Empty v-if="!dayList.unfinished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -27,7 +27,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已完成" :badge="dayList.finished.length=== 0 ? false :dayList.finished.length">
+            <van-tab title="已完成" :badge="dayList.finished.length=== 0 ? '' :dayList.finished.length">
               <Empty v-if="!dayList.finished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -46,7 +46,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已逾期" :badge="dayList.proceed.length=== 0 ? false :dayList.proceed.length">
+            <van-tab title="已逾期" :badge="dayList.proceed.length=== 0 ? '' :dayList.proceed.length">
               <Empty v-if="!dayList.proceed.length"/>
               <div class="list-container" v-else>
                 <van-cell
@@ -68,7 +68,7 @@
         <div class="list-item">
           <p>周期履职</p>
           <van-tabs >
-            <van-tab title="待完成" :badge="otherList.unfinished.length=== 0 ? false :otherList.unfinished.length">
+            <van-tab title="待完成" :badge="otherList.unfinished.length=== 0 ? '' :otherList.unfinished.length">
               <Empty v-if="!otherList.unfinished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -87,7 +87,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已完成" :badge="otherList.finished.length=== 0 ? false :otherList.finished.length">
+            <van-tab title="已完成" :badge="otherList.finished.length=== 0 ? '' :otherList.finished.length">
               <Empty v-if="!otherList.finished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -106,7 +106,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已逾期" :badge="otherList.proceed.length=== 0 ? false :otherList.proceed.length">
+            <van-tab title="已逾期" :badge="otherList.proceed.length=== 0 ? '' :otherList.proceed.length">
               <Empty v-if="!otherList.proceed.length"/>
               <div class="list-container" v-else>
                 <van-cell
@@ -176,6 +176,9 @@ export default {
   mounted() {
     this.initDatalist();
   },
+  watch: {
+    '$route':'initDatalist'
+  },
   computed:{
     ...mapGetters(['dictionary','orgName','orgId','roleList']),
     // stateList(){
@@ -206,8 +209,8 @@ export default {
       switch (state) {
         case '待履职':
           return '#008cd6'
-        case '进行中':
-          return '#d9b627'
+        case '履职中':
+          return '#bc9f71'
         case '已完成':
           return '#009240'
         case '已逾期':

src/views/menu/visitCheck/index.vue

@@ -48,15 +48,15 @@
               <template #default>
                 <div class="info-box">
                   <div v-if="v.type == 2" class="info-item">
-                    <div class="item-label">介绍信编号：</div>
+                    <div class="item-label">介绍信编号</div>
                     <div class="item-value"> {{v.letterNo}}</div>
                   </div>
                   <div class="info-item">
-                    <div class="item-label">有效期限：</div>
+                    <div class="item-label">有效期限</div>
                     <div class="item-value">{{v.startTime}}~{{v.endTime}}</div>
                   </div>
                   <div class="info-item">
-                    <div class="item-label">来访事由：</div>
+                    <div class="item-label">来访事由</div>
                     <div class="item-value">
                       {{v.reasons}}
                     </div>
@@ -268,17 +268,17 @@ export default {
 .info-item{
   display: flex;
   justify-content: space-between;
+  align-items: center;
   font-size: 26px;
   .item-label{
-    flex:.29;
+    flex:.25;
     text-align: left;
     color:#333;
   }
   .item-value{
-    flex:.70;
+    flex:.75;
     color:#666;
     min-height: 50px;
-    line-height: 36px;
     max-height: 250px;
     display: -webkit-box;
     -webkit-line-clamp: 3; /* 限制显示为3行 */

src/views/menu/visitRecord/index.vue

@@ -39,17 +39,17 @@
               <template #default>
                 <div class="info-box">
                   <div class="info-item">
-                    <div class="item-label">人员姓名：</div>
+                    <div class="item-label">人员姓名</div>
                     <div class="item-value"> {{v.userName}}</div>
                   </div>
                   <div class="info-item">
-                    <div class="item-label">到达时间：</div>
+                    <div class="item-label">到达时间</div>
                     <div class="item-value">
                       {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}}
                     </div>
                   </div>
                   <div class="info-item">
-                    <div class="item-label">离开时间：</div>
+                    <div class="item-label">离开时间</div>
                     <div class="item-value">
                       {{v.departureTime? dayjs(v.departureTime).format('YYYY-MM-DD HH:mm') : '暂无'}}
                     </div>
@@ -296,12 +296,12 @@ export default {
   align-items: center;
   font-size: 26px;
   .item-label{
-    flex:.23;
+    flex:.25;
     text-align: left;
     color:#333;
   }
   .item-value{
-    flex:.77;
+    flex:.75;
     color:#666;
     min-height: 50px;
     max-height: 250px;