修改借款管理中的查看历史借款按钮；

投标新增是否中标

oa-ui/src/views/flowable/form/finance/historyBorrow.vue

@@ -6,6 +6,9 @@
           <span class="applier">申请人：{{ item.applierUser.nickName }}</span>
           <span class="apply-date">申请日期：{{ item.applyDate }}</span>
         </div>
+        <div class="applier-remark">
+          <b>申请人说明：</b>{{ item.remark }}
+        </div>
         <div class="card-body">
           <div class="detail-table" v-if="borrowDetailsMap[item.borrowId]">
             <template v-if="borrowDetailsMap[item.borrowId].length > 0">
@@ -23,8 +26,10 @@
                 <span>{{ detail.price }}</span>
                 <span>{{ detail.quantity }}</span>
                 <span>{{ detail.applyAmount }}</span>
-                <span :class="{ 'not-approved': detail.managerAmount === undefined || detail.managerAmount === null || detail.managerAmount === '' }">
-                  {{ detail.managerAmount !== undefined && detail.managerAmount !== null && detail.managerAmount !== '' ? detail.managerAmount : '未核准' }}
+                <span
+                  :class="{ 'not-approved': detail.managerAmount === undefined || detail.managerAmount === null || detail.managerAmount === '' }">
+                  {{ detail.managerAmount !== undefined && detail.managerAmount !== null && detail.managerAmount !== ''
+                    ? detail.managerAmount : '未核准' }}
                 </span>
               </div>
             </template>
@@ -38,7 +43,8 @@
         </div>
         <div class="card-footer">
           <span class="apply-amount">申请金额：{{ item.applyAmount }}</span>
-          <span class="manager-amount">核准金额：{{ item.managerAmount !== undefined && item.managerAmount !== null && item.managerAmount !== '' ? item.managerAmount : '未核准' }}</span>
+          <span class="manager-amount">核准金额：{{ item.managerAmount !== undefined && item.managerAmount !== null &&
+            item.managerAmount !== '' ? item.managerAmount : '未核准' }}</span>
         </div>
       </div>
     </template>
@@ -92,17 +98,20 @@ export default {
   padding: 18px 0;
   background: #f7f8fa;
 }
+
 .borrow-card {
   margin: 0 5px;
   background: #fff;
   border-radius: 14px;
-  box-shadow: 0 2px 12px 0 rgba(0,0,0,0.06);
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
   margin-bottom: 22px;
   padding: 20px 22px 14px 22px;
   transition: box-shadow 0.2s;
+
   &:hover {
-    box-shadow: 0 4px 18px 0 rgba(0,0,0,0.10);
+    box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.10);
   }
