承接合同允许输入甲方单位

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -3,6 +3,9 @@ package com.ruoyi.web.controller.oa;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcPartyA;
+import com.ruoyi.oa.service.ICmcPartyAService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +37,9 @@ public class CmcContractController extends BaseController
     @Autowired
     private ICmcContractService cmcContractService;
 
+    @Autowired
+    private ICmcPartyAService cmcPartyAService;
+
     /**
      * 查询cmc合同评审列表
      */
@@ -73,6 +79,13 @@ public class CmcContractController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcContract cmcContract)
     {
+        if (!cmcContract.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
+            CmcPartyA cmcPartyA = new CmcPartyA();
+            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+            cmcPartyA.setPartyAName(cmcContract.getPartyAId());
+            cmcPartyAService.insertCmcPartyA(cmcPartyA);
+            cmcContract.setPartyAId(cmcPartyA.getPartyAId());
+        }
         return toAjax(cmcContractService.insertCmcContract(cmcContract));
     }
 

oa-ui/src/views/oa/contract/index.vue

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-13 21:33:20
+ * @LastEditTime: 2024-06-18 10:40:58
 -->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="合同编码" prop="contractCode">
-        <el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable
+        <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="合同编号" prop="contractNumber">
@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="拟稿人" prop="drafter">
-        <el-select v-model="queryParams.drafter" filterable>
+        <el-select v-model="queryParams.drafter" filterable clearable>
           <el-option :key="item.userId" v-for="item of $store.state.user.userList" :label="item.nickName"
             :value="item.userId"></el-option>
         </el-select>
@@ -60,6 +60,7 @@
     <el-table v-loading="loading" border :data="contractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="合同id" align="center" prop="contractId" /> -->
+      <el-table-column label="合同名称" align="center" prop="contractName" />
       <el-table-column label="合同编码" align="center" prop="contractCode" />
       <el-table-column label="合同编号" align="center" prop="contractNumber" />
       <el-table-column label="合同金额" align="center" prop="amount" />
@@ -71,22 +72,17 @@
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column label="拟稿人" align="center" prop="drafter">
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.drafter) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
+      <!-- <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="签订日期" align="center" prop="signDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="签订备注" align="center" prop="signRemark" />
+      <!-- <el-table-column label="签订备注" align="center" prop="signRemark" /> -->
       <el-table-column label="签订扫描件" align="center" prop="signScan" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.signScan}`)">
@@ -100,6 +96,11 @@
         </template>
       </el-table-column>
       <el-table-column label="合同备注" align="center" prop="remark" />
+      <el-table-column label="拟稿人" align="center" prop="drafter">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.drafter) }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"

oa-ui/src/views/oa/project/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-11 16:37:26
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-18 14:13:03
 -->
 <template>
   <div class="project-wrapper">
@@ -98,8 +98,8 @@
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" />
         <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.projectLevel === '0' ? 'info' : 'danger'" disable-transitions>
-              {{ scope.row.projectLevel == '0' ? '一般项目' : '重大项目' }}
+            <el-tag :type="scope.row.projectLevel ? (scope.row.projectLevel === '0' ? 'info' : 'danger') : 'info'" disable-transitions>
+              {{ scope.row.projectLevel ? (scope.row.projectLevel == '0' ? '一般项目' : '重大项目') : '一般项目' }}
             </el-tag>
           </template>
         </el-table-column>

oa-ui/src/views/oa/project/info.vue

@@ -47,8 +47,8 @@
                 <svg-icon slot="prefix" icon-class="pmLevel" />
                 项目级别
               </template>
-              <el-tag :type="project.projectLevel === '0' ? 'info' : 'danger'">
-                {{ project.projectLevel == '0' ? '一般项目' : '重大项目' }}
+              <el-tag :type="project.projectLevel ? (project.projectLevel === '0' ? 'info' : 'danger') : 'info'">
+                {{ project.projectLevel ? (project.projectLevel == '0' ? '一般项目' : '重大项目') : '一般项目'}}
               </el-tag>
             </el-descriptions-item>
             <el-descriptions-item>