设计量明细，上下移、插入问题

app/public/js/ledger.js

@@ -197,8 +197,8 @@ $(document).ready(function() {
                 const row = sel[0].row, count = sel[0].rowCount;
                 const first = detailRange[row];
                 if (type === 'insert') {
-                    const node = SpreadJsObj.getSelectObject(ledgerSheet);
-                    data.add = [{ lid: node.id, pcd_order: detailRange.length + 1 }];
+                    const node = SpreadJsObj.getSelectObject(posSheet);
+                    data.add = [{ lid: node.lid, pid: node.id, pcd_order: detailRange.length + 1 }];
                 } else if (type === 'delete') {
                     data.del = [];
                     for (let iRow = 0; iRow < count; iRow++) {
@@ -233,8 +233,8 @@ $(document).ready(function() {
                         const detailData = detailRange[iRow + row];
                         if (!detailData) continue;
 
-                        data.update.push({ id: detailData.id, pcd_order: detailRange[iRow + row + 1].g_order});
-                        nextUpdate.g_order = detailData.g_order;
+                        data.update.push({ id: detailData.id, pcd_order: detailRange[iRow + row + 1].pcd_order});
+                        nextUpdate.pcd_order = detailData.pcd_order;
                     }
                     data.update.push(nextUpdate);
 

app/public/js/pos_calc_tmpl.js

@@ -303,7 +303,11 @@ $(document).ready(() => {
                 $(`dd[templateId=${curTemplate.id}]`).addClass('bg-warning');
                 if (!curTemplate.col_set) await loadTemplateDetail(curTemplate);
                 detailObj.loadDetail(curTemplate);
-                $('#detail-user-info').html(`新建人：${curTemplate.user_name}（${curTemplate.create_time_str}）`);
+                if (curTemplate.user_name) {
+                    $('#detail-user-info').html(`新建人：${curTemplate.user_name}（${curTemplate.create_time_str}）`);
+                } else {
+                    $('#detail-user-info').html('');
+                }
             }
         };
         const setCurTemplate = function(template) {

app/service/pos_calc_detail.js

@@ -228,6 +228,7 @@ module.exports = app => {
                 if (!od) continue;
 
                 const nd = { id: od.id, update_user_id: user_id };
+                if (d.pcd_order) nd.pcd_order = d.pcd_order;
                 if (this._loadDataAndCalc(nd, d, od, calcTemplate)) isCalc = true;
                 uDatas.push(nd);
             }

app/service/report_memory.js

@@ -548,7 +548,7 @@ module.exports = app => {
                 const billsData = this.ctx.stage.ledgerHis
                     ? await this.ctx.helper.loadLedgerDataFromOss(this.ctx.stage.ledgerHis.bills_file)
                     : await this.ctx.service.ledger.getData(this.ctx.tender.id);
-                const extraData = await this.ctx.service.ledgerExtra.getData(this.ctx.tender.id, ['is_tp', 'gxby_status', 'gxby_limit', 'gxby_ratio', 'dagl_status', 'dagl_limit', 'dagl_ratio', 'calc_template']);
+                const extraData = await this.ctx.service.ledgerExtra.getData(this.ctx.tender.id, ['is_tp', 'gxby_status', 'gxby_limit', 'dagl_status', 'dagl_limit', 'calc_template']);
                 const memoData = this.ctx.stage.ledgerHis ? await this.ctx.service.ledger.getAllDataByCondition({ columns: ['id', 'memo'], where: { tender_id: this.ctx.tender.id } }) : [];
                 if (this._checkFieldsExist(fields, billsFields.stageDgn)) {
                     const dgnData = await this.ctx.service.stageBillsDgn.getDgnData(this.ctx.tender.id);
@@ -578,7 +578,7 @@ module.exports = app => {
                     ? await this.ctx.service.changeAuditList.getBillsSum(this.ctx.tender.id)
                     : [];
                 this.ctx.helper.assignRelaData(billsData, [
-                    { data: extraData, field: ['is_tp', 'gxby_status', 'gxby_limit', 'gxby_ratio', 'dagl_status', 'dagl_limit', 'dagl_ratio', 'calc_template'], prefix: '', relaId: 'id' },
+                    { data: extraData, field: ['is_tp', 'gxby_status', 'gxby_limit', 'dagl_status', 'dagl_limit', 'calc_template'], prefix: '', relaId: 'id' },
                     { data: memoData, fields: ['memo'], prefix: '', relaId: 'id' },
                     { data: curStage, fields: ['contract_qty', 'contract_tp', 'contract_expr', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'lid' },
                     { data: preStage, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty'], prefix: 'pre_', relaId: 'lid' },