+
   .card-header {
     display: flex;
     justify-content: space-between;
@@ -110,25 +119,41 @@ export default {
     font-weight: 500;
     margin-bottom: 10px;
     padding-bottom: 2px;
+
     .applier {
       color: #222;
       font-size: 16px;
     }
+
     .apply-date {
       color: #aaa;
       font-size: 14px;
       font-weight: 400;
     }
   }
+
+  .applier-remark {
+    background: #f8f9fa;
+    border-left: 3px solid #2d8cf0;
+    padding: 8px 12px;
+    margin-bottom: 12px;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #666;
+    line-height: 1.4;
+  }
+
   .card-body {
     .detail-table {
       width: 100%;
+
       .detail-header {
         font-weight: 500;
         background: #f8fafd;
         color: #666;
         border-radius: 6px 6px 0 0;
       }
+
       .detail-row {
         display: grid;
         grid-template-columns: 2fr 1fr 1fr 1fr 2fr 2fr;
@@ -136,6 +161,7 @@ export default {
         padding: 5px 0;
         border-bottom: 1px solid #f0f0f0;
         font-size: 15px;
+
         span {
           text-align: center;
           word-break: break-all;
@@ -144,14 +170,17 @@ export default {
           align-items: center;
           justify-content: center;
         }
+
         .not-approved {
           color: #bbb;
         }
+
         &:last-child {
           border-bottom: none;
         }
       }
     }
+
     .no-detail {
       color: #bbb;
       text-align: center;
@@ -160,6 +189,7 @@ export default {
       font-size: 15px;
     }
   }
+
   .card-footer {
     display: flex;
     justify-content: flex-end;
@@ -169,12 +199,15 @@ export default {
     font-size: 16px;
     border-top: none;
     padding-top: 0;
+
     .apply-amount {
       color: #2d8cf0;
     }
+
     .manager-amount {
       color: #19be6b;
     }
+
     .manager-amount:after {
       color: #bbb;
     }

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-20 09:31:22
+ * @LastEditTime: 2025-07-02 11:37:20
 -->
 
 <template>
@@ -67,6 +67,11 @@
                 <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="更新时间" align="center" prop="updateTime" width="100">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" width="90" align="center">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" icon="el-icon-view"

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

@@ -10,6 +10,12 @@
           placeholder="请选择投标时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="中标状态" prop="isWin">
+        <el-select v-model="queryParams.isWin" placeholder="请选择中标状态" clearable @change="handleQuery">
+          <el-option label="中标" value="1" />
+          <el-option label="未中标" value="0" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -39,15 +45,16 @@
     <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" />
+      <el-table-column label="状态" align="center" prop="isWin" width="80">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isWin == 1" type="success">中标</el-tag>
+          <el-tag v-else type="danger">未中标</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="投标项目名称" align="center" prop="projectName" min-width="200px" />
       <el-table-column label="招标业主" align="center" prop="partyAName" 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="dept" min-width="100px">
-        <template slot-scope="scope">
-          {{ getNameByDeptId(scope.row.dept) }}
-        </template>
-</el-table-column> -->
       <el-table-column label="投标委托人" align="center" prop="trustee" width="100px">
         <template slot-scope="scope">
           {{ scope.row.trusteeUser ? scope.row.trusteeUser.nickName : '' }}
@@ -55,7 +62,7 @@
       </el-table-column>
       <el-table-column label="业主预算" align="center" prop="budget" width="120px" />
       <el-table-column label="拟报价金额" align="center" prop="quote" width="120px" />
-      <el-table-column label="保证金" align="center" prop="deposit"  width="120px" />
+      <el-table-column label="保证金" align="center" prop="deposit" width="120px" />
       <el-table-column label="投标时间" align="center" prop="tenderTime" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.tenderTime, '{y}-{m}-{d}') }}</span>
@@ -66,25 +73,6 @@
           <span>{{ parseTime(scope.row.bidBuyDeadline, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="招标信息网址" align="center" prop="bidWebsite" /> -->
-      <!-- <el-table-column label="招标文件" align="center" prop="bidDocument" /> -->
-      <!-- <el-table-column label="项目内容简述" align="center" prop="projectBriefly" /> -->
-      <!-- <el-table-column label="商务标书编写人" align="center" prop="businessWriter" /> -->
-      <!-- <el-table-column label="商务标书要求提交时间" align="center" prop="businessDeadline" width="180"> -->
-      <!-- <template slot-scope="scope"> -->
-      <!-- <span>{{ parseTime(scope.row.businessDeadline, '{y}-{m}-{d}') }}</span> -->
-      <!-- </template> -->
-      <!-- </el-table-column> -->
-      <!-- <el-table-column label="技术标书编写人" align="center" prop="techWriter" /> -->
-      <!-- <el-table-column label="技术标书要求提交时间" align="center" prop="techDeadline" width="180"> -->
-      <!-- <template slot-scope="scope"> -->
-      <!-- <span>{{ parseTime(scope.row.techDeadline, '{y}-{m}-{d}') }}</span> -->
-      <!-- </template> -->
-      <!-- </el-table-column> -->
-      <!-- <el-table-column label="标书合稿人" align="center" prop="tenderCombiner" /> -->
-      <!-- <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" width="120px">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
@@ -247,10 +235,12 @@
               招标文件
             </template>
             <FileUpload v-if="form.tenderId == null" ref="zbFile" :limit="1" :filePathName="'投标文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getUploadPathBidDocument"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getUploadPathBidDocument">
+            </FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload v-if="!isView" ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-                :isShowTip="false" :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument">
+              <FileUpload v-if="!isView" ref="zb" :limit="1"
+                :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" :isShowTip="false"
+                :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument">
               </FileUpload>
               <div v-if="form.bidDocument">
                 <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.bidDocument}`)">
@@ -351,10 +341,12 @@
               标书文件
             </template>
             <FileUpload v-if="form.tenderId == null" ref="bsFile" :limit="1" :filePathName="'投标文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getUploadPathTenderDocument"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getUploadPathTenderDocument">
+            </FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload v-if="!isView" ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-                :isShowTip="false" :filePathName="'投标文件'" :isModify="true" @input="getUploadPathTenderDocument">
+              <FileUpload v-if="!isView" ref="bs" :limit="1"
+                :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" :isShowTip="false"
+                :filePathName="'投标文件'" :isModify="true" @input="getUploadPathTenderDocument">
               </FileUpload>
               <div v-if="form.tenderDocument">
                 <el-link type="primary" @click="toPath(`${baseUrl}${'/profile/upload' + form.tenderDocument}`)">
@@ -367,6 +359,17 @@
               </div>
             </div>
           </el-descriptions-item>
+          <el-descriptions-item :span="3">
+            <template slot="label">
+              中标状态
+            </template>
+            <div>
+              <el-switch style="display: block" v-model="form.isWin" active-color="#13ce66" inactive-color="#ff4949"
+                active-text="中标" inactive-text="未中标" active-value="1" inactive-value="0">
+              </el-switch>
+
+            </div>
+          </el-descriptions-item>
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center;">
@@ -383,7 +386,7 @@ import { listDept } from '@/api/system/dept'
 import { listUser, deptTreeSelect } from "@/api/system/user";
 export default {
   name: "Tender",
-  components:{
+  components: {
   },
   data() {
     return {