panhui 6 years ago
parent
commit
b595e6772a

+ 2 - 0
src/main/vue/src/components/ResidenceData.vue

@@ -999,10 +999,12 @@ export default {
             this.$http
                 .post('/residence/save', data, { body: 'json' })
                 .then(res => {
+                    this.$store.commit('updateFetchingData', false);
                     this.$message.success('成功');
                     this.$emit('close');
                 })
                 .catch(e => {
+                    this.$store.commit('updateFetchingData', false);
                     console.log(e);
                     this.$message.error(e.error);
                 });

+ 20 - 6
src/main/vue/src/views/sale/ContractList.vue

@@ -54,7 +54,15 @@
             <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加</el-button>
         </div>
         <div class="el-table table-content">
-            <el-button :style="{right:showMoreEdit?'300px':'80px'}" @click="showMoreEdit=!showMoreEdit" :plain="showMoreEdit" type="primary" :icon="showMoreEdit?'el-icon-arrow-right':'el-icon-arrow-left'" circle class="float-button transition"></el-button>
+            <el-button
+                :style="{ right: showMoreEdit ? '300px' : '80px' }"
+                @click="showMoreEdit = !showMoreEdit"
+                :plain="showMoreEdit"
+                type="primary"
+                :icon="showMoreEdit ? 'el-icon-arrow-right' : 'el-icon-arrow-left'"
+                circle
+                class="float-button transition"
+            ></el-button>
             <el-table
                 :data="tableData"
                 row-key="id"
@@ -208,7 +216,13 @@
                 <el-table-column prop="status" label="状态" width="60" :formatter="statusFormatter"> </el-table-column>
                 <el-table-column prop="checkInType" label="合作模式" width="100" :formatter="checkinTypeFormatter">
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" :width="showMoreEdit?300:80" align="center" class-name="transition">
+                <el-table-column
+                    label="操作"
+                    fixed="right"
+                    :width="showMoreEdit ? 300 : 80"
+                    align="center"
+                    class-name="transition"
+                >
                     <template slot-scope="{ row }">
                         <!-- <el-button @click="detail(row)" type="success" size="mini" plain>详情</el-button> -->
                         <el-button @click="renewalRow(row)" type="success" size="mini" plain>续约</el-button>
@@ -599,7 +613,7 @@ export default {
             },
             sortStr: 'id,desc',
             showDetail: false,
-            showMoreEdit:false
+            showMoreEdit: false
         };
     },
     computed: {
@@ -1176,12 +1190,12 @@ export default {
         position: absolute;
         z-index: 60;
         top: 50%;
-        transform: translate(50%,-50%);
+        transform: translate(20%, -50%);
         right: 80px;
     }
 }
 
-.transition{
-    transition: all ease-in-out .3s;
+.transition {
+    transition: all ease-in-out 0.3s;
 }
 </style>