修改一些小细节

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

@@ -7,7 +7,7 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-form-item label="品牌项目" prop="projectId">
             <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-              :disabled="taskName != '支付申请'" clearable>
+              :disabled="taskName != '支付申请'" clearable style="width: 100%;">
               <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
               </el-option>
             </el-select>
@@ -53,27 +53,28 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="财务反馈：">
-            <table border="1">
+            <table border="1" style="width:100%;">
               <tr>
                 <td>序号</td>
                 <td>到账情况</td>
                 <td>到账时间</td>
+                <td>操作</td>
               </tr>
               <tr v-for="(payment, index) in paymentList" :key="index">
                 <td>
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input v-model="payment.cwComment" placeholder="请输入到账情况" :disabled="taskName != '财务反馈'" />
+                  <el-input type="textarea" v-model="payment.cwComment" placeholder="请输入到账情况" :disabled="taskName != '财务反馈'" />
                 </td>
                 <td>
                   <el-date-picker clearable v-model="payment.paymentTime" type="date" value-format="yyyy-MM-dd"
-                    placeholder="请选择到账时间" :disabled="taskName != '财务反馈'">
+                    placeholder="请选择到账时间" :disabled="taskName != '财务反馈'" style="width:100%;">
                   </el-date-picker>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletPaymentItem(index)"
-                    :disabled="taskName != '财务反馈'"></el-button>
+                  <el-button type="text" style="color:#F56C6C;"  size="mini" @click="deletPaymentItem(index)"
+                    :disabled="taskName != '财务反馈'">删除行</el-button>
                 </td>
               </tr>
             </table>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-13 16:12:41
+ * @LastEditTime: 2024-06-14 19:07:59
 -->
 <template>
   <div class="app-container">
@@ -53,7 +53,7 @@
             </el-col>
 
             <el-col :span="12" :xs="24">
-              <el-alert title="院外项目，不选关联项目；院内项目，必选关联项目" type="warning">
+              <el-alert title="后签合同的项目，必须选择关联项目；先签合同的项目不选关联项目" type="error">
               </el-alert>
               <el-form-item label="关联项目：" prop="projectIds">
                 <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
