Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue

@@ -97,6 +97,53 @@
             <el-form-item label="房主姓名" prop="ownerName">
                 <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;" disabled></el-input>
             </el-form-item>
+
+        <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同信息</div>
+        <div style="margin-left: 50px;height: 30px;">出租人信息</div>
+        <el-form-item label="出租人姓名" prop="lessorName" label-width="140px">
+            <el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="出租人证件号" prop="lessorIdCard" label-width="140px">
+            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号"></el-input>
+        </el-form-item>
+        <el-form-item label="出租人手机" prop="lessorMobile" label-width="140px">
+            <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
+        </el-form-item>
+        <el-form-item label="与房主关系" prop="lessorRelation" label-width="140px">
+            <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
+            <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系">
+                <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="出租人现居住地" prop="lessorLiveAddress" label-width="140px">
+            <el-input v-model="dataForm.lessorLiveAddress" placeholder="出租人现居住地" ></el-input>
+        </el-form-item>
+        <br/>
+        <el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'" label-width="140px">
+            <template>
+              <upload-image :defaultFileList="dataForm.agencyImgList" :limit="6" @change="onChangeAgencyImgList"></upload-image>
+            </template>
+        </el-form-item>
+        <br/>
+
+        <div style="margin-left: 50px;height: 30px;">承租人信息</div>
+        <el-form-item label="承租人姓名" prop="lesseeName" label-width="140px">
+            <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" ></el-input>
+        </el-form-item>
+        <el-form-item label="承租人证件号" prop="lesseeIdCard" label-width="140px">
+            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" ></el-input>
+        </el-form-item>
+        <el-form-item label="承租人手机" prop="lesseeMobile" label-width="140px">
+            <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机" ></el-input>
+        </el-form-item>
+        <el-form-item label="工作单位" prop="lesseeUnit" label-width="140px">
+            <el-input v-model="dataForm.lesseeUnit" placeholder="工作单位" ></el-input>
+        </el-form-item>
+        <el-form-item label="承租人户籍地" prop="lesseeHouseAddress" label-width="140px">
+            <el-input v-model="dataForm.lesseeHouseAddress" placeholder="承租人户籍地" ></el-input>
+        </el-form-item>
+        <br/>
         <div style="padding:20px 30px">
           <div style="font-weight: bold;">居住成员信息</div>
           <br/>
@@ -206,53 +253,6 @@
               </el-table-column>
           </el-table>
         </div>
-        <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同信息</div>
-        <div style="margin-left: 50px;height: 30px;">出租人信息</div>
-        <el-form-item label="出租人姓名" prop="lessorName" label-width="140px">
-            <el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="出租人证件号" prop="lessorIdCard" label-width="140px">
-            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人证件号"></el-input>
-        </el-form-item>
-        <el-form-item label="出租人手机" prop="lessorMobile" label-width="140px">
-            <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
-        </el-form-item>
-        <el-form-item label="与房主关系" prop="lessorRelation" label-width="140px">
-            <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
-            <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系">
-                <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
-                </el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="出租人现居住地" prop="lessorLiveAddress" label-width="140px">
-            <el-input v-model="dataForm.lessorLiveAddress" placeholder="出租人现居住地" ></el-input>
-        </el-form-item>
-        <br/>
-        <el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'" label-width="140px">
-            <template>
-              <upload-image :defaultFileList="dataForm.agencyImgList" :limit="6" @change="onChangeAgencyImgList"></upload-image>
-            </template>
-        </el-form-item>
-        <br/>
-
-        <div style="margin-left: 50px;height: 30px;">承租人信息</div>
-        <el-form-item label="承租人姓名" prop="lesseeName" label-width="140px">
-            <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" ></el-input>
-        </el-form-item>
-        <el-form-item label="承租人证件号" prop="lesseeIdCard" label-width="140px">
-            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人证件号" ></el-input>
-        </el-form-item>
-        <el-form-item label="承租人手机" prop="lesseeMobile" label-width="140px">
-            <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机" ></el-input>
-        </el-form-item>
-        <el-form-item label="工作单位" prop="lesseeUnit" label-width="140px">
-            <el-input v-model="dataForm.lesseeUnit" placeholder="工作单位" ></el-input>
-        </el-form-item>
-        <el-form-item label="承租人户籍地" prop="lesseeHouseAddress" label-width="140px">
-            <el-input v-model="dataForm.lesseeHouseAddress" placeholder="承租人户籍地" ></el-input>
-        </el-form-item>
-        <br/>
-
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate" label-width="140px">
             <!--<el-input v-model="dataForm.signDate" placeholder="签署日期" ></el-input>-->

