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

杨泽宇
2 parents c23b70bd 86b3541f
Showing 2 changed files with 41 additions and 26 deletions
src/views/ownerManagement/owner/detail.vue
src/views/ownerManagement/owner/index.vue
@@ -80,16 +80,32 @@ watchEffect((newValue, oldVlaue) =&gt; {
 <template>
   <el-form :model="data.formObj" label-width="120px" :inline="true">
     <el-form-item label="所属小区:" prop="neighborhoodName">
-      <el-input v-model="data.formObj.neighborhoodName" disabled></el-input>
+      <el-input
+        v-model="data.formObj.neighborhoodName"
+        disabled
+        suffix-icon="el-icon-date"
+      ></el-input>
     </el-form-item>
     <el-form-item label="楼宇名称:" prop="buildingName">
-      <el-input v-model="data.formObj.buildingName" disabled></el-input>
+      <el-input
+        v-model="data.formObj.buildingName"
+        disabled
+        suffix-icon="el-icon-date"
+      ></el-input>
     </el-form-item>
     <el-form-item label="姓名:" prop="name">
-      <el-input v-model="data.formObj.name" :disabled="props.isEdit"></el-input>
+      <el-input
+        v-model="data.formObj.name"
+        :disabled="props.isEdit"
+        suffix-icon="el-icon-date"
+      ></el-input>
     </el-form-item>
     <el-form-item label="房间号:" prop="houseName">
-      <el-input v-model="data.formObj.houseName" disabled></el-input>
+      <el-input
+        v-model="data.formObj.houseName"
+        disabled
+        suffix-icon="el-icon-date"
+      ></el-input>
     </el-form-item>
     <el-form-item label="身份证号:" prop="idcard">
       <el-input
@@ -97,6 +113,7 @@ watchEffect((newValue, oldVlaue) =&gt; {
         onkeyup="value=value.replace(/[^\d]/g,'')"
         v-model="data.formObj.idcard"
         :disabled="props.isEdit"
+        suffix-icon="el-icon-date"
       ></el-input>
     </el-form-item>
  
@@ -106,25 +123,11 @@ watchEffect((newValue, oldVlaue) =&gt; {
         onkeyup="value=value.replace(/[^\d]/g,'')"
         v-model="data.formObj.mobile"
         disabled
+        suffix-icon="el-icon-date"
       ></el-input>
     </el-form-item>
-    <el-form-item label="出生日期:" prop="birthdate">
-      <el-date-picker
-        :disabled="props.isEdit"
-        style="width: 200px"
-        v-model="data.formObj.birthdate"
-        type="date"
-        placeholder="Select date and time"
-      >
-      </el-date-picker>
-    </el-form-item>
     <el-form-item label="性别:" prop="gender">
-      <el-select
-        disabled
-        v-model="data.formObj.gender"
-        placeholder="请选择"
-        style="width: 200px"
-      >
+      <el-select disabled v-model="data.formObj.gender" placeholder="请选择">
         <el-option
           v-for="item in data.genderList"
           :key="item.value"
@@ -135,10 +138,15 @@ watchEffect((newValue, oldVlaue) =&gt; {
       </el-select>
     </el-form-item>
     <el-form-item label="民族:" prop="nationality">
-      <el-input v-model="data.formObj.nationality" disabled></el-input>
+      <el-input
+        v-model="data.formObj.nationality"
+        disabled
+        suffix-icon="el-icon-date"
+      ></el-input>
     </el-form-item>
     <el-form-item label="户籍所在地:" prop="censusRegister">
       <el-input
+        suffix-icon="el-icon-date"
         v-model="data.formObj.censusRegister"
         :disabled="props.isEdit"
       ></el-input>
@@ -148,7 +156,6 @@ watchEffect((newValue, oldVlaue) =&gt; {
         :disabled="props.isEdit"
         v-model="data.formObj.isMarried"
         placeholder="请选择"
-        style="width: 200px"
       >
         <el-option
           v-for="item in data.isMarriedList"
@@ -163,7 +170,6 @@ watchEffect((newValue, oldVlaue) =&gt; {
       <el-select
         v-model="data.formObj.politicalStatus"
         placeholder="请选择"
-        style="width: 200px"
         :disabled="props.isEdit"
       >
         <el-option
@@ -179,7 +185,6 @@ watchEffect((newValue, oldVlaue) =&gt; {
       <el-select
         v-model="data.formObj.censusType"
         placeholder="请选择"
-        style="width: 200px"
         :disabled="props.isEdit"
       >
         <el-option
@@ -195,7 +200,6 @@ watchEffect((newValue, oldVlaue) =&gt; {
       <el-select
         v-model="data.formObj.isLiving"
         placeholder="请选择"
-        style="width: 200px"
         :disabled="props.isEdit"
       >
         <el-option
@@ -211,14 +215,25 @@ watchEffect((newValue, oldVlaue) =&gt; {
       <el-input
         v-model="data.formObj.location"
         :disabled="props.isEdit"
+        suffix-icon="el-icon-date"
       ></el-input>
     </el-form-item>
     <el-form-item label="暂住证号:" prop="residencePermit">
       <el-input
         v-model="data.formObj.residencePermit"
         :disabled="props.isEdit"
+        suffix-icon="el-icon-date"
       ></el-input>
     </el-form-item>
+     <el-form-item label="出生日期:" prop="birthdate">
+      <el-date-picker
+        :disabled="props.isEdit"
+        v-model="data.formObj.birthdate"
+        type="date"
+        placeholder="Select date and time"
+      >
+      </el-date-picker>
+    </el-form-item>
     <el-row>
       <el-form-item>
         <el-button type="primary" @click="submit">保存</el-button>
@@ -251,7 +251,7 @@ watchEffect(() =&gt; {
     <el-dialog
       v-model="data.dialogVisible"
       :title="data.title"
-      width="800px"
+      width="80%"
       @close="dialogClose"
     >
     <Detail