提交

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

@@ -1485,6 +1485,16 @@
           this.msgError("请输入责任人联系方式");
           return  false
         }
+		
+		if(this.shareholderList.length == 0  && this.shareholderLists.length == 0){
+			console.log(178)
+			this.msgError("自然人和企业股东二选一必填");
+			return  false
+		}
+		
+		
+		
+		
         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)
@@ -1493,7 +1503,6 @@
             //   this.msgError("企业股东不能为空，请上传企业股东");
             //   return;
             // }
-
             if (this.form.totInvestment != zNum) {
               this.msgError("请重新填写总投资额,总投资额度与其他投资数总和不等");
               return;
@@ -1755,7 +1764,7 @@
            // 统一社会信用代码
            this.form.code = item.id
            // 联系方式
-           this.form.companyName = this.resets[i].Name
+           // this.form.companyName = this.resets[i].Name
          }
         }
 

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -354,12 +354,14 @@
               <!-- class-name="small-padding fixed-width" -->
               <template slot-scope="scope">
                 <div class="demo-image__preview">
-                  <el-image
+                  <a   v-for="(item, index) in scope.row.photo"
+            :key="index" style="color: red;" :href="item == null? '#' : item" target="blank" v-html="item == null?'暂无数据' :  '点击查看到资证明文件'  + '</br>'"></a>
+                 <!-- <el-image
                     style="width: 100px; height: 100px"
                     :src="scope.row.phototwo"
                     :preview-src-list="scope.row.photo"
                   >
-                  </el-image>
+                  </el-image> -->
                 </div>
               </template>
             </el-table-column>
@@ -671,7 +673,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="图片" prop="photo">
+        <el-form-item label="文件" prop="photo">
           <el-upload
             class="upload-demo"
             ref="upload"
@@ -684,7 +686,7 @@
             :auto-upload="true"
             :multiple="true"
             :disabled = "disfal"
-            list-type="picture"
+
           >
             <el-button slot="trigger" :disabled = "disfal"  size="small" type="primary"
               >选取文件</el-button
@@ -698,7 +700,7 @@
               >上传到服务器</el-button
             > -->
             <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
+              只能上传PDF/Word文件，且不超过100MB
             </div>
           </el-upload>
         </el-form-item>