修改一些前端小问题

oa-ui/public/index.html

@@ -118,7 +118,7 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #7171C6;
+      background: #324865;
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);

oa-ui/src/api/oa/project/project.js

@@ -4,12 +4,6 @@
  * @LastEditors: wrh
  * @LastEditTime: 2024-04-16 16:05:21
  */
-/*
- * @Author: wrh
- * @Date: 2024-01-30 16:37:46
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-28 16:53:30
- */
 import request from '@/utils/request'
 
 // 查询cmc项目列表

oa-ui/src/views/flowable/form/budget/components/choosePeople.vue

@@ -14,8 +14,9 @@
         <el-button @click="getList" type="primary">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table ref="chooseUser" :data="userList" @selection-change="handleSelectionChange" :row-key="getRowKeys">
-      <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+    <el-table ref="chooseUser" :data="userList" @selection-change="handleSelectionChange" :row-key="getRowKeys"
+      @current-change="handleCurrentChange" @row-dblclick="confirmChooseBySingle" :highlight-current-row="!multiple">
+      <el-table-column type="selection" width="50" align="center" :reserve-selection="true" v-if="multiple" />
       <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
       <el-table-column label="姓名" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
@@ -32,18 +33,21 @@
       <el-table-column label="岗级" align="center" key="postLevel" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           {{ formatLevel(scope.row.postLevel, scope.row.salaryLevel,
-      dict.type.sys_user_postlevel, dict.type.sys_user_salarylevel) }}
+            dict.type.sys_user_postlevel, dict.type.sys_user_salarylevel) }}
         </template>
       </el-table-column>
     </el-table>
     <div style="text-align: right;">
-      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
-        :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
+      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum" :page-size="queryParams.pageSize"
+        layout="total, prev, pager, next" :total="total">
       </el-pagination>
     </div>
-    <div>
+    <div v-if="multiple">
       已选人员：<el-tag v-for="item in chooseUser" style="margin: 5px;" :key="item.userId">{{ item.nickName }}</el-tag>
     </div>
+    <div v-if="!multiple">
+      已选人员：<el-tag style="margin: 5px;">{{ chooseUser.nickName }}</el-tag>
+    </div>
     <div style="text-align: center;margin-top: 20px;">
       <el-button type="primary" @click="confirmChoose">确认选择</el-button>
       <el-button @click="clearChoose">清空选择</el-button>
@@ -59,6 +63,10 @@ export default {
   props: {
     deptId: {
       type: Number
+    },
+    multiple: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -112,14 +120,33 @@ export default {
     handleSelectionChange(val) {
       this.chooseUser = val
     },
+    handleCurrentChange(val) {
+      console.log(val);
+      if (!this.multiple) {
+        this.chooseUser = val
+      }
+    },
     getRowKeys(row) {
       return row.userId;
     },
     confirmChoose() {
-      this.$emit('chooseUser', this.chooseUser)
+      debugger
+      if (this.chooseUser)
+        this.$emit('chooseUser', this.chooseUser)
+    },
+    confirmChooseBySingle() {
+      debugger
+      if (!this.multiple) {
+        if (this.chooseUser)
+          this.$emit('chooseUser', this.chooseUser)
+      }
     },
     clearChoose() {
-      this.$refs.chooseUser.clearSelection();
+      if (this.multiple)
+        this.$refs.chooseUser.clearSelection();
+      else {
+        this.chooseUser = {}
+      }
     },
     getAgeByIdCard(idCard) {
       const sexAndAge = {}

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -68,8 +68,7 @@
 
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload :disabled="taskName != '合同拟稿'"
-              v-if="form.contractDocument == '' || form.contractDocument == null" ref="contractFile" :limit="1"
+            <FileUpload v-if="taskName == '合同拟稿'" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
               :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
             </FileUpload>
             <div v-if="form.contractDocument && taskName != '合同拟稿'">

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -36,7 +36,7 @@
       <el-form-item label="合同编号：">
         <el-input v-model="chooseContractInfo.contractNumber" disabled></el-input>
       </el-form-item>
-      <el-form-item label="甲方单位：" prop="partyA">
+      <el-form-item label="甲方单位：" prop="partyAId">
         <el-select allow-create v-model="addForm.partyAId" filterable placeholder="请选择" style="width: 100%;" clearable>
           <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
           </el-option>
@@ -71,8 +71,7 @@
             </td>
             <td>
               <el-select v-model="work.unit" placeholder="请选择" clearable>
-                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
-                  :value="dict.label" />
+                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
               </el-select>
             </td>
             <td>
@@ -116,7 +115,7 @@
         <el-col :span="6" :xs="24" :offset="12">
           <el-form-item label="项目登记人：" prop="registrantUser">
             <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName :
-      registrantUser }} </span>
+              registrantUser }} </span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -189,7 +188,10 @@ export default {
         projectSource: "0",
         projectLevel: "0"
       },
