编写在线预览

oa-ui/package.json

@@ -37,6 +37,10 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
+    "@vue-office/docx": "^1.6.2",
+    "@vue-office/excel": "^1.7.8",
+    "@vue-office/pdf": "^2.0.2",
+    "@vue/composition-api": "^1.7.2",
     "axios": "0.24.0",
     "bpmn-js": "^11.1.0",
     "bpmn-js-bpmnlint": "^0.15.0",

oa-ui/src/assets/styles/index.scss

@@ -211,4 +211,12 @@ aside {
 .auditor {
   font-family: 'auditor';
   font-size: 20px;
+}
+.preview-btn{
+  width: 100px;
+  height: 30px;
+  border: none;
+  background-color: #409EFF;
+  color: #fff;
+  border-radius: 4px;
 }

oa-ui/src/components/preview/index.vue

@@ -0,0 +1,51 @@
+<template>
+  <div v-loading="loading">
+    <vue-office-docx :src="url" v-if="fileType == 'docx'" />
+    <vue-office-excel :src="url" v-if="fileType == 'xlsx'" />
+    <vue-office-pdf :src="url" v-if="fileType == 'pdf'"></vue-office-pdf>
+    <div v-if="fileType == 'doc' || fileType == 'xls'">
+      <el-empty :image-size="200" :description="'抱歉，' + fileType + '类型文件不支持在线预览，请下载到本地查看'">
+        <el-link type="primary" :href="url" :underline="false" target="_blank">
+          <span>立即下载</span>
+        </el-link>
+      </el-empty>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import VueOfficeDocx from "@vue-office/docx";
+import VueOfficeExcel from "@vue-office/excel";
+import VueOfficePdf from "@vue-office/pdf";
+export default {
+  components: {
+    VueOfficeDocx,
+    VueOfficeExcel,
+    VueOfficePdf
+  },
+  data() {
+    return {
+      loading: true,
+      url: "",
+      fileType: ""
+    };
+  },
+  created() {
+    this.loading = true;
+    if (this.$route.query.url) {
+      this.url = this.$route.query.url;
+      this.getFileType();
+    }
+  },
+  methods: {
+    getFileType() {
+      let suffix = this.url.split(".").slice(-1);
+      this.fileType = suffix;
+      this.loading = false;
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/main.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-09 14:49:27
+ * @LastEditTime: 2024-06-04 15:11:48
  */
 import Vue from 'vue'
 
@@ -24,7 +24,7 @@ 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 } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, getUserName, getFileName, reviewWord } from "@/utils/ruoyi";
 // 标题组件
 import RowTitle from '@/components/RowTitle'
 
@@ -64,6 +64,9 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.publicData = publicData
+Vue.prototype.getUserName = getUserName
+Vue.prototype.getFileName = getFileName
+Vue.prototype.reviewWord = reviewWord
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
 Vue.component('Pagination', Pagination)

oa-ui/src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-31 17:03:36
+ * @LastEditTime: 2024-06-04 09:56:16
  */
 /*
  * @Author: ysh
@@ -321,6 +321,20 @@ export const constantRoutes = [
         name: 'projectInfo',
         meta: { title: '项目详情', icon: '' }
 
+      }
+    ]
+  },
+  {
+    path: '/preview',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/components/preview'),
+        name: 'preview',
+        meta: { title: '在线预览', icon: '' }
+
       }
     ]
   }

oa-ui/src/utils/ruoyi.js

@@ -246,4 +246,30 @@ export function setArray(arr) {
   } else {
     return [];
   }
+}
+
+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
+    }
+  }
+}
+
+export function getFileName(name) {
+  if (name) {
+    let arr = name.split("/");
+    return arr[arr.length - 1];
+  }
+}
+
+export function reviewWord(url) {
+  this.$router.push({
+    path: '/preview',
+    query: {
+      url: url
+    }
+  })
 }

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-05-31 15:35:26
+ * @LastEditTime: 2024-06-04 16:48:47
 -->
 <template>
   <div class="main">
@@ -135,7 +135,7 @@
       </tr>
       <tr v-if="contract.contractId">
         <td colspan="3" class="head">利润</td>
-        <td colspan="2" class="head">{{ profit }}</td>
+        <td colspan="2" class="head">{{ profit.toFixed(2) }}</td>
         <td colspan="3" class="head">合同总价约</td>
         <td colspan="1" class="head">{{ contract.contractId ? contract.amount : '' }}</td>
       </tr>
@@ -234,7 +234,6 @@ export default {
             this.getProjectWorkList();
           })
           listProjectContract({ projectId: this.taskForm.formId }).then(res => {
-            console.log(res);
             if (res.total == 1) {
               getContract(res.rows[0].contractId).then(response => {
                 this.contract = response.data;

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

@@ -242,6 +242,7 @@ export default {
       if (index >= 0 && index < arr.length) {
         arr.splice(index, 1);
       }
+      this.getSettleSum();
     },
     /* 获取工作类别 */
     getWorkTypeList() {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-04 09:11:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-04 16:33:59
 -->
 <template>
   <div class="app-container">
@@ -14,7 +14,8 @@
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
+                <el-button type="primary" size="mini" @click="tbOpen = true"
+                  v-if="taskName == '合同拟稿'">选择投标项目</el-button>
                 <!-- <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
                   :disabled="taskName != '合同拟稿'" clearable>
                   <el-option v-for="item in tenderList" :key="item.value" :label="item.projectName"
@@ -23,15 +24,15 @@
                 </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
                   <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="2">{{ chooseTender.projectName
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="招标业主" label-class-name="my-label">{{ chooseTender.partyA
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
 
@@ -87,11 +88,14 @@
 
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload :disabled="taskName != '合同拟稿'" v-if="form.contractDocument == '' || form.contractDocument == null"
-              ref="contractFile" :limit="1" :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="getContractPath"></FileUpload>
+            <FileUpload :disabled="taskName != '合同拟稿'"
+              v-if="form.contractDocument == '' || form.contractDocument == null" ref="contractFile" :limit="1"
+              :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
+            </FileUpload>
             <div v-if="form.contractDocument != '' && form.contractDocument != null">
               <file-item :document="form.contractDocument"></file-item>
+              <button class="preview-btn" type="primary" size="mini" plain
+                @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">在线预览</button>
             </div>
           </el-form-item>
           <el-divider></el-divider>
@@ -172,8 +176,8 @@
                   <el-input v-model="payment.paymentAmount" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
+                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -268,6 +272,8 @@
                           <el-link :underline="false" @click="handleFileDelete(comment, 'document')"
                             type="danger">删除</el-link>
                         </div>
+                        <button class="preview-btn" type="primary" size="mini" plain
+                          @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">在线预览</button>
                       </li>
                     </transition-group>
                   </div>
@@ -372,8 +378,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
-              :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -397,6 +403,8 @@
                   <div class="ele-upload-list__item-content-action" v-if="taskName != ''">
                     <el-link :underline="false" @click="handleFileDelete(form, 'signScan')" type="danger">删除</el-link>
                   </div>
+                  <button class="preview-btn" type="primary" size="mini" plain
+                    @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">在线预览</button>
                 </li>
               </transition-group>
             </div>
@@ -956,63 +964,68 @@ export default {
             })
           } else {
             this.form.contractId = this.taskForm.formId;
+
             addContract(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-            for (let work of this.workList) {
-              work.contractId = this.form.contractId
-              addContractWork(work);
-            }
-            for (let payment of this.paymentList) {
-              payment.contractId = this.form.contractId
-              addContractPayment(payment);
-            }
-            for (let projectId of this.projectContractForm.projectIds) {
-              addProjectContract({ projectId: projectId, contractId: this.form.contractId });
-            }
-            const params = { taskId: this.taskForm.taskId };
-            getNextFlowNode(params).then(res => {
-              if (this.commentOpen == false && this.meetingOpen == false) {
-                getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
-                  this.$set(this.taskForm.variables, "commentType", '0');
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  });
-                })
-              }
-              else if (this.commentOpen == true && this.meetingOpen == false) {
-                let approvalList = [];
-                for (let comment of this.commentList) {
-                  comment.contractId = this.form.contractId
-                  addContractComment(comment);
-                  approvalList.push(comment.userId)
+              if (response.code == 200) {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+                for (let work of this.workList) {
+                  work.contractId = this.form.contractId
+                  addContractWork(work);
                 }
-                this.$set(this.taskForm.variables, "approvalList", approvalList);
-                this.$set(this.taskForm.variables, "commentType", '2');
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
-              }
-              else if (this.commentOpen == false && this.meetingOpen == true) {
-                this.meetingForm.contractId = this.form.contractId;
-                let formData = new FormData();
-                let jsonForm = JSON.stringify(this.meetingForm);
-                formData.append("form", jsonForm);
-                addContractMeeting(formData);
-                this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
-                this.$set(this.taskForm.variables, "commentType", '1');
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                for (let payment of this.paymentList) {
+                  payment.contractId = this.form.contractId
+                  addContractPayment(payment);
+                }
+                for (let projectId of this.projectContractForm.projectIds) {
+                  addProjectContract({ projectId: projectId, contractId: this.form.contractId });
+                }
+                const params = { taskId: this.taskForm.taskId };
+                getNextFlowNode(params).then(res => {
+                  if (this.commentOpen == false && this.meetingOpen == false) {
+                    getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+                      let userId = res.data.userId;
+                      this.$set(this.taskForm.variables, "approval", userId);
+                      this.$set(this.taskForm.variables, "commentType", '0');
+                      complete(this.taskForm).then(response => {
+                        this.$modal.msgSuccess(response.msg);
+                        this.$emit('goBack')
+                      });
+                    })
+                  }
+                  else if (this.commentOpen == true && this.meetingOpen == false) {
+                    let approvalList = [];
+                    for (let comment of this.commentList) {
+                      comment.contractId = this.form.contractId
+                      addContractComment(comment);
+                      approvalList.push(comment.userId)
+                    }
+                    this.$set(this.taskForm.variables, "approvalList", approvalList);
+                    this.$set(this.taskForm.variables, "commentType", '2');
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    });
+                  }
+                  else if (this.commentOpen == false && this.meetingOpen == true) {
+                    this.meetingForm.contractId = this.form.contractId;
+                    let formData = new FormData();
+                    let jsonForm = JSON.stringify(this.meetingForm);
+                    formData.append("form", jsonForm);
+                    addContractMeeting(formData);
+                    this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
+                    this.$set(this.taskForm.variables, "commentType", '1');
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    });
+                  }
+                })
+              } else {
+                this.$message.error("新增失败，请确认合同编码是否唯一");
               }
-            })
+            });
           }
         }
       });
