bug修改

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -121,7 +121,7 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="82px" label="土地证:" class="elItem" prop="landPhoto">
-            <el-upload class="upload-demo" :limit="1" :on-success="upl_fn" :action="defaultSettings.urls + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListTdz" :on-success="upl_fn" :action="defaultSettings.urls + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -143,14 +143,14 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="119px" label="土地流转合同:" class="elItem" prop="circulationDoc">
-            <el-upload class="upload-demo" :limit="1" :on-success="upl_fn_lzht" :action="defaultSettings.urls + '/common/upload'">
+            <el-upload class="upload-demo" :file-list="fileListTdls" :limit="1" :on-success="upl_fn_lzht" :action="defaultSettings.urls + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="94px" label="产权证:" class="elItem" prop="circulationPhoto">
-            <el-upload class="upload-demo" :limit="1" :on-success="upl_fn_cqz" :action="defaultSettings.urls + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -172,14 +172,14 @@
         </el-col>
         <el-col :span="3">
           <el-form-item label-width="94px" label="租赁合同:" class="elItem" prop="leasePlantDoc">
-            <el-upload class="upload-demo" :limit="1" :on-success="upl_fn_zlht" :action="defaultSettings.urls + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="94px" label="产权证:" class="elItem" prop="leasePlantPhoto">
-            <el-upload class="upload-demo" :limit="1" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -264,7 +264,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="合同文本:" class="elItem" prop="agreementUrl">
-            <el-upload class="upload-demo" ref="upload" :action="defaultSettings.urls + '/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="upload" :file-list="flieListHt" :action="defaultSettings.urls + '/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>
@@ -308,7 +308,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label-width="173px" label="营业执照复印件:" class="elItem" prop="bussinessUrl">
-            <el-upload class="upload-demo" :limit="1" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + '/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -384,7 +384,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="备案表:" class="elItem" prop="recordUrl">
-            <el-upload class="upload-demo" ref="bAupload" :action="defaultSettings.urls + '/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="bAupload" :file-list="flieListBa" :action="defaultSettings.urls + '/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>
@@ -433,7 +433,7 @@
           <el-input v-model="sharData.name" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="股权比例" prop="equityRatio">
-          <el-input-number min="0" max="100" style="width: 140px" v-model="sharData.equityRatio" /><span style="margin: 0 10px; font-size: 16px">%</span>
+          <el-input-number :min="0" :max="100" style="width: 140px" v-model="sharData.equityRatio" /><span style="margin: 0 10px; font-size: 16px">%</span>
         </el-form-item>
         <el-form-item label="身份证号码" prop="idcard">
           <el-input v-model="sharData.idcard" placeholder="请输入身份证号码" />
@@ -469,7 +469,7 @@
     setShareholder,
     setOrderinfo,
     addOrderinfo,
-    getExamine
+    getExamine,
   } from "@/api/system/signContract";
   import {
     setExamine,
@@ -479,6 +479,15 @@
   export default {
     data() {
       return {
+        fileListZcq: [],
+        fileListZht: [],
+        fileListCqz: [],
+        fileListTdls: [],
+        fileListTdz: [],
+
+        flieListHt: [],
+        flieListYzz: [],
+        flieListBa: [],
         defaultSettings,
         title: "",
         // 是否显示弹出层
@@ -500,12 +509,16 @@
             required: true,
             message: "请输入身份证号",
             trigger: "blur",
-          }, ],
+          }, {
+          pattern:  /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
+          message: '身份证格式错误',
+          trigger: 'blur'
+        }],
           idcardFront: [{
             required: true,
             message: "请上传身份证正面",
             trigger: "blur",
-          }, ],
+          }],
           idcardBack: [{
             required: true,
             message: "请上传身份证反面",
@@ -740,7 +753,6 @@
       };
     },
     mounted() {
-      console.log(defaultSettings.urls);
       this.queryParams.bmProjectId = this.$route.query.setid;
       this.setrd = this.$route.query.setrd;
       this.getOrderinfo();
@@ -793,11 +805,18 @@
         var that = this
         this.$refs["form"].validate((valid) => {
           if (valid) {
+            let  zNum =  (this.form.overseasInvestment-0)+ (this.form.jnswInvestm-0)+ (this.form.snswInvestm-0)+ (this.form.snxwInvestm-0)+ (this.form.xnInvestm-0)
+            console.log(this.form.totInvestment,zNum)
+            if (this.form.totInvestment != zNum) {
+              this.msgError("请重新填写总投资额,总投资额度与其他投资数总和不等");
+              return;
+            }
             if (this.total == 0) {
               this.msgError("企业股东不能为空，请上传企业股东");
               return;
             }
             let data = JSON.parse(JSON.stringify(this.form));
+            data.isOutInvestment = Number(data.isOutInvestment)
             data.agreementUrl = data.agreementUrl.join(",");
             data.recordUrl = data.recordUrl.join(",");
             if (this.form.id) {
@@ -949,11 +968,18 @@
       submitForm() {
         this.$refs["form"].validate((valid) => {
           if (valid) {
+            let  zNum =  (this.form.overseasInvestment-0)+ (this.form.jnswInvestm-0)+ (this.form.snswInvestm-0)+ (this.form.snxwInvestm-0)+ (this.form.xnInvestm-0)
+            console.log(this.form.totInvestment,zNum)
+            if (this.form.totInvestment != zNum) {
+              this.msgError("请重新填写总投资额,总投资额度与其他投资数总和不等");
+              return;
+            }
             if (this.total == 0) {
               this.msgError("企业股东不能为空，请上传企业股东");
               return;
             }
             let data = JSON.parse(JSON.stringify(this.form));
+            data.isOutInvestment = Number(data.isOutInvestment)
             data.agreementUrl = data.agreementUrl.join(",");
             data.recordUrl = data.recordUrl.join(",");
             if (this.form.id!=-1) {
@@ -980,7 +1006,54 @@
         getOrderinfo(this.queryParams.bmProjectId).then((res) => {
           console.log(res);
           if (res.data) {
-            this.form = res.data;
+            let data = res.data
+            let arr = []
+            for(let item of data.agreementUrl.split(',')){
+              arr.push({
+                name: item,
+                url: item,
+              })
+            }
+            this.flieListHt = arr
+
+            let arrs = []
+            for(let item of data.recordUrl.split(',')){
+              arrs.push({
+                name: item,
+                url: item,
+              })
+            }
+            this.flieListBa = arrs
+
+            this.flieListYzz = [{
+              name: data.bussinessUrl,
+              url: data.bussinessUrl,
+            }]
+            this.fileListZcq = [{
+              name: data.leasePlantPhoto,
+              url: data.leasePlantPhoto,
+            }]
+            this.fileListZht = [{
+              name: data.leasePlantDoc,
+              url: data.leasePlantDoc,
+            }]
+            this.fileListCqz = [{
+              name: data.circulationPhoto,
+              url: data.circulationPhoto,
+            }]
+            this.fileListTdls = [{
+              name: data.circulationDoc,
+              url: data.circulationDoc,
+            }]
+            this.fileListTdz = [{
+              name: data.landPhoto,
+              url: data.landPhoto,
+            }]
+            
+            data.isOutInvestment = Boolean(data.isOutInvestment - 0)
+            data.agreementUrl = data.agreementUrl.split(',')
+            data.recordUrl = data.recordUrl.split(',')
+            this.form = data;
           }
         });
       },