Browse Source

修复一些测试bug

ellisran 11 months ago
parent
commit
ad62478373

+ 4 - 2
app/public/js/change_information_set.js

@@ -1153,7 +1153,8 @@ $(document).ready(() => {
                         return changeOrder === 0;
                     },
                     callback: function (key, opt) {
-                        $('#addlist').modal('show');
+                        // $('#addlist').modal('show');
+                        $('#set-site-btn').click();
                     },
                 },
                 'createAdd': {
@@ -1206,7 +1207,8 @@ $(document).ready(() => {
                     //     }
                     // },
                     callback: function (key, opt) {
-                        $('#addlist').modal('show');
+                        // $('#addlist').modal('show');
+                        $('#set-site-btn').click();
                     },
                 },
                 'createAdd1': {

+ 1 - 1
app/view/change/information.ejs

@@ -499,7 +499,7 @@
     const auditConst = JSON.parse('<%- JSON.stringify(auditConst) %>');
     let attData = JSON.parse(unescape('<%- escape(JSON.stringify(attList)) %>'));
     let currPageFileData = [];
-    const change_uid = parseInt('<%- change.uid %>');;
+    const change_uid = parseInt('<%- change.uid %>');
     const settleBills = JSON.parse(unescape('<%- escape(JSON.stringify(settleBills)) %>'));
     const settlePos = JSON.parse(unescape('<%- escape(JSON.stringify(settlePos)) %>'));
     const auditType = JSON.parse('<%- JSON.stringify(auditType) %>');

+ 1 - 1
app/view/change/relation.ejs

@@ -6,7 +6,7 @@
             <div>
                 <div class="d-inline-block">
                     <div class="btn-group btn-group-toggle group-tab">
-                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/information">申请详情</a>
+                        <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/information">变更详情</a>
                         <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/report">输出报表</a>
                         <a class="btn btn-sm btn-light active" href="javascript:void(0);">关联数据</a>
                     </div>

+ 1 - 1
app/view/ledger/explode.ejs

@@ -53,7 +53,7 @@
                 <% if (tender.ledger_status === auditConst.status.checkNo) { %>
                     <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-dark sp-list-btn">审批退回</a>
                 <% } else if (tender.ledger_status === auditConst.status.checking && curAuditor.audit_id !== ctx.session.sessionUser.accountId) { %>
-                    <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-dark sp-list-btn">审批中</a>
+                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-dark">审批中</a>
                 <% } else if (tender.ledger_status === auditConst.status.checked) { %>
                     <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm sp-list-btn">审批完成</a>
                 <% } %>

+ 1 - 4
sql/update.sql

@@ -403,10 +403,7 @@ ADD COLUMN `features` varchar(1000) NOT NULL DEFAULT '' COMMENT '项目特征' A
 ALTER TABLE `zh_revise_bills_99`
 ADD COLUMN `features` varchar(1000) NOT NULL DEFAULT '' COMMENT '项目特征' AFTER `memo`;
 
-ALTER TABLE zh_change`
-ADD COLUMN `order_site` int(11) NULL DEFAULT NULL COMMENT 'order_by为自定义时插入到清单id值' AFTER `order_by`;
-
-ALTER TABLE `zh_rpt_tree_node_cust` 
+ALTER TABLE `zh_rpt_tree_node_cust`
 ADD COLUMN `tender_id` INT NULL DEFAULT -1 COMMENT '新需求,跟标段走,不跟客户走' AFTER `cust_acc_id`,
 ADD INDEX `tender` (`tender_id` ASC);
 ;