@@ -1053,6 +1066,14 @@ export default {
       this.form.tenderId = val.tenderId
       this.chooseTender = val
       this.isSelect = true
+    },
+    reviewWord(url) {
+      this.$router.push({
+        path: '/preview',
+        query: {
+          url: url
+        }
+      })
     }
   }
 }
@@ -1094,4 +1115,5 @@ table {
 
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
-}</style>
+}
+</style>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 14:45:03
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-03 15:18:06
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-04 11:33:23
 -->
 <template>
   <div class="mt20">
@@ -35,7 +35,7 @@
     </el-table>
     <el-dialog title="结算明细" :visible.sync="open" append-to-body width="65%">
       <settle-print :form="clickRow" :chooseProject="chooseProject" :workList="workList"
-        :settleList="summaryList"></settle-print>
+        :settleList="summaryList" @cancel="open = false"></settle-print>
     </el-dialog>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 17:15:38
+ * @LastEditTime: 2024-06-04 16:55:40
 -->
 <template>
   <div class="project-wrapper">

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-05-31 16:26:38
+ * @LastEditTime: 2024-06-04 17:38:50
 -->
 <template>
   <div class="app-container">
@@ -65,6 +65,7 @@
                 <span class="el-icon-document"> {{ getFileName(form.organizeDocument) }} </span>
               </el-link>
             </div>
