Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

杨泽宇
2 parents 3f59949d bdb147dd
Showing 6 changed files with 14 additions and 10 deletions
src/views/community/housekeeper/index.vue
src/views/community/houses/index.vue
src/views/community/residence/index.vue
src/views/notify/edit.vue
src/views/property/edit.vue
src/views/serviceman/detail.vue
@@ -194,12 +194,12 @@ watchEffect(() =&gt; {
               query: { buildingId: scope.row.id },
             }"
           >
-            <el-button type="text" size="mini">房屋管理</el-button>
+            <el-button type="text" size="mini" class="btn">房屋管理</el-button>
           </router-link>
-          <el-button type="text" size="mini" @click="edit(scope.row)"
+          <el-button type="text" size="mini" @click="edit(scope.row)" class="btn"
             >编辑</el-button
           >
-          <el-button type="text" size="mini" @click="remove(scope.row.id)"
+          <el-button type="text" size="mini" @click="remove(scope.row.id)" class="btn"
             >删除</el-button
           >
         </template>
@@ -246,4 +246,8 @@ watchEffect(() =&gt; {
   </div>
 </template>
-<style></style>
+<style scoped>
+.btn{
+  margin-left:8px
+}
+</style>
@@ -179,14 +179,13 @@ watchEffect(() =&gt; {
             @click="buildPeople(scope.row.id, false)"
             >取消绑定</el-button
           >
-
-          <el-button
+          <!-- <el-button
             type="text"
             size="mini"
             @click="check(scope.row.id)"
             style="margin-left: 10px"
             >查看房屋</el-button
-          >
+          > -->
           <router-link
             :to="{
               name: 'owner',
@@ -134,7 +134,7 @@ onMounted(() =&gt; {
               query: { neighborhoodId: scope.row.id },
             }"
           >
-            <el-button type="text" size="mini">楼宇管理</el-button></router-link
+            <el-button type="text" size="mini" style="margin-left: 10px">楼宇管理</el-button></router-link
           >
         </template>
       </el-table-column>
@@ -78,6 +78,7 @@ const submitForm = (
             postApi(type);
           })
           .catch((error) => {
+            form.loading = false;
             console.log(error);
           });
       } else {
@@ -273,7 +273,7 @@ onMounted(() =&gt; {
           <el-input
             v-model.trim="form.data.contractNumber"
             placeholder="请填写合同编号"
-            maxlength="50"
+            maxlength="30"
           />
         </el-form-item>
         <el-form-item label="备注" prop="remark" style="width: 100%">
@@ -185,7 +185,7 @@ onMounted(() =&gt; {
       <el-input
         v-model="props.formObj.name"
         placeholder="请输入姓名"
-        maxlength="30"
+        maxlength="10"
       ></el-input>
     </el-form-item>
     <el-form-item label="年龄:" prop="age">