修改承接合同流程表单

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

@@ -20,9 +20,9 @@
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
-        <template v-if="fileSize">
+        <!-- <template v-if="fileSize">
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
-        </template>
+        </template> -->
         <template v-if="fileType">
           格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
         </template>
@@ -83,11 +83,18 @@ export default {
       type: Boolean,
       default: true,
     },
-    isModify:{
+    isModify: {
       type: Boolean,
       default: false,
+    },
+    filePathName:{
+      type: String,
+      default: '',
     }
   },
+  created(){
+    this.additionalData.fileType = this.filePathName
+  },
   data() {
     return {
       number: 0,
@@ -98,7 +105,7 @@ export default {
         Authorization: "Bearer " + getToken(),
       },
       additionalData: {
-        fileType: "投标文件",
+        fileType: '',
       },
       fileList: [],
     };
@@ -161,7 +168,7 @@ export default {
       return true;
     },
     // 文件个数超出
-    handleExceed() {
+    handleExceed(files, fileList) {
       this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
     },
     // 上传失败
@@ -172,7 +179,6 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        console.log(res);
         this.uploadList.push({ name: res.fileName, url: res.fileName });
         this.uploadedSuccessfully();
       } else {
@@ -210,7 +216,6 @@ export default {
     // 对象转成指定字符串分隔
     listToString(list, separator) {
       let strs = "";
-      debugger
       separator = separator || ",";
       for (let i in list) {
         strs += list[i].url + separator;

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-10 15:31:57
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-13 18:58:07
+-->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
@@ -8,30 +14,32 @@
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
+                <el-button type="primary" size="mini" @click="tbOpen = true">选择投标项目</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"
                     :value="item.tenderId">
                   </el-option>
-                </el-select>
+                </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 label="投标项目名称" label-class-name="my-label" :span="2">{{ chooseTender.projectName
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                  }}</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.partyA
+                    }}</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>
 
               <el-row :gutter="20">
                 <el-col :span="12" :xs="24">
                   <el-form-item label="合同编码" prop="contractCode">
-                    <el-input v-model="form.contractCode" placeholder="请输入合同编码" :disabled="taskName != '合同拟稿'"></el-input>
+                    <el-input v-model="form.contractCode" placeholder="请输入合同编码"
+                      :disabled="taskName != '合同拟稿'"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" :xs="24">
@@ -57,12 +65,13 @@
 
             <el-col :span="12" :xs="24">
               <el-form-item label="关联项目编号：" prop="projectIds">
-                <el-select v-model="projectContractForm.projectIds" multiple filterable placeholder="请选择"
+                <!-- <el-select v-model="projectContractForm.projectIds" multiple filterable placeholder="请选择"
                   @change="handleSelectProject" :disabled="taskName != '合同拟稿'" clearable>
-                  <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber + item.projectName"
-                    :value="item.projectId">
+                  <el-option v-for="item in projectList" :key="item.value"
+                    :label="item.projectNumber + item.projectName" :value="item.projectId">
                   </el-option>
-                </el-select>
+                </el-select> -->
+                <el-button type="primary" size="mini" @click="open = true">选择项目</el-button>
               </el-form-item>
               <el-table v-loading="loading" :data="chooseProjectList">
                 <el-table-column label="项目编号" align="center" prop="projectNumber"></el-table-column>
@@ -74,7 +83,20 @@
 
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
-            <el-input v-model="form.contractDocument" placeholder="请输入合同文件" :disabled="taskName != '合同拟稿'" />
+            <FileUpload v-if="form.tenderId == null" ref="contractFile" :limit="1" :filePathName="'合同文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath"></FileUpload>
+            <div v-if="form.tenderId != null">
+              <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" style="color:#0011ff;text-decoration: underline;"> {{
+      getFileName(form.contractDocument) }} </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </div>
           </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="合同计划工作量：">
@@ -115,12 +137,13 @@
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                    @click="deletWorkItem(index)" :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"
+                    :disabled="taskName != '合同拟稿'"></el-button>
                 </td>
               </tr>
             </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain :disabled="taskName != '合同拟稿'"></el-button>
+            <el-button icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain
+              :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="合同回款计划：">
             <table border="1">
@@ -147,8 +170,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>
@@ -156,12 +179,13 @@
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                    @click="deletPaymentItem(index)" :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletPaymentItem(index)"
+                    :disabled="taskName != '合同拟稿'"></el-button>
                 </td>
               </tr>
             </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain :disabled="taskName != '合同拟稿'"></el-button>
+            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
+              :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="合同备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
@@ -189,12 +213,12 @@
           <el-form-item label="线上会审：" v-if="commentOpen">
             <table border="1">
               <tr>
-                <td>序号</td>
+                <td style="width: 50px;">序号</td>
                 <td>会审部门</td>
                 <td>会审人</td>
                 <td>会审意见</td>
                 <td>会审附件</td>
-                <td>签名</td>
+                <td style="width: 90px;">签名</td>
                 <td>日期</td>
               </tr>
               <tr v-for="(comment, index) in commentList" :key="index">
@@ -219,9 +243,12 @@
                   <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input>
                 </td>
-                <td>
-                  <el-input v-model="comment.document" clearable
-                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input>
+                <td style="text-align:left;">
+                  <FileUpload :limit="1" :filePathName="'合同文件'"
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input=""></FileUpload>
+                  <!-- <el-input v-model="comment.document" clearable
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input> -->
+
                 </td>
                 <td>
                   <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : '' }} </span>
