Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/weeklyCustomization.vue

@@ -38,7 +38,7 @@
                     </el-table-column>
                     <el-table-column prop="content" :label="user.companyId == wuqiId ? '日报' : $t('gongZuoNeiRong')" width="300">
                         <template slot-scope="scope">
-                            <el-input size="small" type="textarea" :rows="2" v-model.trim="scope.row.content"
+                            <el-input size="small" type="textarea" :rows="2" v-model="scope.row.content"
                                 :disabled="scope.row.state == 1 || scope.row.state == 0 || !scope.row.canFill"
                                 resize="none" :maxlength="user.companyId == wuqiId && 30" :show-word-limit="user.companyId == wuqiId" :placeholder="user.companyId == wuqiId ? '所在项目负责哪一模块（可重复填写），无需涉及技术细节。' : '' "></el-input>
                         </template>
@@ -372,6 +372,8 @@ export default {
             console.log(JSON.parse(JSON.stringify(data)), '<===== 处理之前的')
             this.summaryContent = data.summary;
             this.serverFileList = data.weeklyAttachment?JSON.parse(data.weeklyAttachment):[];
+            //重置文件列表
+            this.fileList = [];
             if (this.serverFileList) {
                 for (var i=0;i<this.serverFileList.length; i++) {
                     var item = this.serverFileList[i];