提交

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

@@ -376,7 +376,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="sign_tit">企业股东构成  (以下自然人和企业股东二选一必填)</div>
+      <div class="sign_tit" >企业股东构成  <span style="color: red;">(*以下自然人和企业股东二选一必填)</span></div>
       <el-row>
         <div class="ads_box" @click="addshareBtn" v-hasPermi="['projectPersion:persion:add']">
           <img src="../../assets/images/icon_add@2x.png" alt="" class="add_icon" />
@@ -1493,7 +1493,7 @@
             //   this.msgError("企业股东不能为空，请上传企业股东");
             //   return;
             // }
-            
+
             if (this.form.totInvestment != zNum) {
               this.msgError("请重新填写总投资额,总投资额度与其他投资数总和不等");
               return;

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: '招商引资管理系统',
-  // urls: 'http://47.99.82.249:80',
-  urls: 'http://192.168.101.11:8010',
+  urls: 'http://47.99.82.249:80',
+  // urls: 'http://192.168.101.11:8010',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
@@ -35,6 +35,6 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production',
-  apiUrl: 'http://192.168.101.11:8010'
-  // apiUrl: 'http://47.99.82.249:80'
+  // apiUrl: 'http://192.168.101.11:8010'
+  apiUrl: 'http://47.99.82.249:80'
 }

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

@@ -100,7 +100,7 @@
             class="manager_form bhyeksu"
           >
             <el-form-item
-              label="施工许可证(请上传完整施工许可证):"
+              label="施工许可证/施工合同:"
               prop="constructionCode"
               class="maget_ty"
               :rules="[{ required: true, message: '请上传施工许可证', trigger: 'blur' }]"
@@ -122,7 +122,7 @@
                   >
                     <div style="display: flex; justify-content: flex-start; flex-direction: column; flex: 1;">
                       <i slot="default" class="el-icon-plus" style="width:100px;height: 100px; line-height: 100px; background-color: #f5f5f5; border-radius: 6px;"> </i>
-                      <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传word/pdf格式，大小不超过10M(许可证须盖章)</div>
+                      <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传word/pdf格式，大小不超过10M(请上传完整施工许可证或完整的施工合同,许可证/合同须盖章,)</div>
                     </div>
                   </el-upload>
                 </div>
@@ -165,7 +165,7 @@
                 style="width: 335px"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item label="施工合同(请上传完整的施工合同):" prop="constructionDoc" class="maget_ty" :rules="[{ required: true, message: '请上传施工合同', trigger: 'blur' }]" >
+            <!-- <el-form-item label="施工合同(请上传完整的施工合同):" prop="constructionDoc" class="maget_ty" :rules="[{ required: true, message: '请上传施工合同', trigger: 'blur' }]" >
               <div class="bgteu fre" style="width: 618px">
                 <div class="">
                   <el-upload
@@ -185,33 +185,10 @@
                       <i slot="default" class="el-icon-plus" style="width:100px;height: 100px; line-height: 100px; background-color: #f5f5f5; border-radius: 6px;"> </i>
                       <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传word/pdf格式，大小不超过10M(合同须盖章)</div>
                     </div>
-
-                    <!-- <div class="ijeut"> -->
-                      <!-- <el-button
-                        plain
-                        slot="trigger"
-                        size="small"
-                        type="primary"
-                        :disabled = "disfal"
-                        >选择图片</el-button
-                      > -->
-                      <!-- margin-top: 15%; transform: translateY(-50%); -->
-                    <!-- </div> -->
-
                   </el-upload>
-                  <!-- <div class="ijeut">
-                    <el-button
-                      style="margin-left: 10px; height: 32px"
-                      size="small"
-                      type="primary"
-                      :disabled = "disfal"
-                      @click="submitUploaduccontract"
-                      >开始上传</el-button
-                    >
-                  </div> -->
                 </div>
               </div>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="开工照片:" prop="constructionPhoto" class="maget_ty" :rules="[{ required: true, message: '请上传开工照片', trigger: 'blur' }]" >
               <div class="bgteu" style="width: 618px">
                 <div class="">
@@ -1576,10 +1553,10 @@ export default {
               return  false
             }
           }
