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

app/public/js/change_revise.js

@@ -2591,7 +2591,7 @@ $(document).ready(() => {
     const jlzfBills = new Jlzf('#jlzf-spread', {
         cols: [
             // {title: '项目节编号', field: 'code', hAlign: 0, width: 85, formatter: '@'},
-            {title: '清单编号', field: 'b_code', hAlign: 0, width: 150, formatter: '@'},
+            {title: '清单编号', field: 'b_code', hAlign: 0, width: 100, formatter: '@'},
             {title: '名称', field: 'name', hAlign: 0, width: 150, formatter: '@'},
             {title: '单位', field: 'unit', hAlign: 1, width: 50, formatter: '@'},
             {title: '单价', field: 'unit_price', hAlign: 2, width: 50},

app/service/project_account.js

@@ -182,7 +182,7 @@ module.exports = app => {
                         loginStatus = 1;
                     }
                     // dev-qa下默认副密码登录，规避验证码
-                    // if (this.ctx.app.config.is_debug) loginStatus = 1;
+                    if (this.ctx.app.config.is_debug) loginStatus = 1;
                     // }
                 } else if (loginType === 3) {
                     // 查找项目数据