21 Commits c80768d115 ... 372a493e73

Auteur SHA1 Bericht Datum
  fanghuisheng 372a493e73 Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-web-mobile into fanghuisheng 1 maand geleden
  gez a19ddfb738 Merge branch 'ming' of uskycloud/usky-web-mobile into master 1 maand geleden
  ming 9a8f7d4f52 回测bug修复 1 maand geleden
  ming d76db8bccc 图片附件详情回显优化 1 maand geleden
  ming 1bd2538b78 代码简化 1 maand geleden
  ming 223f432194 附件上传删除事件及回显逻辑调整 1 maand geleden
  ming cf4b01b984 图片附件上传个数限制 1 maand geleden
  gez 09ddfeb64a Merge branch '165' of uskycloud/usky-web-mobile into master 2 maanden geleden
  gez 764805d27a Merge branch '165' of uskycloud/usky-web-mobile into master 2 maanden geleden
  gez 490b303658 Merge branch '165' of uskycloud/usky-web-mobile into master 2 maanden geleden
  王涛 fb3e3f8d74 Merge branch '165' of uskycloud/usky-web-mobile into master 2 maanden geleden
  gez 177b662958 Merge branch '165' of uskycloud/usky-web-mobile into master 2 maanden geleden
  gez 37133b51c2 Merge branch '165' of uskycloud/usky-web-mobile into master 2 maanden geleden
  gez 15dfe241c3 Merge branch '165' of uskycloud/usky-web-mobile into master 2 maanden geleden
  gez 23fb08b7e4 Merge branch '165' of uskycloud/usky-web-mobile into master 3 maanden geleden
  gez 1f2b489ede Merge branch '165' of uskycloud/usky-web-mobile into master 3 maanden geleden
  gez ae6aa6ff0e Merge branch '165' of uskycloud/usky-web-mobile into master 3 maanden geleden
  gez 8d18574053 Merge branch '165' of uskycloud/usky-web-mobile into master 3 maanden geleden
  gez 7bc6ef7f85 Merge branch '165' of uskycloud/usky-web-mobile into master 3 maanden geleden
  gez dc2eea9316 Merge branch '165' of uskycloud/usky-web-mobile into master 3 maanden geleden
  gez a4fe5e9864 Merge branch '165' of uskycloud/usky-web-mobile into master 3 maanden geleden

+ 2 - 2
src/pages/business/common/projectMange/list/index.vue

@@ -83,12 +83,12 @@
           </view>
           <view class="content-area-row_wrap menu-item">
             <view class="content-area-row_wrap-view"> 负责人: {{ proxy.$common.mapping("nickName", "userId", base.projectHead, userDate) }} </view>
-            <view class="content-area-row_wrap-view">
+            <!-- <view class="content-area-row_wrap-view">
               状态:
               <span :style="{ color: proxy.$common.mapping('elTagClass', 'value', base.projectStatus, project_status) }">{{
                 proxy.$common.mapping("label", "value", base.projectStatus, project_status)
               }}</span>
-            </view>
+            </view> -->
             <view class="content-area-row_wrap-view">
               类型:
               {{ proxy.$common.mapping("label", "value", base.projectStatus, project_type) }}

+ 3 - 3
src/pages/business/common/projectMange/record/details.vue

@@ -61,8 +61,8 @@
           <u-text :text="item.coordinateWork ? item.coordinateWork : '无'" color="#000000" size="14"></u-text>
         </view>
         <view class="content-area-center mb10">
-          <view class="content-area-center-top">图片 </view>
-          <view class="imageBox" v-if="item.reportImage">
+          <view class="content-area-center-top">图片</view>
+          <view class="imageBox" v-if="JSON.parse(item.reportImage)&&JSON.parse(item.reportImage).length>0">
             <image class="image m5" style="width: 50px" mode="widthFix" v-for="(a, index) in JSON.parse(item.reportImage)" :key="index" :src="a.url" @click="previewImage(index)" />
           </view>
           <view class="imageBox" v-else>无</view>
@@ -70,7 +70,7 @@
 
         <view class="content-area-center mb10">
           <view class="content-area-center-top">附件 </view>
