Browse Source

修改分包合同等小问题

余思翰 8 months ago
parent
commit
e0c28a4017

+ 9
- 5
oa-ui/src/views/flowable/form/business/components/paymentTable.vue View File

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-08-29 15:21:42
3
  * @Date: 2024-08-29 15:21:42
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-09-02 10:09:25
5
+ * @LastEditTime: 2024-09-25 16:50:13
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div style="width:100%">
8
   <div style="width:100%">
9
     <table border="1" style="width:100%">
9
     <table border="1" style="width:100%">
10
       <tr>
10
       <tr>
11
-        <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表2:合同回款计划</strong></td>
11
+        <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表2:合同{{titles}}计划</strong></td>
12
       </tr>
12
       </tr>
13
       <tr>
13
       <tr>
14
         <td style="width: 50px;">序号</td>
14
         <td style="width: 50px;">序号</td>
15
-        <td style="min-width:350px">回款条件</td>
16
-        <td>回款比例(%)</td>
17
-        <td>回款金额(元)</td>
15
+        <td style="min-width:350px">{{titles}}条件</td>
16
+        <td>{{titles}}比例(%)</td>
17
+        <td>{{titles}}金额(元)</td>
18
         <td>预计时间</td>
18
         <td>预计时间</td>
19
         <td>备注</td>
19
         <td>备注</td>
20
       </tr>
20
       </tr>
71
     amount: {
71
     amount: {
72
       type: Number,
72
       type: Number,
73
       default: 0
73
       default: 0
74
+    },
75
+    titles:{
76
+      type: String,
77
+      default: '回款'
74
     }
78
     }
75
   },
79
   },
76
   data() {
80
   data() {

+ 3
- 3
oa-ui/src/views/flowable/form/business/components/workTable.vue View File

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

+ 1
- 1
oa-ui/src/views/flowable/form/business/subContract.vue View File

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

+ 1
- 1
oa-ui/src/views/flowable/form/components/print/projectPrint.vue View File

52
         </tr>
52
         </tr>
53
         <tr>
53
         <tr>
54
           <td class="fontbold">
54
           <td class="fontbold">
55
-            经营发展部审核
55
+            经营副总审核
56
           </td>
56
           </td>
57
           <td :colspan="5">
57
           <td :colspan="5">
58
             <div class="minHeight">{{ projectComment.jyComment }}</div>
58
             <div class="minHeight">{{ projectComment.jyComment }}</div>

+ 22
- 7
oa-ui/src/views/oa/contract/index.vue View File

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-06-21 18:52:00
3
  * @Date: 2024-06-21 18:52:00
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-09-03 16:01:56
6
--->
7
-<!--
8
- * @Author: ysh
9
- * @Date: 2024-03-18 09:05:41
10
- * @LastEditors: Please set LastEditors
11
- * @LastEditTime: 2024-08-28 16:13:14
5
+ * @LastEditTime: 2024-09-25 17:05:16
12
 -->
6
 -->
13
 <template>
7
 <template>
14
   <div class="app-container">
8
   <div class="app-container">
21
         <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
15
         <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
22
           @keyup.enter.native="handleQuery" />
16
           @keyup.enter.native="handleQuery" />
23
       </el-form-item>
17
       </el-form-item>
18
+      <el-form-item label="甲方单位" prop="partyAId">
19
+        <el-select v-model="queryParams.partyAId" clearable filterable remote reserve-keyword placeholder="请输入单位名称"
20
+          :remote-method="remoteMethod" :loading="queryLoading" style="width: 400px;" @change="handleQuery()">
21
+          <el-option v-for="partyA in queryPartyAList" :key="partyA.partyAId" :label="partyA.partyAName"
22
+            :value="partyA.partyAId">
23
+          </el-option>
24
+        </el-select>
25
+      </el-form-item>
24
       <el-form-item>
26
       <el-form-item>
25
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
27
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
26
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
28
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
112
 
114
 
113
 <script>
115
 <script>
114
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
116
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
117
+import { listPartyA } from "@/api/oa/partyA/partyA";
115
 import contractInfo from './contractInfo.vue';
118
 import contractInfo from './contractInfo.vue';
116
 import ContractForm from '../../flowable/form/business/contractForm.vue';
119
 import ContractForm from '../../flowable/form/business/contractForm.vue';
117
 import { listDefinition } from "@/api/flowable/definition";
120
 import { listDefinition } from "@/api/flowable/definition";
169
       taskForm: {},
172
       taskForm: {},
170
       commentList: [],
173
       commentList: [],
171
       commentOpen: false,
174
       commentOpen: false,
175
+      queryPartyAList:[],
176
+      queryLoading:true,
172
     };
177
     };
173
   },
178
   },
174
   created() {
179
   created() {
361
       this.download('oa/contract/export', {
366
       this.download('oa/contract/export', {
362
         ...this.queryParams
367
         ...this.queryParams
363
       }, `contract_${new Date().getTime()}.xlsx`)
368
       }, `contract_${new Date().getTime()}.xlsx`)
369
+    },
370
+    remoteMethod(val){
371
+      listPartyA({
372
+        pageNum: 1,
373
+        pageSize: 30,
374
+        partyAName: val
375
+      }).then(res => {
376
+        this.queryPartyAList = res.rows;
377
+        this.queryLoading = false;
378
+      })
364
     }
379
     }
365
   }
380
   }
366
 };
381
 };

Loading…
Cancel
Save