修改前端显示问题

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -136,8 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
-		where p.post_name = '副主任'
-		order by r.user_id desc limit 1
+		where p.post_name = '副主任' limit 1
 	</select>
 
 	<select id="selectSubLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
@@ -182,8 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		sys_user where dept_id = #{param}) as r
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
-		where p.post_name = '副主任'
-		order by r.user_id desc limit 1
+		where p.post_name = '副主任' limit 1
 	</select>
 
 	<delete id="deleteUserPostByUserId" parameterType="Long">

oa-ui/src/main.js

@@ -25,7 +25,7 @@ import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, 
-  handleTree, getUserName, getFileName, reviewWord,getDeptName } from "@/utils/ruoyi";
+  handleTree, getUserName, getFileName, reviewWord,getDeptName,getUserNames } from "@/utils/ruoyi";
 // 标题组件
 import RowTitle from '@/components/RowTitle'
 
@@ -66,6 +66,7 @@ Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.publicData = publicData
 Vue.prototype.getUserName = getUserName
+Vue.prototype.getUserNames = getUserNames
 Vue.prototype.getDeptName = getDeptName
 Vue.prototype.getFileName = getFileName
 Vue.prototype.reviewWord = reviewWord

oa-ui/src/utils/deleteResource.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-06-13 17:07:59
+ * @LastEditors: 
+ * @LastEditTime: 2024-06-14 09:55:50
+ */
 import request from '@/utils/request'
 
 const apiEndpoints = [
@@ -9,6 +15,22 @@ const apiEndpoints = [
       '/oa/contractMeeting/:id',
       '/oa/contractPayment/:id',
     ]
+  },
+  {
+    procDefName: '项目结算',
+    apiUrl: [
+      '/oa/settle/:id',
+      '/oa/settleSummary/:id',
+      '/oa/settleWork/:id',
+    ]
+  },
+  {
+    procDefName: '项目结算',
+    apiUrl: [
+      '/oa/settle/:id',
+      '/oa/settleSummary/:id',
+      '/oa/settleWork/:id',
+    ]
   }
 ]
 

oa-ui/src/utils/ruoyi.js