@@ -230,12 +257,13 @@
                   <span> {{ comment.commentTime }} </span>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                    @click="deletCommentItem(index)" :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletCommentItem(index)"
+                    :disabled="taskName != '合同拟稿'"></el-button>
                 </td>
               </tr>
             </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addCommentList()" type="primary" plain :disabled="taskName != '合同拟稿'"></el-button>
+            <el-button icon="el-icon-plus" size="mini" @click="addCommentList()" type="primary" plain
+              :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="会议评审：" v-if="meetingOpen">
             <table border="1">
@@ -314,8 +342,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">
@@ -329,7 +357,7 @@
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
-      </el-col>
+      </el-col>` `
       <el-col :span="6" :xs="24">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
@@ -339,6 +367,13 @@
         </el-card>
       </el-col>
     </el-row>
+
+    <el-dialog title="选择项目" :visible.sync="open" width="70%" append-to-body>
+      <choose-project @chooseProject="confirmProject" :chooseList="chooseProjectList"></choose-project>
+    </el-dialog>
+    <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="70%" append-to-body>
+      <choose-tender @choose="confirmTender"></choose-tender>
+    </el-dialog>
   </div>
 </template>
 
@@ -358,9 +393,13 @@ import { listTender, getTender } from "@/api/oa/tender/tender";
 import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import ChooseProject from '../components/chooseProject.vue';
