Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/views/index.vue

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

@@ -72,21 +72,27 @@
       <el-table-column label="部门名称" align="center" prop="deptName" />
       <el-table-column label="年份" align="center" prop="year" />
       <el-table-column label="新签约亿元以上项目数(个数)" align="center" prop="projectMillionNum" />
+      <el-table-column label="其中" align="center">
       <el-table-column label="工业项目数(个数)" align="center" prop="projectIndustryNum" />
       <el-table-column label="1～5亿元项目" align="center" prop="projectOneNum" />
       <el-table-column label="5～10亿元项目" align="center" prop="projectTwoNum" />
       <el-table-column label="10亿元以上" align="center" prop="projectThrNum" />
       <el-table-column label="15亿元以上" align="center" prop="projectFourNum" />
       <el-table-column label="20亿元以上" align="center" prop="projectFiveNum" />
+      </el-table-column >
       <el-table-column label="实际利用市外资金" align="center" prop="projectCityMoney" />
       <el-table-column label="入省库项目(个数)" align="center" prop="projectProNum" />
+      <el-table-column label="其中" align="center">
       <el-table-column label="十大新兴产业项目数(个数)" align="center" prop="projectRisNum" />
       <el-table-column label="现代服务业项目数(个数)" align="center" prop="projectSerNum" />
       <el-table-column label="15亿元以上项目数(个数)" align="center" prop="projectProFiveNum" />
+      </el-table-column >
       <el-table-column label="500强投资新注册公司数(个数)" align="center" prop="projectInvestmentNum" />
+      <el-table-column label="入统入规(个)" align="center">
       <el-table-column label="入统(个数)" align="center" prop="projectIntegrationNum" />
       <el-table-column label="小升规(个数)" align="center" prop="projectSmallNum" />
       <el-table-column label="新入规(个数)" align="center" prop="projectNewNum" />
+      </el-table-column >
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -117,14 +123,15 @@
     />
 
     <!-- 添加或修改两区及乡镇单位部门招商计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="200px">
         <el-form-item label="年份" prop="year">
           <el-input v-model="form.year" placeholder="请输入年份" />
         </el-form-item>
-        <el-form-item label="新签约亿元以上项目数" prop="projectMillionNum">
+        <el-form-item  label="新签约亿元以上项目数" prop="projectMillionNum">
           <el-input v-model="form.projectMillionNum" placeholder="请输入新签约亿元以上项目数" />
         </el-form-item>
+
         <el-form-item label="工业项目数" prop="projectIndustryNum">
           <el-input v-model="form.projectIndustryNum" placeholder="请输入工业项目数" />
         </el-form-item>
@@ -143,6 +150,7 @@
         <el-form-item label="20亿元以上" prop="projectFiveNum">
           <el-input v-model="form.projectFiveNum" placeholder="请输入20亿元以上" />
         </el-form-item>
+
         <el-form-item label="实际利用市外资金" prop="projectCityMoney">
           <el-input v-model="form.projectCityMoney" placeholder="请输入实际利用市外资金" />
         </el-form-item>

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

@@ -115,8 +115,8 @@
     />
 
     <!-- 添加或修改 部门招商计划对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="250px">
         <el-form-item label="年度" prop="year">
           <el-date-picker
             v-model="form.year"

ruoyi-ui/src/views/index.vue

