Bläddra i källkod

导入分项清单excel,勾选问题

MaiXinRong 4 år sedan
förälder
incheckning
e480cdc061
2 ändrade filer med 11 tillägg och 13 borttagningar
  1. 1 1
      app/view/shares/import_excel_modal.ejs
  2. 10 12
      sql/update.sql

+ 1 - 1
app/view/shares/import_excel_modal.ejs

@@ -20,7 +20,7 @@
             <div class="modal-footer d-flex justify-content-between">
                 <div>
                     <div class="custom-control custom-checkbox custom-control-inline" id="filter-excel">
-                        <input type="radio" class="custom-control-input" name="customRadioInline1" id="filter-qty-price" checked="">
+                        <input type="checkbox" class="custom-control-input" name="customRadioInline1" id="filter-qty-price" checked="">
                         <label class="custom-control-label" for="filter-qty-price">过滤清单数量和单价为0项</label>
                     </div>
                 </div>

+ 10 - 12
sql/update.sql

@@ -44,22 +44,19 @@ CREATE TABLE `zh_s2b_proj_push` (
 Insert Into zh_tender_tag (tid, pid) Select id, project_id From zh_tender Where 1=1;
 
 -- ----------------------------
+-- Table structure for zh_s2b_push_log
 -- ----------------------------
-CREATE TABLE `zh_s2b_proj_push` (
+CREATE TABLE `zh_s2b_push_log` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `pid` int(11) NOT NULL COMMENT '项目id-zh_s2b_proj中的id',
-  `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
-  `url` varchar(255) CHARACTER SET ascii NOT NULL DEFAULT '' COMMENT '推送的url',
-  `ledger` tinyint(1) NOT NULL DEFAULT '1' COMMENT '台账审批通过-是否推送',
-  `revise` tinyint(1) NOT NULL DEFAULT '1' COMMENT '台账修订审批通过-是否推送',
-  `stage` tinyint(1) NOT NULL DEFAULT '1' COMMENT '期审批通过-是否推送',
-  `bgl` tinyint(1) NOT NULL DEFAULT '1' COMMENT '变更令审批通过-是否需要推送',
-  `add_time` datetime(4) DEFAULT NULL COMMENT '创建时间',
-  `lastest_time` datetime(4) DEFAULT NULL COMMENT '最后修改时间',
-  `push_time` datetime(4) DEFAULT NULL COMMENT '最近一次推送时间',
+  `pid` int(11) NOT NULL COMMENT '项目id',
+  `push_id` int(11) NOT NULL COMMENT '推送id',
+  `url` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '推送url',
+  `push_data` text COLLATE utf8_unicode_ci COMMENT '推送内容',
+  `push_time` datetime NOT NULL COMMENT '推送时间',
+  `push_result` text COLLATE utf8_unicode_ci COMMENT '推送结果',
+  `push_err` varchar(1000) CHARACTER SET utf8 DEFAULT NULL COMMENT '推送错误',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 ALTER TABLE `zh_s2b_c_proj`
 ADD COLUMN `push_tender`  varchar(1000) CHARACTER SET ascii NOT NULL DEFAULT '' COMMENT '推送的标段' AFTER `base_data`;