+import ChooseTender from '../components/chooseTender.vue';
 export default {
   components: {
-    flow
+    flow,
+    ChooseProject,
+    ChooseTender
   },
   props: {
     taskName: {
@@ -375,6 +414,7 @@ export default {
   name: "Contract",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       draftUser: '',
       draftTime: undefined,
       managerUser: '',
@@ -399,6 +439,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      tbOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -548,15 +589,15 @@ export default {
               this.isSelect = true
             })
           }
-          listContractWork({contractId: this.taskForm.formId}).then(res => {
+          listContractWork({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.workList = res.rows;
           });
-          listContractPayment({contractId: this.taskForm.formId}).then(res => {
+          listContractPayment({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.paymentList = res.rows;
           });
-          listContractComment({contractId: this.taskForm.formId}).then(res => {
+          listContractComment({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.commentList = res.rows;
             for (let comment of this.commentList) {
@@ -774,38 +815,6 @@ export default {
       };
       this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.contractId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc合同评审";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const contractId = row.contractId || this.ids
-      getContract(contractId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc合同评审";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -875,7 +884,7 @@ export default {
               addContractPayment(payment);
             }
             for (let projectId of this.projectContractForm.projectIds) {
-              addProjectContract({projectId: projectId, contractId: this.form.contractId});
+              addProjectContract({ projectId: projectId, contractId: this.form.contractId });
             }
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
@@ -922,35 +931,47 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const contractIds = row.contractId || this.ids;
-      this.$modal.confirm('是否确认删除cmc合同评审编号为"' + contractIds + '"的数据项？').then(function () {
-        return delContract(contractIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+    getContractPath(val) {
+      let arr = val.split('/upload')
+      this.form.contractDocument = arr[1]
+      if (val == "") {
+        this.form.contractDocument = ""
+      }
+    },
+    getFileName(name) {
+      let arr = name.split('/')
+      return arr[arr.length - 1];
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/contract/export', {
-        ...this.queryParams
-      }, `contract_${new Date().getTime()}.xlsx`)
+    confirmProject(val) {
+      this.open = false
+      for (let v of val) {
+        this.projectContractForm.projectIds.push(v.projectId);
+      }
+      this.chooseProjectList = val
+    },
+    confirmTender(val) {
+      this.tbOpen = false
+      this.form.tenderId = val.tenderId
+      this.chooseTender = val
+      this.isSelect = true
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 table {
-  /*居中*/
-  margin: 0 auto;
   /*边框*/
   /* border: 1px solid black; */
   text-align: center;
   border-collapse: collapse;
+
   /*设置背景颜色*/
   /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
 }
 </style>

oa-ui/src/views/flowable/form/components/chooseProject.vue

@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <el-row>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="88px">
+        <el-form-item label="项目编号" prop="projectNumber">
+          <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
+            @keyup.enter.native="handleQuery()" />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="projectName">
+          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable
+            @keyup.enter.native="handleQuery()" />
+        </el-form-item>
+        <el-form-item label="项目负责人" prop="projectLeader">
+          <el-select v-model="queryParams.projectLeader" clearable filterable placeholder="请输入项目负责人" size="large"
+            style="width: 240px" @keyup.enter.native="handleQuery()">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery()">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-table ref="chooseProject" v-loading="loading" :data="projectList" @selection-change="handleSelectionChange"
+      :row-key="getRowKeys">
+      <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+      <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
+      <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" :show-overflow-tooltip="true" />
+      <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeader"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="甲方公司" align="center" key="partyA" prop="partyA" :show-overflow-tooltip="true" />
+      <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" />
+    </el-table>
+    <div style="text-align: right;" class="mt20 mr20">
+      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
+        :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
+      </el-pagination>
+    </div>
+    <div>
+      已选项目：<el-tag v-for="item in chooseProject" style="margin: 5px;" :key="item.projectId">{{ item.projectNumber + '-'
+        + item.projectName }}</el-tag>
+    </div>
+    <div style="text-align: center;margin-top: 20px;">
+      <el-button type="primary" @click="confirmChoose">确认选择</el-button>
+      <el-button @click="clearChoose">清空选择</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { listUser, getUser } from '@/api/system/user'
+export default {
+  props: {
+    chooseList: {
+      type: Array,
+      default: []
+    }
+  },
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectNumber: '',
+        projectLeader: undefined,
+        projectName: '',
+      },
+      projectList: [],
+      userList: [],
+      total: 0,
+      loading: true,
+      chooseProject: []
+    }
+  },
+  created() {
+    this.getList();
+    this.getUserList();
+    this.chooseProject = this.chooseList;
+  },
+  methods: {
+    // 查询项目列表
+    getList() {
+      this.loading = true
+      listProject(this.queryParams).then(response => {
+        this.projectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      })
+    },
+    /** 查询用户列表 */
+    getUserList() {
+      listUser({ pageNum: 1, pageSize: 9999 }).then(res => {
+        this.userList = res.rows
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    handleSelectionChange(val) {
+      this.chooseProject = val
+    },
+    getRowKeys(row) {
+      return row.projectId;
+    },
+    confirmChoose() {
+      this.$emit('chooseProject', this.chooseProject)
+    },
+    clearChoose() {
+      this.$refs.chooseProject.clearSelection();
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/form/components/chooseTender.vue

@@ -0,0 +1,110 @@
+<template>
+  <div>
+    <el-row>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="88px">
+        <el-form-item label="投标项目名称" prop="projectName">
+          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable
+            @keyup.enter.native="handleQuery()" />
+        </el-form-item>
+        <el-form-item label="招标业主" prop="partyA">
+          <el-input v-model="queryParams.partyA" placeholder="请输入招标业主" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="投标时间" prop="tenderTime">
+          <el-date-picker clearable v-model="queryParams.tenderTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择投标时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery()">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-table ref="choosePTender" v-loading="loading" :data="tenderList" highlight-current-row
+      @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose">
+      <el-table-column label="投标项目名称" align="center" key="projectName" prop="projectName"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="招标业主" align="center" prop="partyA" min-width="100px" />
+      <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
+      <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />
+      <el-table-column label="业主预算" align="center" prop="budget" min-width="100px" />
+    </el-table>
+    <div style="text-align: right;" class="mt20 mr20">
+      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
+        :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
+      </el-pagination>
+    </div>
+    <div>
+      已选项目：<el-tag>{{ choosePTender.projectName }}</el-tag>
+    </div>
+    <div style="text-align: center;margin-top: 20px;">
+      <el-button type="primary" @click="confirmChoose">确认选择</el-button>
+      <el-button @click="clearChoose">清空选择</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { listUser, getUser } from '@/api/system/user'
+import { listTender, getTender } from "@/api/oa/tender/tender";
+export default {
+  props: {
+  },
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      tenderList: [],
+      userList: [],
+      total: 0,
+      loading: true,
+      choosePTender: {
+        projectName: ''
+      }
+    }
+  },
+  created() {
+    this.getList();
+    this.getUserList();
+  },
+  methods: {
+    // 查询项目列表
+    getList() {
+      this.loading = true
+      listTender(this.queryParams).then(response => {
+        this.tenderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      })
+    },
+    /** 查询用户列表 */
+    getUserList() {
+      listUser({ pageNum: 1, pageSize: 9999 }).then(res => {
+        this.userList = res.rows
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.choosePTender = val
+    },
+    getRowKeys(row) {
+      return row.tenderId;
+    },
+    confirmChoose() {
+      this.$emit('choose', this.choosePTender)
+    },
+    clearChoose() {
+      this.$refs.choosePTender.clearSelection();
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -24,37 +24,34 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['oa:tender: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:tender: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:tender:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:tender:export']">导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="tenderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" min-width="100px" />
+      <el-table-column type="index" label="序号" width="55" align="center" min-width="100px" />
       <!-- <el-table-column label="投标id" align="center" prop="tenderId" min-width="100px" /> -->
       <el-table-column label="投标项目名称" align="center" prop="projectName" min-width="100px" />
       <el-table-column label="招标业主" align="center" prop="partyA" min-width="100px" />
-      <el-table-column label="业主联系人" align="center" prop="aPerson" min-width="100px" />
-      <el-table-column label="业主联系电话" align="center" prop="aPhone" min-width="100px" />
+      <!-- <el-table-column label="业主联系人" align="center" prop="aPerson" min-width="100px" /> -->
+      <!-- <el-table-column label="业主联系电话" align="center" prop="aPhone" min-width="100px" /> -->
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
-      <el-table-column label="代理联系人" align="center" prop="agentPerson" min-width="100px" />
-      <el-table-column label="代理联系电话" align="center" prop="agentPhone" min-width="100px" />
+      <!-- <el-table-column label="代理联系人" align="center" prop="agentPerson" min-width="100px" /> -->
+      <!-- <el-table-column label="代理联系电话" align="center" prop="agentPhone" min-width="100px" /> -->
       <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />
-      <el-table-column label="投标部门" align="center" prop="dept" min-width="100px">
+      <!-- <el-table-column label="投标部门" align="center" prop="dept" min-width="100px">
         <template slot-scope="scope">
           {{ getNameByDeptId(scope.row.dept) }}
         </template>
-      </el-table-column>
+</el-table-column> -->
       <el-table-column label="投标委托人" align="center" prop="trustee" min-width="100px">
         <template slot-scope="scope">
           {{ getNameByUserId(scope.row.trustee) }}
@@ -94,6 +91,8 @@
       <!-- <el-table-column label="标书文件" align="center" prop="tenderDocument" /> -->
       <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:tender:view']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:tender:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -108,7 +107,7 @@
     <!-- 添加或修改投标管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" :width="dialogProperty.dialogWidth" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :rules="rules" :model="form">
+      <el-form ref="form" :rules="rules" :model="form" :disabled="formDisabled">
         <el-descriptions class="margin-top" :column="dialogProperty.column" border>
           <el-descriptions-item :span="3">
             <template slot="label">
@@ -252,9 +251,12 @@
             <template slot="label">
               招标文件
             </template>
-            <FileUpload v-if="form.tenderId == null" ref="zbFile" :limit="1"
+            <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"
+              :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">
@@ -262,6 +264,9 @@
                     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>
             </div>
@@ -353,9 +358,11 @@
             <template slot="label">
               标书文件
             </template>
-            <FileUpload v-if="form.tenderId == null" ref="bsFile" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-              @input="getUploadPathTenderDocument"></FileUpload>
+            <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"  :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">
@@ -363,8 +370,9 @@
                     target="_blank">
                     <span class="el-icon-document"> {{ getFileName(form.tenderDocument) }} </span>
                   </el-link>
-                  <FileUpload :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false" :isModify="true"
-                    @input="getUploadPathTenderDocument"></FileUpload>
+                  <div class="ele-upload-list__item-content-action">
+                    <el-link :underline="false" @click="handleFileDelete('bs')" type="danger">删除</el-link>
+                  </div>
                 </li>
               </transition-group>
             </div>
@@ -372,7 +380,7 @@
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center;">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button :disabled="formDisabled" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -412,6 +420,7 @@ export default {
         dialogWidth: '1200px',
         column: 3,
       },
+      formDisabled: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -520,7 +529,6 @@ export default {
     getUserList() {
       listUser({ pageNum: 1, pageSize: 99999, deptId: this.form.dept }).then(response => {
         this.userList = response.rows;
-        console.log(response.rows);
       }
       );
     },
@@ -606,6 +614,16 @@ export default {
       this.form.dept = 105
       this.open = true;
       this.title = "添加投标信息";
+      this.formDisabled = false;
+    },
+    handleView(row) {
+      const tenderId = row.tenderId || this.ids
+      getTender(tenderId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.formDisabled = true;
+        this.title = "查看投标信息";
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -614,6 +632,7 @@ export default {
       getTender(tenderId).then(response => {
         this.form = response.data;
         this.open = true;
+        this.formDisabled = false;
         this.title = "修改投标信息";
       });
     },
@@ -639,22 +658,33 @@ export default {
       });
     },
     getUploadPathBidDocument(val) {
-      console.log(val);
       let arr = val.split('/upload')
       this.form.bidDocument = arr[1]
+      if (val == "") {
+        this.form.bidDocument = ""
+      }
     },
     getUploadPathTenderDocument(val) {
       let arr = val.split('/upload')
       this.form.tenderDocument = arr[1]
+      if (val == "") {
+        this.form.tenderDocument = ""
+      }
     },
     getFileName(name) {
       let arr = name.split('/')
       return arr[arr.length - 1];
     },
+    handleFileDelete(name) {
+      if (name == 'zb')
+        this.$refs.zb.handleDelete(0);
+      else
+        this.$refs.bs.handleDelete(0);
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const tenderIds = row.tenderId || this.ids;
-      this.$modal.confirm('是否确认删除投标管理编号为"' + tenderIds + '"的数据项？').then(function () {
+      this.$modal.confirm('删除后不可恢复，是否确认删除？').then(function () {
         return delTender(tenderIds);
       }).then(() => {
         this.getList();
@@ -675,6 +705,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 ::v-deep .el-descriptions-item__label.is-bordered-label {
   color: #121212;
   // background: rgba($color: #46a6ff, $alpha: 0.1);
@@ -700,4 +732,27 @@ export default {
   font-weight: bold;
   display: inline-block;
 }
+
+
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+.upload-file-list .el-upload-list__item {
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
+}
 </style>