-      chooseContractInfo: {},
+      chooseContractInfo: {
+        contractCode: '',
+        contractNumber: ''
+      },
       contractCode: "",
       contractNumber: "",
       rules: {
@@ -314,12 +316,17 @@ export default {
     // 查询业主单位列表
     getPartyAList() {
       this.loading = true
+      let partyAName = ''
+      if (this.taskName == '项目登记') {
+        partyAName = '中国电建集团成都勘测设计研究院有限公司'
+      }
       listPartyA({
         pageNum: 1,
-        pageSize: 99999999,
-        partyAName: '中国电建集团成都勘测设计研究院有限公司'
+        pageSize: 999999,
+        partyAName: partyAName
       }).then(response => {
         this.partyAList = response.rows;
+        console.log(this.addForm, this.partyAList);
       })
     },
     cancel() {

oa-ui/src/views/login.vue

@@ -71,8 +71,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
@@ -164,7 +164,7 @@ export default {
     flex: 1.8;
     min-width: 0%;
     background: url('../assets/images/login.jpg') no-repeat;
-    background-size: 100% 100%;
+    background-size: 100% 110%;
     position: relative;
   }
 

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

@@ -311,6 +311,9 @@ export default {
               } else {
                 this.$set(project, 'percentage', 0)
               }
+              if(project.isFinished == '1'){
+                this.$set(project, 'percentage', 100)
+              }
             }
           })
         }

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

@@ -56,7 +56,7 @@
                 <svg-icon slot="prefix" icon-class="school" />
                 甲方单位
               </template>
-              {{ project.partyA.partyAName }}
+              {{ project.partyA ? project.partyA.partyAName : '' }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -174,7 +174,15 @@
                 <svg-icon slot="prefix" icon-class="user" />
                 项目负责人
               </template>
-              {{ project.projectLeaderUser ? project.projectLeaderUser.nickName : "" }}
+              <div style="display: flex;justify-content:space-between;">
+                <div>{{ project.projectLeaderUser ? project.projectLeaderUser.nickName : "" }}</div>
+                <div>
+                  <el-button class="ml20" type="warning" plain size="mini" icon="el-icon-plus"
+                    @click="prLeaderOpen = true" v-hasPermi="['oa:project:edit']">
+                    更换项目负责人
+                  </el-button>
+                </div>
+              </div>
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -232,8 +240,8 @@
                 <el-input disabled type="textarea" v-model="projectComment.jyComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.jyUser ? projectComment.jyUser.nickName :
-        ''
-                      }}</span>
+                    ''
+                  }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.jyApprovalTime }}</span></div>
                 </div>
@@ -248,7 +256,7 @@
                 <el-input disabled type="textarea" v-model="projectComment.manageComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.managerUser ?
-        projectComment.managerUser.nickName : '' }}</span>
+                    projectComment.managerUser.nickName : '' }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.manageApprovalTime }}</span></div>
                 </div>
@@ -299,7 +307,7 @@
               </template>
               <el-select v-model="devices" multiple disabled style="width:100%">
                 <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-        + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+                  + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
                 </el-option>
               </el-select>
             </el-descriptions-item>
