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

fhKeeper/formulahousekeeper/course-pc/src/views/coursemanagement/addVideo.vue

@@ -36,6 +36,7 @@
               :min="0"
               :max="600"
               placeholder="试看时间(秒)"
+              :disabled="item.coursePreviousUrl"
             ></el-input-number>
           </el-col>
           <el-col :span="5">

fhKeeper/formulahousekeeper/course-pc/src/views/coursemanagement/list.vue

@@ -165,23 +165,23 @@
                         </el-form-item>
                         <el-form-item label="培训学时" style="width: 50%;">
                             <el-input-number v-model="courseForm.teachDuration" :min="0" step-strictly
-                                :step="1" controls-position="right"></el-input-number>
+                                :step="1" controls-position="right" @blur="inputNumberBlur('teachDuration')"></el-input-number>
                         </el-form-item>
                         <el-form-item label="培训费/认证费" style="width: 50%;">
                             <el-input-number v-model="courseForm.teachVeriPrice" :min="0" step-strictly
-                                :step="1" controls-position="right"></el-input-number>
+                                :step="1" controls-position="right"  @blur="inputNumberBlur('teachVeriPrice')"></el-input-number>
                         </el-form-item>
                         <el-form-item label="资料费" style="width: 50%;">
                             <el-input-number v-model="courseForm.materialPrice" :min="0" step-strictly
-                                :step="1" controls-position="right"></el-input-number>
+                                :step="1" controls-position="right"  @blur="inputNumberBlur('materialPrice')"></el-input-number>
                         </el-form-item>
                         <el-form-item label="其他费用1" style="width: 50%;">
                             <el-input-number v-model="courseForm.other1Price" :min="0" step-strictly
-                                :step="1" controls-position="right"></el-input-number>
+                                :step="1" controls-position="right"  @blur="inputNumberBlur('other1Price')"></el-input-number>
                         </el-form-item>
                         <el-form-item label="其他费用2" style="width: 50%;">
                             <el-input-number v-model="courseForm.other2Price" :min="0" step-strictly
-                                :step="1" controls-position="right"></el-input-number>
+                                :step="1" controls-position="right"  @blur="inputNumberBlur('other2Price')"></el-input-number>
                         </el-form-item>
                     </div>
                     <el-form-item label="课程封面">
@@ -436,6 +436,11 @@ export default {
                 this.courseForm.courseDuration = 1
             }
         },