-          if(this.queryParamstwr.constructionDoc == null){
-            this.msgSuccess("请上传施工施工合同");
-            return  false
-          }
+          // if(this.queryParamstwr.constructionDoc == null){
+          //   this.msgSuccess("请上传施工施工合同");
+          //   return  false
+          // }
           if(this.queryParamstwr.constructionPhoto == null||this.queryParamstwr.constructionPhoto==''){
             this.msgSuccess("请上传开工照片");
             return  false

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

@@ -59,11 +59,11 @@
               :rules="rules"
               ref="form"
               :inline="true"
-              label-width="135px"
+              label-width="155px"
               label-position="center"
               class="manager_form bhyeksu"
             >
-              <el-form-item label=" 已完成投资额:" prop="totInvestment">
+              <el-form-item label=" 已完成投资额(万元):" prop="totInvestment">
                 <el-input
                   v-model="form.totInvestment"
                   placeholder="请输入已完成投资额"
@@ -73,7 +73,7 @@
                   style="width: 335px"
                 />
               </el-form-item>
-              <el-form-item label="设备投资额度:" prop="macInvestment">
+              <el-form-item label="设备投资额度(万元):" prop="macInvestment">
                 <el-input
                   v-model="form.macInvestment"
                   placeholder="请输入设备投资额度"
@@ -360,6 +360,8 @@ export default {
         if (that.form.entryPhoto.length > 0) {
           this.orderContractPhotoLists = JSON.parse(that.form.entryPhoto);
         }
+
+        console.log(that.form.productPhoto,7654)
       }
     });
   },
@@ -447,6 +449,7 @@ export default {
     /** 暂存按钮 */
     submitForm() {
       var tmp = [];
+      console.log(this.form,8765)
 	  if (this.form.totInvestment == null) {
 	    this.msgError("请输入已完成投资额");
 	    return;
@@ -475,51 +478,88 @@ export default {
         this.msgError("请填写项目入规信息");
         return;
       }
+      console.log(this.form,8765)
       this.productPhotoList.forEach((item, index) => {
         var obj = {};
-        obj.name = item.response.fileName;
-        obj.uid = item.uid;
-        obj.url = item.response.url;
+        console.log(item.response,98765)
+        if(item.response == undefined){
+          obj.name = item.fileName;
+          obj.fileName = item.fileName;
+          obj.uid = item.uid;
+          obj.url = item.url;
+        }else{
+          obj.name = item.response.fileName;
+          obj.fileName = item.response.fileName;
+          obj.uid = item.uid;
+          obj.url = item.response.url;
+        }
+
         tmp[index] = obj;
       });
       this.form.productPhoto = JSON.stringify(tmp);
 
       this.arrivalListPhotoList.forEach((item, index) => {
         var obj = {};
-        obj.name = item.response.fileName;
-        obj.uid = item.uid;
-        obj.url = item.response.url;
+        if(item.response == undefined){
+          obj.name = item.fileName;
+          obj.fileName = item.fileName;
+          obj.uid = item.uid;
+          obj.url = item.url;
+        }else{
+          obj.name = item.response.fileName;
+          obj.fileName = item.response.fileName;
+          obj.uid = item.uid;
+          obj.url = item.response.url;
+        }
         tmp[index] = obj;
       });
       this.form.arrivalListPhoto = JSON.stringify(tmp);
 
       this.orderContractPhotoList.forEach((item, index) => {
         var obj = {};
-        obj.name = item.response.fileName;
-        obj.uid = item.uid;
-        obj.url = item.response.url;
+        if(item.response == undefined){
+          obj.name = item.fileName;
+          obj.fileName = item.fileName;
+          obj.uid = item.uid;
+          obj.url = item.url;
+        }else{
+          obj.name = item.response.fileName;
+          obj.fileName = item.response.fileName;
+          obj.uid = item.uid;
+          obj.url = item.response.url;
+        }
         tmp[index] = obj;
       });
       this.form.orderContractPhoto = JSON.stringify(tmp);
       this.orderContractPhotoLists.forEach((item, index) => {
         var obj = {};
-        obj.name = item.response.fileName;
-        obj.uid = item.uid;
-        obj.url = item.response.url;
+        if(item.response == undefined){
+          obj.name = item.fileName;
+          obj.fileName = item.fileName;
+          obj.uid = item.uid;
+          obj.url = item.url;
+        }else{
+          obj.name = item.response.fileName;
+          obj.fileName = item.response.fileName;
+          obj.uid = item.uid;
+          obj.url = item.response.url;
+        }
         tmp[index] = obj;
       });
       this.form.entryPhoto = JSON.stringify(tmp);
 
-
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+
             updateProduct(this.form).then((response) => {
               this.msgSuccess("操作成功");
               this.submitBtn()
               // this.$router.go(-1)
             });
           } else {
+
+
             addProduct(this.form).then((response) => {
               this.msgSuccess("操作成功");
               this.submitBtn()