Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/const/deal_pay.js

@@ -14,6 +14,12 @@ const payType = {
     sf: 3,
     wc: 4
 };
+const paySubType = {
+    normal: {value: 1, name: '常规'},
+    award: {value: 2, name: '奖罚金'},
+    supply: {value: 3, title: '甲供材料'},
+};
+
 const payTemplate = [
     {order: 1, name: '本期应付', ptype: payType.yf, minus: false, expr: null, sexpr: null, rexpr: null},
     {order: 2, name: '本期实付', ptype: payType.sf, minus: false},

app/public/js/change_set.js

@@ -606,7 +606,7 @@ function tableDataRemake(changeListData) {
                 // 针对旧数据获取清单信息
                 listinfo = changeListData[clinfo[8] - 1];
                 if (listinfo === undefined) {
-                    toastr.warning('台账清单列表已不存在'+ clinfo[0] +'，故删除之');
+                    toastr.warning('台账清单列表已不存在'+ clinfo[0] +'，请手动删除，并重新添加修订后的清单');
                     changeList.splice(index, 1);
                     continue;
                 }

app/public/js/ledger.js

@@ -2158,6 +2158,7 @@ $(document).ready(function() {
                         if (bills) {
                             info.sheet.getCell(info.row, 1).value(bills.name);
                             info.sheet.getCell(info.row, 2).value(bills.unit);
+                            info.sheet.getCell(info.row, 3).value(bills.unit_price);
                         }
                     }
                 }

app/public/js/revise.js

@@ -1638,6 +1638,7 @@ $(document).ready(() => {
                         if (bills) {
                             info.sheet.getCell(info.row, 1).value(bills.name);
                             info.sheet.getCell(info.row, 2).value(bills.unit);
+                            info.sheet.getCell(info.row, 3).value(bills.unit_price);
                         }
                     }
                 }

app/public/js/stage_audit.js

@@ -55,7 +55,7 @@ $(document).ready(function () {
     $('#account_group').change(function () {
         let account_html = '<option value="0">选择审批人</option>';
         for (const account of accountList) {
-            if (parseInt($(this).val()) === 0 || parseInt($(this).val()) === account.account_group) {
+            if ((parseInt($(this).val()) === 0 || parseInt($(this).val()) === account.account_group) && account.id !== parseInt(userID)) {
                 const role = account.role !== '' ? '（' + account.role + '）' : '';
                 const company = account.company !== '' ? ' -' + account.company : '';
                 account_html += '<option value="' + account.id + '">' + account.name + role + company + '</option>';

config/config.temp.js

@@ -0,0 +1,57 @@
+'use strict';
+/**
+ * 开发环境相关配置
+ *
+ * @author CaiAoLin
+ * @date 2017/8/29
+ * @version
+ */
+
+module.exports = appInfo => {
+    const config = {};
+    // 数据库配置
+    config.mysql = {
+        client: {
+            // host
+            host: '47.106.95.114',
+            // 端口号
+            port: '3306',
+            // 用户名
+            user: 'smartcost',
+            // 密码
+            password: 'zongheng_@)!(_jlzf',
+            // 数据库名
+            database: 'calculation',
+        },
+        // 是否加载到 app 上，默认开启
+        app: true,
+        // 是否加载到 agent 上，默认关闭
+        agent: false,
+    };
+    // 表名前缀
+    config.tablePrefix = 'zh_';
+
+    // redis设置
+    config.redis = {
+        client: {
+            host: '47.106.95.114',
+            port: '6379',
+            password: 'zongheng_@)!(_jlzf',
+            db: '0',
+        },
+        agent: true,
+        version: '1.0.0',
+    };
+
+    // session配置
+    config.session = {
+        key: 'ZHC_SESS',
+        maxAge: 7 * 24 * 3600 * 1000, // 7天
+        httpOnly: true,
+        encrypt: true,
+        //renew: true, // session临近过期更新过期时间
+        rolling: true, // 每次都更新session有效期
+    };
+
+    return config;
+};

package.json

@@ -61,6 +61,7 @@
     "start-qa": "set EGG_SERVER_ENV=qa&&egg-scripts start --daemon --port 7002",
     "dev": "egg-bin dev --port 7002",
     "dev-local": "set EGG_SERVER_ENV=local&&egg-bin dev --port 7002",
+    "dev-temp": "set EGG_SERVER_ENV=temp&&egg-bin dev --port 7002",
     "dev-qa": "set EGG_SERVER_ENV=qa&&egg-bin dev --port 7002",
     "dev-test": "set EGG_SERVER_ENV=test&&egg-bin dev --port 7002",
     "test": "npm run lint -- --fix&&npm run test-local",