新增全局deptList，修改文件在线预览

oa-ui/src/main.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 15:11:48
+ * @LastEditTime: 2024-06-05 09:39:10
  */
 import Vue from 'vue'
 
@@ -24,7 +24,8 @@ import './assets/icons' // icon
 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 } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, 
+  handleTree, getUserName, getFileName, reviewWord,getDeptName } from "@/utils/ruoyi";
 // 标题组件
 import RowTitle from '@/components/RowTitle'
 
@@ -65,6 +66,7 @@ Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.publicData = publicData
 Vue.prototype.getUserName = getUserName
+Vue.prototype.getDeptName = getDeptName
 Vue.prototype.getFileName = getFileName
 Vue.prototype.reviewWord = reviewWord
 // 全局组件挂载

oa-ui/src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
-import { listUser} from '@/api/system/user'
+import { listUser } from '@/api/system/user'
+import { listDept } from '@/api/system/dept'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const user = {
@@ -8,11 +9,12 @@ const user = {
     id: '',
     name: '',
     avatar: '',
-    deptId:'',
-    deptName:'',
+    deptId: '',
+    deptName: '',
     roles: [],
     permissions: [],
-    userList:[],
+    userList: [],
+    deptList: []
   },
 
   mutations: {
@@ -25,10 +27,10 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
-    SET_DEPTID:(state, deptId) => {
+    SET_DEPTID: (state, deptId) => {
       state.deptId = deptId
     },
-    SET_DEPTNAME:(state, deptName) => {
+    SET_DEPTNAME: (state, deptName) => {
       state.deptName = deptName
     },
     SET_AVATAR: (state, avatar) => {
@@ -40,9 +42,12 @@ const user = {
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
     },
-    SET_USERLIST:(state, userList) => {
+    SET_USERLIST: (state, userList) => {
       state.userList = userList
     },
+    SET_DEPTLIST: (state, deptList) => {
+      state.deptList = deptList
+    },
   },
 
   actions: {
@@ -77,11 +82,14 @@ const user = {
           }
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.nickName)
-          commit('SET_DEPTID',user.deptId)
-          commit('SET_DEPTNAME',user.dept.deptName)
+          commit('SET_DEPTID', user.deptId)
+          commit('SET_DEPTNAME', user.dept.deptName)
           commit('SET_AVATAR', avatar)
-          listUser({pageNum:1,pageSize:9999}).then(result=>{
+          listUser({ pageNum: 1, pageSize: 9999 }).then(result => {
             commit('SET_USERLIST', result.rows)
+            listDept({ pageNum: 1, pageSize: 9999 }).then(response => {
+              commit('SET_DEPTLIST', response.data)
+            })
           })
           resolve(res)
         }).catch(error => {

oa-ui/src/utils/ruoyi.js

@@ -258,6 +258,16 @@ export function getUserName(userId) {
   }
 }
 
+export function getDeptName(deptId) {
+  if (deptId) {
+    let arr = this.$store.state.user.deptList.filter(item => item.deptId == deptId)
+    if (arr.length == 1) {
+      let name = arr[0].deptName
+      return name
+    }
+  }
+}
+
 export function getFileName(name) {
   if (name) {
     let arr = name.split("/");

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

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-04-08 16:08:33
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-27 15:13:37
+ * @LastEditTime: 2024-06-05 10:16:54
 -->
 <template>
   <div>
     <add-budget :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '预算编制'"></add-budget>
-    <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '预算审核'"></budget-info>
+    <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '预算审核' || taskName == '预算批准'"></budget-info>
   </div>
 </template>
 

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 16:48:47
+ * @LastEditTime: 2024-06-05 10:27:53
 -->
 <template>
   <div class="main">
@@ -140,8 +140,8 @@
         <td colspan="1" class="head">{{ contract.contractId ? contract.amount : '' }}</td>
       </tr>
     </table>
-    <el-row v-if="taskName == '预算审核'" class="text-center mt20 mb20">
-      <el-button type="success" size="mini" @click="confirmSucess">审批通过</el-button>
+    <el-row v-if="taskName == '预算审核' || taskName == '预算批准'" class="text-center mt20 mb20">
+      <el-button type="success" size="mini" @click="confirmSucess(taskName)">审批通过</el-button>
     </el-row>
   </div>
 </template>
@@ -250,18 +250,28 @@ export default {
         this.workContentList = res.rows;
       })
     },
-    confirmSucess() {
+    confirmSucess(taskName) {
       const params = { taskId: this.taskForm.taskId };
-      getNextFlowNode(params).then(res => {
-        getUsersManageLeader({ userId: this.budgetForm.compiler }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
+      if (taskName == '预算审核') {
+        getNextFlowNode(params).then(res => {
+          getUsersManageLeader({ userId: this.budgetForm.compiler }).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");
+            });
+          });
+        });
+      } else if (taskName == '预算批准') {
+        getNextFlowNode(params).then(res => {
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit("goBack");
           });
-        });
-      });
+        })
+      }
+
     }
   },
 };

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-04 10:41:18
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-05 16:05:20
 -->
 
 <template>
