فهرست منبع

批量插入部位明细,签约清单数据对齐调整

maixinrong 5 سال پیش
والد
کامیت
c0a904f6c0
3فایلهای تغییر یافته به همراه9 افزوده شده و 10 حذف شده
  1. 4 4
      app/public/js/ledger.js
  2. 5 5
      app/public/js/revise.js
  3. 0 1
      app/service/change.js

+ 4 - 4
app/public/js/ledger.js

@@ -2067,10 +2067,10 @@ $(document).ready(function() {
             // 初始化 签约清单 参数
             this.dealSpreadSetting = {
                 cols: [
-                    {title: '清单编号', field: 'code', width: 80, formatter: '@', readOnly: true},
-                    {title: '名称', field: 'name', width: 120, formatter: '@', readOnly: true},
-                    {title: '单位', field: 'unit', width: 50, formatter: '@', readOnly: true},
-                    {title: '单价', field: 'unit_price', width: 50, readOnly: true},
+                    {title: '清单编号', field: 'code', width: 80, hAlign: 0, formatter: '@', readOnly: true},
+                    {title: '名称', field: 'name', width: 120, hAlign: 0, formatter: '@', readOnly: true},
+                    {title: '单位', field: 'unit', hAlign: 1, width: 50, formatter: '@', readOnly: true},
+                    {title: '单价', field: 'unit_price', hAlign: 2, width: 50, readOnly: true},
                 ],
                 emptyRows: 0,
                 headRows: 1,

+ 5 - 5
app/public/js/revise.js

@@ -52,7 +52,7 @@ $(document).ready(() => {
     const billsTree = createNewPathTree('revise', treeSetting);    
     // 初始化 计量单元
     const pos = new PosData({ id: 'id', ledgerId: 'lid' });
-    
+
     // 清单 相关方法&绑定spreadjs事件
     const billsTreeSpreadObj = {
         loadExprToInput(sheet) {
@@ -1583,10 +1583,10 @@ $(document).ready(() => {
             // 初始化 签约节点 参数
             this.dealSpreadSetting = {
                 cols: [
-                    {title: '清单编号', field: 'code', width: 80, formatter: '@', readOnly: true},
-                    {title: '名称', field: 'name', width: 120, formatter: '@', readOnly: true},
-                    {title: '单位', field: 'unit', width: 50, formatter: '@', readOnly: true},
-                    {title: '单价', field: 'unit_price', width: 50, readOnly: true},
+                    {title: '清单编号', field: 'code', width: 80, hAlign: 0, formatter: '@', readOnly: true},
+                    {title: '名称', field: 'name', width: 120, hAlign: 0, formatter: '@', readOnly: true},
+                    {title: '单位', field: 'unit', hAlign: 1, width: 50, formatter: '@', readOnly: true},
+                    {title: '单价', field: 'unit_price', hAlign: 2, width: 50, readOnly: true},
                 ],
                 emptyRows: 0,
                 headRows: 1,

+ 0 - 1
app/service/change.js

@@ -816,7 +816,6 @@ module.exports = app => {
                         '  WHERE c.tid = ? And c.status = ? And c.valid And ' + filter +
                         '  ORDER BY c.in_time';
             const sqlParam = [tid, tid, audit.flow.status.checked];
-            console.log(this.db.format(sql, sqlParam));
             const changes = await this.db.query(sql, sqlParam);
             for (const c of changes) {
                 const aSql = 'SELECT ca.*, pa.name As u_name, pa.role As u_role ' +