项目管理部

app/const/tender_info.js

@@ -31,6 +31,7 @@ const defaultInfo = {
             company: '',
             corporation: '',
             date: '',
+            management: '',
         },
         contract2: {
             company: '',

app/service/stage_audit.js

@@ -315,6 +315,8 @@ module.exports = app => {
                     tp_history: JSON.stringify(this.ctx.stage.tp_history),
                     cache_time_r: this.ctx.stage.cache_time_l,
                 });
+                // 多人协同，取消下一审批人存在的锁定
+                await this.ctx.service.cooperationConfirm.cancelLock(this.ctx.stage, audit.aid, transaction);
 
                 // 添加短信通知-需要审批提醒功能
                 // const smsUser = await this.ctx.service.projectAccount.getDataById(audit.aid);
@@ -448,7 +450,7 @@ module.exports = app => {
                         cache_time_r: this.ctx.stage.cache_time_l,
                     });
                     // 多人协同，取消下一审批人存在的锁定
-                    await this.ctx.service.cooperationConfirm.cancelLock(this.ctx.stage, nextAudit.id, transaction);
+                    await this.ctx.service.cooperationConfirm.cancelLock(this.ctx.stage, nextAudit.aid, transaction);
 
                     // 添加短信通知-需要审批提醒功能
                     // const smsUser = await this.ctx.service.projectAccount.getDataById(nextAudit.aid);

app/view/tender/detail_modal.ejs

@@ -140,6 +140,14 @@
                                             <input type="date" class="form-control" value="" id="contract1-date">
                                         </div>
                                     </div>
+                                    <div class="col-12 mt-2">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">项目经理部</span>
+                                            </div>
+                                            <input type="text" class="form-control" value="" id="contract1-management" maxlength="100" oninput="limitReturn(this)">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="form-group mb-4">
@@ -939,6 +947,7 @@
         $('#contract1-company').val(property.construction_unit.contract1.company);
         $('#contract1-corporation').val(property.construction_unit.contract1.corporation);
         $('#contract1-date').val(property.construction_unit.contract1.date);
+        $('#contract1-management').val(property.construction_unit.contract1.management);
         // 承包单位2
         $('#contract2-company').val(property.construction_unit.contract2.company);
         $('#contract2-corporation').val(property.construction_unit.contract2.corporation);
@@ -1000,6 +1009,7 @@
                     company: $('#contract1-company').val(),
                     corporation: $('#contract1-corporation').val(),
                     date: $('#contract1-date').val(),
+                    management: $('#contract1-management').val(),
                 },
                 contract2: {
                     company: $('#contract2-company').val(),