-          <view v-if="item.reportFile">
+          <view v-if="JSON.parse(item.reportFile)&&JSON.parse(item.reportFile).length>0">
             <uni-link v-for="(file, index) in JSON.parse(item.reportFile)" :key="index" :href="file.url" text="file.url" style="color: rgba(0, 0, 0, 0.7)">{{ file.name }}</uni-link>
           </view>
           <view v-else>无</view>

+ 28 - 7
src/pages/business/common/projectMange/write/components/template1.vue

@@ -67,18 +67,19 @@
     </view>
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">图片上传</view>
+      <view style="color:#f56c6c;font-size:11px;margin-bottom:10px">( 注:不可同步钉钉,最多上传5张 )</view>
       <oa-upload :uploadCount="5" :uploadList="reportImage1" :uploadListSrc="'url'" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
     </view>
     <view class="content-area-item mt10 p10 bg-white">
       <view class="font14 weight mb10">附件上传</view>
-      <uni-file-picker limit="100" 
-					@select='selectUpload' 
+      <view style="color:#f56c6c;font-size:11px;margin-bottom:10px">( 注:不可同步钉钉,最多上传5个 )</view>
+      <uni-file-picker limit="5" 
+        @select='selectUpload' 
+          v-model="reportFile1"
 					:auto-upload='false' 
 					file-extname='git,pdf,docx,doc,xls,xlsx,ppt,pptx,txt,zip,rar,7z,gz,bz2,tar,tgz,tbz,txz,apk,ipa,mp3,mp4,avi,flv,rmvb,wmv,mkv,mov,wma,aac,m4a,amr,ogg,flac,wav,amr,ape,m4r,aac,ac3,dts,m4b,m4p,m4v,mp2,mpe,mpeg,mpg,mpv,ogv,rm,swf,vob,wmv,3gp,3g2,asf,asx,avi,flv,m2ts,m4v,mkv,mov,mp4,mpg,mpeg,rm,swf,vob,wmv,3gp,3g2,asf,asx,avi,' 
 					file-mediatype="all" 
 		  >
-        <u-button class="mt20" type="primary" style="width: 100px; height: 25px"  icon="plus" size="mini"  shape="circle"> 点击上传 </u-button>
-
       </uni-file-picker>
        <!-- 文件列表回显 -->
        <br>
@@ -356,6 +357,7 @@ function modalConfirm() {
     name: e.name,
     url: e.url,
   })
+  reportImage1.value=reportImage1.value.slice(0,5)
   realTimeSaving()
 }
 /**
@@ -365,8 +367,13 @@ function modalConfirm() {
   reportImage1.value = e;
   realTimeSaving()
 }
+
+
+
+
+
 /**
- * @文件上传
+ * @文件删除
  */
 function delectFile(param){
   reportFile1.value = reportFile1.value.filter(function (item) {
@@ -374,11 +381,14 @@ function delectFile(param){
   });
   realTimeSaving()
 }
+
+
 /**
- * @文件删除
+ * @文件上传
  */
 function selectUpload(e) {
-	console.log('上传:', e)
+  // console.log('上传:', e)
+
     e.tempFilePaths.forEach((item,index) => {
       uni.uploadFile({
         url: config.baseUrl+'/service-file/upload', 
@@ -427,6 +437,17 @@ function handleSubmit() {
      
     });;
 }
+watch(
+  () => reportFile1.value.length,
+  (val) => {
+    var element = document.querySelector('.files-button');
+   if(reportFile1.value.length>=5){
+    element.style.display = 'none';
+   }else{
+    element.style.display = 'block';
+   }
+  }
+);
 
 watch(
   () => props.projectList,

+ 2 - 0
src/pages/index.vue

@@ -48,7 +48,9 @@
         <image v-if="!state.swiperBool" style="width: 100%; height: 160px" src="@/static/images/index/banner1.png"></image>
 
         <!-- 天气 -->
+        <!-- #ifdef APP-PLUS || H5 -->
         <oa-weather ref="oaWeatherRef"></oa-weather>
+        <!-- #endif -->
 
         <!-- 最近使用宫格 -->
         <view class="grid-area bg-white" v-if="state.recentlyUsed.length > 0">