+        inputNumberBlur(type) {
+            if(!(this.courseForm[type] || this.courseForm[type] === 0)) {
+                this.courseForm[type] = 0
+            }
+        },
         saveVideo() {
             console.log(this.displayVideoList, '<=== 看看数据')
             const courseInfoId = this.addVideoRow.id
@@ -820,7 +825,6 @@ export default {
                 if (!valid) {
                     return false;
                 }
-
                 const formData = new FormData();
                 if (this.courseForm.id) {
                     formData.append('id', this.courseForm.id);

fhKeeper/formulahousekeeper/course-pc/src/views/examinationManagement/examRegistrationReview.vue

@@ -150,10 +150,10 @@ export default {
                         parentId: id,
                         parentExamStatus: examStatus,
                         parentIsOnlineCourse: isOnlineCourse,
-                        sex: fixedDataGender.find(val => val.value == (sex ? 1 : 0)).label,
-                        idType: fixedDataCertificateType.find(val => val.value == idType).label,
-                        invoiceType: fixedDatainvoiceType.find(val => val.value == invoiceType).label,
-                        isIndivdual: fixedDataInvoiceSubject.find(val => val.value == (isIndivdual ? 1 : 0)).label,
+                        sex: (fixedDataGender.find(val => val.value == (sex ? 1 : 0)) || {}).label,
+                        idType: (fixedDataCertificateType.find(val => val.value == idType) || {}).label,
+                        invoiceType: (fixedDatainvoiceType.find(val => val.value == invoiceType) || {}).label,
+                        isIndivdual: (fixedDataInvoiceSubject.find(val => val.value == (isIndivdual ? 1 : 0)) || {}).label,
                     }
                 })
             }).finally(() => {

fhKeeper/formulahousekeeper/course-pc/src/views/examinationManagement/examResults.vue

@@ -7,12 +7,12 @@
                     <el-input v-model="keyword" placeholder="请输入" clearable @input="searchList"
                         size="small"></el-input>
                 </el-form-item>
-                <el-form-item label="课程名称">
+                <el-form-item label="考试课程">
                     <el-input v-model="courseName" placeholder="请输入" clearable @input="searchList"
                         size="small"></el-input>
                 </el-form-item>
                 <el-form-item label="考试结果">
-                    <el-select v-model="courseStatus" placeholder="请选择" size="small">
+                    <el-select v-model="courseStatus" placeholder="请选择" size="small" @change="searchList" clearable>
                         <el-option label="合格" :value="true"></el-option>
                         <el-option label="不合格" :value="false"></el-option>
                     </el-select>

fhKeeper/formulahousekeeper/course-pc/src/views/orderAndFinancialManagement/electronicInvoiceRegistration.vue

@@ -46,7 +46,7 @@
       <el-table-column prop="money" label="金额（元）" min-width="150" align="center"></el-table-column>
       <el-table-column prop="payDate" label="汇款日期" min-width="150" align="center"></el-table-column>
       <el-table-column prop="name" label="汇款单位" min-width="150" align="center"></el-table-column>
-      <el-table-column prop="payDate" label="实际汇款金额" min-width="150" align="center"></el-table-column>
+      <el-table-column prop="money" label="实际汇款金额" min-width="150" align="center"></el-table-column>
     </el-table>
 
     <!--分页-->
@@ -88,7 +88,7 @@ export default {
         if (res.code == "ok") {
           var filePath = res.data;
           const a = document.createElement('a'); // 创建a标签
-          a.setAttribute('download', '学员缴费情况.xlsx');// download属性
+          a.setAttribute('download', '学员缴费情况.xls');// download属性
           a.setAttribute('href', filePath);// href链接
           a.click(); //自执行点击事件
           a.remove();

fhKeeper/formulahousekeeper/course-pc/src/views/trainingClassManagement/student.vue

@@ -84,7 +84,7 @@ export default {
         if (res.code == "ok") {
           var filePath = res.data;
           const a = document.createElement('a'); // 创建a标签
-          a.setAttribute('download', '学员名单.xlsx');// download属性
+          a.setAttribute('download', '学员名单.xls');// download属性
           a.setAttribute('href', filePath);// href链接
           a.click(); //自执行点击事件
           a.remove();

fhKeeper/formulahousekeeper/course-pc/src/views/trainingClassManagement/studentPayment.vue

@@ -69,7 +69,7 @@ export default {
         if (res.code == "ok") {
           var filePath = res.data;
           const a = document.createElement('a'); // 创建a标签
-          a.setAttribute('download', '学员缴费情况.xlsx');// download属性
+          a.setAttribute('download', '学员缴费情况.xls');// download属性
           a.setAttribute('href', filePath);// href链接
           a.click(); //自执行点击事件
           a.remove();

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

@@ -625,7 +625,7 @@
 
                         <!-- 工单号，行号 -->
                         <el-form-item :label="user.timeType.reportExtraField4Name" v-if="user.timeType.reportExtraField4Name">
-                            <el-select v-model="domain.extraField4" placeholder="请选择" @change="onProgressChange" :disabled="!domain.canEdit" filterable clearable >
+                            <el-select v-model="domain.extraField4" placeholder="请选择" @change="onProgressChange" @clear="domain.extraField5 = ''" :disabled="!domain.canEdit" filterable clearable >
                                 <el-option v-for="lin in (domain.reportExtraField4List || [])" :key="lin" :label="lin" :value="lin">
                                 </el-option>
                             </el-select>
@@ -1175,7 +1175,7 @@
                 <!-- 工单号，行号 -->
                 <div class="zhoFel" v-if="user.timeType.reportExtraField4Name">
                     <p>{{ user.timeType.reportExtraField4Name }}</p>
-                    <el-select v-model="zhoBao.extraField4" placeholder="请选择" @change="onProgressChange"  filterable style="width: 355px" clearable>
+                    <el-select v-model="zhoBao.extraField4" placeholder="请选择" @change="onProgressChange" @clear="zhoBao.extraField5 = ''"  filterable style="width: 355px" clearable>
                         <el-option v-for="lin in (zhoBao.reportExtraField4List || [])" :key="lin" :label="lin" :value="lin">
                         </el-option>
                     </el-select>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -2439,6 +2439,9 @@ export default {
             if (value) {
                 this.form.domains[this.clickIndex].extraField4 = value
             }
+            if(!value) {
+                this.form.domains[this.clickIndex].extraField5 = ''
+            }
             this.form.domains[this.clickIndex].showPickerExtraField4 = false;
             this.$forceUpdate();
         },

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -1875,6 +1875,9 @@
                 if (value) {
                     this.currentForm.domains[this.clickIndex].extraField4 = value
                 }
+                if(!value) {
+                    this.currentForm.domains[this.clickIndex].extraField5 = ''
+                }
                 this.currentForm.domains[this.clickIndex].showPickerExtraField4 = false;
                 this.$forceUpdate();
             },