Merge branch '165' of http://47.111.81.118:3000/uskycloud/usky-web-mobile into wangtao

src/pages/business/common/projectMange/list/index.vue

@@ -241,8 +241,12 @@ const { tabsList, tabsCurrent, dataList, pageSize, current, total, userDate, pop
  * @action弹出框点击事件
  */
  function handleAction(value,event, index, ind) {
+  if(!event.some((element => element.value==0))){
+    event.unshift({label:'全部',value:0})
+  } 
+ 
   if (value == "项目类型") {
-    state.projectTypeList[0] = event
+    state.projectTypeList[0] = event;
   }
 
   state.actionShow = true;

src/pages/business/common/projectMange/record/index.vue

@@ -43,12 +43,12 @@
   >
     <template #default>
 
-      <view v-if="timedList.length>0" class="list-cell list-cell-arrow"  style="margin:20px 0;color:rgb(20, 158, 255);background-color: rgba(20, 158, 255,.1)"  >
-          <view style="width: calc(100% - 51px); display: flex; ; padding-right: 10px">
+      <view v-if="timedList.length>0" @click="goTimingPage()" class="list-cell list-cell-arrow"  style="margin:20px 0;color:rgb(20, 158, 255);background-color: rgba(20, 158, 255,.1)"  >
+          <view style="width: calc(100% - 51px); display: flex; ; padding-right: 10px"  >
             <u-icon name="info-circle" color="#2979ff" size="18" style="margin-right: 5px"></u-icon>
-            <view v-if="timedList.length==1" @click="goTimingPage()">您有1条定时日志将于{{timedList[0].timingTime.slice(0,16)}}发布</view>
+            <view v-if="timedList.length==1">您有1条定时日志将于{{timedList[0].timingTime.slice(0,16)}}发布</view>
 
-            <view v-else  @click="goTimingPage()">您有{{timedList.length}}条定时日志将于指定时间发布</view>
+            <view v-else >您有{{timedList.length}}条定时日志将于指定时间发布</view>
           </view>
       </view>
 

src/pages/business/common/projectMange/record/timingLog.vue

@@ -51,15 +51,15 @@
             ></u-avatar>
             <view>
               <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
-              <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
+              <!-- <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view> -->
             </view>
           </view>
           <view class="mb5" @click="goContentDetails(el)">
             <u-text :text="el.contentText.length >= 100 ? el.contentText.slice(0, 100) + '···' : el.contentText" color="#666666" size="14"></u-text>
           </view>
-          <view style="font-size:12px;lcolor:#a7a4a4">
+          <view style="font-size:12px;color:#a7a4a4">
             <u-button size="mini" style="width:50px;float:left;margin-right:5px;line-height:18px;height:18px">定时日志</u-button>
-            将于 2021-10-10 19:20 发布
+            将于 {{ el.timingTime.replace("T", " ").slice(0, 16) }} 发布
           </view>
         
         </view>

src/pages/business/common/projectMange/write/components/template1.vue

@@ -122,7 +122,8 @@
   <view class="app-button">
     <view class="app-button-padding"></view>
     <view class="app-button-fixed">
-      <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+      <!-- {{ form }} -->
+      <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> {{ form.isRegularlySend == 1 &&form.reportStatus!=1 ?  "保 存" : "确 定" }} </u-button>
     </view>
   </view>