+            <!-- <button class="preview-btn" type="primary" size="mini" plain @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">在线预览</button> -->
           </el-form-item>
         </el-col>
       </el-row>
@@ -146,6 +147,7 @@ export default {
     initForm() {
       getProject(this.taskForm.formId).then(res => {
         this.form = res.data;
+        console.log( this.form);
         if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
           this.form.deptId = this.form.undertakingDeptName.split(',')
         }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 17:12:50
+ * @LastEditTime: 2024-06-04 16:58:07
 -->
 <template>
   <div>
@@ -97,13 +97,13 @@
       <div class="headers">
         项目借款
         <div class="line"></div>
-        <borrow-data :taskForm="taskForm"></borrow-data>
+        <borrow-data :taskForm="taskForm" :taskName="taskName"></borrow-data>
       </div>
 
       <div class="headers">
         成果汇交
         <div class="line"></div>
-        <achi-data :taskForm="taskForm"></achi-data>
+        <achi-data :taskForm="taskForm" :taskName="taskName"></achi-data>
       </div>
       <div class="headers">
         产值结算（内部）

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

@@ -2,34 +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="contractNumber">
-        <el-input
-          v-model="queryParams.contractNumber"
-          placeholder="请输入合同编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.contractNumber" placeholder="请输入合同编号" 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-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-select>
       </el-form-item>
       <el-form-item label="拟稿日期" prop="draftTime">
-        <el-date-picker clearable
-          v-model="queryParams.draftTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <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"
+        <el-date-picker clearable v-model="queryParams.signDate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择签订日期">
         </el-date-picker>
       </el-form-item>
@@ -39,105 +26,86 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <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:contract:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:contract: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:contract:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:contract: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:contract:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:contract: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:contract:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:contract:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="合同id" align="center" prop="contractId" />
+      <!-- <el-table-column label="合同id" align="center" prop="contractId" /> -->
       <el-table-column label="合同编号" align="center" prop="contractNumber" />
       <el-table-column label="合同金额" align="center" prop="amount" />
       <el-table-column label="履约保证金" align="center" prop="deposit" />
-      <el-table-column label="合同文件" align="center" prop="contractDocument" />
-      <el-table-column label="拟稿人" align="center" prop="drafter" />
+      <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.contractDocument}`)">
+            {{ getFileName(scope.row.contractDocument) }}
+          </el-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="拟稿人" align="center" prop="drafter">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.drafter) }}
+        </template>
+      </el-table-column>
       <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="合同备注" align="center" prop="remark" />
       <el-table-column label="签订日期" align="center" prop="signDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="签订备注" align="center" prop="signRemark" />
-      <el-table-column label="签订扫描件" align="center" prop="signScan" />
-      <el-table-column label="评审方式" align="center" prop="commentType" />
+      <el-table-column label="签订扫描件" align="center" prop="signScan" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.signScan}`)">
+            {{ getFileName(scope.row.signScan) }}
+          </el-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="评审方式" align="center" prop="commentType">
+        <template slot-scope="scope">
+          {{ getCommentType(scope.row.commentType) }}
+        </template>
+      </el-table-column>
+      <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:contract:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:contract:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:contract:query']">查看</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:contract:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:contract: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>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="合同编号" prop="contractNumber">
           <el-input v-model="form.contractNumber" placeholder="请输入合同编号" />
         </el-form-item>
@@ -154,10 +122,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>
@@ -165,11 +130,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">
@@ -184,16 +145,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 查看详情 -->
+    <el-dialog :title="title" :visible.sync="openInfo" width="600px" append-to-body>
+
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
-
 export default {
   name: "Contract",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -212,6 +177,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openInfo:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -231,7 +197,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      project:{}
     };
   },
   created() {
@@ -252,6 +219,17 @@ export default {
       this.open = false;
       this.reset();
     },
+    getCommentType(row){
+      let name = '';
+      if(row == '0'){
+        name = '无须评审'
+      }else if(row == '1'){
+        name = '会议评审'
+      }else{
+        name = '线上评审'
+      }
+      return name
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -283,7 +261,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.contractId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -292,6 +270,11 @@ export default {
       this.open = true;
       this.title = "添加cmc合同评审";
     },
+    handleView(row){
+      this.openInfo = true;
+      this.title = "合同详情";
+      this.form = row
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -325,12 +308,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const contractIds = row.contractId || this.ids;
-      this.$modal.confirm('是否确认删除cmc合同评审编号为"' + contractIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc合同评审编号为"' + contractIds + '"的数据项？').then(function () {
         return delContract(contractIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-30 18:13:12
+ * @LastEditTime: 2024-06-04 15:49:07
 -->
 <template>
   <div class="project-wrapper">
@@ -295,7 +295,7 @@ export default {
     // 查询项目列表
     getList() {
       this.loading = true
-      if(this.deptId > 104){
+      if(this.deptId > 107){
         this.queryParams.undertakingDept = this.deptId
       }
       listProject(this.queryParams).then(response => {

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

@@ -116,6 +116,8 @@
                 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" /> -->
             </el-descriptions-item>
             <el-descriptions-item :span="3">
               <template slot="label">
@@ -202,6 +204,7 @@
                 :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>
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -579,6 +582,14 @@ export default {
       this.$tab.closeOpenPage(obj);
       this.$router.push({ path: '/project' });
     },
+    reviewWord(url){
+      this.$router.push({
+        path:'/preview',
+        query:{
+          url:url
+        }
+      })
+    }
   },
 }
 </script>

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

@@ -89,7 +89,7 @@
       <!-- <el-table-column label="标书检查人" align="center" prop="tenderChecker" /> -->
       <!-- <el-table-column label="标书打印装订人" align="center" prop="tenderPrinter" /> -->
       <!-- <el-table-column label="标书文件" align="center" prop="tenderDocument" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120px">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-hasPermi="['oa:tender:query']">查看</el-button>