@@ -396,6 +404,9 @@
     <el-dialog title="技术交底记录表" :visible.sync="openTech" width="1000px" append-to-body>
       <technical-tab :taskForm="taskForm"></technical-tab>
     </el-dialog>
+    <el-dialog title="更换项目负责人" :visible.sync="prLeaderOpen" width="1000px" append-to-body>
+      <choose-people :multiple="false" @chooseUser="changeProjectLeader"></choose-people>
+    </el-dialog>
   </div>
 </template>
 
@@ -403,7 +414,7 @@
 import { getDept } from "@/api/system/dept";
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { listUser, getUser } from "@/api/system/user";
-import { getProject } from "@/api/oa/project/project";
+import { getProject, updateProject } from "@/api/oa/project/project";
 import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectComment, getProjectComment } from "@/api/oa/project/projectComment";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
@@ -411,15 +422,16 @@ import { listProjectContract, addProjectContract } from "@/api/oa/contract/proje
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { listDevice } from "@/api/oa/device/device";
 import { listCar } from '@/api/oa/car/car';
-import budgetInfo from '../../flowable/form/budget/budgetInfo.vue';
-import SafeTab from '../../flowable/form/projectProcess/safeTab.vue';
-import TechnicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
-import SettleData from '../../flowable/form/inProgress/settleData.vue';
-import BorrowData from '../../flowable/form/inProgress/borrowData.vue';
-import BudgetTab from '../../flowable/form/projectProcess/budgetTab.vue';
-import achiData from "../../flowable/form/inProgress/achiData.vue";
+import budgetInfo from '@/views/flowable/form/budget/budgetInfo.vue';
+import SafeTab from '@/views/flowable/form/projectProcess/safeTab.vue';
+import TechnicalTab from '@/views/flowable/form/projectProcess/technicalTab.vue';
+import SettleData from '@/views/flowable/form/inProgress/settleData.vue';
+import BorrowData from '@/views/flowable/form/inProgress/borrowData.vue';
+import BudgetTab from '@/views/flowable/form/projectProcess/budgetTab.vue';
+import achiData from "@/views/flowable/form/inProgress/achiData.vue";
+import choosePeople from '@/views/flowable/form/budget/components/choosePeople.vue'
 export default {
-  components: { budgetInfo, SafeTab, TechnicalTab, SettleData, BorrowData, BudgetTab, achiData },
+  components: { budgetInfo, SafeTab, TechnicalTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
   created() {
     this.getUserList();
     this.getDeviceList();
@@ -451,6 +463,7 @@ export default {
       openBudget: false,
       openSafe: false,
       openTech: false,
+      prLeaderOpen: false,
       taskForm: {
         formId: ''
       },
@@ -590,6 +603,23 @@ export default {
           url: url
         }
       })
+    },
+    changeProjectLeader(val) {
+      let preLeader = this.getUserName(this.project.projectLeader);
+      let curLeader = val.nickName;
+      this.$confirm('项目负责人将由' + preLeader + '变更为' + curLeader + '，是否确认', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateProject(
+          { projectId: this.project.projectId, projectLeader: val.userId }
+        ).then(res => {
+          this.$message.success('项目负责人修改成功');
+          this.prLeaderOpen = false;
+          this.$router.go(0);
+        })
+      }).catch(() => { });
     }
   },
 }

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

@@ -78,7 +78,7 @@
           <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
           <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[0].visible"
             :show-overflow-tooltip="true" />
-          <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible" sortable>
+          <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible" sortable :sort-method="sortAge">
             <template slot-scope="scope">
               {{ getAgeByIdCard(scope.row.idCard) }}
             </template>
@@ -756,6 +756,9 @@ export default {
         newStr = str.join(splitStr)
       }
       return newStr
+    },
+    sortAge(a, b) {
+      return this.getAgeByIdCard(a.idCard) - this.getAgeByIdCard(b.idCard);
     }
   }
 };