Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/basicdata/team/basicdataTeamGroup.vue

@@ -149,7 +149,11 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              :loading="buttonLoadingList.handleSubmitBtn"
+              @click="handleSubmit('form')"
               >提 交</el-button
             >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
@@ -274,6 +278,7 @@ export default {
         department: [{ required: true, message: '请选择班组', trigger: 'change' }],
         belongTo: [{ required: true, message: '请选择仓库', trigger: 'change' }],
       },
+      buttonLoadingList: { handleSubmitBtn: false },
     };
   },
   mounted() {
@@ -385,6 +390,8 @@ export default {
     handleSubmit(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
+          this.buttonLoadingList.handleSubmitBtn = true;
+          try {
             if (!this.form.id) {
               this.form.groupType = this.form.groupTypes.join(',');
 
@@ -407,6 +414,10 @@ export default {
                 });
               });
             }
+          } finally {
+            console.log('finally');
+            this.buttonLoadingList.handleSubmitBtn = false;
+          }
         } else {
           console.log('error submit!!');
           return false;
@@ -423,9 +434,9 @@ export default {
     async getWarehouseList() {
       // let userDept = await getListUser();
       var value = localStorage.getItem('TWMS-userInfo');
-      let s=   JSON.parse(value)
+      let s = JSON.parse(value);
       // s.user_id
-      console.log(s,'=========================================='); // 输出: value
+      console.log(s, '=========================================='); // 输出: value
       // console.log('<><><>', userDept.data.data);
       let sole = await getUserDetail(s.content.user_id);
       console.log(',....t=用户信息s', sole);

src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue

@@ -3,11 +3,11 @@
     <div class="avue-crud">
       <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" style='width:100%'>
+        <el-form :inline="true" :model="query" style="width: 100%">
           <!-- 查询按钮 -->
 
-          <el-form-item  class='fr-fo'>
-            <el-col class='el-sl'>
+          <el-form-item class="fr-fo">
+            <el-col class="el-sl">
               <div>
                 <el-form-item label="启用状态:" prop="areaStatus">
                   <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
@@ -61,7 +61,12 @@
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
               >删 除</el-button
             >
-            <el-button type="danger" icon="el-icon-download" @click="handleExport" plain
+            <el-button
+              type="danger"
+              icon="el-icon-download"
+              :loading="buttonLoadingList.handleExportBtn"
+              @click="handleExport"
+              plain
               >导 出 货 区</el-button
             >
             <el-button type="danger" icon="el-icon-upload" plain @click="handleImport"
@@ -229,7 +234,11 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              :loading="buttonLoadingList.handleSubmitBtn"
+              @click="handleSubmit"
               >提 交</el-button
             >
             <el-button icon="el-icon-circle-close" @click="handleClose">取 消</el-button>
@@ -470,6 +479,7 @@ export default {
         areaType: [{ required: true, message: '请选择货区类型!', trigger: 'change' }],
       },
       aaa: false,
+      buttonLoadingList: { handleSubmitBtn: false, handleExportBtn: false },
     };
   },
   created() {
@@ -571,6 +581,8 @@ export default {
       });
     },
     handleExport(row) {
+      try {
+        this.buttonLoadingList.handleExportBtn = true;
         let downloadUrl = `/api/logpm-basicdata/goodsArea/export-warehouseGoodsArea?${
           this.website.tokenHeader
         }=${getToken()}`;
@@ -593,11 +605,16 @@ export default {
             NProgress.done();
           });
         });
+      } finally {
+        this.buttonLoadingList.handleExportBtn = false;
+      }
     },
     handleSubmit() {
       //表单校验
       this.$refs.form.validate(valid => {
         if (valid) {
+          this.buttonLoadingList.handleSubmitBtn = true;
+          try {
             if (!this.form.id) {
               add(this.form).then(() => {
                 this.box = false;
@@ -618,6 +635,9 @@ export default {
                 });
               });
             }
+          } finally {
+            this.buttonLoadingList.handleSubmitBtn = false;
+          }
         } else {
           console.log('error submit!!');
           return false;
@@ -853,12 +873,12 @@ export default {
 };
 </script>
 
-<style scoped lang='scss'>
-.fr-fo{
-  width:100%;
+<style scoped lang="scss">
+.fr-fo {
+  width: 100%;
 }
-.el-sl{
-  display:flex;
+.el-sl {
+  display: flex;
   justify-content: space-between;
 }
 </style>