加冒号

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -636,7 +636,7 @@
                         format="yyyy-MM-dd" 
                         value-format="yyyy-MM-dd"
                         :clearable="false" type="date" 
-                        placeholder="$t('optiondate')"></el-date-picker>
+                        :placeholder="$t('optiondate')"></el-date-picker>
                     </el-form-item>
                     <el-form-item :label="$t('IndependentProject')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
                         <!-- <el-input v-model="addForm.projectCategorySub" placeholder="请输入自主项目类别" clearable></el-input> -->

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

@@ -1489,7 +1489,7 @@
             </div>
             <div slot="footer" class="dialog-footer">
                 <el-button  @click="denyReasonDialog = false" >{{$t('btn.cancel')}}</el-button>
-                <el-button type="primary" @click="deny()" >{{$t('btn.submit')}}</el-button>
+                <el-button type="primary" :loading="isDenying" @click="deny()" >{{$t('btn.submit')}}</el-button>
             </div>
         </el-dialog>
         <!--  通过弹出框 -->
@@ -1600,6 +1600,14 @@
                         </div>
                     </template>
                 </el-table-column>
+                <el-table-column prop="departmentName" label="部门"  >
+                    <template slot-scope="scope">
+                        <div>
+                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate != 1">{{scope.row.departmentName}}</span>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="startTime" :label="$t('screening.workinghoursss')"  ></el-table-column>
                 <el-table-column prop="endTime" :label="$t('screening.off-dutytime')" ></el-table-column>
                 <el-table-column prop="workHours" :label="$t('other.actualworkinghours')"  align="right">
@@ -1750,6 +1758,7 @@
         },
         data() {
             return {
+                isDenying: false,
                 targetWeekDate: null,//填写周报中的周日期
                 importCardTimeVisi: false,
                 startRatioExporting: false,
@@ -6718,6 +6727,7 @@
             },
             showDenyDialog(id,i, item) {
                 this.denyReasonDialog = true;
+                this.isDenying = false;
                 let day = (this.choseDay+1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 var ids = item.id;
                 // var data = item.data;
@@ -6729,10 +6739,11 @@
             // 未通过日报
             deny() {
                 this.logining = true;
-                
+                this.isDenying = true;
                 this.http.post( this.port.report.deny, this.denyForm,
                 res => {
                     this.logining = false;
+                    this.isDenying = false;
                     if (res.code == "ok") {
                         this.$message({
                             message: this.denyForm.i==0?this.$t('message.rejectedsuccessfully'):this.$t('Revocationofsuccess'),