修改分包合同等小问题

oa-ui/src/views/flowable/form/business/components/paymentTable.vue

@@ -2,19 +2,19 @@
  * @Author: ysh
  * @Date: 2024-08-29 15:21:42
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-02 10:09:25
+ * @LastEditTime: 2024-09-25 16:50:13
 -->
 <template>
   <div style="width:100%">
     <table border="1" style="width:100%">
       <tr>
-        <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表2：合同回款计划</strong></td>
+        <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表2：合同{{titles}}计划</strong></td>
       </tr>
       <tr>
         <td style="width: 50px;">序号</td>
-        <td style="min-width:350px">回款条件</td>
-        <td>回款比例（%）</td>
-        <td>回款金额（元）</td>
+        <td style="min-width:350px">{{titles}}条件</td>
+        <td>{{titles}}比例（%）</td>
+        <td>{{titles}}金额（元）</td>
         <td>预计时间</td>
         <td>备注</td>
       </tr>
@@ -71,6 +71,10 @@ export default {
     amount: {
       type: Number,
       default: 0
+    },
+    titles:{
+      type: String,
+      default: '回款'
     }
   },
   data() {

oa-ui/src/views/flowable/form/business/components/workTable.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-08-29 15:21:42
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-02 14:12:47
+ * @LastEditTime: 2024-09-25 17:08:46
 -->
 <template>
   <div style="width:100%">
@@ -28,13 +28,13 @@
             :disabled="taskName != '合同拟稿'"></el-input>
         </td>
         <td>
-          <el-select v-model="work.scale" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
+          <el-select v-model="work.scale" placeholder="请选择" filterable  clearable :disabled="taskName != '合同拟稿'">
             <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
               :value="dict.label" />
           </el-select>
         </td>
         <td>
-          <el-select v-model="work.unit" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
+          <el-select v-model="work.unit" placeholder="请选择" filterable  clearable :disabled="taskName != '合同拟稿'">
             <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
           </el-select>
         </td>

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

@@ -87,7 +87,7 @@
           <p class="mb20 mt20"></p>
 
           <!-- 表2：合同回款计划  -->
-          <payment-table ref="paymentRef" :contractId="taskForm.formId" :amount="form.subAmount"
+          <payment-table ref="paymentRef" :contractId="taskForm.formId" :amount="form.subAmount" :titles="'付款'"
             :taskName="taskName"></payment-table>
 
           <el-form-item label="合同备注" prop="remark">

oa-ui/src/views/flowable/form/components/print/projectPrint.vue

@@ -52,7 +52,7 @@
         </tr>
         <tr>
           <td class="fontbold">
-            经营发展部审核
+            经营副总审核
           </td>
           <td :colspan="5">
             <div class="minHeight">{{ projectComment.jyComment }}</div>

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

@@ -2,13 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-03 16:01:56
--->
-<!--
- * @Author: ysh
- * @Date: 2024-03-18 09:05:41
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-28 16:13:14
+ * @LastEditTime: 2024-09-25 17:05:16
 -->
 <template>
   <div class="app-container">
@@ -21,6 +15,14 @@
         <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="甲方单位" prop="partyAId">
+        <el-select v-model="queryParams.partyAId" clearable filterable remote reserve-keyword placeholder="请输入单位名称"
+          :remote-method="remoteMethod" :loading="queryLoading" style="width: 400px;" @change="handleQuery()">
+          <el-option v-for="partyA in queryPartyAList" :key="partyA.partyAId" :label="partyA.partyAName"
+            :value="partyA.partyAId">
+          </el-option>
+        </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>
@@ -112,6 +114,7 @@
 
 <script>
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { listPartyA } from "@/api/oa/partyA/partyA";
 import contractInfo from './contractInfo.vue';
 import ContractForm from '../../flowable/form/business/contractForm.vue';
 import { listDefinition } from "@/api/flowable/definition";
@@ -169,6 +172,8 @@ export default {
       taskForm: {},
       commentList: [],
       commentOpen: false,
+      queryPartyAList:[],
+      queryLoading:true,
     };
   },
   created() {
@@ -361,6 +366,16 @@ export default {
       this.download('oa/contract/export', {
         ...this.queryParams
       }, `contract_${new Date().getTime()}.xlsx`)
+    },
+    remoteMethod(val){
+      listPartyA({
+        pageNum: 1,
+        pageSize: 30,
+        partyAName: val
+      }).then(res => {
+        this.queryPartyAList = res.rows;
+        this.queryLoading = false;
+      })
     }
   }
 };