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

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/customContract.vue

@@ -235,7 +235,7 @@
             <el-date-picker v-model="contractForm.filingsDate" :disabled="contractForm.status == 0" value-format="yyyy-MM-dd" type="date" :placeholder="$t('optiondate')"></el-date-picker>
           </el-form-item>
           <el-form-item label="合同金额(元)/含税价">
-            <el-input v-model="contractForm.amounts" :disabled="contractForm.status == 0" :placeholder="$t('peaseenterthe')" @change="chgPayedAmount()" clearable>
+            <el-input v-model="contractForm.amounts" :disabled="contractForm.status == 0 || !contractForm.isAmountFixed" :placeholder="$t('peaseenterthe')" @change="chgPayedAmount()" clearable>
               <span slot="prefix">￥</span>
             </el-input>
           </el-form-item>
@@ -250,7 +250,7 @@
             </el-input>
           </el-form-item>
           <el-form-item label="是否固定金额">
-            <el-select v-model="contractForm.isAmountFixed" :disabled="contractForm.status == 0" placeholder="请选择">
+            <el-select v-model="contractForm.isAmountFixed" :disabled="contractForm.status == 0" placeholder="请选择" @change="processingContractAmount()">
               <el-option label="是" :value="true"></el-option>
               <el-option label="否" :value="false"></el-option>
             </el-select>
@@ -705,12 +705,26 @@ export default {
     //   console.log('test',row);
     //   // this.$refs.uploadFile.submit()
     // },
+    processingContractAmount() {
+      console.log(this.contractForm.isAmountFixed, '<====== 开始执行')
+      if(this.contractForm.isAmountFixed) {
+        return
+      }
+      const list = this.contractPaymentList || []
+      const totalNum = list.reduce((sum, item) => sum + (item.payedAmount || 0), 0);
+      console.log(list, '<====== 开始执行')
+      console.log(totalNum, '<====== 开始执行')
+      this.contractForm.amounts = totalNum
+    },
     chgPayedAmount() {
       const { amounts } = this.contractForm
       const list = this.contractPaymentList || []
       let totalNum = +amounts || 0
       if(amounts <= 0 || list.length <= 0) {
+        this.processingContractAmount()
         return
+      } else {
+        this.processingContractAmount()
       }
       
       for(let i in list) {

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

@@ -2692,7 +2692,6 @@ export default {
           this.userId ? sl.userId = this.userId : ''
           dept ? sl.deptId = dept : ''
         } else if(this.ins == 24) {
-          this.exportReportLoading = true
           if(this.tabsType == 'all') {
             fName = this.$t('fenZuHaoYongJinDuBiao') + '.xlsx'
             url = "/project/exportGroupExpendProcessList"
@@ -2744,6 +2743,7 @@ export default {
           sl.startDate = this.rangeDatas[0]
           sl.endDate = this.rangeDatas[1]
         }
+        this.exportReportLoading = true
           this.http.post(url, sl,
             res => {
                 this.exportReportLoading = false

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

@@ -221,6 +221,13 @@
                         type: 'bar',
                         barMaxWidth: 30,
                         data: yList,
+                        label: {
+                            normal: {
+                                show: true,
+                                position: 'top',
+                                formatter: `{c} ${this.yAxisValue == 0 ? '元' : '小时'}`,
+                            }
+                        }
                     }]
                 };
                 myChart.setOption(option,{notMerge: true});

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

@@ -139,7 +139,7 @@
                                     <el-link v-if="user.timeType.enableNewWeeklyfill == 1" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">{{ $t('textLink.fillInAWeek') }}</el-link>
                                     <!-- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">按周填报123</el-link> -->
                                     <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;weekIndex++,fillWeekDialogVisiCustomTwo=true" v-if="user.timeType.enableNewWeeklyfill==2">按周填报</el-link>
-                                    <el-link type="primary" v-if="user.companyId != 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,0)">{{$t('textLink.helpToFillIn')}}</el-link>
+                                    <el-link type="primary" v-if="user.companyId != 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,user.companyId == 5814?2:0)">{{$t('textLink.helpToFillIn')}}</el-link>
                                     <!-- 苏州景昱，按周填报的模式进行代填日报 -->
                                     <el-link type="primary" v-if="user.companyId == 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReportss();">{{$t('textLink.helpToFillIn')}}</el-link>
                                     
@@ -378,7 +378,7 @@
         </el-dialog>
 
         <!-- 填写日报的dialog -->
-        <el-dialog :title="editTitle[isBatch]" :visible.sync="dialogVisible" width="60%" :close-on-click-modal="false" @closed="guanbi()" :top="'5.5vh'" custom-class="editReportDialog" ref="editReportDialog">
+        <el-dialog :title="isSubstitude?$t(textLink.helpToFillIn):editTitle[isBatch]" :visible.sync="dialogVisible" width="60%" :close-on-click-modal="false" @closed="guanbi()" :top="'5.5vh'" custom-class="editReportDialog" ref="editReportDialog">
             <div style="height: 65vh;overflow: auto;">
                 <el-form ref="workForm" :model="workForm" :rules="workRules" label-width="120px">
                     <el-form-item :label="$t('screening.selectPeople')" v-if="isSubstitude">
@@ -395,6 +395,10 @@
                                 {{$t('defaultText.pleaseSelectAsubstitute')}}
                             </span>
                         </div>
+                        <!-- <el-radio-group v-model="singleDate" style="margin-left:10px;">
+                            <el-radio :label="1">单日代填</el-radio>
+                            <el-radio :label="2">多日代填</el-radio>
+                        </el-radio-group> -->
                     </el-form-item>
                     <el-form-item :label="$t('screening.workingDate')" prop="createDate">
                         <el-date-picker v-model="workForm.createDate" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
@@ -2289,6 +2293,7 @@
         },
         data() {
             return {
+                singleDate:1,
                 subFillProjectList:[],
                 curAuditNode: 1,
                 refreshingTime: false,