src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue

@@ -18,38 +18,7 @@
                 <el-input v-model="dataForm.ownerName" placeholder="房主姓名" disabled></el-input>
             </el-form-item>
         </div>
-        <div style="padding:20px 30px">
+
-          <div style="height: 30px;font-weight: bold;">居住成员信息</div>
-          <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
-              <el-table-column label="序号" header-align="center" align="center" width="50px">
-                  <template slot-scope="scope">
-                      {{scope.$index+1}}
-                  </template>
-              </el-table-column>
-              <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="idCard" label="证件号" header-align="center" align="center" width="180"></el-table-column>
-              <el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="idCardImgList" label="证件照片" header-align="center" align="center">
-                  <template slot-scope="scope">
-                      <div v-for="(item,index) in scope.row.idCardImgList" :key="index">
-                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
-                      </div>
-                  </template>
-              </el-table-column>
-              <el-table-column prop="imgList" label="照片" header-align="center" align="center">
-                  <template slot-scope="scope">
-                      <div v-for="(item,index) in scope.row.imgList" :key="index">
-                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
-                      </div>
-                  </template>
-              </el-table-column>
-          </el-table>
-        </div>
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同信息</div>
         <div style="margin-left: 50px;height: 30px;">出租人信息</div>
         <el-form-item label="出租人姓名" prop="lessorName">
@@ -103,7 +72,38 @@
         </el-form-item>
         <br/>
 
-
+        <div style="padding:20px 30px">
+          <div style="height: 30px;font-weight: bold;">居住成员信息</div>
+          <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
+              <el-table-column label="序号" header-align="center" align="center" width="50px">
+                  <template slot-scope="scope">
+                      {{scope.$index+1}}
+                  </template>
+              </el-table-column>
+              <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
+              <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
+              <el-table-column prop="idCard" label="证件号" header-align="center" align="center" width="180"></el-table-column>
+              <el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
+              <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="idCardImgList" label="证件照片" header-align="center" align="center">
+                  <template slot-scope="scope">
+                      <div v-for="(item,index) in scope.row.idCardImgList" :key="index">
+                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                      </div>
+                  </template>
+              </el-table-column>
+              <el-table-column prop="imgList" label="照片" header-align="center" align="center">
+                  <template slot-scope="scope">
+                      <div v-for="(item,index) in scope.row.imgList" :key="index">
+                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                      </div>
+                  </template>
+              </el-table-column>
+          </el-table>
+        </div>
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate">
             <el-input v-model="dataForm.signDate" placeholder="签署日期" disabled></el-input>

src/views/modules/shujuduibi/canji.vue

@@ -19,7 +19,11 @@
       </template>
 
       <template v-slot:listBtnSup="{ item }">
-        <el-button type="text" @click="handleSync(item)" size="small"
+        <el-button
+          type="text"
+          v-if="item.dealStatus != 1"
+          @click="handleSync(item)"
+          size="small"
           >全部更新</el-button
         >
       </template>

src/views/modules/shujuduibi/siwang.vue

@@ -19,7 +19,11 @@
       </template>
 
       <template v-slot:listBtnSup="{ item }">
-        <el-button type="text" @click="handleSync(item)" size="small"
+        <el-button
+          type="text"
+          v-if="item.dealStatus != 1"
+          @click="handleSync(item)"
+          size="small"
           >全部更新</el-button
         >
       </template>