Merge branch 'master' of http://git.dgtis.com/sunlupeng/yudao-ui-saas

src/views/finance/asset/index.vue

@@ -20,7 +20,7 @@
             </el-form-item>
             <el-form-item label="资产日期" prop="capitalizationDate">
                 <el-date-picker v-model="queryParams.capitalizationDate" style="width: 250px"
-                    value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="-" start-placeholder="开始日期"
+                    value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期"
                     end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
             </el-form-item>
             <el-form-item label="折旧年限" prop="depreciationYear">
@@ -365,7 +365,7 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    
+
                     <el-col :span="24" v-if="receiveTitle=='领用'">
                         <el-form-item label="领用原因" prop="reason">
                             <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="receiveform.reason"
@@ -531,8 +531,8 @@ export default {
                 retirementReason: [
                     { required: true, message: '请输入原因', trigger: 'blur' },
                 ],
-                
-                
+
+
 
             },
         };
@@ -560,13 +560,13 @@ export default {
                 this.receiveform.employeeName = this.assetInfo[0].receiveEmployeeName;
                 this.receiveTitle = val;
                 this.openReceive = true;
-                
+
             }else{
                 this.$message.warning("该数据的资产状态不支持此操作,请重新选择!");
                 return;
             }
-            
-            
+
+
         },
         handleSelectionChange(selection) {
             console.log(selection);
@@ -894,4 +894,4 @@ ul {
 .el-tag+.el-tag {
     margin-left: 10px;
 }
-</style>
+</style>

src/views/personnel/attendance/info/index.vue

@@ -473,7 +473,7 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       this.download('personnel/attendance/info/get-import-template', {
-      }, `template_${new Date().getTime()}.xlsx`)
+      }, `考勤导入模版.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -555,4 +555,4 @@ ul {
 .el-tag+.el-tag {
   margin-left: 10px;
 }
-</style>
+</style>

src/views/system/user/index.vue

@@ -58,7 +58,7 @@
           <el-table-column label="性别" prop="gender" align="center">
             <template v-slot="scope">
               <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.gender"/>
-            </template> 
+            </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="160">
             <template v-slot="scope">
@@ -110,7 +110,7 @@
             <el-button slot="append" class="copy-btn">复制</el-button>
           </el-input>
           </div>
-          
+
         </div>
       </div>
     </el-dialog>
@@ -280,7 +280,7 @@ export default {
       }else{
         this.$modal.msgWarning("该员工尚未注册账号,暂时无法分配角色!");
       }
-      
+
     },
 
     /** 提交按钮（角色权限） */
@@ -299,11 +299,11 @@ export default {
      /** 导出按钮操作 */
      handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有职位数据项?').then(() => {
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
           this.exportLoading = true;
           return exportUser(queryParams);
         }).then(response => {
-          this.$download.excel(response, '职位数据.xls');
+          this.$download.excel(response, '员工数据.xls');
           this.exportLoading = false;
       }).catch(() => {});
     }
@@ -342,4 +342,4 @@ export default {
     width: 100%;
 }
 }
-</style>
+</style>