فهرست منبع

计量台账定位问题

MaiXinRong 3 سال پیش
والد
کامیت
b36fde6707
2فایلهای تغییر یافته به همراه22 افزوده شده و 4 حذف شده
  1. 4 3
      app/public/js/stage.js
  2. 18 1
      sql/update.sql

+ 4 - 3
app/public/js/stage.js

@@ -974,11 +974,12 @@ $(document).ready(() => {
             }
         },
         loadRelaData: function () {
-            const billsSheet = spSpread.getActiveSheet();
-            SpreadJsObj.resetTopAndSelect(billsSheet);
+            const billsSheet = slSpread.getActiveSheet();
+            SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
+            const posSheet = spSpread.getActiveSheet();
+            SpreadJsObj.resetTopAndSelect(posSheet);
             stagePosSpreadObj.loadCurPosData();
             if (posSearch) posSearch.search();
-            SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
         },
         selectionChanged: function (e, info) {
             if (!info.oldSelections || !info.oldSelections[0] || info.newSelections[0].row !== info.oldSelections[0].row) {

+ 18 - 1
sql/update.sql

@@ -109,4 +109,21 @@ ALTER TABLE `zh_stage_change`
 ADD COLUMN `minus`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否负变更' AFTER `qty`;
 
 ALTER TABLE `zh_stage_change_final`
-ADD COLUMN `minus`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否负变更' AFTER `qty`;
+ADD COLUMN `minus`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否负变更' AFTER `qty`;
+
+CREATE TABLE `zh_stage_stash` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `pid` int(11) unsigned NOT NULL COMMENT '项目id',
+  `tid` int(11) unsigned NOT NULL COMMENT '标段id',
+  `sid` int(11) unsigned NOT NULL COMMENT '期id',
+  `sorder` int(11) unsigned NOT NULL COMMENT '期序号',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `uid` int(11) unsigned NOT NULL COMMENT '保存人',
+  `uname` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '保存人姓名',
+  `filepath` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT 'oss保存路径',
+  `valid` tinyint(4) unsigned NOT NULL DEFAULT '1' COMMENT '是否可用',
+  `info` varchar(1000) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '相关信息',
+  `remark` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;