Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/material_list.js

@@ -645,7 +645,8 @@ $(document).ready(() => {
                     return item.qc_qty || item.contract_qty
                 });
                 const nRow = leafXmjs.indexOf(leafXmjSelect);
-                return [index, iRow, nRow, leafXmjSheet, leafXmjSelect];
+                const leafXmjColor = findNotJoinLeafXmj(leafXmjSelect) ? '#d6d8db' : '';
+                return [index, iRow, nRow, leafXmjSheet, leafXmjSelect, leafXmjColor];
             },
             checkJoinMaterial: function (type) {
                 const [iGclRow, iRow, nRow, sheet, select] = leafXmjSpreadObj.getSelect();
@@ -1213,10 +1214,11 @@ $(document).ready(() => {
                     sheet.setSelection(index > 0 ? index - 1 : 0, sel.length > 0 ? sel[0].col : 0, 1, 1);
                     const materialListIndex = materialListData.indexOf(select);
                     materialListData.splice(materialListIndex, 1);
-                    const [iGclRow, iRow, nRow, lsheet, lselect] = leafXmjSpreadObj.getSelect();
+                    const [iGclRow, iRow, nRow, lsheet, lselect, color] = leafXmjSpreadObj.getSelect();
                     gclGatherData[iGclRow].leafXmjs[iRow].jiacha = calcOneBQJC(lselect);
                     calculateJiaCha(gclGatherData, iGclRow);
                     SpreadJsObj.reLoadRowData(lsheet, nRow);
+                    lsheet.getRange(nRow, -1, 1, -1).backColor(color);
                     SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), iGclRow);
                 });
             },
@@ -1286,10 +1288,12 @@ $(document).ready(() => {
                         materialListData.splice(materialListIndex, 1, select);
                         materialList.indexOf(index, 1, select);
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);
-                        const [iGclRow, iRow, nRow, sheet, lselect] = leafXmjSpreadObj.getSelect();
+                        const [iGclRow, iRow, nRow, sheet, lselect, color] = leafXmjSpreadObj.getSelect();
                         gclGatherData[iGclRow].leafXmjs[iRow].jiacha = calcOneBQJC(lselect);
                         calculateJiaCha(gclGatherData, iGclRow);
                         SpreadJsObj.reLoadRowData(sheet, nRow);
+                        console.log(lselect, color);
+                        sheet.getRange(nRow, -1, 1, -1).backColor(color);
                         SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), iGclRow);
                     }, function () {
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);

app/service/material.js

@@ -385,7 +385,7 @@ module.exports = app => {
          * @return {Promise<*>}
          */
         async getExPreTpHs(tid, order, tp) {
-            const sql = 'SELECT SUM(ROUND(`ex_tp`*(1+ `rate`/100),' + tp + ')) AS `ex_pre_tp_hs` FROM ?? WHERE `tid` = ? AND `order` < ?';
+            const sql = 'SELECT SUM(ROUND(`ex_tp`*(1+ `exponent_rate`/100),' + tp + ')) AS `ex_pre_tp_hs` FROM ?? WHERE `tid` = ? AND `order` < ?';
             const sqlParam = [this.tableName, tid, order];
             const result = await this.db.queryOne(sql, sqlParam);
             return result.ex_pre_tp_hs;

app/view/change/project_information_modal.ejs

@@ -746,7 +746,7 @@
                             </dl>
                         </div>
                     </div>
-                    <div class="modal-height-max100" style="overflow: hidden" id="xs-list">
+                    <div class="modal-height-max100" style="overflow: visible" id="xs-list">
                         <% for (const xs of change.xsAuditors) { %>
                   <span class="d-inline-block">
                     <span class="badge badge-light">