瀏覽代碼

bug更新

sr 4 年之前
父節點
當前提交
1a04acb3df
共有 2 個文件被更改,包括 71 次插入41 次删除
  1. 4 3
      ruoyi-ui/src/components/BigPicture/index.vue
  2. 67 38
      ruoyi-ui/src/components/ProjectDec/SignContract.vue

+ 4 - 3
ruoyi-ui/src/components/BigPicture/index.vue

@@ -35,8 +35,8 @@
 
 <style lang="scss" scoped>
   .heibox {
-    width: 100%;
-    height: 100%;
+    width: 100vw;
+    height: 100vh;
     background-color: rgba(0,0,0,.8);
     position: fixed;
     z-index: 99999;
@@ -45,7 +45,8 @@
     .imgs{
       width: 80%;
       position: absolute;
-      left: 50%;
+      left: 50%;
+      height: auto;
       top: 50%;
       transform: translate(-50%,-50%);
       .img{

+ 67 - 38
ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -106,37 +106,41 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label-width="121px" label="是否独立供地:" class="elItem" prop="isIndependentLan">
-            <el-select v-model="form.isIndependentLan" :disabled="dis_flag" placeholder="请选择">
-              <el-option label="是" value="Y"></el-option>
-              <el-option label="否" value="N"></el-option>
-            </el-select>
+            <el-col :span="24">
+              <el-select style="width: 100%;" v-model="form.isIndependentLan" :disabled="dis_flag" placeholder="请选择">
+                <el-option label="是" value="Y"></el-option>
+                <el-option label="否" value="N"></el-option>
+              </el-select>
+            </el-col>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="111px" label="供地面积:" class="elItem" prop="landArea">
+        <el-col :span="8">
+          <el-form-item label-width="121px" label="供地面积:" class="elItem" prop="landArea">
             <el-col :span="20">
               <el-input placeholder="请输入供地面积" :disabled="dis_flag" v-model="form.landArea"></el-input>
             </el-col>
             <div class="dw_name">亩</div>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="93px" label="供地位置:" class="elItem" prop="landAddress">
+        <el-col :span="8">
+          <el-form-item label-width="121px" label="供地位置:" class="elItem" prop="landAddress">
             <el-input placeholder="请输入供地位置" :disabled="dis_flag" v-model="form.landAddress"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="119px" label="土地证:" class="elItem" prop="landPhoto">
-            <el-upload class="upload-demo" list-type="picture" :disabled="dis_flag" :file-list="fileListTdz" :on-remove="resetPhoto" :on-success="upl_fn" :action="defaultSettings.urls + process + '/common/upload'">
-              <el-button size="small" type="primary">点击上传</el-button>
-            </el-upload>
-          </el-form-item>
-        </el-col>
       </el-row>
+	  <el-row>
+		  <el-col :span="24">
+		    <el-form-item label-width="121px" label="土地证:" class="elItem" prop="landPhoto">
+		      <el-upload class="upload-demo" list-type="picture-card" :disabled="dis_flag" :file-list="fileListTdz" :on-remove="resetPhoto" :on-success="upl_fn" :action="defaultSettings.urls + process + '/common/upload'">
+		        <el-button size="small" type="primary">点击上传</el-button>
+		      </el-upload>
+		    </el-form-item>
+		  </el-col>
+	  </el-row>
       <el-row>
-        <el-col :span="6">
+        <el-col :span="12">
           <el-form-item label-width="121px" label="流转土地面积:" class="elItem" prop="circulationLand">
             <el-col :span="18">
               <el-input placeholder="请输入" :disabled="dis_flag" v-model="form.circulationLand"></el-input>
@@ -145,27 +149,29 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label-width="111px" label="流转土地位置:" class="elItem" prop="circulationAddres">
+          <el-form-item label-width="121px" label="流转土地位置:" class="elItem" prop="circulationAddres">
             <el-input placeholder="请输入流转土地位置" :disabled="dis_flag" v-model="form.circulationAddres"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
-          <el-form-item label-width="119px" label="土地流转合同:" class="elItem" prop="circulationDoc">
-            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture" :on-remove="resetPhoto1" :file-list="fileListTdls" :on-success="upl_fn_lzht" :action="defaultSettings.urls+process+'/common/upload'">
+        </el-row>
+        <el-row>
+        <el-col :span="12">
+          <el-form-item label-width="121px" label="土地流转合同:" class="elItem" prop="circulationDoc">
+            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture-card" :on-remove="resetPhoto1" :file-list="fileListTdls" :on-success="upl_fn_lzht" :action="defaultSettings.urls+process+'/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
-          <el-form-item label-width="94px" label="产权证:" class="elItem" prop="circulationPhoto">
-            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture" :on-remove="resetPhoto2" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + process + '/common/upload'">
+        <el-col :span="12">
+          <el-form-item label-width="121px" label="产权证:" class="elItem" prop="circulationPhoto">
+            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture-card" :on-remove="resetPhoto2" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="6">
+        <el-col :span="12">
           <el-form-item label-width="121px" label="租赁厂房面积:" class="elItem" prop="leasePlantArea">
             <el-col :span="16">
               <el-input :disabled="dis_flag" placeholder="请输入" v-model="form.leasePlantArea"></el-input>
@@ -174,20 +180,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label-width="111px" label="租赁厂房位置:" class="elItem" prop="leasePlantAddress">
+          <el-form-item label-width="121px" label="租赁厂房位置:" class="elItem" prop="leasePlantAddress">
             <el-input :disabled="dis_flag" placeholder="请输入租赁厂房位置" v-model="form.leasePlantAddress"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
-          <el-form-item label-width="119px" label="租赁合同:" class="elItem" prop="leasePlantDoc">
-            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture" :on-remove="resetPhoto3" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + process + '/common/upload'">
+        </el-row>
+        <el-row>
+        <el-col :span="12">
+          <el-form-item label-width="121px" label="租赁合同:" class="elItem" prop="leasePlantDoc">
+            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture-card" :on-remove="resetPhoto3" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
-          <el-form-item label-width="94px" label="产权证:" class="elItem" prop="leasePlantPhoto">
-            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture" :on-remove="resetPhoto4" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + process + '/common/upload'">
+        <el-col :span="12">
+          <el-form-item label-width="121px" label="产权证:" class="elItem" prop="leasePlantPhoto">
+            <el-upload :disabled="dis_flag" class="upload-demo" list-type="picture-card" :on-remove="resetPhoto4" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -272,7 +280,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="合同文本:" class="elItem" prop="agreementUrl">
-            <el-upload class="upload-demo" :disabled="dis_flag" ref="upload" list-type="picture" :file-list="flieListHt" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" :disabled="dis_flag" ref="upload" list-type="picture-card" :file-list="flieListHt" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
               :on-success="up_loat_htwb" :on-remove="handleRemove" :auto-upload="false">
               <el-button slot="trigger" size="small" type="primary">选择图片</el-button>
               <el-button style="margin-left: 10px" size="small" type="success" @click="submitUpload">开始上传</el-button>
@@ -316,7 +324,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label-width="173px" label="营业执照复印件:" class="elItem" prop="bussinessUrl">
-            <el-upload :disabled="dis_flag" class="upload-demo" :on-remove='resetPhoto5'  list-type="picture" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + process + '/common/upload'">
+            <el-upload :disabled="dis_flag" class="upload-demo" :on-remove='resetPhoto5'  list-type="picture-card" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -392,7 +400,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="备案表:" class="elItem" prop="recordUrl">
-            <el-upload class="upload-demo" :disabled="dis_flag" ref="bAupload" list-type="picture" :file-list="flieListBa" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" :disabled="dis_flag" ref="bAupload" list-type="picture-card" :file-list="flieListBa" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
               :on-success="up_loat_bab" :on-remove="handleRemove_bab" :auto-upload="false">
               <el-button slot="trigger" size="small" type="primary">选择图片</el-button>
               <el-button style="margin-left: 10px" size="small" type="success" @click="submitUpload_bab">开始上传</el-button>
@@ -447,13 +455,13 @@
           <el-input v-model="sharData.idcard" placeholder="请输入身份证号码" />
         </el-form-item>
         <el-form-item label="身份证(正面)" prop="idcardFront">
-          <el-upload class="upload-demo" :file-list="idcardFrontFlie" list-type="picture" :on-remove="upl_remove_sfzzm" :on-success="upl_fn_sfzzm"
+          <el-upload class="upload-demo" :file-list="idcardFrontFlie" list-type="picture-card" :on-remove="upl_remove_sfzzm" :on-success="upl_fn_sfzzm"
             :action="defaultSettings.urls + process + '/common/upload'">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
         <el-form-item label="身份证(反面)" prop="idcardBack">
-          <el-upload class="upload-demo" :file-list="idcardBackFlie" list-type="picture" :on-remove="upl_remove_sfzfm" :on-success="upl_fn_sfzfm"
+          <el-upload class="upload-demo" :file-list="idcardBackFlie" list-type="picture-card" :on-remove="upl_remove_sfzfm" :on-success="upl_fn_sfzfm"
             :action="defaultSettings.urls + process + '/common/upload'">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
@@ -464,6 +472,10 @@
         <el-button @click="open = false">取 消</el-button>
       </div>
     </el-dialog>
+     <el-dialog :visible.sync="dialogVisible">
+       <img width="100%" :src="dialogImageUrl" alt="">
+     </el-dialog>
+
     <BigPicture ref="BigPicture" :urls="pir_imgs"></BigPicture>
   </div>
 </template>
@@ -763,6 +775,8 @@
         idcardBackFlie: [],
         fileList: [],
         pir_imgs: '',
+        dialogImageUrl: '',
+                dialogVisible: false,
       };
     },
     mounted() {
@@ -773,6 +787,10 @@
       this.getShareholderList();
     },
     methods: {
+      handlePictureCardPreview(file) {
+             this.dialogImageUrl = file.url;
+             this.dialogVisible = true;
+           },
       backProBtn(){
         var that = this
         this.$confirm("是否确认撤销审核", "提醒", {
@@ -1286,7 +1304,18 @@
   };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+  .el-upload-list--picture-card .el-upload-list__item{
+    width: 100px;
+    height: 100px;
+  }
+  .el-upload--picture-card{
+    width: auto;
+    height: auto;
+    background-color: transparent;
+    border: none;
+    line-height: 0;
+  }
   .imgs {
     width: 100px;
     height: 100px;