提交

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

@@ -55,11 +55,19 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="是否外资:" class="elItem" prop="isOutInvestment">
-            <el-col :span="6">
-              <el-checkbox-group v-model="form.isOutInvestment" :disabled="dis_flag">
-                <el-checkbox :label="1" name="type">外资</el-checkbox>
-              </el-checkbox-group>
-            </el-col>
+            <!-- <el-col :span="6"> -->
+              <!-- <el-checkbox-group v-model="form.isOutInvestment" :disabled="dis_flag"> -->
+				  <el-radio-group v-model="form.isOutInvestment" :disabled="dis_flag" style="width: 100%">
+				    <el-col :span="12">
+				      <el-radio label="1">是</el-radio>
+				    </el-col>
+				    <el-col :span="12">
+				      <el-radio label="2">否</el-radio>
+				    </el-col>
+				  </el-radio-group>
+                <!-- <el-checkbox :label="1" name="type">外资</el-checkbox> -->
+              <!-- </el-checkbox-group> -->
+            <!-- </el-col> -->
           </el-form-item>
         </el-col>
       </el-row>
@@ -367,11 +375,11 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="sign_tit">企业股东构成</div>
+      <div class="sign_tit">企业股东构成  (以下自然人和企业股东二选一必填)</div>
       <el-row>
-        <div class="ads_box" @click="addshareBtn">
+        <div class="ads_box" @click="addshareBtn" v-hasPermi="['projectPersion:persion:add']">
           <img src="../../assets/images/icon_add@2x.png" alt="" class="add_icon" />
-          <span>添加自然人</span>
+          <span >添加自然人</span>
           <!-- <i style="color: red;">*</i> -->
         </div>
       </el-row>
@@ -408,7 +416,7 @@
           @pagination="getShareholderList" />
       </el-row>
 	  <el-row>
-	    <div class="ads_box" @click="addshareBtnde">
+	    <div class="ads_box" @click="addshareBtnde" v-hasPermi="['projectInvestor:investor:add']">
 	      <img src="../../assets/images/icon_add@2x.png" alt="" class="add_icon" />
 	      <span>添加企业股东</span>
 	      <!-- <i style="color: red;">*</i> -->
@@ -554,9 +562,9 @@
 	    <el-form-item label="企业名称" prop="companyName">
 	      <!-- <el-input v-model="sharData.name" placeholder="请输入企业名称" /> -->
 		  <el-autocomplete
-		    v-model="sharData.name"
+		    v-model="sharData.companyName"
 		    :fetch-suggestions="querySearchAsync"
-		    placeholder="请输入在潜注册公司名称"
+		    placeholder="请输入企业名称"
 		    @select="handleSelecthueys"
 		    :trigger-on-focus="false"
 		    style="width: 100%;"
@@ -634,7 +642,7 @@
         fileListCqz: [],
         fileListTdls: [],
         fileListTdz: [],
-
+        dialogImagename:'',
         flieListHt: [],
         flieListYzz: [],
         flieListBa: [],
@@ -708,7 +716,7 @@
             message: "请选择投资方式",
             trigger: "blur",
           }, ],
-          dialogImagename:'',
+
           totInvestment: [{
             required: true,
             message: "请输入总投资额度",
@@ -764,11 +772,6 @@
 		  			  message: "请输入信息",
 		  			  trigger: "blur",
 		  }],