@@ -12,7 +12,7 @@
         <el-card>
           <h2 style="text-align: center;">用车申请表</h2>
           <div>
-            <el-form ref="carForm" :model="form" label-width="100px" :rules="rules">
+            <el-form ref="carForm" :model="form" label-width="120px" :rules="rules">
               <!-- 申请人填写 -->
               <el-divider></el-divider>
               <el-row :gutter="20">
@@ -56,17 +56,17 @@
                 </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                    chooseProject.projectLeaderUser.nickName : ''
-                  }}</el-descriptions-item>
+    chooseProject.projectLeaderUser.nickName : ''
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="用车事由：" prop="applyReason">
@@ -215,7 +215,7 @@
             </el-row>
             <el-row style="text-align: center;" v-else>
               <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" :
-                "完成审批" }}</el-button>
+    "完成审批" }}</el-button>
             </el-row>
           </div>
         </el-card>
@@ -447,7 +447,6 @@ export default {
             data.cars = arr;
           }
           this.form = data;
-          console.log(this.form);
           if (data.projectId) {
             getProject(data.projectId).then(response => {
               this.chooseProject = response.data;
@@ -629,6 +628,14 @@ export default {
         return
       } else if (val.length == 1) {
         this.chooseProject = val[0]
+        let undertakingDeptName = []
+        if (val[0].undertakingDept) {
+          let deptArr = val[0].undertakingDept.split(',');
+          for (let dept of deptArr) {
+            undertakingDeptName.push(this.getDeptName(dept))
+          }
+        }
+        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
         this.isSelect = true
         this.form.projectId = val[0].projectId
       }

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

@@ -7,7 +7,8 @@
       </el-form-item>
       <el-form-item label="拟稿人" prop="drafter">
         <el-select v-model="queryParams.drafter" filterable>
-          <el-option v-for="item of $store.state.user.userList" :label="item.nickName" :value="item.userId"></el-option>
+          <el-option :key="item.userId" v-for="item of $store.state.user.userList" :label="item.nickName"
+            :value="item.userId"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="拟稿日期" prop="draftTime">
@@ -147,7 +148,15 @@
     </el-dialog>
     <!-- 查看详情 -->
     <el-dialog :title="title" :visible.sync="openInfo" width="600px" append-to-body>
-
+      <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+        <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+          <el-link :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`" :underline="false" target="_blank">
+            <span class="el-icon-document"> {{ getFileName(form.contractDocument) }} </span>
+          </el-link>
+        </li>
+      </transition-group>
+      <el-button class="ml20" type="primary" size="mini" plain
+        @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">在线预览</el-button>
     </el-dialog>
   </div>
 </template>
@@ -177,7 +186,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      openInfo:false,
+      openInfo: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -198,7 +207,7 @@ export default {
       // 表单校验
       rules: {
       },
-      project:{}
+      project: {}
     };
   },
   created() {
@@ -219,13 +228,13 @@ export default {
       this.open = false;
       this.reset();
     },
-    getCommentType(row){
+    getCommentType(row) {
       let name = '';
-      if(row == '0'){
+      if (row == '0') {
         name = '无须评审'
-      }else if(row == '1'){
+      } else if (row == '1') {
         name = '会议评审'
-      }else{
+      } else {
         name = '线上评审'
       }
       return name
@@ -270,7 +279,7 @@ export default {
       this.open = true;
       this.title = "添加cmc合同评审";
     },
-    handleView(row){
+    handleView(row) {
       this.openInfo = true;
       this.title = "合同详情";
       this.form = row

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

@@ -112,12 +112,15 @@
                 <svg-icon slot="prefix" icon-class="file" />
                 项目任务书
               </template>
-              <el-link type="primary" :href="`${baseUrl}${'/profile/upload' + project.taskDocument}`" :underline="false"
-                target="_blank">
-                <span class="el-icon-document"> {{ getFileName(project.taskDocument) }} </span>
-              </el-link>
-              <el-button class="ml20" type="primary" size="mini" plain @click="reviewWord(`${baseUrl}${'/profile/upload' + project.taskDocument}`)">在线预览</el-button>
-              <!-- <vue-office-docx style="width:80%;height:100vh" :src="`${baseUrl}${'/profile/upload' + project.taskDocument}`" @rendered="rendered" /> -->
+              <div v-if="project.taskDocument">
+                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + project.taskDocument}`)">
+                  {{ getFileName(project.taskDocument) }}
+                </el-link>
+                <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + project.taskDocument}`"
+                  :underline="false" target="_blank">
+                  <span class="el-icon-download">下载文件</span>
+                </el-link>
+              </div>
             </el-descriptions-item>
             <el-descriptions-item :span="3">
               <template slot="label">
@@ -200,11 +203,15 @@
                 <svg-icon slot="prefix" icon-class="documentation" />
                 组织交底文档
               </template>
-              <el-link type="primary" :href="`${baseUrl}${'/profile/upload' + project.organizeDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-document"> {{ getFileName(project.organizeDocument) }} </span>
-              </el-link>
-              <el-button class="ml20" type="primary" size="mini" plain @click="reviewWord(`${baseUrl}${'/profile/upload' + project.organizeDocument}`)">在线预览</el-button>
+              <div v-if="project.organizeDocument">
+                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + project.organizeDocument}`)">
+                  {{ getFileName(project.organizeDocument) }}
+                </el-link>
+                <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + project.organizeDocument}`"
+                  :underline="false" target="_blank">
+                  <span class="el-icon-download">下载文件</span>
+                </el-link>
+              </div>
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -582,11 +589,11 @@ export default {
       this.$tab.closeOpenPage(obj);
       this.$router.push({ path: '/project' });
     },
-    reviewWord(url){
+    reviewWord(url) {
       this.$router.push({
-        path:'/preview',
-        query:{
-          url:url
+        path: '/preview',
+        query: {
+          url: url
         }
       })
     }

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

@@ -105,8 +105,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改投标管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :width="dialogProperty.dialogWidth" append-to-body
-      :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" :width="dialogProperty.dialogWidth" append-to-body>
       <el-form ref="form" :rules="rules" :model="form" :disabled="formDisabled">
         <el-descriptions class="margin-top" :column="dialogProperty.column" border>
           <el-descriptions-item :span="3">
@@ -254,21 +253,15 @@
             <FileUpload v-if="form.tenderId == null" ref="zbFile" :limit="1" :filePathName="'投标文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getUploadPathBidDocument"></FileUpload>
             <div v-if="form.tenderId != null">
-
-              <FileUpload ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
+              <FileUpload v-if="!isView" ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
                 :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument"></FileUpload>
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.bidDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document"> {{ getFileName(form.bidDocument) }} </span>
-                  </el-link>
-                  <div class="ele-upload-list__item-content-action">
-                    <el-link :underline="false" @click="handleFileDelete('zb')" type="danger">删除</el-link>
-                  </div>
-                </li>
-              </transition-group>
+              <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.bidDocument}`)">
+                {{ getFileName(form.bidDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.bidDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-descriptions-item>
           <el-descriptions-item :span="3">
@@ -361,20 +354,15 @@
             <FileUpload v-if="form.tenderId == null" ref="bsFile" :limit="1" :filePathName="'投标文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getUploadPathTenderDocument"></FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
+              <FileUpload v-if="!isView" ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
                 :filePathName="'投标文件'" :isModify="true" @input="getUploadPathTenderDocument"></FileUpload>
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li02" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.tenderDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document"> {{ getFileName(form.tenderDocument) }} </span>
-                  </el-link>
-                  <div class="ele-upload-list__item-content-action">
-                    <el-link :underline="false" @click="handleFileDelete('bs')" type="danger">删除</el-link>
-                  </div>
-                </li>
-              </transition-group>
+              <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.tenderDocument}`)">
+                {{ getFileName(form.tenderDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.tenderDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
             </div>
           </el-descriptions-item>
         </el-descriptions>
@@ -415,6 +403,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      isView:true,
       // 对话框属性
       dialogProperty: {
         dialogWidth: '1200px',
@@ -617,6 +606,7 @@ export default {
       this.formDisabled = false;
     },
     handleView(row) {
+      this.isView = true;
       const tenderId = row.tenderId || this.ids
       getTender(tenderId).then(response => {
         this.form = response.data;
@@ -628,6 +618,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.isView = false;
       const tenderId = row.tenderId || this.ids
       getTender(tenderId).then(response => {
         this.form = response.data;
@@ -702,6 +693,10 @@ export default {
     // 修改投标部门
     changeDept() {
       this.getUserList();
+    },
+    toPath(url) {
+      this.open = false
+      this.reviewWord(url)
     }
   }
 };