소스 검색

提交尝试线上调试

Lijy 2 년 전
부모
커밋
20facd0b13
1개의 변경된 파일23개의 추가작업 그리고 4개의 파일을 삭제
  1. 23 4
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

+ 23 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -590,8 +590,15 @@
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"></el-input>
                         </el-form-item>
                         <!-- 拍照上传 -->
-                        <el-form-item label="拍照上传" v-if="user.companyId == '7' || user.companyId == '10'">
+                        <el-form-item label="图片上传" v-if="user.companyId == '7' || user.companyId == '10'">
                             <div class="photos">
+                                <div class="photos_img" v-for="(p, ip) in domain.pics" :key="ip">
+                                    <el-image
+                                        style="width: 120px; height: 120px; margin-right:10px;"
+                                        :src="p" 
+                                        :preview-src-list="domain.pics">
+                                    </el-image>
+                                </div>
                                 <div @click="addImg(index)" class="photos_img">
                                     <img src="../../assets/image/aacbc.png" />
                                 </div>
@@ -758,13 +765,13 @@
                         </div>
 
                         <!--照片的显示 -->
-                        <p v-if="domain.pics != null && domain.pics.length > 0" style="text-align:center;"> 
+                        <!-- <p v-if="domain.pics != null && domain.pics.length > 0" style="text-align:center;"> 
                             <el-image v-for="(pic, index) in domain.pics" :key="index"
                                 style="width: 100px; height: 100px; margin-right:10px;"
                                 :src="pic" 
                                 :preview-src-list="domain.pics">
                             </el-image>
-                        </p>
+                        </p> -->
                         <el-divider v-if="workForm.domains.length>1" style="margin-bottom:10px;"></el-divider>
                     </div>
                     <span id="workFormsItemBottom"></span>
@@ -2116,6 +2123,12 @@
             // 图片上传
             addImg(index) {
                 var that = this;
+                // if (that.workForm.domains[index].pics == null) {
+                //     that.workForm.domains[index].pics = [];
+                //     that.workForm.domains[index].iospics = [];
+                // }
+                // that.workForm.domains[index].pics.push('https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AAOEcdM.img')
+                // console.log(that.workForm.domains)
                 wx.chooseImage({
                     count: 3, // 默认9
                     sizeType: ['compressed'],
@@ -2143,13 +2156,15 @@
                                 isShowProgressTips: 1, // 默认为1,显示进度提示
                                 success: function (res) {
                                     var serverId = res.serverId; // 返回图片的服务器端ID
-                                    // serverIdList.push(serverId);
                                     that.workForm.domains[index].serverPics.push(serverId);
+
+                                    console.log(that.workForm.domains, '数据')
                                 }
                             });
                         }
                     }
                 })
+                cosno
             },
             test(){
                 console.log('test',this.workForm.domains);
@@ -6732,10 +6747,14 @@
 <style lang="scss" scoped>
 .photos {
     position: relative;
+    display: flex;
+    flex-wrap: wrap;
 }
 .photos_img {
     width: 120px;
     height: 120px;
+    margin-right: 20px;
+    margin-bottom: 20px;
     cursor: pointer;
     img {
         width: 100%;