提交相关代码

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

@@ -40,7 +40,7 @@
                         <template slot-scope="scope">
                             <el-input size="small" type="textarea" :rows="2" v-model.trim="scope.row.content"
                                 :disabled="scope.row.state == 1 || scope.row.state == 0 || !scope.row.canFill"
-                                resize="none" :maxlength="user.companyId == wuqiId && 30"></el-input>
+                                resize="none" :maxlength="user.companyId == wuqiId && 30" :show-word-limit="user.companyId == wuqiId"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="workingTime" :label="$t('shiJianXiaoShi')" width="160">
@@ -177,12 +177,17 @@ export default {
                     groupId: data.groupId,
                     id: data.id || -1,
                 }));
+            let flag = false
             arr.forEach(item => {
                 if(item.projectId && !item.content && this.user.companyId == this.wuqiId) {
                     this.$message({
                         type: 'warning',
                         message: `${item.createDate} 日报请填写完整`,
                     })
+                    flag = true
+                    return
+                } else {
+                    flag = false
                 }
                 Object.entries(item).forEach(([key, value]) => {
                     formData.append(key, value);
@@ -196,6 +201,9 @@ export default {
                 })
                 return
             }
+            if(flag) {
+                return
+            }
             this.submitLoading = true
             this.http.uploadFile(this.port.report.editPort, formData,
                 res => {
@@ -425,6 +433,10 @@ export default {
     display: flex;
     flex-direction: row;
     align-items: center;
+    border: 1px solid #EBEEF5;
+    border-top: 0px;
+    padding: 10px 20px;
+    box-sizing: border-box;
     .weekly {
         padding: 0 20px;
         font-size: 20px;