-		  thirdJob:[{
-		  			  required: true,
-		  			  message: "请输入信息",
-		  			  trigger: "blur",
-		  }],
           agreementUs: [{
             required: true,
             message: "请输入合同签约我方",
@@ -1336,14 +1339,14 @@
           this.sharData.name = undefined
 		      if (this.sharData.id) {
 		        setShareholderde(this.sharData).then((res) => {
-		          this.open = false;
+		          this.openss = false;
 		          this.msgSuccess("修改成功");
 		          this.getShareholderListss();
 		        });
 		      } else {
 
 		        addShareholderde(this.sharData).then((res) => {
-		          this.open = false;
+		          this.openss = false;
 		          this.msgSuccess("新增成功");
 		          this.getShareholderListss();
 		        });
@@ -1612,14 +1615,13 @@
         for (let i = 0; i < this.resets.length; i++) {
          if(item.id == this.resets[i].CreditCode){
            // 企业名称
-           this.form.companyName = this.resets[i].Name
-
+           this.form.name = this.resets[i].Name
            // 企业所在地
-           this.form.companyAddress = this.resets[i].Name
+           // this.form.address = this.resets[i].Name
            // 法人代表姓名
-           this.form.companyLegal = this.resets[i].OperName
+           this.form.legalRep = this.resets[i].OperName
            // 统一社会信用代码
-           this.form.companyCode = item.id
+           this.form.code = item.id
            // 联系方式
            this.form.companyName = this.resets[i].Name
          }
@@ -1635,7 +1637,7 @@
 	    for (let i = 0; i < this.resets.length; i++) {
 	     if(item.id == this.resets[i].CreditCode){
 	       // 企业名称
-	       this.sharData.name = this.resets[i].Name
+	       this.sharData.companyName = this.resets[i].Name
 	       // 企业所在地
 	       // this.form.companyAddress = this.resets[i].Name
 	       // 法人代表姓名

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/under/index.vue

@@ -1542,25 +1542,25 @@ export default {
     }
   }
   //tab
-  .naue_tab {
-    border-bottom: 1px solid #cdcdcd;
-    display: flex;
-    margin-top: 30px;
-    padding: 0 10px;
-    margin-bottom: 30px;
-    p {
-      font-size: 12px;
-      font-family: PingFang SC;
-      font-weight: 400;
-      color: #343434;
-      padding: 11px 15px;
-      margin: 0;
-    }
-    .p {
-      border-bottom: 2px solid #1c84c6;
-      margin-bottom: -1px;
-    }
-  }
+  // .naue_tab {
+  //   border-bottom: 1px solid #cdcdcd;
+  //   display: flex;
+  //   margin-top: 30px;
+  //   padding: 0 10px;
+  //   margin-bottom: 30px;
+  //   p {
+  //     font-size: 16px;
+  //     font-family: PingFang SC;
+  //     font-weight: 700;
+  //     color: #fff;
+  //     padding: 11px 15px;
+  //     margin: 10px;
+  //   }
+  //   .p {
+  //     border-bottom: 2px solid #1c84c6;
+  //     margin-bottom: -1px;
+  //   }
+  // }
   .mation {
     .enterprise {
       font-size: 14px;

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

@@ -77,7 +77,7 @@
             <p>{{ queryParamstwr.orderEndTime }}</p>
           </div>
         </div>
-        <div class="naue_tab">
+        <div class="naue_tabd">
           <p
             @click="tabClid(index)"
             v-for="(item, index) in tabNume"
@@ -781,7 +781,7 @@ export default {
       //步骤条
       naueactive: 2,
       tab: 0,
-      tabNume: ["项目施工", "设备安装", "项目到资", "项目入统","项目入规"],
+      tabNume: ["项目施工", "设备安装", "项目到资", "项目入统"],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -1209,6 +1209,8 @@ export default {
         this.loading = false;
       });
     },
+    
+    
     //设备安装接口
     getListther() {
       this.loading = true;
@@ -1923,25 +1925,25 @@ export default {
       }
     }
     //tab
-    .naue_tab {
-      border-bottom: 1px solid #cdcdcd;
-      display: flex;
-      margin-top: 30px;
-      padding: 0 10px;
-      margin-bottom: 30px;
-      p {
-        font-size: 14px;
-        font-family: PingFang SC;
-        font-weight: 700;
-        color: #343434;
-        padding: 11px 15px;
-        margin: 0;
-      }
-      .p {
-        border-bottom: 2px solid #1c84c6;
-        margin-bottom: -1px;
-      }
-    }
+    // .naue_tab {
+    //   border-bottom: 1px solid #cdcdcd;
+    //   display: flex;
+    //   margin-top: 30px;
+    //   padding: 0 10px;
+    //   margin-bottom: 30px;
+    //   p {
+    //     font-size: 14px;
+    //     font-family: PingFang SC;
+    //     font-weight: 700;
+    //     color: #fff;
+    //     padding: 11px 15px;
+    //     margin: 10px;
+    //   }
+    //   .p {
+    //     border-bottom: 2px solid #1c84c6;
+    //     margin-bottom: -1px;
+    //   }
+    // }
     .mation {
       .enterprise {
         font-size: 14px;
@@ -1962,6 +1964,25 @@ export default {
       }
     }
   }
+  .naue_tabd{
+    border-bottom: 1px solid #cdcdcd;
+    display: flex;
+    margin-top: 30px;
+    padding: 0 10px;
+    margin-bottom: 30px;
+    p {
+      font-size: 14px;
+      font-family: PingFang SC;
+      font-weight: 700;
+      color: #343434;
+      padding: 11px 15px;
+      margin: 0;
+    }
+    .p {
+      border-bottom: 2px solid #1c84c6;
+      margin-bottom: -1px;
+    }
+  }
   .nvestor {
     margin-bottom: 10px;
     p {

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

@@ -192,33 +192,6 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item> </el-form-item>
-              <el-form-item label=" 项目入规(限):" prop="isOk">
-                <el-select
-                  v-model="form.isOk"
-                  placeholder="项目入规(限)"
-                  clearable
-                  size="small"
-                  :disabled = "disfal"
-                  style="width: 235px"
-                >
-                  <el-option
-                    v-for="dict in typeOptions"
-                    :key="dict.dictValue"
-                    :label="dict.dictLabel"
-                    :value="dict.dictValue"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="项目入规时间:" prop="okDate">
-                <el-date-picker
-                  type="date"
-                  :disabled = "disfal"
-                  placeholder="选择项目入规时间"
-                  v-model="form.okDate"
-                  style="width: 235px"
-                ></el-date-picker>
-              </el-form-item>
               <el-form-item label="入规截图:" prop="entryPhoto" class="maget_ty">
                 <div class="bgteu " style="width: 618px">
                   <div class="">
@@ -253,6 +226,33 @@
                   </div>
                 </div>
               </el-form-item>
+              <el-form-item> </el-form-item>
+              <el-form-item label=" 项目入规(限):" prop="isOk">
+                <el-select
+                  v-model="form.isOk"
+                  placeholder="项目入规(限)"
+                  clearable
+                  size="small"
+                  :disabled = "disfal"
+                  style="width: 235px"
+                >
+                  <el-option
+                    v-for="dict in typeOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="项目入规时间:" prop="okDate">
+                <el-date-picker
+                  type="date"
+                  :disabled = "disfal"
+                  placeholder="选择项目入规时间"
+                  v-model="form.okDate"
+                  style="width: 235px"
+                ></el-date-picker>
+              </el-form-item>
             </el-form>
           </div>
         </div>
@@ -320,6 +320,9 @@ export default {
         productDate: [
           { required: true, message: "请选择投产时间", trigger: "blur" },
         ],
+        isOk:[{
+          required: true, message: "请填写信息", trigger: "blur"
+        }]
       },
     };
   },
@@ -342,7 +345,7 @@ export default {
         that.form = response.data;
         //  投产图片
         if (that.form.productPhoto.length > 0) {
-          
+
           this.productPhotoList = JSON.parse(that.form.productPhoto);
         }
         //  到资清单
@@ -820,25 +823,25 @@ export default {
       }
     }
     //tab
-    .naue_tab {
-      border-bottom: 1px solid #cdcdcd;
-      display: flex;
-      margin-top: 30px;
-      padding: 0 10px;
-      margin-bottom: 30px;
-      p {
-        font-size: 12px;
-        font-family: PingFang SC;
-        font-weight: 400;
-        color: #343434;
-        padding: 11px 15px;
-        margin: 0;
-      }
-      .p {
-        border-bottom: 2px solid #1c84c6;
-        margin-bottom: -1px;
-      }
-    }
+    // .naue_tab {
+    //   border-bottom: 1px solid #cdcdcd;
+    //   display: flex;
+    //   margin-top: 30px;
+    //   padding: 0 10px;
+    //   margin-bottom: 30px;
+    //   p {
+    //     font-size: 16px;
+    //     font-family: PingFang SC;
+    //     font-weight: 700;
+    //     color: #fff;
+    //     padding: 11px 15px;
+    //     margin: 10px;
+    //   }
+    //   .p {
+    //     border-bottom: 2px solid #1c84c6;
+    //     margin-bottom: -1px;
+    //   }
+    // }
     .mation {
       .enterprise {
         font-size: 14px;

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

@@ -593,7 +593,7 @@ export default {
           color: #343434;
         }
         .naue_name {
-          font-size: 14px;
+          font-size: 16px;
           font-family: PingFang SC;
           font-weight: bold;
           color: #0669b2;
@@ -609,25 +609,25 @@ export default {
       }
     }
     //tab
-    .naue_tab {
-      border-bottom: 1px solid #cdcdcd;
-      display: flex;
-      margin-top: 30px;
-      padding: 0 10px;
-      margin-bottom: 30px;
-      p {
-        font-size: 12px;
-        font-family: PingFang SC;
-        font-weight: 400;
-        color: #343434;
-        padding: 11px 15px;
-        margin: 0;
-      }
-      .p {
-        border-bottom: 2px solid #1c84c6;
-        margin-bottom: -1px;
-      }
-    }
+    // .naue_tab {
+    //   border-bottom: 1px solid #cdcdcd;
+    //   display: flex;
+    //   margin-top: 30px;
+    //   padding: 0 10px;
+    //   margin-bottom: 30px;
+    //   p {
+    //     font-size: 14px;
+    //     font-family: PingFang SC;
+    //     font-weight: 700;
+    //     color: #fff;
+    //     padding: 11px 15px;
+    //     margin: 10px;
+    //   }
+    //   .p {
+    //     border-bottom: 2px solid #1c84c6;
+    //     margin-bottom: -1px;
+    //   }
+    // }
     .mation {
       .enterprise {
         font-size: 14px;

ruoyi-ui/src/views/management/row/tab.vue

@@ -41,23 +41,65 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss">
   //tab
-  .naue_tab{
-    border-bottom: 1px solid #CDCDCD;
-    display: flex;
-    margin-top: 30px;
-    padding: 0 10px;
-    margin-bottom: 30px;
-    p{
-      font-size: 12px;
-      font-family: PingFang SC;
-      font-weight: 400;
-      color: #343434;
-      padding: 11px 15px;
-      margin: 0;
-    }
-    .p{
-      border-bottom: 2px solid #1C84C6;
-      margin-bottom: -1px;
-    }
-  }
+ .naue_tab{
+   border-bottom: 1px solid #CDCDCD;
+   display: flex;
+   margin-top: 30px;
+   padding: 0 10px;
+   margin-bottom: 30px;
+   p{
+     font-size: 16px;
+     font-family: PingFang SC;
+     font-weight: 700;
+     color: #fff !important;
+     padding: 11px 15px;
+     margin: 0;
+     cursor: pointer;
+     background-color: #0086c6;
+     margin-right: 10px !important;
+     // border-radius: 6px;
+   }
+   p:nth-child(2){
+     font-size: 16px;
+     font-family: PingFang SC;
+     font-weight: 700;
+     color: #fff;
+     padding: 11px 15px;
+     margin: 0;
+     cursor: pointer;
+     background-color: #02b938;
+     margin-right: 10px;
+     // border-radius: 6px;
+   }
+   p:nth-child(3){
+     font-size: 16px;
+     font-family: PingFang SC;
+     font-weight: 700;
+     color: #fff;
+     padding: 11px 15px;
+     margin: 0;
+     cursor: pointer;
+     background-color: #df3838;
+     margin-right: 10px;
+     // border-radius: 6px;
+   }
+   p:nth-child(4){
+     font-size: 16px;
+     font-family: PingFang SC;
+     font-weight: 700;
+     color: #fff !important;
+     padding: 11px 15px;
+     margin: 0;
+     cursor: pointer;
+     background-color: #f66e00;
+     margin-right: 10px !important;
+     // border-radius: 6px;
+   }
+   .p{
+     // border-bottom: 2px solid #1C84C6;
+     // margin-bottom: -1px;
+     // color: #343434;
+     opacity: .8;
+   }
+ }
 </style>

ruoyi-ui/src/views/tab/index.vue

@@ -57,15 +57,55 @@ export default {
       font-size: 16px;
       font-family: PingFang SC;
       font-weight: 700;
-      color: #343434;
+      color: #fff !important;
       padding: 11px 15px;
       margin: 0;
       cursor: pointer;
-
+      background-color: #0086c6;
+      margin-right: 10px !important;
+      // border-radius: 6px;
+    }
+    p:nth-child(2){
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 700;
+      color: #fff;
+      padding: 11px 15px;
+      margin: 0;
+      cursor: pointer;
+      background-color: #02b938;
+      margin-right: 10px;
+      // border-radius: 6px;
+    }
+    p:nth-child(3){
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 700;
+      color: #fff;
+      padding: 11px 15px;
+      margin: 0;
+      cursor: pointer;
+      background-color: #df3838;
+      margin-right: 10px;
+      // border-radius: 6px;
+    }
+    p:nth-child(4){
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 700;
+      color: #fff !important;
+      padding: 11px 15px;
+      margin: 0;
+      cursor: pointer;
+      background-color: #f66e00;
+      margin-right: 10px !important;
+      // border-radius: 6px;
     }
     .p{
-      border-bottom: 2px solid #1C84C6;
-      margin-bottom: -1px;
+      // border-bottom: 2px solid #1C84C6;
+      // margin-bottom: -1px;
+      // color: #343434;
+      opacity: .8;
     }
   }
 </style>

ruoyi-ui/src/views/under/index.vue

@@ -582,7 +582,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;">只能上传jpg/png文件，且不超过500kb</div>
+                  <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传word/pdf格式，大小不超过10M</div>
                 </div>
 
               </el-upload>
@@ -1876,9 +1876,9 @@ export default {
     padding: 0 10px;
     margin-bottom: 30px;
     p {
-      font-size: 12px;
+      font-size: 14px;
       font-family: PingFang SC;
-      font-weight: 400;
+      font-weight: 700;
       color: #343434;
       padding: 11px 15px;
       margin: 0;