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

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

@@ -661,7 +661,7 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="exportTask" style="width:100%;" >导出</el-button>
+                <el-button type="primary" @click="exportTask" style="width:100%;" :loading="loadingExport">导出</el-button>
             </div>
         </el-dialog>
 
@@ -680,7 +680,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-upload ref="upload" action="#" :limit="1" :http-request="importTask" :show-file-list="false">
-                        <el-button type="primary" :underline="false" style="width:100%;">上传文件</el-button>
+                        <el-button type="primary" :underline="false" style="width:100%;" :loading="loadingExport">上传文件</el-button>
                 </el-upload>
             </div>
         </el-dialog>
@@ -720,6 +720,7 @@
         
         data() {
             return {
+                loadingExport : false,
                 saveTemplateLoading: false,
                 joinMembList:[],
                 setInchargerDialog: false,
@@ -942,9 +943,11 @@
             // 批量导入人员
             importTask(item) {
                 //首先判断文件类型
+                this.loadingExport = true
                 let str = item.file.name.split(".");
                 let format = str[str.length - 1];
                 if (format != "xls" && format != "xlsx") {
+                    this.loadingExport = false
                     this.$message({
                         message: "请选择.xls或.xlsx文件",
                         type: "error"
@@ -960,6 +963,7 @@
                     res => {
                         this.$refs.upload.clearFiles();
                         this.listLoading = false;
+                        this.loadingExport = false
                         if (res.code == "ok") {
                             this.$message({
                                 message: "导入成功",
@@ -978,6 +982,7 @@
                     error => {
                         this.$refs.upload.clearFiles();
                         this.listLoading = false;
+                        this.loadingExport = false
                         this.$message({
                             message: error,
                             type: "error"
@@ -1065,8 +1070,10 @@
             },
             exportTask() {
                 let _this = this;
+                this.loadingExport = true
                 this.http.post('/task/exportTask', {projectId: this.curProjectId, taskType: this.exportTaskType},
                 res => {
+                    this.loadingExport = false
                     if (res.code == "ok") {
                         location.href = res.data;
                     } else {

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -49,7 +49,7 @@
             ></el-pagination>
         </el-col> -->
         <!-- 分配权限弹窗 -->
-        <el-dialog :title="'分配权限 - '+roleName" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
+        <el-dialog :title="'分配权限 - '+roleName" :visible.sync="dialogVisible" width="764px" :before-close="handleClose">
             <div class="quanxians">
                 <!-- <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input> -->
                 <!-- <el-tree :data="data" show-checkbox node-key="id" :filter-node-method="filterNode" ref="tree" :default-expanded-keys="[2, 3]" :default-checked-keys="[5]" :props="defaultProps"> </el-tree> -->