@@ -510,7 +510,7 @@ export default {
       // 表单参数
       form: {
         amount: 0,
-        deposit: 0
+        deposit: 0,
       },
       meetingForm: {
         users: [],

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-22 11:12:57
+ * @LastEditors: 
+ * @LastEditTime: 2024-06-14 18:26:54
+-->
 <template>
   <div>
     <el-row>
@@ -17,7 +23,7 @@
     </el-row>
     <el-table ref="choosePContract" v-loading="loading" :data="contractList" highlight-current-row
       @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose">
-      <el-table-column label="项目名称" align="center" key="tender.projectName" prop="tender.projectName"
+      <el-table-column label="投标项目名称" align="center" key="tender.projectName" prop="tender.projectName"
         min-width="150px" />
       <el-table-column label="合同编码" align="center" key="contractCode" prop="contractCode" />
       <el-table-column label="合同编号" align="center" prop="contractNumber" min-width="100px" />

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="88px">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="108px">
         <el-form-item label="投标项目名称" prop="projectName">
           <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable
             @keyup.enter.native="handleQuery()" />

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

@@ -230,7 +230,7 @@
           </div>
           <el-divider></el-divider>
           <el-form-item label="支付凭证" prop="lendDocument">
-            <FileUpload v-if="form.lendDocument == null || form.lendDocument == ''" :disabled="taskName != '财务处理'"
+            <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'"
               :limit="1" :filePathName="'借款/支付凭证'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath">
             </FileUpload>
             <div v-if="form.lendDocument && taskName != '财务处理'">
@@ -263,8 +263,7 @@
           </el-row>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">

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

@@ -23,36 +23,45 @@
             </el-col>
           </el-row>
           <el-form-item label="投标项目名称" prop="tenderId" v-if="tenderOpen">
-            <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
+            <!-- <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-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '保证金申请'">选择投标项目</el-button>
             <el-descriptions border v-if="isTenderSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="投标项目名称" label-class-name="my-label">
+                {{ chooseTender.projectName }}
+              </el-descriptions-item>
               <el-descriptions-item label="投标保证金" label-class-name="my-label">{{ chooseTender.deposit
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
+              <el-descriptions-item label="招标业主" label-class-name="my-label">{{ chooseTender.partyA ?
+      chooseTender.partyA.partyAName : '' }}</el-descriptions-item>
               <el-descriptions-item label="招标代理人" label-class-name="my-label">{{ chooseTender.agent
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="联系人及电话" label-class-name="my-label">{{ chooseTender.agentPerson +
-                chooseTender.agentPhone
-              }}</el-descriptions-item>
+      chooseTender.agentPhone
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="合同名称" prop="contractId" v-if="contractOpen">
-            <el-select v-model="form.contractId" filterable placeholder="请选择" @change="handleSelectContract"
+            <!-- <el-select v-model="form.contractId" filterable placeholder="请选择" @change="handleSelectContract"
               :disabled="taskName != '保证金申请'" clearable>
-              <el-option v-for="item in contractList" :key="item.value" :label="item.tender.projectName"
-                :value="item.contractId">
+              <el-option v-for="item in contractList" :key="item.value"
+                :label="item.tender ? item.tender.projectName : item.contractCode" :value="item.contractId">
               </el-option>
-            </el-select>
+            </el-select> -->
+            <el-button type="primary" size="mini" @click="htOpen = true" v-if="taskName == '保证金申请'">选择合同</el-button>
             <el-descriptions border v-if="isContractSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="合同编码" label-class-name="my-label">{{ chooseContract.contractCode
+                }}</el-descriptions-item>
               <el-descriptions-item label="履约保证金" label-class-name="my-label">{{ chooseContract.deposit
-              }}</el-descriptions-item>
-              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseContract.tender.aPerson
-              }}</el-descriptions-item>
-              <el-descriptions-item label="联系人及电话" label-class-name="my-label">{{ chooseContract.tender.aPerson +
-                chooseContract.tender.aPhone
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseContract.tender ? chooseContract.tender.aPerson : ''
+                }}</el-descriptions-item>
+              <el-descriptions-item label="联系人及电话" label-class-name="my-label">
+                {{ chooseContract.tender ? chooseContract.tender.aPerson + chooseContract.tender.aPhone : ''}}
+              </el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-row>
@@ -133,7 +142,7 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="汇款凭证" prop="remitDocument">
-            <FileUpload v-if="form.remitDocument == null || form.remitDocument == ''" :disabled="taskName != '财务处理'"
+            <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'"
               :limit="1" :filePathName="'保证金/汇款凭证'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
               @input="getRemitPath"></FileUpload>
             <div v-if="form.remitDocument && taskName != '财务处理'">
@@ -180,8 +189,7 @@
           </el-row>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm" v-if="taskName != '财务处理'">确 定</el-button>
-          <el-button @click="cancel" v-if="taskName != '财务处理'">取 消</el-button>
+          <el-button type="primary" @click="submitForm" v-if="taskName != '财务处理'">提 交</el-button>
           <el-button @click="submitForm" type="danger" v-if="taskName == '财务处理'">结束</el-button>
         </div>
       </el-col>
@@ -194,6 +202,12 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="70%" append-to-body>
+      <choose-tender @choose="confirmTender"></choose-tender>
+    </el-dialog>
+    <el-dialog title="选择合同" :visible.sync="htOpen" width="70%" append-to-body>
+      <choose-contract @choose="confirmContract" @close="htOpen == false"></choose-contract>
+    </el-dialog>
   </div>
 </template>
 
@@ -207,11 +221,15 @@ import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import FileItem from '../business/fileItem.vue';
+import ChooseTender from '../components/chooseTender.vue';
+import ChooseContract from '../components/chooseContract.vue';
 
 export default {
   components: {
     flow,
-    FileItem
+    FileItem,
+    ChooseTender,
+    ChooseContract
   },
   props: {
     taskName: {
@@ -227,6 +245,8 @@ export default {
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
+      tbOpen: false,
+      htOpen:false,
       applierUser: '',
       applyTime: undefined,
       managerUser: '',
@@ -392,11 +412,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 查询项目列表
     getTenderList() {
       this.loading = true
@@ -417,17 +432,6 @@ export default {
         this.contractList = response.rows;
       })
     },
-    // 选择项目
-    handleSelectTender(val) {
-      if (val != "" && val != undefined && val != null) {
-        getTender(val).then(res => {
-          this.chooseTender = res.data;
-          this.isTenderSelect = true;
-        })
-      } else {
-        this.isTenderSelect = false
-      }
-    },
     // 选择合同
     handleSelectContract(val) {
       if (val != "" && val != undefined && val != null) {
@@ -457,65 +461,6 @@ export default {
         this.contractOpen = true;
       }
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        depositId: null,
-        depositType: null,
-        tenderId: null,
-        contractId: null,
-        returnTime: null,
-        accountName: null,
-        accountBank: null,
-        cardNumber: null,
-        depositWay: null,
-        applier: null,
-        applyTime: null,
-        applyReason: null,
-        applyDocument: null,
-        managerComment: null,
-        managerTime: null,
-        managerUserId: null,
-        remitTime: null,
-        cwTime: null,
-        backTime: null,
-        cwComment: null,
-        cwUserId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.depositId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc保证金审批";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const depositId = row.depositId || this.ids
-      getDeposit(depositId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc保证金审批";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -573,21 +518,32 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const depositIds = row.depositId || this.ids;
-      this.$modal.confirm('是否确认删除cmc保证金审批编号为"' + depositIds + '"的数据项？').then(function () {
-        return delDeposit(depositIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+    confirmTender(val) {
+      if (val != "" && val != undefined && val != null) {
+        this.chooseTender = val;
+        this.isTenderSelect = true;
+        this.form.tenderId = val.tenderId;
+        this.tbOpen = false;
+      }
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/deposit/export', {
-        ...this.queryParams
-      }, `deposit_${new Date().getTime()}.xlsx`)
+    confirmContract(val) {
+      if (val != "" && val != undefined && val != null) {
+        this.chooseContract = val;
+        this.isContractSelect = true;
+        this.form.contractId = val.contractId;
+        this.htOpen = false;
+      }
+    },
+    // 选择项目
+    handleSelectTender(val) {
+      if (val != "" && val != undefined && val != null) {
+        getTender(val).then(res => {
+          this.chooseTender = res.data;
+          this.isTenderSelect = true;
+        })
+      } else {
+        this.isTenderSelect = false
+      }
     },
     getApplyPath(val) {
       let arr = val.split('/upload')

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

@@ -78,7 +78,7 @@
           <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
           <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[0].visible"
             :show-overflow-tooltip="true" />
-          <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible">
+          <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible" sortable>
             <template slot-scope="scope">
               {{ getAgeByIdCard(scope.row.idCard) }}
             </template>