@@ -130,13 +130,24 @@
       },
       zj_btn() {
         getUnitAmountList().then(res => {
-          this.zjList = res.rows
+          if(res.rows == null){
+            this.zjList = []
+          }else{
+            this.zjList = res.rows
+          }
+
         })
       },
       bd_btn() {
         getUnitList().then(res =>{
           console.log(res)
           this.unitList = res.rows
+          if(res.rows == null){
+            this.unitList = []
+          }else{
+            this.unitList = res.rows
+          }
+
         })
       },
       dec_btn(row){

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

@@ -1596,6 +1596,8 @@ export default {
     },
     //确认审核
     handleAudit() {
+      console.log(23)
+      this.msgSuccess("请点击暂存按钮,返回上级页面进行提交");
       this.queryFormhye.code = 1;
       this.queryFormhye.bmProjectId = this.bmProjectId;
       addConfigbout(this.queryFormhye).then((response) => {

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

@@ -317,6 +317,7 @@ export default {
 		    type: "warning",
 		  })
 		  .then(function() {
+
 		    return setBack({
 		      code: 4,
 		      bmProjectId: that.form.bmProjectId,
@@ -365,6 +366,7 @@ export default {
         type: "warning",
       })
         .then(function () {
+           that.msgSuccess("请点击暂存按钮,返回上级页面进行提交");
           return setExamine({
             code: 1,
             bmProjectId: that.bmProjectId,
@@ -373,7 +375,7 @@ export default {
         .then(() => {
           this.$router.go(-1);
           // this.getList();
-          this.msgSuccess("审核成功");
+          this.msgSuccess("提交成功");
         });
     },
 

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

@@ -151,7 +151,7 @@
         ref="queryParams"
         :inline="true"
         v-show="showSearch"
-        label-width="115px"
+        label-width="120px"
         label-position="center"
         class="manager_form"
       >
@@ -191,7 +191,7 @@
                style="width: 128px"
                 ></el-cascader>
           </el-form-item>
-          <el-form-item label="投资分配额:"  style="width: 18%;" class="fenpe" prop="investmentAllcocation">
+          <el-form-item label="省外股东占比:"  style="width: 18%;" class="fenpe" prop="investmentAllcocation">
             <el-input
               v-model="queryParams.referralList[0].investmentAllcocation"
               placeholder="数"
@@ -234,7 +234,7 @@
                 :disabled = "disfal"
                 @change="handleChangete"></el-cascader>
           </el-form-item>
-          <el-form-item label="投资分配额:" style="width: 18%;" class="fenpe" prop="investmentAllcocation">
+          <el-form-item label="省外股东占比:" style="width: 20%;" class="fenpe" prop="investmentAllcocation">
             <el-input
               v-model="queryParams.referralList[1].investmentAllcocation"
               placeholder="数"
@@ -272,7 +272,7 @@
         <div class="nvestor">
           <p>项目基本信息 <i>*</i></p>
         </div>
-        <el-form-item label="预计投资额" prop="needAmt">
+        <el-form-item label="预计投资额(亿元)" class=" gueigntwo" prop="needAmt">
           <el-input
             v-model.number="queryParams.needAmt"
             placeholder="请输入预计投资额"
@@ -284,10 +284,9 @@
           />
         </el-form-item>
         <el-form-item
-          label="其中 固定资产投资:"
+          label="其中 固定资产投资(亿元):"
           prop="fixedAssets"
-          class="manager_lab"
-
+          class=" gueigntwo"
         >
           <el-input
             v-model.number="queryParams.fixedAssets"
@@ -331,7 +330,7 @@
         </el-form-item>
         <div class="lage_div">
           <span>项目预计收益</span>
-          <el-form-item label="预计产值:" prop="productPrice" class="maneg_lar">
+          <el-form-item label="预计产值(万元):" prop="productPrice" class="maneg_lar manager_labthre" >
             <el-input
               v-model.number="queryParams.productPrice"
               placeholder="请输入预计产值"
@@ -344,7 +343,7 @@
           </el-form-item>
         </div>
         <el-form-item
-          label="预计税收:"
+          label="预计税收(万元):"
           prop="productTax"
           class="manager_labtwo"
         >
@@ -359,7 +358,7 @@
           />
         </el-form-item>
         <el-form-item
-          label="预计用工:"
+          label="预计用工(人):"
           prop="productEmp"
           class="manager_labtwo"
         >
@@ -1353,6 +1352,7 @@ export default {
       });
     },
     submitCtion() {
+      this.msgSuccess("请点击暂存按钮,返回上级页面进行提交");
       this.queryFormhye.code = 1;
       this.queryFormhye.bmProjectId = this.bmProjectId;
       addConfigbout(this.queryFormhye).then((response) => {
@@ -1440,6 +1440,7 @@ export default {
   box-sizing: border-box;
   z-index: 999;
 }
+
 .weiru {
   .el-form-item__label {
     width: 130px !important;
@@ -1476,6 +1477,7 @@ export default {
     margin-right: 40px !important;
     // }
   }
+
   .ieuyr {
     .el-textarea__inner {
       height: 80px !important;
@@ -1539,6 +1541,11 @@ export default {
     }
   }
 }
+.gueigntwo{
+    .el-form-item__label {
+      width: 180px !important;
+    }
+  }
 .lage_div {
   padding-left: 15px;
   display: flex;