MaiXinRong 2 년 전
부모
커밋
9360af38ac
2개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 1
      app/service/stage_change.js
  2. 1 1
      app/view/stage/pay.ejs

+ 3 - 1
app/service/stage_change.js

@@ -816,6 +816,8 @@ module.exports = app => {
             const useModal = new autoUseChange(this.ctx.helper, tender.info);
             useModal.use({ledgerData, posData, stageBills, stagePos, default: { tid: stage.tid, sid: stage.id, said: this.ctx.session.sessionUser.accountId } }, validChangeBills);
 
+            // if (useModal.insertChange.length === 0) throw '无可调用的清单或计量单元';
+
             const conn = await this.db.beginTransaction();
             try {
                 if (useModal.insertBills.length > 0) await conn.insert(this.ctx.service.stageBills.tableName, useModal.insertBills);
@@ -823,7 +825,7 @@ module.exports = app => {
                 if (useModal.insertPos.length > 0) await conn.insert(this.ctx.service.stagePos.tableName, useModal.insertPos);
                 if (useModal.updatePos.length > 0) await conn.updateRows(this.ctx.service.stagePos.tableName, useModal.updatePos);
                 await conn.delete(this.tableName, { sid: stage.id });
-                await conn.insert(this.tableName, useModal.insertChange);
+                if (useModal.insertChange.length > 0) await conn.insert(this.tableName, useModal.insertChange);
                 await conn.commit();
             } catch (err) {
                 await conn.rollback();

+ 1 - 1
app/view/stage/pay.ejs

@@ -15,7 +15,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text" id="basic-addon1">表达式</span>
                         </div>
-                        <input type="text" class="form-control m-0" <% if (stage.readOnly) { %> readonly="" <% } %> id="expr" onpaste="pasteExpr(event, this);" style="width: 270px">
+                        <input type="text" class="form-control m-0" <% if (stage.readOnly) { %> readonly="" <% } %> id="expr" onpaste="pasteExpr(event, this);" style="width: 400px">
                     </div>
                 </div>
             </div>