Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -26,7 +26,7 @@ import com.ruoyi.system.service.ISysDeptService;
 
 /**
  * 部门信息
- * 
+ *
  * @author ruoyi
  */
 @RestController

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -183,12 +183,14 @@ public class SysDeptServiceImpl implements ISysDeptService
     public int insertDept(SysDept dept)
     {
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
-        // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
-        {
-            throw new CustomException("部门停用，不允许新增");
+        if (info != null){
+            // 如果父节点不为正常状态,则不允许新增子节点
+            if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+            {
+                throw new CustomException("部门停用，不允许新增");
+            }
+            dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         }
-        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         return deptMapper.insertDept(dept);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectServiceImpl.java

@@ -254,7 +254,7 @@ public class BmProjectServiceImpl implements IBmProjectService {
                 return AjaxResult.error("当前项目已结束,无法继续操作");
             }
             //判断是否是提交审核/通过审核
-            projectStatus = (code & 1) == 0 ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
+            projectStatus = (code & 1) == 1 ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
             if (projectStatus < EXAMINE_COMMIT) {
                 projectStatus = EXAMINE_COMMIT;
             }

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

@@ -235,10 +235,20 @@ export default {
   },
   methods: {
     changeBtn(e){
-      this.queryParams.sysDeptId = e[2]
+      if(e.length == 1){
+        this.queryParams.sysDeptId  = e
+      }else{
+         this.queryParams.sysDeptId = e[2]
+      }
+     
     },
     changeBtn1(e){
-      this.form.sysDeptId = e[2]
+      if(e.length == 1){
+        this.form.sysDeptId  = e
+      }else{
+        this.form.sysDeptId = e[2]
+      }
+
     },
     /** 查询 部门招商计划列表 */
     getList() {

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

@@ -1649,24 +1649,24 @@ export default {
       width: 244px !important;
     }
   }
-  .manager_labthre {
-    // .el-form-item{
-    .el-form-item__label {
-      width: 130px !important;
-    }
-    margin-right: 40px !important;
-    // }
-  }
+  // .manager_labthre {
+  //   // .el-form-item{
+  //   .el-form-item__label {
+  //     width: 130px !important;
+  //   }
+  //   margin-right: 40px !important;
+  //   // }
+  // }
   .ieuyr {
     .el-textarea__inner {
       height: 80px !important;
     }
   }
-  .mage_ter {
-    .el-form-item__label {
-      width: 543px !important;
-    }
-  }
+  // .mage_ter {
+  //   .el-form-item__label {
+  //     width: 543px !important;
+  //   }
+  // }
   .maget_ty {
     .el-form-item__label {
       width: 140px !important;

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

@@ -495,24 +495,24 @@ export default {
       width: 244px !important;
     }
   }
-  .manager_labthre {
-    // .el-form-item{
-    .el-form-item__label {
-      width: 130px !important;
-    }
-    margin-right: 40px !important;
-    // }
-  }
+  // .manager_labthre {
+  //   // .el-form-item{
+  //   .el-form-item__label {
+  //     width: 130px !important;
+  //   }
+  //   margin-right: 40px !important;
+  //   // }
+  // }
   .ieuyr {
     .el-textarea__inner {
       height: 80px !important;
     }
   }
-  .mage_ter {
-    .el-form-item__label {
-      width: 543px !important;
-    }
-  }
+  // .mage_ter {
+  //   .el-form-item__label {
+  //     width: 543px !important;
+  //   }
+  // }
   .maget_ty {
     .el-form-item__label {
       width: 135px !important;

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

@@ -493,24 +493,24 @@ export default {
       width: 244px !important;
     }
   }
-  .manager_labthre {
-    // .el-form-item{
-    .el-form-item__label {
-      width: 130px !important;
-    }
-    margin-right: 40px !important;
-    // }
-  }
+  // .manager_labthre {
+  //   // .el-form-item{
+  //   .el-form-item__label {
+  //     width: 130px !important;
+  //   }
+  //   margin-right: 40px !important;
+  //   // }
+  // }
   .ieuyr {
     .el-textarea__inner {
       height: 80px !important;
     }
   }
-  .mage_ter {
-    .el-form-item__label {
-      width: 543px !important;
-    }
-  }
+  // .mage_ter {
+  //   .el-form-item__label {
+  //     width: 543px !important;
+  //   }
+  // }
   .maget_ty {
     .el-form-item__label {
       width: 135px !important;

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

@@ -377,7 +377,7 @@
         <el-form-item
           label="项目计划用地:"
           prop="plannedLand"
-
+          style="width: 45%;"
           class="manager_labthre"
         >
           <el-input
@@ -391,7 +391,7 @@
           />
           <span class="souu">亩</span>
         </el-form-item>
-        <el-form-item label="其中 独立供地:" prop="independentLand">
+        <el-form-item label="其中 独立供地:" prop="independentLand" style="width: 45%;">
           <el-input
             v-model="queryParams.independentLand"
             placeholder="请输入"
@@ -403,7 +403,7 @@
           />
           <span class="souu">亩</span>
         </el-form-item>
-        <el-form-item label="流转土地:" prop="circulationLan" class="mage_ter">
+        <el-form-item label="流转土地:" prop="circulationLan" class="mage_ter mage_tergt" style="width: 98%;">
           <el-input
             v-model="queryParams.circulationLan"
             placeholder="请输入"
@@ -418,7 +418,8 @@
         <el-form-item
           label="项目计划租赁用房:"
           prop="needRoom"
-          class="manager_labthre"
+          class="manager_labthre"
+          style="width: 45%;"
         >
           <el-input
             v-model="queryParams.needRoom"
@@ -431,7 +432,7 @@
           />
           <span class="souu">亩</span>
         </el-form-item>
-        <el-form-item label="其中 厂房:" prop="needFactoryRoom">
+        <el-form-item label="其中 厂房:" prop="needFactoryRoom" style="width: 45%;">
           <el-input
             v-model="queryParams.needFactoryRoom"
             placeholder="请输入"
@@ -443,7 +444,7 @@
           />
           <span class="souu">亩</span>
         </el-form-item>
-        <el-form-item label="办公生活用房:" prop="needBusRoom" class="mage_ter">
+        <el-form-item label="办公生活用房:" style="width: 100%;" prop="needBusRoom" class="mage_ter">
           <el-input
             v-model="queryParams.needBusRoom"
             placeholder="请输入"
@@ -480,7 +481,8 @@
         <el-form-item
           label="是否签订框架协议:"
           prop="isFrameorder"
-          class="maget_tyty"
+          class="maget_tyty"
+          style="width: 100%;"
         >
           <el-select
             v-model="queryParams.isFrameorder"
@@ -1457,9 +1459,10 @@ export default {
     }
   }
   .manager_labthre {
-    // .el-form-item{
+    // .el-form-item{
+      margin-bottom: 20px;
     .el-form-item__label {
-      width: 130px !important;
+      width: 137px !important;
     }
     margin-right: 40px !important;
     // }
@@ -1471,9 +1474,14 @@ export default {
   }
   .mage_ter {
     .el-form-item__label {
-      width: 533px !important;
+      width: 137px!important;
     }
-  }
+  }
+  // .mage_tergt{
+  //   .el-form-item__label {
+  //     width: 55.5% !important;
+  //   }
+  // }
   .maget_ty {
     .el-form-item__label {
       width: 140px !important;