@@ -250,14 +250,27 @@ export function setArray(arr) {
 
 export function getUserName(userId) {
   if (userId) {
-    let arr = this.$store.state.user.userList.filter(item => item.userId == userId)
-    if (arr.length == 1) {
-      let name = arr[0].nickName
-      return name
+    let user = this.$store.state.user.userList.find(item => item.userId === userId);
+    // 如果找到了匹配的元素，返回其nickName  
+    if (user) {
+      return user.nickName;
     }
   }
 }
 
+export function getUserNames(ids) {
+  if (!ids) {
+    return '';
+  }
+  return ids.split(',').map(id => {
+    // 使用trim去除id两侧的空白字符  
+    const trimmedId = id.trim();
+    let user = this.$store.state.user.userList.find(item => item.userId === Number(trimmedId));
+    // 在返回nickName之前检查user是否存在  
+    return user ? user.nickName.trim() : ''; // 如果user不存在，返回一个空字符串或者其他默认值  
+  }).join(',');
+}
+
 export function getDeptName(deptId) {
   if (deptId) {
     let arr = this.$store.state.user.deptList.filter(item => item.deptId == deptId)

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -336,7 +336,7 @@
                 </tr>
               </table>
             </el-form-item>
-            <el-form-item label="直接成本小计：">
+            <el-form-item label="小计：">
               <el-tag type="danger" style="margin-right: 20px; font-size: 14px">
                 ¥{{ budgetForm.directExpense }}
               </el-tag>
@@ -359,7 +359,7 @@
             <el-breadcrumb-item>¥ {{ budgetForm.fixCost }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
-            <el-breadcrumb-item>直接成本小计</el-breadcrumb-item>
+            <el-breadcrumb-item>直接成本和其他成本小计</el-breadcrumb-item>
             <el-breadcrumb-item>¥ {{ budgetForm.directExpense }}</el-breadcrumb-item>
           </el-breadcrumb>
           <budget-table :budgetForm="budgetForm" :projectForm="projectForm" @getTotal="getTotalBudget"></budget-table>

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

@@ -111,7 +111,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="9">合计</td>
+            <td colspan="9">直接成本小计</td>
             <td>{{ Number(settle).toFixed(2) }}</td>
           </tr>
         </table>

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

@@ -2,37 +2,18 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-13 18:42:56
+ * @LastEditTime: 2024-06-14 15:37:51
 -->
 <template>
   <div class="project-wrapper">
     <!-- 项目登记 -->
     <h2 style="text-align: center">项目登记</h2>
     <el-form :model="addForm" :rules="rules" label-width="100px" :disabled="disabled">
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编号：" prop="projectNumber">
-            <el-input v-model="addForm.projectNumber"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="addForm.projectSource == '0'">
-          <el-form-item label="合同编码：">
-            <el-input v-model="contractCode" disabled></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12"><el-form-item label="项目名称：" prop="projectName">
-            <el-input v-model="addForm.projectName"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="addForm.projectSource == '0'">
-          <el-form-item label="合同编号：">
-            <el-input v-model="contractNumber" disabled></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
+      <el-form-item label="项目编号：" prop="projectNumber">
+        <el-input v-model="addForm.projectNumber"></el-input>
+      </el-form-item><el-form-item label="项目名称：" prop="projectName">
+        <el-input v-model="addForm.projectName"></el-input>
+      </el-form-item>
       <el-form-item label="项目类型：" prop="projectType">
         <el-input v-model="addForm.projectType"></el-input>
       </el-form-item>
@@ -41,16 +22,18 @@
         <el-radio v-model="addForm.projectLevel" label="1">重大项目</el-radio>
       </el-form-item>
       <el-form-item label="项目来源：" prop="projectSource">
-        <el-radio v-model="addForm.projectSource" label="0">院内</el-radio>
-        <el-radio v-model="addForm.projectSource" label="1">院外</el-radio>
+        <el-radio-group v-model="addForm.projectSource" @change="changeProjectSource">
+          <el-radio label="0">院内</el-radio>
+          <el-radio label="1">院外</el-radio>
+        </el-radio-group>
       </el-form-item>
-      <el-form-item label="合同编码：" v-if="addForm.projectSource == '1'">
+      <el-form-item label="合同编码：">
         <el-input v-model="chooseContractInfo.contractCode">
           <el-button slot="append" @click="openContract = true">选择</el-button>
         </el-input>
       </el-form-item>
 
-      <el-form-item label="合同编号：" v-if="addForm.projectSource == '1'">
+      <el-form-item label="合同编号：">
         <el-input v-model="chooseContractInfo.contractNumber" disabled></el-input>
       </el-form-item>
       <el-form-item label="甲方单位：" prop="partyA">
@@ -88,7 +71,8 @@
             </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>
@@ -132,7 +116,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">
@@ -202,7 +186,8 @@ export default {
       addForm: {
         registerTime: undefined,
         projectRegistrant: "",
-        projectSource: "0"
+        projectSource: "0",
+        projectLevel: "0"
       },
       chooseContractInfo: {},
       contractCode: "",
@@ -262,7 +247,6 @@ export default {
 
     getProjectInfo() {
       getProject(this.taskForm.formId).then(res => {
-        console.log(res.data);
         this.addForm = res.data;
       })
     },
@@ -277,15 +261,15 @@ export default {
           for (let row of res.rows) {
             getContract(row.contractId).then(res => {
               if (res.data) {
-                if (this.contractCode != '') {
-                  this.contractCode = this.contractCode + '、' + res.data.contractCode;
+                if (this.chooseContractInfo.contractCode != '') {
+                  this.chooseContractInfo.contractCode = this.chooseContractInfo.contractCode + '、' + res.data.contractCode;
                 } else {
-                  this.contractCode = res.data.contractCode;
+                  this.chooseContractInfo.contractCode = res.data.contractCode;
                 }
-                if (this.contractNumber != '') {
-                  this.contractNumber = this.contractNumber + '、' + res.data.contractNumber;
+                if (this.chooseContractInfo.contractNumber != '') {
+                  this.chooseContractInfo.contractNumber = this.chooseContractInfo.contractNumber + '、' + res.data.contractNumber;
                 } else {
-                  this.contractNumber = res.data.contractNumber;
+                  this.chooseContractInfo.contractNumber = res.data.contractNumber;
                 }
               }
             })
@@ -332,7 +316,8 @@ export default {
       this.loading = true
       listPartyA({
         pageNum: 1,
-        pageSize: 99999999
+        pageSize: 99999999,
+        partyAName: '中国电建集团成都勘测设计研究院有限公司'
       }).then(response => {
         this.partyAList = response.rows;
       })
@@ -385,6 +370,19 @@ export default {
         return arr[arr.length - 1];
       }
     },
+    // 修改项目来源
+    changeProjectSource(val) {
+      let params = {
+        pageNum: 1,
+        pageSize: 1000, // 假设这是一个合理的值  
+      };
+      if (val === '0') {
+        params.partyAName = '中国电建集团成都勘测设计研究院有限公司';
+      }
+      listPartyA(params).then(response => {
+        this.partyAList = response.rows;
+      })
+    }
   },
 };
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 10:55:28
+ * @LastEditTime: 2024-06-14 14:57:08
 -->
 <template>
   <div class="app-container">
@@ -140,10 +140,13 @@ export default {
     }
   },
   created() {
+
+  },
+  mounted() {
     if (this.$route.query.taskName != '项目登记') {
-      this.initForm();
       // this.form.projectId = this.taskForm.formId;
       this.getDeptList();
+      this.initForm();
     }
   },
   methods: {
@@ -158,7 +161,8 @@ export default {
         }
         this.$set(this.form, 'deptLeader', [])
         if (this.form.undertakingDept) {
-          let arr = this.form.undertakingDept.split(',')
+          let arr = (this.form.undertakingDept.split(',')).map(Number)
+          this.$set(this.form, 'deptId', arr)
           this.getDeptLeader(arr);
         } else {
           this.$set(this.form, 'deptId', [])
@@ -220,22 +224,29 @@ export default {
       this.peopleVisible = false;
     },
     confirmPlanForm() {
-      this.form.undertakingDept = this.form.deptId.join(',');
-      updateProject(this.form)
-      const params = { taskId: this.taskForm.taskId };
-      // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
-        getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack');
-          });
+      this.$confirm('项目安排之后会自动发起预算编制、技术交底、安全交底三个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.form.undertakingDept = this.form.deptId.join(',');
+        updateProject(this.form)
+        const params = { taskId: this.taskForm.taskId };
+        // 获取下一个流程节点
+        getNextFlowNode(params).then(res => {
+          this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+          this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
+          getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
+            let userId = res.data.userId;
+            this.$set(this.taskForm.variables, "approval", userId);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack');
+            });
+          })
         })
       })
+
     },
     cancel() {
       this.form = {}
@@ -261,6 +272,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-.upload-list {}
-</style>
+<style lang="scss" scoped></style>

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

@@ -385,6 +385,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.preserve();
+        this.form.isFinished = '1'
+        updateProject(this.form.isFinished)
         const params = { taskId: this.taskForm.taskId };// 获取下一个流程节点
         getNextFlowNode(params).then(res => {
           getProject(this.taskForm.formId).then(res => {

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

@@ -247,6 +247,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
 .project-wrapper {
   padding: 25px;
 }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 11:49:08
+ * @LastEditTime: 2024-06-14 15:12:57
 -->
 <template>
   <div class="app-container">
@@ -81,7 +81,7 @@ export default {
   },
   methods: {
     initForm() {
-    getProjectComment(this.taskForm.formId).then(res => {
+      getProjectComment(this.taskForm.formId).then(res => {
         if (res.data) {
           this.form = res.data
           this.form.scApprover = '';
@@ -133,8 +133,10 @@ export default {
     sign() {
       this.form.scApprover = this.$store.state.user.id;
       if (this.form.scApproverName != null && this.form.scApproverName != undefined && this.form.scApproverName != '') {
-        let sign = this.form.scApproverName + ',' + this.$store.state.user.name;
-        this.form.scApproverName = sign
+        if (this.form.scApproverName.indexOf(this.$store.state.user.name) == -1) {
+          let sign = this.form.scApproverName + ',' + this.$store.state.user.name;
+          this.form.scApproverName = sign
+        }
       } else {
         this.form.scApproverName = this.$store.state.user.name;
       }
@@ -145,35 +147,35 @@ export default {
         if (valid) {
           this.form.projectId = this.taskForm.formId
           if (this.form.scApprover == '' || this.form.scApprover == null) {
-            if (this.form.scApproverName != '' && this.form.scApproverName != null){
+            if (this.form.scApproverName != '' && this.form.scApproverName != null) {
               this.form.scApprover = this.$store.state.user.id;
-            }else {
-            this.$modal.msgError('请签名');
-            return
-          }
-        }
-        updateProjectComment(this.form)
-        const params = { taskId: this.taskForm.taskId };
-        // 获取下一个流程节点
-        getNextFlowNode(params).then(res => {
-          getProject(this.taskForm.formId).then(res => {
-            if (res.data) {
-              this.$set(this.taskForm.variables, "approval", res.data.projectLeader);
-              complete(this.taskForm).then(response => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit("goBack");
-              });
+            } else {
+              this.$modal.msgError('请签名');
+              return
             }
-          })
+          }
+          updateProjectComment(this.form)
+          const params = { taskId: this.taskForm.taskId };
+          // 获取下一个流程节点
+          getNextFlowNode(params).then(res => {
+            getProject(this.taskForm.formId).then(res => {
+              if (res.data) {
+                this.$set(this.taskForm.variables, "approval", res.data.projectLeader);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit("goBack");
+                });
+              }
+            })
 
-        });
-      } else {
-        this.$modal.msgError('必填项未写');
-        return false;
-      }
-  })
+          });
+        } else {
+          this.$modal.msgError('必填项未写');
+          return false;
+        }
+      })
 
-},
+    },
 
   },
 }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-30 13:52:57
+ * @LastEditTime: 2024-06-14 16:06:57
 -->
 <template>
   <div class="app-container">
@@ -53,9 +53,15 @@
           </el-col>
         </el-row>
         <el-form-item label="技术方案" prop="technicalDocument">
-          <el-link :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`" :underline="false" target="_blank">
-            <span class="el-icon-document" style="color:#00f"> {{ getFileName(form.technicalDocument) }} </span>
-          </el-link>
+          <div v-if="form.technicalDocument">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.technicalDocument}`)">
+              {{ getFileName(form.technicalDocument) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
         </el-form-item>
         <el-form-item label="方案说明" prop="designDescription">
           <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明" />
@@ -73,9 +79,15 @@
           </el-col>
         </el-row>
         <el-form-item label="修改技术方案" prop="modifyDocument">
-          <el-link :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`" :underline="false" target="_blank">
-            <span class="el-icon-document" style="color:#00f"> {{ getFileName(form.modifyDocument) }} </span>
-          </el-link>
+          <div v-if="form.modifyDocument">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.modifyDocument}`)">
+              {{ getFileName(form.modifyDocument) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
         </el-form-item>
         <el-form-item label="技术部审核意见" prop="technicalComment">
           <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见" />
@@ -93,9 +105,15 @@
           </el-col>
         </el-row>
         <el-form-item label="最终技术方案" prop="finalDocument">
-          <el-link :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`" :underline="false" target="_blank">
-            <span class="el-icon-document" style="color:#00f"> {{ getFileName(form.finalDocument) }} </span>
-          </el-link>
+          <div v-if="form.finalDocument">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">
+              {{ getFileName(form.finalDocument) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
         </el-form-item>
         <el-form-item label="总工程师审核意见" prop="manageComment">
           <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见" />
@@ -103,7 +121,7 @@
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
             <el-form-item label="签名" prop="manager">
-              <span class="auditor"> {{ form.managerUser? form.managerUser.nickName:''}} </span>
+              <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : '' }} </span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -154,7 +172,7 @@ export default {
   },
   data() {
     return {
-      baseUrl:process.env.VUE_APP_BASE_API,
+      baseUrl: process.env.VUE_APP_BASE_API,
       haveTechnical: false,
       form: {},
       rules: {},

oa-ui/src/views/flowable/form/safeForm.vue

@@ -60,8 +60,7 @@
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">

oa-ui/src/views/flowable/task/finished/index.vue

@@ -47,7 +47,7 @@
           <el-button size="mini" type="text" icon="el-icon-tickets"
             @click="handleFlowRecord(scope.row)">办理进度</el-button>
           <el-button size="mini" type="text" icon="el-icon-tickets" @click="handleFlowNote(scope.row)">表单信息</el-button>
-          <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回
+          <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)" :disabled="beDisabled(scope.row)">撤回
           </el-button>
         </template>
       </el-table-column>
@@ -223,6 +223,13 @@ export default {
         }
       })
     },
+    beDisabled(row){
+      if(row.procDefName == '项目流转' && row.taskName == '项目安排'){
+        return true
+      }else{
+        return false
+      }
+    },
     /** 撤回任务 */
     handleRevoke(row) {
       this.$confirm('确定撤回任务吗？', '提示', {

oa-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-13 20:05:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-14 14:03:01
 -->
 
 <template>
@@ -172,7 +172,7 @@ export default {
           icon: 'dict',
           bgColor: '#e64c56',
           boxShadow: '0 5px 20px rgba(230,76,86,0.5)',
-          path: '/project',
+          path: '/product/project',
           privilege:['oa:project:query']
         }, {
           id: 5,
@@ -180,7 +180,7 @@ export default {
           icon: 'car',
           bgColor: '#eeb62f',
           boxShadow: '0 5px 20px rgba(238,182,47,0.5)',
-          path: '/car/index',
+          path: '/oa/car/index',
           privilege:['oa:car:list']
         }, {
           id: 6,
@@ -188,7 +188,7 @@ export default {
           icon: 'lock',
           bgColor: '#0be1bd',
           boxShadow: '0 5px 20px rgba(11,225,189,0.5)',
-          path: '/device/equipment',
+          path: '/oa/device/equipment',
           privilege:['oa:device:list']
         }, {
           id: 7,
@@ -196,7 +196,7 @@ export default {
           icon: 'example',
           bgColor: '#F7C59F',
           boxShadow: '0 5px 20px rgba(247,197,159,0.5)',
-          path: '/tender',
+          path: '/business/tender',
           privilege:['oa:tender:query']
         }, {
           id: 8,
@@ -204,7 +204,7 @@ export default {
           icon: 'dept',
           bgColor: '#20B2AA',
           boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
-          path: '/staff/people',
+          path: '/oa/staff/people',
           privilege:['oa:salary:list']
         }, 
         // {

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

@@ -2,149 +2,25 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="成果汇交日期" prop="submitTime">
-        <el-date-picker clearable
-          v-model="queryParams.submitTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择成果汇交日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="备注说明" prop="submitSituation">
-        <el-input
-          v-model="queryParams.submitSituation"
-          placeholder="请输入备注说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="坐标经度" prop="locationLng">
-        <el-input
-          v-model="queryParams.locationLng"
-          placeholder="请输入坐标经度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="坐标纬度" prop="locationLat">
-        <el-input
-          v-model="queryParams.locationLat"
-          placeholder="请输入坐标纬度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="生产部门检查员" prop="produceInspector">
-        <el-input
-          v-model="queryParams.produceInspector"
-          placeholder="请输入生产部门检查员"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="质量检查员" prop="qualityInspector">
-        <el-input
-          v-model="queryParams.qualityInspector"
-          placeholder="请输入质量检查员"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术部负责人" prop="deptLeader">
-        <el-input
-          v-model="queryParams.deptLeader"
-          placeholder="请输入技术部负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="归档人" prop="archiver">
-        <el-input
-          v-model="queryParams.archiver"
-          placeholder="请输入归档人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="资料接收时间" prop="receiveTime">
-        <el-date-picker clearable
-          v-model="queryParams.receiveTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择资料接收时间">
-        </el-date-picker>
+        <el-select v-model="queryParams.archiver" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="质量检查时间" prop="qualityTime">
-        <el-date-picker clearable
-          v-model="queryParams.qualityTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择质量检查时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="生产部门检查时间" prop="produceTime">
-        <el-date-picker clearable
-          v-model="queryParams.produceTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择生产部门检查时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="技术部审核时间" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择技术部审核时间">
+      <el-form-item label="成果汇交日期" prop="submitTime" label-width="128px">
+        <el-date-picker clearable v-model="queryParams.submitTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择成果汇交日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="归档时间" prop="archiveTime">
-        <el-date-picker clearable
-          v-model="queryParams.archiveTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.archiveTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择归档时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="生产部门意见" prop="produceComment">
-        <el-input
-          v-model="queryParams.produceComment"
-          placeholder="请输入生产部门意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="质量检查意见" prop="qualityComment">
-        <el-input
-          v-model="queryParams.qualityComment"
-          placeholder="请输入质量检查意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术部审核意见" prop="deptComment">
-        <el-input
-          v-model="queryParams.deptComment"
-          placeholder="请输入技术部审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="归档审核意见" prop="archiveComment">
-        <el-input
-          v-model="queryParams.archiveComment"
-          placeholder="请输入归档审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -153,53 +29,26 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:archive:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:archive:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:archive:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:archive:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:archive:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:archive:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:archive:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:archive:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="archiveList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="成果归档id" align="center" prop="archiveId" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目id" align="center" prop="projectId" />
       <el-table-column label="成果汇交日期" align="center" prop="submitTime" width="180">
         <template slot-scope="scope">
@@ -207,8 +56,6 @@
         </template>
       </el-table-column>
       <el-table-column label="备注说明" align="center" prop="submitSituation" />
-      <el-table-column label="坐标经度" align="center" prop="locationLng" />
-      <el-table-column label="坐标纬度" align="center" prop="locationLat" />
       <el-table-column label="生产部门检查员" align="center" prop="produceInspector" />
       <el-table-column label="质量检查员" align="center" prop="qualityInspector" />
       <el-table-column label="技术部负责人" align="center" prop="deptLeader" />
@@ -218,7 +65,7 @@
           <span>{{ parseTime(scope.row.receiveTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="质量检查时间" align="center" prop="qualityTime" width="180">
+      <!-- <el-table-column label="质量检查时间" align="center" prop="qualityTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.qualityTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -232,43 +79,28 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="归档时间" align="center" prop="archiveTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.archiveTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="生产部门意见" align="center" prop="produceComment" />
+      <!-- <el-table-column label="生产部门意见" align="center" prop="produceComment" />
       <el-table-column label="质量检查意见" align="center" prop="qualityComment" />
       <el-table-column label="技术部审核意见" align="center" prop="deptComment" />
-      <el-table-column label="归档审核意见" align="center" prop="archiveComment" />
+      <el-table-column label="归档审核意见" align="center" prop="archiveComment" /> -->
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:archive:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:archive:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:archive:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:archive:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc成果归档对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -277,10 +109,7 @@
           <el-input v-model="form.projectId" placeholder="请输入项目id" />
         </el-form-item>
         <el-form-item label="成果汇交日期" prop="submitTime">
-          <el-date-picker clearable
-            v-model="form.submitTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择成果汇交日期">
           </el-date-picker>
         </el-form-item>
@@ -306,42 +135,27 @@
           <el-input v-model="form.archiver" placeholder="请输入归档人" />
         </el-form-item>
         <el-form-item label="资料接收时间" prop="receiveTime">
-          <el-date-picker clearable
-            v-model="form.receiveTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.receiveTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择资料接收时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="质量检查时间" prop="qualityTime">
-          <el-date-picker clearable
-            v-model="form.qualityTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择质量检查时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="生产部门检查时间" prop="produceTime">
-          <el-date-picker clearable
-            v-model="form.produceTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.produceTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择生产部门检查时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="技术部审核时间" prop="deptTime">
-          <el-date-picker clearable
-            v-model="form.deptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择技术部审核时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="归档时间" prop="archiveTime">
-          <el-date-picker clearable
-            v-model="form.archiveTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.archiveTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择归档时间">
           </el-date-picker>
         </el-form-item>
@@ -477,7 +291,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.archiveId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -519,12 +333,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const archiveIds = row.archiveId || this.ids;
-      this.$modal.confirm('是否确认删除cmc成果归档编号为"' + archiveIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc成果归档编号为"' + archiveIds + '"的数据项？').then(function () {
         return delArchive(archiveIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -2,172 +2,14 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="借款事由" prop="applyReason">
-        <el-input
-          v-model="queryParams.applyReason"
-          placeholder="请输入借款事由"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="借款人" prop="applier">
-        <el-input
-          v-model="queryParams.applier"
-          placeholder="请输入借款人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="借款日期" prop="applyDate">
-        <el-date-picker clearable
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择借款日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="申请金额" prop="applyAmount">
-        <el-input
-          v-model="queryParams.applyAmount"
-          placeholder="请输入申请金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="核准金额" prop="managerAmount">
-        <el-input
-          v-model="queryParams.managerAmount"
-          placeholder="请输入核准金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门意见" prop="deptComment">
-        <el-input
-          v-model="queryParams.deptComment"
-          placeholder="请输入部门意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审批人" prop="deptUserId">
-        <el-input
-          v-model="queryParams.deptUserId"
-          placeholder="请输入部门审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目部审批人" prop="xmUserId">
-        <el-input
-          v-model="queryParams.xmUserId"
-          placeholder="请输入项目部审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目部审批意见" prop="xmComment">
-        <el-input
-          v-model="queryParams.xmComment"
-          placeholder="请输入项目部审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批人" prop="zjlUserId">
-        <el-input
-          v-model="queryParams.zjlUserId"
-          placeholder="请输入总经理审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批意见" prop="zjlComment">
-        <el-input
-          v-model="queryParams.zjlComment"
-          placeholder="请输入总经理审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="财务部经办人" prop="cwUserId">
-        <el-input
-          v-model="queryParams.cwUserId"
-          placeholder="请输入财务部经办人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="财务部支付备注" prop="cwComment">
-        <el-input
-          v-model="queryParams.cwComment"
-          placeholder="请输入财务部支付备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审批时间" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择部门审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="项目部审批时间" prop="xmTime">
-        <el-date-picker clearable
-          v-model="queryParams.xmTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择项目部审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审批时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理审批时间" prop="zjlTime">
-        <el-date-picker clearable
-          v-model="queryParams.zjlTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="借款支付时间" prop="lendTime">
-        <el-date-picker clearable
-          v-model="queryParams.lendTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择借款支付时间">
-        </el-date-picker>
+        <el-select v-model="queryParams.applier" filterable clearable @change="handleQuery">
+          <el-option v-for="user in $store.state.user.userList" :key="user.userId" :label="user.nickName"
+            :value="user.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -177,53 +19,26 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:borrow:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:borrow:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:borrow:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:borrow:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:borrow:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:borrow:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:borrow:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:borrow:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="borrowList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="借款申请id" align="center" prop="borrowJd" />
+      <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="项目id" align="center" prop="projectId" />
       <el-table-column label="借款类型" align="center" prop="borrowType" />
       <el-table-column label="借款事由" align="center" prop="applyReason" />
@@ -236,13 +51,13 @@
       <el-table-column label="申请金额" align="center" prop="applyAmount" />
       <el-table-column label="核准金额" align="center" prop="managerAmount" />
       <el-table-column label="部门意见" align="center" prop="deptComment" />
-      <el-table-column label="部门审批人" align="center" prop="deptUserId" />
-      <el-table-column label="项目部审批人" align="center" prop="xmUserId" />
+      <!-- <el-table-column label="部门审批人" align="center" prop="deptUserId" />
+      <el-table-column label="项目部审批人" align="center" prop="xmUserId" /> -->
       <el-table-column label="项目部审批意见" align="center" prop="xmComment" />
       <el-table-column label="分管审批意见" align="center" prop="managerComment" />
-      <el-table-column label="分管审批人" align="center" prop="managerUserId" />
-      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" />
-      <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
+      <!-- <el-table-column label="分管审批人" align="center" prop="managerUserId" />
+      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" /> -->
+      <!-- <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
       <el-table-column label="财务部经办人" align="center" prop="cwUserId" />
       <el-table-column label="财务部支付备注" align="center" prop="cwComment" />
       <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
@@ -264,39 +79,24 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="借款支付时间" align="center" prop="lendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.lendTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:borrow:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:borrow:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:borrow:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:borrow:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc借款申请对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -311,10 +111,7 @@
           <el-input v-model="form.applier" placeholder="请输入借款人" />
         </el-form-item>
         <el-form-item label="借款日期" prop="applyDate">
-          <el-date-picker clearable
-            v-model="form.applyDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择借款日期">
           </el-date-picker>
         </el-form-item>
@@ -355,42 +152,27 @@
           <el-input v-model="form.cwComment" placeholder="请输入财务部支付备注" />
         </el-form-item>
         <el-form-item label="部门审批时间" prop="deptTime">
-          <el-date-picker clearable
-            v-model="form.deptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择部门审批时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="项目部审批时间" prop="xmTime">
-          <el-date-picker clearable
-            v-model="form.xmTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择项目部审批时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="分管审批时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择分管审批时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="总经理审批时间" prop="zjlTime">
-          <el-date-picker clearable
-            v-model="form.zjlTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.zjlTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择总经理审批时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="借款支付时间" prop="lendTime">
-          <el-date-picker clearable
-            v-model="form.lendTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.lendTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择借款支付时间">
           </el-date-picker>
         </el-form-item>
@@ -522,7 +304,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.borrowJd)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -564,12 +346,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const borrowJds = row.borrowJd || this.ids;
-      this.$modal.confirm('是否确认删除cmc借款申请编号为"' + borrowJds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc借款申请编号为"' + borrowJds + '"的数据项？').then(function () {
         return delBorrow(borrowJds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -2,164 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="人员成本" prop="staffCost">
-        <el-input
-          v-model="queryParams.staffCost"
-          placeholder="请输入人员成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆成本" prop="carCost">
-        <el-input
-          v-model="queryParams.carCost"
-          placeholder="请输入车辆成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备成本" prop="deviceCost">
-        <el-input
-          v-model="queryParams.deviceCost"
-          placeholder="请输入设备成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="固定成本" prop="fixCost">
-        <el-input
-          v-model="queryParams.fixCost"
-          placeholder="请输入固定成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预结算额" prop="settleExpense">
-        <el-input
-          v-model="queryParams.settleExpense"
-          placeholder="请输入预结算额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="外协费用" prop="outExpense">
-        <el-input
-          v-model="queryParams.outExpense"
-          placeholder="请输入外协费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经营费用" prop="businessExpense">
-        <el-input
-          v-model="queryParams.businessExpense"
-          placeholder="请输入经营费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="税费成本" prop="taxExpense">
-        <el-input
-          v-model="queryParams.taxExpense"
-          placeholder="请输入税费成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车船租赁" prop="rentExpense">
-        <el-input
-          v-model="queryParams.rentExpense"
-          placeholder="请输入车船租赁"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="其他费用" prop="otherExpense">
-        <el-input
-          v-model="queryParams.otherExpense"
-          placeholder="请输入其他费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="外协费用备注" prop="outRemark">
-        <el-input
-          v-model="queryParams.outRemark"
-          placeholder="请输入外协费用备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经营管理备注" prop="businessRemark">
-        <el-input
-          v-model="queryParams.businessRemark"
-          placeholder="请输入经营管理备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="税费成本备注" prop="taxRemark">
-        <el-input
-          v-model="queryParams.taxRemark"
-          placeholder="请输入税费成本备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车船租赁备注" prop="rentRemark">
-        <el-input
-          v-model="queryParams.rentRemark"
-          placeholder="请输入车船租赁备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="其他费用备注" prop="otherRemark">
-        <el-input
-          v-model="queryParams.otherRemark"
-          placeholder="请输入其他费用备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="直接成本" prop="directExpense">
-        <el-input
-          v-model="queryParams.directExpense"
-          placeholder="请输入直接成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预算总额" prop="totalBudget">
-        <el-input
-          v-model="queryParams.totalBudget"
-          placeholder="请输入预算总额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="编制人" prop="compiler">
-        <el-input
-          v-model="queryParams.compiler"
-          placeholder="请输入编制人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人" prop="auditor">
-        <el-input
-          v-model="queryParams.auditor"
-          placeholder="请输入审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -169,100 +12,51 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:budget:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:budget:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:budget:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:budget:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:budget:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:budget:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:budget:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:budget:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="预算id" align="center" prop="budgetId" />
       <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="人员成本" align="center" prop="staffCost" />
-      <el-table-column label="车辆成本" align="center" prop="carCost" />
-      <el-table-column label="设备成本" align="center" prop="deviceCost" />
       <el-table-column label="固定成本" align="center" prop="fixCost" />
-      <el-table-column label="预结算额" align="center" prop="settleExpense" />
-      <el-table-column label="外协费用" align="center" prop="outExpense" />
-      <el-table-column label="经营费用" align="center" prop="businessExpense" />
-      <el-table-column label="税费成本" align="center" prop="taxExpense" />
-      <el-table-column label="车船租赁" align="center" prop="rentExpense" />
-      <el-table-column label="其他费用" align="center" prop="otherExpense" />
-      <el-table-column label="外协费用备注" align="center" prop="outRemark" />
-      <el-table-column label="经营管理备注" align="center" prop="businessRemark" />
-      <el-table-column label="税费成本备注" align="center" prop="taxRemark" />
-      <el-table-column label="车船租赁备注" align="center" prop="rentRemark" />
-      <el-table-column label="其他费用备注" align="center" prop="otherRemark" />
       <el-table-column label="直接成本" align="center" prop="directExpense" />
       <el-table-column label="预算总额" align="center" prop="totalBudget" />
-      <el-table-column label="编制人" align="center" prop="compiler" />
-      <el-table-column label="审核人" align="center" prop="auditor" />
+      <el-table-column label="编制人" align="center" prop="compiler">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.compiler) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="auditor">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.auditor) }}
+        </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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:budget:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:budget:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:budget:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:budget:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc预算管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -452,7 +246,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.budgetId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -494,12 +288,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const budgetIds = row.budgetId || this.ids;
-      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function () {
         return delBudget(budgetIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/car/approval.vue

@@ -2,228 +2,21 @@
   <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="applier">
-        <el-input
-          v-model="queryParams.applier"
-          placeholder="请输入申请人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.applier" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="使用部门" prop="useDept">
-        <el-input
-          v-model="queryParams.useDept"
-          placeholder="请输入使用部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆id" prop="cars">
-        <el-input
-          v-model="queryParams.cars"
-          placeholder="请输入车辆id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="驾驶员id" prop="drivers">
-        <el-input
-          v-model="queryParams.drivers"
-          placeholder="请输入驾驶员id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.useDept" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请用途" prop="carUsage">
-        <el-input
-          v-model="queryParams.carUsage"
-          placeholder="请输入申请用途"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用车事由" prop="applyReason">
-        <el-input
-          v-model="queryParams.applyReason"
-          placeholder="请输入用车事由"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="人数" prop="passengers">
-        <el-input
-          v-model="queryParams.passengers"
-          placeholder="请输入人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始日期" prop="beginDate">
-        <el-date-picker clearable
-          v-model="queryParams.beginDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束日期" prop="endDate">
-        <el-date-picker clearable
-          v-model="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="天数" prop="days">
-        <el-input
-          v-model="queryParams.days"
-          placeholder="请输入天数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审批人" prop="deptUserId">
-        <el-input
-          v-model="queryParams.deptUserId"
-          placeholder="请输入部门审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审批意见" prop="deptComment">
-        <el-input
-          v-model="queryParams.deptComment"
-          placeholder="请输入部门审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审批时间" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择部门审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审批人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="工会审批人" prop="unionUserId">
-        <el-input
-          v-model="queryParams.unionUserId"
-          placeholder="请输入工会审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工会审批意见" prop="unionComment">
-        <el-input
-          v-model="queryParams.unionComment"
-          placeholder="请输入工会审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工会审批时间" prop="unionTime">
-        <el-date-picker clearable
-          v-model="queryParams.unionTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择工会审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理审批人" prop="gmUserId">
-        <el-input
-          v-model="queryParams.gmUserId"
-          placeholder="请输入总经理审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批意见" prop="gmComment">
-        <el-input
-          v-model="queryParams.gmComment"
-          placeholder="请输入总经理审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批时间" prop="gmTime">
-        <el-date-picker clearable
-          v-model="queryParams.gmTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="派车人" prop="dispatcher">
-        <el-input
-          v-model="queryParams.dispatcher"
-          placeholder="请输入派车人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="派车审批意见" prop="dispatchComment">
-        <el-input
-          v-model="queryParams.dispatchComment"
-          placeholder="请输入派车审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="派车审批时间" prop="dispatchTime">
-        <el-date-picker clearable
-          v-model="queryParams.dispatchTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择派车审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="预计用车成本" prop="estimateCost">
-        <el-input
-          v-model="queryParams.estimateCost"
-          placeholder="请输入预计用车成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请日期" prop="applyDate">
-        <el-date-picker clearable
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请日期">
-        </el-date-picker>
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -233,22 +26,20 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['car:record:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['car:record:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="carApprovalList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="用车申请id" align="center" prop="carApplyId" />
-      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column label="申请人" align="center" prop="applier" >
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.applier) }}
+        </template>
+      </el-table-column>
       <el-table-column label="使用部门" align="center" prop="useDept" />
       <el-table-column label="车辆id" align="center" prop="cars" />
       <el-table-column label="驾驶员id" align="center" prop="drivers" />
@@ -307,16 +98,11 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>      
+      </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc用车审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -346,19 +132,12 @@
           <el-input v-model="form.passengers" placeholder="请输入人数" />
         </el-form-item>
         <el-form-item label="开始日期" prop="beginDate">
-          <el-date-picker clearable
-            v-model="form.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.beginDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择开始日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束日期" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择结束日期">
+          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="天数" prop="days">
@@ -371,10 +150,7 @@
           <el-input v-model="form.deptComment" placeholder="请输入部门审批意见" />
         </el-form-item>
         <el-form-item label="部门审批时间" prop="deptTime">
-          <el-date-picker clearable
-            v-model="form.deptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择部门审批时间">
           </el-date-picker>
         </el-form-item>
@@ -385,10 +161,7 @@
           <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
         </el-form-item>
         <el-form-item label="分管审批时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择分管审批时间">
           </el-date-picker>
         </el-form-item>
@@ -399,10 +172,7 @@
           <el-input v-model="form.unionComment" placeholder="请输入工会审批意见" />
         </el-form-item>
         <el-form-item label="工会审批时间" prop="unionTime">
-          <el-date-picker clearable
-            v-model="form.unionTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.unionTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择工会审批时间">
           </el-date-picker>
         </el-form-item>
@@ -413,10 +183,7 @@
           <el-input v-model="form.gmComment" placeholder="请输入总经理审批意见" />
         </el-form-item>
         <el-form-item label="总经理审批时间" prop="gmTime">
-          <el-date-picker clearable
-            v-model="form.gmTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择总经理审批时间">
           </el-date-picker>
         </el-form-item>
@@ -427,10 +194,7 @@
           <el-input v-model="form.dispatchComment" placeholder="请输入派车审批意见" />
         </el-form-item>
         <el-form-item label="派车审批时间" prop="dispatchTime">
-          <el-date-picker clearable
-            v-model="form.dispatchTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.dispatchTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择派车审批时间">
           </el-date-picker>
         </el-form-item>
@@ -438,10 +202,7 @@
           <el-input v-model="form.estimateCost" placeholder="请输入预计用车成本" />
         </el-form-item>
         <el-form-item label="申请日期" prop="applyDate">
-          <el-date-picker clearable
-            v-model="form.applyDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择申请日期">
           </el-date-picker>
         </el-form-item>
@@ -585,7 +346,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.carApplyId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -627,12 +388,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const carApplyIds = row.carApplyId || this.ids;
-      this.$modal.confirm('是否确认删除cmc用车审批编号为"' + carApplyIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc用车审批编号为"' + carApplyIds + '"的数据项？').then(function () {
         return delCarApproval(carApplyIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/car/detail.vue

@@ -397,7 +397,7 @@ export default {
     goBack() {
       let obj = { path: "/car/detail" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/car/index' });
+      this.$router.push({ path: '/oa/car/index' });
     },
     getScrapStatus() {
       this.queryParams.carId = this.$route.query.carId

oa-ui/src/views/oa/car/expense.vue

@@ -2,45 +2,20 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="车辆id" prop="carId">
-        <el-input
-          v-model="queryParams.carId"
-          placeholder="请输入车辆id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.carId" placeholder="请输入车辆id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="负责人id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入负责人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="费用金额" prop="expense">
-        <el-input
-          v-model="queryParams.expense"
-          placeholder="请输入费用金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="负责人" prop="userId">
+        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="发生日期" prop="occurDate">
-        <el-date-picker clearable
-          v-model="queryParams.occurDate"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.occurDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择发生日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="附件" prop="document">
-        <el-input
-          v-model="queryParams.document"
-          placeholder="请输入附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -49,46 +24,20 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['car:record:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['car:record:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['car:record:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['car:record:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['car:record:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['car:record:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['car:record:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['car:record:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -108,31 +57,16 @@
       <el-table-column label="附件" align="center" prop="document" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['car:record:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['car:record:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['car:record:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['car:record:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc设备费用对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -147,10 +81,7 @@
           <el-input v-model="form.expense" placeholder="请输入费用金额" />
         </el-form-item>
         <el-form-item label="发生日期" prop="occurDate">
-          <el-date-picker clearable
-            v-model="form.occurDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择发生日期">
           </el-date-picker>
         </el-form-item>
@@ -258,7 +189,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deviceExpenseId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -300,12 +231,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceExpenseIds = row.deviceExpenseId || this.ids;
-      this.$modal.confirm('是否确认删除cmc设备费用编号为"' + deviceExpenseIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc设备费用编号为"' + deviceExpenseIds + '"的数据项？').then(function () {
         return delDeviceExpense(deviceExpenseIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/car/scrap.vue

@@ -1,54 +1,14 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">      
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="车辆id" prop="carId">
-        <el-input
-          v-model="queryParams.carId"
-          placeholder="请输入车辆id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="原价值" prop="cost">
-        <el-input
-          v-model="queryParams.cost"
-          placeholder="请输入原价值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.carId" placeholder="请输入车辆id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="报废日期" prop="scrapDate">
-        <el-date-picker clearable
-          v-model="queryParams.scrapDate"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.scrapDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择报废日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="报废原因" prop="reason">
-        <el-input
-          v-model="queryParams.reason"
-          placeholder="请输入报废原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理结果" prop="deal">
-        <el-input
-          v-model="queryParams.deal"
-          placeholder="请输入处理结果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="附件" prop="document">
-        <el-input
-          v-model="queryParams.document"
-          placeholder="请输入附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -57,46 +17,20 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['car:record:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['car:record:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['car:record:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['car:record:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['car:record:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['car:record:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['car:record:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['car:record:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -116,31 +50,16 @@
       <el-table-column label="附件" align="center" prop="document" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['car:record:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['car:record:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['car:record:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['car:record:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc设备报废对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -152,10 +71,7 @@
           <el-input v-model="form.cost" placeholder="请输入原价值" />
         </el-form-item>
         <el-form-item label="报废日期" prop="scrapDate">
-          <el-date-picker clearable
-            v-model="form.scrapDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.scrapDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择报废日期">
           </el-date-picker>
         </el-form-item>
@@ -269,7 +185,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deviceScrapId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -311,12 +227,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceScrapIds = row.deviceScrapId || this.ids;
-      this.$modal.confirm('是否确认删除cmc设备报废编号为"' + deviceScrapIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc设备报废编号为"' + deviceScrapIds + '"的数据项？').then(function () {
         return delDeviceScrap(deviceScrapIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -1,85 +1,18 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
       <el-form-item label="主合同id" prop="contractId">
-        <el-input
-          v-model="queryParams.contractId"
-          placeholder="请输入主合同id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同名称" prop="subContractName">
-        <el-input
-          v-model="queryParams.subContractName"
-          placeholder="请输入合同名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分包合同金额" prop="subAmount">
-        <el-input
-          v-model="queryParams.subAmount"
-          placeholder="请输入分包合同金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.contractId" placeholder="请输入主合同id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="承接单位id" prop="partnerId">
-        <el-input
-          v-model="queryParams.partnerId"
-          placeholder="请输入承接单位id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="承接单位联系人" prop="contactPerson">
-        <el-input
-          v-model="queryParams.contactPerson"
-          placeholder="请输入承接单位联系人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.partnerId" placeholder="请输入承接单位id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="拟稿人" prop="drafter">
-        <el-input
-          v-model="queryParams.drafter"
-          placeholder="请输入拟稿人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拟稿日期" prop="draftTime">
-        <el-date-picker clearable
-          v-model="queryParams.draftTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择拟稿日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="签订日期" prop="signDate">
-        <el-date-picker clearable
-          v-model="queryParams.signDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择签订日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="签订备注" prop="signRemark">
-        <el-input
-          v-model="queryParams.signRemark"
-          placeholder="请输入签订备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="签订扫描件" prop="signScan">
-        <el-input
-          v-model="queryParams.signScan"
-          placeholder="请输入签订扫描件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.drafter" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -89,26 +22,19 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:subContract:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:subContract:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="subContractList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="分包合同id" align="center" prop="subContractId" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="主合同id" align="center" prop="contractId" />
       <el-table-column label="合同名称" align="center" prop="subContractName" />
       <el-table-column label="分包合同金额" align="center" prop="subAmount" />
       <el-table-column label="承接单位id" align="center" prop="partnerId" />
-      <el-table-column label="承接单位联系人" align="center" prop="contactPerson" />
+      <!-- <el-table-column label="承接单位联系人" align="center" prop="contactPerson" /> -->
       <el-table-column label="拟稿人" align="center" prop="drafter" />
       <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
         <template slot-scope="scope">
@@ -125,18 +51,13 @@
       <el-table-column label="签订扫描件" align="center" prop="signScan" />
       <el-table-column label="评审方式" align="center" prop="commentType" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:subContract:query']">查看</el-button>
+        <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+          v-hasPermi="['oa:subContract:query']">查看</el-button>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc分包合同评审对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -160,10 +81,7 @@
           <el-input v-model="form.drafter" placeholder="请输入拟稿人" />
         </el-form-item>
         <el-form-item label="拟稿日期" prop="draftTime">
-          <el-date-picker clearable
-            v-model="form.draftTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择拟稿日期">
           </el-date-picker>
         </el-form-item>
@@ -171,11 +89,7 @@
           <el-input v-model="form.remark" placeholder="请输入合同备注" />
         </el-form-item>
         <el-form-item label="签订日期" prop="signDate">
-          <el-date-picker clearable
-            v-model="form.signDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择签订日期">
+          <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="签订备注" prop="signRemark">
@@ -258,7 +172,7 @@ export default {
       this.openInfo = true;
       this.title = "合同详情";
       this.form = row;
-      this.$set(this.taskForm,'formId',row.subContractId)
+      this.$set(this.taskForm, 'formId', row.subContractId)
     },
     // 取消按钮
     cancel() {
@@ -297,7 +211,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.subContractId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -339,12 +253,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const subContractIds = row.subContractId || this.ids;
-      this.$modal.confirm('是否确认删除cmc分包合同评审编号为"' + subContractIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc分包合同评审编号为"' + subContractIds + '"的数据项？').then(function () {
         return delSubContract(subContractIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -1,165 +1,23 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
       <el-form-item label="投标项目id" prop="tenderId">
-        <el-input
-          v-model="queryParams.tenderId"
-          placeholder="请输入投标项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.tenderId" placeholder="请输入投标项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="合同id" prop="contractId">
-        <el-input
-          v-model="queryParams.contractId"
-          placeholder="请输入合同id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.contractId" placeholder="请输入合同id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="预计退还日期" prop="returnTime">
-        <el-date-picker clearable
-          v-model="queryParams.returnTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.returnTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择预计退还日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="开户名称" prop="accountName">
-        <el-input
-          v-model="queryParams.accountName"
-          placeholder="请输入开户名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开户银行" prop="accountBank">
-        <el-input
-          v-model="queryParams.accountBank"
-          placeholder="请输入开户银行"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="银行卡号" prop="cardNumber">
-        <el-input
-          v-model="queryParams.cardNumber"
-          placeholder="请输入银行卡号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="保证金形式" prop="depositWay">
-        <el-input
-          v-model="queryParams.depositWay"
-          placeholder="请输入保证金形式"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="申请人" prop="applier">
-        <el-input
-          v-model="queryParams.applier"
-          placeholder="请输入申请人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请日期" prop="applyTime">
-        <el-date-picker clearable
-          v-model="queryParams.applyTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="申请说明" prop="applyReason">
-        <el-input
-          v-model="queryParams.applyReason"
-          placeholder="请输入申请说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="相关附件" prop="applyDocument">
-        <el-input
-          v-model="queryParams.applyDocument"
-          placeholder="请输入相关附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审批人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="汇款日期" prop="remitTime">
-        <el-date-picker clearable
-          v-model="queryParams.remitTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择汇款日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="财务处理时间" prop="cwTime">
-        <el-date-picker clearable
-          v-model="queryParams.cwTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择财务处理时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="退还时间" prop="backTime">
-        <el-date-picker clearable
-          v-model="queryParams.backTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择退还时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="财务打款备注" prop="cwComment">
-        <el-input
-          v-model="queryParams.cwComment"
-          placeholder="请输入财务打款备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="财务处理人" prop="cwUserId">
-        <el-input
-          v-model="queryParams.cwUserId"
-          placeholder="请输入财务处理人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="汇款凭证" prop="remitDocument">
-        <el-input
-          v-model="queryParams.remitDocument"
-          placeholder="请输入汇款凭证"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.applier" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -169,53 +27,26 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:deposit:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:deposit:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:deposit:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:deposit:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:deposit:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:deposit:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:deposit:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:deposit:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="depositList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="保证金审批id" align="center" prop="depositId" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="保证金类型" align="center" prop="depositType" />
       <el-table-column label="投标项目id" align="center" prop="tenderId" />
       <el-table-column label="合同id" align="center" prop="contractId" />
@@ -224,9 +55,9 @@
           <span>{{ parseTime(scope.row.returnTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="开户名称" align="center" prop="accountName" />
+      <!-- <el-table-column label="开户名称" align="center" prop="accountName" />
       <el-table-column label="开户银行" align="center" prop="accountBank" />
-      <el-table-column label="银行卡号" align="center" prop="cardNumber" />
+      <el-table-column label="银行卡号" align="center" prop="cardNumber" /> -->
       <el-table-column label="保证金形式" align="center" prop="depositWay" />
       <el-table-column label="申请人" align="center" prop="applier" />
       <el-table-column label="申请日期" align="center" prop="applyTime" width="180">
@@ -234,9 +65,9 @@
           <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请说明" align="center" prop="applyReason" />
-      <el-table-column label="相关附件" align="center" prop="applyDocument" />
-      <el-table-column label="分管审批意见" align="center" prop="managerComment" />
+      <!-- <el-table-column label="申请说明" align="center" prop="applyReason" />
+      <el-table-column label="相关附件" align="center" prop="applyDocument" /> -->
+      <!-- <el-table-column label="分管审批意见" align="center" prop="managerComment" />
       <el-table-column label="分管审批时间" align="center" prop="managerTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
@@ -252,7 +83,7 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.cwTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="退还时间" align="center" prop="backTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.backTime, '{y}-{m}-{d}') }}</span>
@@ -263,31 +94,18 @@
       <el-table-column label="汇款凭证" align="center" prop="remitDocument" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:deposit:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:deposit:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:deposit:view']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:deposit:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:deposit:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc保证金审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -299,10 +117,7 @@
           <el-input v-model="form.contractId" placeholder="请输入合同id" />
         </el-form-item>
         <el-form-item label="预计退还日期" prop="returnTime">
-          <el-date-picker clearable
-            v-model="form.returnTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.returnTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择预计退还日期">
           </el-date-picker>
         </el-form-item>
@@ -322,10 +137,7 @@
           <el-input v-model="form.applier" placeholder="请输入申请人" />
         </el-form-item>
         <el-form-item label="申请日期" prop="applyTime">
-          <el-date-picker clearable
-            v-model="form.applyTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.applyTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择申请日期">
           </el-date-picker>
         </el-form-item>
@@ -339,10 +151,7 @@
           <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
         </el-form-item>
         <el-form-item label="分管审批时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择分管审批时间">
           </el-date-picker>
         </el-form-item>
@@ -350,27 +159,16 @@
           <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
         </el-form-item>
         <el-form-item label="汇款日期" prop="remitTime">
-          <el-date-picker clearable
-            v-model="form.remitTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.remitTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择汇款日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="财务处理时间" prop="cwTime">
-          <el-date-picker clearable
-            v-model="form.cwTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择财务处理时间">
+          <el-date-picker clearable v-model="form.cwTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择财务处理时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="退还时间" prop="backTime">
-          <el-date-picker clearable
-            v-model="form.backTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择退还时间">
+          <el-date-picker clearable v-model="form.backTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择退还时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="财务打款备注" prop="cwComment">
@@ -508,7 +306,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.depositId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -516,6 +314,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加cmc保证金审批";
+    },
+    handleView(row){
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -550,12 +351,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const depositIds = row.depositId || this.ids;
-      this.$modal.confirm('是否确认删除cmc保证金审批编号为"' + depositIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc保证金审批编号为"' + depositIds + '"的数据项？').then(function () {
         return delDeposit(depositIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/device/approval.vue

@@ -2,172 +2,21 @@
   <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="applier">
-        <el-input
-          v-model="queryParams.applier"
-          placeholder="请输入申请人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.applier" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="使用部门" prop="useDept">
-        <el-input
-          v-model="queryParams.useDept"
-          placeholder="请输入使用部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备id" prop="devices">
-        <el-input
-          v-model="queryParams.devices"
-          placeholder="请输入设备id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改后设备id" prop="modifyDevices">
-        <el-input
-          v-model="queryParams.modifyDevices"
-          placeholder="请输入修改后设备id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.useDept" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申领事由" prop="applyReason">
-        <el-input
-          v-model="queryParams.applyReason"
-          placeholder="请输入申领事由"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始日期" prop="beginDate">
-        <el-date-picker clearable
-          v-model="queryParams.beginDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束日期" prop="endDate">
-        <el-date-picker clearable
-          v-model="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="天数" prop="days">
-        <el-input
-          v-model="queryParams.days"
-          placeholder="请输入天数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审批意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调度员" prop="dispatcher">
-        <el-input
-          v-model="queryParams.dispatcher"
-          placeholder="请输入调度员"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调度审批意见" prop="dispatchComment">
-        <el-input
-          v-model="queryParams.dispatchComment"
-          placeholder="请输入调度审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预计设备成本" prop="estimateCost">
-        <el-input
-          v-model="queryParams.estimateCost"
-          placeholder="请输入预计设备成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请日期" prop="applyDate">
-        <el-date-picker clearable
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="确认日期" prop="confirmDate">
-        <el-date-picker clearable
-          v-model="queryParams.confirmDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择确认日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="归还日期" prop="returnDate">
-        <el-date-picker clearable
-          v-model="queryParams.returnDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择归还日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="需维修设备id" prop="repairDevices">
-        <el-input
-          v-model="queryParams.repairDevices"
-          placeholder="请输入需维修设备id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审批时间" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择部门审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审批时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="调度审批时间" prop="dispatchTime">
-        <el-date-picker clearable
-          v-model="queryParams.dispatchTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择调度审批时间">
-        </el-date-picker>
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -177,25 +26,22 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['device:record:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['device:record:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="deviceApprovalList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="设备申请id" align="center" prop="deviceApplyId" />
-      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column type="idnex" label="序号" width="55" align="center" />
+      <el-table-column label="申请人" align="center" prop="applier" >
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.applier) }}
+        </template>
+      </el-table-column>
       <el-table-column label="使用部门" align="center" prop="useDept" />
       <el-table-column label="设备id" align="center" prop="devices" />
-      <el-table-column label="修改后设备id" align="center" prop="modifyDevices" />
+      <!-- <el-table-column label="修改后设备id" align="center" prop="modifyDevices" /> -->
       <el-table-column label="项目id" align="center" prop="projectId" />
       <el-table-column label="申领事由" align="center" prop="applyReason" />
       <el-table-column label="开始日期" align="center" prop="beginDate" width="180">
@@ -209,11 +55,11 @@
         </template>
       </el-table-column>
       <el-table-column label="天数" align="center" prop="days" />
-      <el-table-column label="分管审批人" align="center" prop="managerUserId" />
+      <!-- <el-table-column label="分管审批人" align="center" prop="managerUserId" />
       <el-table-column label="分管审批意见" align="center" prop="managerComment" />
       <el-table-column label="调度员" align="center" prop="dispatcher" />
       <el-table-column label="调度审批意见" align="center" prop="dispatchComment" />
-      <el-table-column label="预计设备成本" align="center" prop="estimateCost" />
+      <el-table-column label="预计设备成本" align="center" prop="estimateCost" /> -->
       <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
@@ -229,7 +75,7 @@
           <span>{{ parseTime(scope.row.returnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="需维修设备id" align="center" prop="repairDevices" />
+      <!-- <el-table-column label="需维修设备id" align="center" prop="repairDevices" />
       <el-table-column label="备注说明" align="center" prop="remark" />
       <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
         <template slot-scope="scope">
@@ -245,16 +91,17 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.dispatchTime, '{y}-{m}-{d}') }}</span>
         </template>
+      </el-table-column> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:deviceApproval:list']">查看</el-button>
+        </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc设备审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -278,19 +125,12 @@
           <el-input v-model="form.applyReason" placeholder="请输入申领事由" />
         </el-form-item>
         <el-form-item label="开始日期" prop="beginDate">
-          <el-date-picker clearable
-            v-model="form.beginDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.beginDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择开始日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束日期" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择结束日期">
+          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="天数" prop="days">
@@ -312,26 +152,17 @@
           <el-input v-model="form.estimateCost" placeholder="请输入预计设备成本" />
         </el-form-item>
         <el-form-item label="申请日期" prop="applyDate">
-          <el-date-picker clearable
-            v-model="form.applyDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择申请日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="确认日期" prop="confirmDate">
-          <el-date-picker clearable
-            v-model="form.confirmDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.confirmDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择确认日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="归还日期" prop="returnDate">
-          <el-date-picker clearable
-            v-model="form.returnDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.returnDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择归还日期">
           </el-date-picker>
         </el-form-item>
@@ -342,26 +173,17 @@
           <el-input v-model="form.remark" placeholder="请输入备注说明" />
         </el-form-item>
         <el-form-item label="部门审批时间" prop="deptTime">
-          <el-date-picker clearable
-            v-model="form.deptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择部门审批时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="分管审批时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择分管审批时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="调度审批时间" prop="dispatchTime">
-          <el-date-picker clearable
-            v-model="form.dispatchTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.dispatchTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择调度审批时间">
           </el-date-picker>
         </el-form-item>
@@ -492,7 +314,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deviceApplyId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -500,6 +322,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加cmc设备审批";
+    },
+    handleView(row){
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -534,12 +359,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceApplyIds = row.deviceApplyId || this.ids;
-      this.$modal.confirm('是否确认删除cmc设备审批编号为"' + deviceApplyIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc设备审批编号为"' + deviceApplyIds + '"的数据项？').then(function () {
         return delDeviceApproval(deviceApplyIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/device/detail.vue

@@ -569,7 +569,7 @@ export default {
     goBack() {
       let obj = { path: "/device/detail" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/device/' + this.routeType });
+      this.$router.push({ path: '/oa/device/' + this.routeType });
     },
     //费用附件路径
     getExpensePath(val) {

oa-ui/src/views/oa/device/expense.vue

@@ -2,45 +2,20 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="设备id" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deviceId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="负责人id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入负责人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="费用金额" prop="expense">
-        <el-input
-          v-model="queryParams.expense"
-          placeholder="请输入费用金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="负责人" prop="userId">
+        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="发生日期" prop="occurDate">
-        <el-date-picker clearable
-          v-model="queryParams.occurDate"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.occurDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择发生日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="附件" prop="document">
-        <el-input
-          v-model="queryParams.document"
-          placeholder="请输入附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -49,46 +24,20 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['device:record:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['device:record:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['device:record:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['device:record:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['device:record:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['device:record:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['device:record:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['device:record:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -96,7 +45,11 @@
     <el-table v-loading="loading" :data="deviceExpenseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="设备id" align="center" prop="deviceId" />
-      <el-table-column label="负责人id" align="center" prop="userId" />
+      <el-table-column label="负责人" align="center" prop="userId">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.userId) }}
+        </template>
+      </el-table-column>
       <el-table-column label="费用类型" align="center" prop="expenseType" />
       <el-table-column label="费用金额" align="center" prop="expense" />
       <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
@@ -108,31 +61,18 @@
       <el-table-column label="附件" align="center" prop="document" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['device:record:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['device:record:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)"
+            v-hasPermi="['device:record:view']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:record:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['device:record:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc设备费用对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -147,10 +87,7 @@
           <el-input v-model="form.expense" placeholder="请输入费用金额" />
         </el-form-item>
         <el-form-item label="发生日期" prop="occurDate">
-          <el-date-picker clearable
-            v-model="form.occurDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择发生日期">
           </el-date-picker>
         </el-form-item>
@@ -258,7 +195,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deviceExpenseId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -266,6 +203,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加cmc设备费用";
+    },
+    handleView(row){
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -300,12 +240,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceExpenseIds = row.deviceExpenseId || this.ids;
-      this.$modal.confirm('是否确认删除cmc设备费用编号为"' + deviceExpenseIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc设备费用编号为"' + deviceExpenseIds + '"的数据项？').then(function () {
         return delDeviceExpense(deviceExpenseIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/device/scrap.vue

@@ -2,53 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="设备id" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="原价值" prop="cost">
-        <el-input
-          v-model="queryParams.cost"
-          placeholder="请输入原价值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deviceId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="报废日期" prop="scrapDate">
-        <el-date-picker clearable
-          v-model="queryParams.scrapDate"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.scrapDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择报废日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="报废原因" prop="reason">
-        <el-input
-          v-model="queryParams.reason"
-          placeholder="请输入报废原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理结果" prop="deal">
-        <el-input
-          v-model="queryParams.deal"
-          placeholder="请输入处理结果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="附件" prop="document">
-        <el-input
-          v-model="queryParams.document"
-          placeholder="请输入附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -57,46 +17,20 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['device:record:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['device:record:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['device:record:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['device:record:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['device:record:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['device:record:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['device:record:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['device:record:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -116,31 +50,16 @@
       <el-table-column label="附件" align="center" prop="document" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['device:record:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['device:record:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:record:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['device:record:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc设备报废对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -152,10 +71,7 @@
           <el-input v-model="form.cost" placeholder="请输入原价值" />
         </el-form-item>
         <el-form-item label="报废日期" prop="scrapDate">
-          <el-date-picker clearable
-            v-model="form.scrapDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.scrapDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择报废日期">
           </el-date-picker>
         </el-form-item>
@@ -269,7 +185,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deviceScrapId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -311,12 +227,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceScrapIds = row.deviceScrapId || this.ids;
-      this.$modal.confirm('是否确认删除cmc设备报废编号为"' + deviceScrapIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc设备报废编号为"' + deviceScrapIds + '"的数据项？').then(function () {
         return delDeviceScrap(deviceScrapIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -1,77 +1,18 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="单位名称" prop="partnerName">
-        <el-input
-          v-model="queryParams.partnerName"
-          placeholder="请输入单位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系人" prop="contactPerson">
-        <el-input
-          v-model="queryParams.contactPerson"
-          placeholder="请输入联系人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="telephone">
-        <el-input
-          v-model="queryParams.telephone"
-          placeholder="请输入联系电话"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.partnerName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="资质等级" prop="qualification">
-        <el-input
-          v-model="queryParams.qualification"
-          placeholder="请输入资质等级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="内业规模" prop="inWorker">
-        <el-input
-          v-model="queryParams.inWorker"
-          placeholder="请输入内业规模"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="外业规模" prop="outWorker">
-        <el-input
-          v-model="queryParams.outWorker"
-          placeholder="请输入外业规模"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.qualification" placeholder="请输入资质等级" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="主要技术装备" prop="equipment">
-        <el-input
-          v-model="queryParams.equipment"
-          placeholder="请输入主要技术装备"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="擅长业务方向" prop="strength" label-width="128px">
+        <el-input v-model="queryParams.strength" placeholder="请输入擅长业务方向" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="擅长业务方向" prop="strength">
-        <el-input
-          v-model="queryParams.strength"
-          placeholder="请输入擅长业务方向"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="履约能力评价" prop="fulfill">
-        <el-input
-          v-model="queryParams.fulfill"
-          placeholder="请输入履约能力评价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="履约能力评价" prop="fulfill" label-width="128px">
+        <el-input v-model="queryParams.fulfill" placeholder="请输入履约能力评价" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -81,53 +22,27 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:partner:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:partner:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:partner:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:partner:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:partner:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:partner:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:partner:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:partner:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="partnerList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="单位名称" align="center" prop="partnerName" />
+      <el-table-column label="单位名称" align="center" prop="partnerName" width="200px" />
       <el-table-column label="联系人" align="center" prop="contactPerson" />
       <el-table-column label="联系电话" align="center" prop="telephone" />
       <el-table-column label="资质等级" align="center" prop="qualification" />
@@ -139,31 +54,18 @@
       <el-table-column label="备注说明" align="center" prop="remark" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:partner:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:partner:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)"
+            v-hasPermi="['oa:partner:view']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:partner:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:partner:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc合作单位对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -301,7 +203,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.partnerId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -309,6 +211,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加cmc合作单位";
+    },
+    handleView(row){
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -343,12 +248,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const partnerIds = row.partnerId || this.ids;
-      this.$modal.confirm('是否确认删除cmc合作单位编号为"' + partnerIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc合作单位编号为"' + partnerIds + '"的数据项？').then(function () {
         return delPartner(partnerIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -295,7 +295,7 @@ export default {
     // 查询项目列表
     getList() {
       this.loading = true
-      if(this.deptId > 107){
+      if (this.deptId > 107) {
         this.queryParams.undertakingDept = this.deptId
       }
       listProject(this.queryParams).then(response => {

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

@@ -581,7 +581,7 @@ export default {
     goBack() {
       let obj = { path: "/project/info" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/project' });
+      this.$router.push({ path: '/product/project' });
     },
     reviewWord(url) {
       this.$router.push({

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

@@ -1,77 +1,15 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="接受交底人" prop="disclosureAccepter">
-        <el-input
-          v-model="queryParams.disclosureAccepter"
-          placeholder="请输入接受交底人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="安全交底人" prop="disclosurer">
-        <el-input
-          v-model="queryParams.disclosurer"
-          placeholder="请输入安全交底人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="环境要求" prop="environmentComment">
-        <el-input
-          v-model="queryParams.environmentComment"
-          placeholder="请输入环境要求"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="外业要求" prop="outsideComment">
-        <el-input
-          v-model="queryParams.outsideComment"
-          placeholder="请输入外业要求"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="内业要求" prop="insideComment">
-        <el-input
-          v-model="queryParams.insideComment"
-          placeholder="请输入内业要求"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="安全交底意见" prop="disclosureComment">
-        <el-input
-          v-model="queryParams.disclosureComment"
-          placeholder="请输入安全交底意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="安全交底时间" prop="disclosureTime">
-        <el-date-picker clearable
-          v-model="queryParams.disclosureTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择安全交底时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="接受交底时间" prop="acceptTime">
-        <el-date-picker clearable
-          v-model="queryParams.acceptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择接受交底时间">
-        </el-date-picker>
+        <el-select v-model="queryParams.disclosureAccepter" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -81,60 +19,33 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:safe:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:safe:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:safe:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:safe:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:safe:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:safe:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:safe:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:safe:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="safeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目id" align="center" prop="safeId" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目id" align="center" prop="projectId" />
       <el-table-column label="接受交底人" align="center" prop="disclosureAccepter" />
       <el-table-column label="安全交底人" align="center" prop="disclosurer" />
-      <el-table-column label="环境要求" align="center" prop="environmentComment" />
+      <!-- <el-table-column label="环境要求" align="center" prop="environmentComment" />
       <el-table-column label="外业要求" align="center" prop="outsideComment" />
-      <el-table-column label="内业要求" align="center" prop="insideComment" />
-      <el-table-column label="安全交底意见" align="center" prop="disclosureComment" />
+      <el-table-column label="内业要求" align="center" prop="insideComment" /> -->
+      <el-table-column label="安全交底意见" align="center" prop="disclosureComment" width="180" show-overflow-tooltip />
       <el-table-column label="安全交底时间" align="center" prop="disclosureTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.disclosureTime, '{y}-{m}-{d}') }}</span>
@@ -147,31 +58,18 @@
       </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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:safe:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:safe:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:safe:view']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:safe:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:safe:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc安全交底对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -198,18 +96,12 @@
           <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" />
         </el-form-item>
         <el-form-item label="安全交底时间" prop="disclosureTime">
-          <el-date-picker clearable
-            v-model="form.disclosureTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.disclosureTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择安全交底时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="接受交底时间" prop="acceptTime">
-          <el-date-picker clearable
-            v-model="form.acceptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.acceptTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择接受交底时间">
           </el-date-picker>
         </el-form-item>
@@ -315,7 +207,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.safeId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -323,6 +215,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加cmc安全交底";
+    },
+    handleView(row){
+      
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -357,12 +252,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const safeIds = row.safeId || this.ids;
-      this.$modal.confirm('是否确认删除cmc安全交底编号为"' + safeIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc安全交底编号为"' + safeIds + '"的数据项？').then(function () {
         return delSafe(safeIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -2,213 +2,20 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工作量上报说明" prop="workloadReport">
-        <el-input
-          v-model="queryParams.workloadReport"
-          placeholder="请输入工作量上报说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="上报人" prop="reporter">
-        <el-input
-          v-model="queryParams.reporter"
-          placeholder="请输入上报人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.reporter" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="上报日期" prop="reportTime">
-        <el-date-picker clearable
-          v-model="queryParams.reportTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.reportTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择上报日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="结算说明" prop="settleComment">
-        <el-input
-          v-model="queryParams.settleComment"
-          placeholder="请输入结算说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="综合事务部审核人" prop="zhUserId">
-        <el-input
-          v-model="queryParams.zhUserId"
-          placeholder="请输入综合事务部审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="综合事务部审核日期" prop="zhTime">
-        <el-date-picker clearable
-          v-model="queryParams.zhTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择综合事务部审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="综合事务部审核意见" prop="zhComment">
-        <el-input
-          v-model="queryParams.zhComment"
-          placeholder="请输入综合事务部审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术质量部审核人" prop="jsUserId">
-        <el-input
-          v-model="queryParams.jsUserId"
-          placeholder="请输入技术质量部审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术质量部审核日期" prop="jsTime">
-        <el-date-picker clearable
-          v-model="queryParams.jsTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择技术质量部审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="技术质量部审核意见" prop="jsComment">
-        <el-input
-          v-model="queryParams.jsComment"
-          placeholder="请输入技术质量部审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目管理部审核人" prop="xmUserId">
-        <el-input
-          v-model="queryParams.xmUserId"
-          placeholder="请输入项目管理部审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目管理部审核日期" prop="xmTime">
-        <el-date-picker clearable
-          v-model="queryParams.xmTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择项目管理部审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="项目管理部审核意见" prop="xmComment">
-        <el-input
-          v-model="queryParams.xmComment"
-          placeholder="请输入项目管理部审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="承担部门审核人" prop="deptUserId">
-        <el-input
-          v-model="queryParams.deptUserId"
-          placeholder="请输入承担部门审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="承担部门审核日期" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择承担部门审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="承担部门审核意见" prop="deptComment">
-        <el-input
-          v-model="queryParams.deptComment"
-          placeholder="请输入承担部门审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经营发展部审核人" prop="jyUserId">
-        <el-input
-          v-model="queryParams.jyUserId"
-          placeholder="请输入经营发展部审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经营发展部审核日期" prop="jyTime">
-        <el-date-picker clearable
-          v-model="queryParams.jyTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择经营发展部审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="经营发展部审核意见" prop="jyComment">
-        <el-input
-          v-model="queryParams.jyComment"
-          placeholder="请输入经营发展部审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核日期" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审核意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审核人" prop="gmUserId">
-        <el-input
-          v-model="queryParams.gmUserId"
-          placeholder="请输入总经理审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审核日期" prop="gmTime">
-        <el-date-picker clearable
-          v-model="queryParams.gmTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审核日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理审核意见" prop="gmComment">
-        <el-input
-          v-model="queryParams.gmComment"
-          placeholder="请输入总经理审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -217,63 +24,36 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:settle:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:settle:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:settle:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:settle:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:settle:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:settle:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:settle:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:settle:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="settleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="结算审批id" align="center" prop="settleId" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="工作量上报说明" align="center" prop="workloadReport" />
       <el-table-column label="上报人" align="center" prop="reporter" />
       <el-table-column label="上报日期" align="center" prop="reportTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="工作量上报说明" align="center" prop="workloadReport" />
       <el-table-column label="结算说明" align="center" prop="settleComment" />
-      <el-table-column label="综合事务部审核人" align="center" prop="zhUserId" />
+      <!-- <el-table-column label="综合事务部审核人" align="center" prop="zhUserId" />
       <el-table-column label="综合事务部审核日期" align="center" prop="zhTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zhTime, '{y}-{m}-{d}') }}</span>
@@ -321,34 +101,21 @@
           <span>{{ parseTime(scope.row.gmTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总经理审核意见" align="center" prop="gmComment" />
+      <el-table-column label="总经理审核意见" align="center" prop="gmComment" /> -->
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:settle:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:settle:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:settle:view']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:settle:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:settle:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc结算审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -363,10 +130,7 @@
           <el-input v-model="form.reporter" placeholder="请输入上报人" />
         </el-form-item>
         <el-form-item label="上报日期" prop="reportTime">
-          <el-date-picker clearable
-            v-model="form.reportTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.reportTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择上报日期">
           </el-date-picker>
         </el-form-item>
@@ -377,10 +141,7 @@
           <el-input v-model="form.zhUserId" placeholder="请输入综合事务部审核人" />
         </el-form-item>
         <el-form-item label="综合事务部审核日期" prop="zhTime">
-          <el-date-picker clearable
-            v-model="form.zhTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.zhTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择综合事务部审核日期">
           </el-date-picker>
         </el-form-item>
@@ -391,10 +152,7 @@
           <el-input v-model="form.jsUserId" placeholder="请输入技术质量部审核人" />
         </el-form-item>
         <el-form-item label="技术质量部审核日期" prop="jsTime">
-          <el-date-picker clearable
-            v-model="form.jsTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.jsTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择技术质量部审核日期">
           </el-date-picker>
         </el-form-item>
@@ -405,10 +163,7 @@
           <el-input v-model="form.xmUserId" placeholder="请输入项目管理部审核人" />
         </el-form-item>
         <el-form-item label="项目管理部审核日期" prop="xmTime">
-          <el-date-picker clearable
-            v-model="form.xmTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择项目管理部审核日期">
           </el-date-picker>
         </el-form-item>
@@ -419,10 +174,7 @@
           <el-input v-model="form.deptUserId" placeholder="请输入承担部门审核人" />
         </el-form-item>
         <el-form-item label="承担部门审核日期" prop="deptTime">
-          <el-date-picker clearable
-            v-model="form.deptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择承担部门审核日期">
           </el-date-picker>
         </el-form-item>
@@ -433,10 +185,7 @@
           <el-input v-model="form.jyUserId" placeholder="请输入经营发展部审核人" />
         </el-form-item>
         <el-form-item label="经营发展部审核日期" prop="jyTime">
-          <el-date-picker clearable
-            v-model="form.jyTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.jyTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择经营发展部审核日期">
           </el-date-picker>
         </el-form-item>
@@ -447,10 +196,7 @@
           <el-input v-model="form.managerUserId" placeholder="请输入分管审核人" />
         </el-form-item>
         <el-form-item label="分管审核日期" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择分管审核日期">
           </el-date-picker>
         </el-form-item>
@@ -461,10 +207,7 @@
           <el-input v-model="form.gmUserId" placeholder="请输入总经理审核人" />
         </el-form-item>
         <el-form-item label="总经理审核日期" prop="gmTime">
-          <el-date-picker clearable
-            v-model="form.gmTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择总经理审核日期">
           </el-date-picker>
         </el-form-item>
@@ -607,7 +350,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.settleId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -615,6 +358,10 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加cmc结算审批";
+    },
+    // 查看详情
+    handleView(row){
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -649,12 +396,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const settleIds = row.settleId || this.ids;
-      this.$modal.confirm('是否确认删除cmc结算审批编号为"' + settleIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc结算审批编号为"' + settleIds + '"的数据项？').then(function () {
         return delSettle(settleIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -181,7 +181,7 @@
             </el-form-item>
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">
+                <el-radio v-for="dict in dict.type.sys_post_status" :key="dict.value" :label="dict.value">
                   {{ dict.label }}
                 </el-radio>
               </el-radio-group>
@@ -343,7 +343,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Staff",
-  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
+  dicts: ['sys_post_status', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
   components: { Treeselect },
   data() {
     return {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 16:03:41
+ * @LastEditTime: 2024-06-14 16:18:31
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -236,7 +236,7 @@ export default {
     goBack() {
       let obj = { path: "/staff/info" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/staff/people' });
+      this.$router.push({ path: '/oa/staff/people' });
     },
     getAgeByIdCard(idCard) {
       const sexAndAge = {}

oa-ui/src/views/oa/supply/handover.vue

@@ -2,68 +2,40 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="设备id" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deviceId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="移交部门id" prop="handoverDeptId">
-        <el-input
-          v-model="queryParams.handoverDeptId"
-          placeholder="请输入移交部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="移交部门" prop="handoverDeptId">
+        <el-select v-model="queryParams.handoverDeptId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="移交人id" prop="handoverUserId">
-        <el-input
-          v-model="queryParams.handoverUserId"
-          placeholder="请输入移交人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="移交人" prop="handoverUserId">
+        <el-select v-model="queryParams.handoverUserId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="移交日期" prop="handoverDate">
-        <el-date-picker clearable
-          v-model="queryParams.handoverDate"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.handoverDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择移交日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="接收部门id" prop="receiveDeptId">
-        <el-input
-          v-model="queryParams.receiveDeptId"
-          placeholder="请输入接收部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="接收部门" prop="receiveDeptId">
+        <el-select v-model="queryParams.receiveDeptId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="接收人id" prop="receiveUserId">
-        <el-input
-          v-model="queryParams.receiveUserId"
-          placeholder="请输入接收人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备软件说明" prop="description">
-        <el-input
-          v-model="queryParams.description"
-          placeholder="请输入设备软件说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="交接原因" prop="reason">
-        <el-input
-          v-model="queryParams.reason"
-          placeholder="请输入交接原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="接收人" prop="receiveUserId">
+        <el-select v-model="queryParams.receiveUserId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -73,46 +45,20 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['device:record:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['device:record:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['device:record:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['device:record:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['device:record:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['device:record:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['device:record:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['device:record:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -135,31 +81,16 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['device:record:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['device:record:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:record:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['device:record:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc设备移交对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -174,10 +105,7 @@
           <el-input v-model="form.handoverUserId" placeholder="请输入移交人id" />
         </el-form-item>
         <el-form-item label="移交日期" prop="handoverDate">
-          <el-date-picker clearable
-            v-model="form.handoverDate"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.handoverDate" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择移交日期">
           </el-date-picker>
         </el-form-item>
@@ -297,7 +225,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deviceHandoverId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -339,12 +267,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceHandoverIds = row.deviceHandoverId || this.ids;
-      this.$modal.confirm('是否确认删除cmc设备移交编号为"' + deviceHandoverIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc设备移交编号为"' + deviceHandoverIds + '"的数据项？').then(function () {
         return delDeviceHandover(deviceHandoverIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -1,117 +1,22 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
       <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="技术负责人" prop="technicalDirector">
-        <el-input
-          v-model="queryParams.technicalDirector"
-          placeholder="请输入技术负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.technicalDirector" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="技术设计人" prop="technicalDesigner">
-        <el-input
-          v-model="queryParams.technicalDesigner"
-          placeholder="请输入技术设计人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术安排人" prop="technicalPlanner">
-        <el-input
-          v-model="queryParams.technicalPlanner"
-          placeholder="请输入技术安排人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术安排意见" prop="planComment">
-        <el-input
-          v-model="queryParams.planComment"
-          placeholder="请输入技术安排意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="质量检查员" prop="qualityInspector">
-        <el-input
-          v-model="queryParams.qualityInspector"
-          placeholder="请输入质量检查员"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术安排时间" prop="technicalTime">
-        <el-date-picker clearable
-          v-model="queryParams.technicalTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择技术安排时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="技术方案" prop="technicalDocument">
-        <el-input
-          v-model="queryParams.technicalDocument"
-          placeholder="请输入技术方案"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="方案说明" prop="designDescription">
-        <el-input
-          v-model="queryParams.designDescription"
-          placeholder="请输入方案说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术审核意见" prop="technicalComment">
-        <el-input
-          v-model="queryParams.technicalComment"
-          placeholder="请输入技术审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总工审核意见" prop="manageComment">
-        <el-input
-          v-model="queryParams.manageComment"
-          placeholder="请输入总工审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="方案上传时间" prop="technicalUploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.technicalUploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择方案上传时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="技术审核时间" prop="techApprovalTime">
-        <el-date-picker clearable
-          v-model="queryParams.techApprovalTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择技术审核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总工审核时间" prop="manageApprovalTime">
-        <el-date-picker clearable
-          v-model="queryParams.manageApprovalTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总工审核时间">
-        </el-date-picker>
+        <el-select v-model="queryParams.technicalDesigner" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -121,59 +26,48 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:technical:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:technical:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:technical:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:technical:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:technical:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:technical:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:technical:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:technical:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="technicalList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目id" align="center" prop="technicalId" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="技术负责人" align="center" prop="technicalDirector" />
-      <el-table-column label="技术设计人" align="center" prop="technicalDesigner" />
-      <el-table-column label="技术安排人" align="center" prop="technicalPlanner" />
+      <el-table-column label="技术负责人" align="center" prop="technicalDirector">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.technicalDirector) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="技术设计人" align="center" prop="technicalDesigner">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.technicalDesigner) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="技术安排人" align="center" prop="technicalPlanner">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.technicalPlanner) }}
+        </template>
+      </el-table-column>
       <el-table-column label="技术安排意见" align="center" prop="planComment" />
-      <el-table-column label="质量检查员" align="center" prop="qualityInspector" />
+      <el-table-column label="质量检查员" align="center" prop="qualityInspector">
+        <template slot-scope="scope">
+          {{ getUserNames(scope.row.qualityInspector) }}
+        </template>
+      </el-table-column>
       <el-table-column label="技术安排时间" align="center" prop="technicalTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.technicalTime, '{y}-{m}-{d}') }}</span>
@@ -181,14 +75,14 @@
       </el-table-column>
       <el-table-column label="技术方案" align="center" prop="technicalDocument" />
       <el-table-column label="方案说明" align="center" prop="designDescription" />
-      <el-table-column label="技术审核意见" align="center" prop="technicalComment" />
-      <el-table-column label="总工审核意见" align="center" prop="manageComment" />
+      <!-- <el-table-column label="技术审核意见" align="center" prop="technicalComment" />
+      <el-table-column label="总工审核意见" align="center" prop="manageComment" /> -->
       <el-table-column label="方案上传时间" align="center" prop="technicalUploadTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.technicalUploadTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="技术审核时间" align="center" prop="techApprovalTime" width="180">
+      <!-- <el-table-column label="技术审核时间" align="center" prop="techApprovalTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.techApprovalTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -197,34 +91,21 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.manageApprovalTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:technical:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:technical:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:technical:view']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:technical:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:technical:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc技术交底对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -248,10 +129,7 @@
           <el-input v-model="form.qualityInspector" placeholder="请输入质量检查员" />
         </el-form-item>
         <el-form-item label="技术安排时间" prop="technicalTime">
-          <el-date-picker clearable
-            v-model="form.technicalTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.technicalTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择技术安排时间">
           </el-date-picker>
         </el-form-item>
@@ -268,26 +146,17 @@
           <el-input v-model="form.manageComment" placeholder="请输入总工审核意见" />
         </el-form-item>
         <el-form-item label="方案上传时间" prop="technicalUploadTime">
-          <el-date-picker clearable
-            v-model="form.technicalUploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.technicalUploadTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择方案上传时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="技术审核时间" prop="techApprovalTime">
-          <el-date-picker clearable
-            v-model="form.techApprovalTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.techApprovalTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择技术审核时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="总工审核时间" prop="manageApprovalTime">
-          <el-date-picker clearable
-            v-model="form.manageApprovalTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.manageApprovalTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择总工审核时间">
           </el-date-picker>
         </el-form-item>
@@ -403,7 +272,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.technicalId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -411,6 +280,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加cmc技术交底";
+    },
+    handleView(row){
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -445,12 +317,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const technicalIds = row.technicalId || this.ids;
-      this.$modal.confirm('是否确认删除cmc技术交底编号为"' + technicalIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc技术交底编号为"' + technicalIds + '"的数据项？').then(function () {
         return delTechnical(technicalIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/system/user/index.vue

@@ -27,7 +27,7 @@
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+              <el-option v-for="dict in dict.type.sys_post_status" :key="dict.value" :label="dict.label"
                 :value="dict.value" />
             </el-select>
           </el-form-item>
@@ -175,7 +175,7 @@
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+                <el-radio v-for="dict in dict.type.sys_post_status" :key="dict.value" :label="dict.value">{{
       dict.label
     }}</el-radio>
               </el-radio-group>
@@ -305,7 +305,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_postlevel','sys_user_salarylevel'],
+  dicts: ['sys_post_status', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_postlevel','sys_user_salarylevel'],
   components: { Treeselect },
   data() {
     return {