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

app/controller/payment_controller.js

@@ -49,10 +49,15 @@ module.exports = app => {
                         where: { project_id: ctx.session.sessionProject.id, enable: 1 },
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                     });
-                    const accountGroupList = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: projectId } });
+                    const accountGroupList = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
+                    // const accountGroupList = accountGroup.map((item, idx) => {
+                    //     const groupList = accountList.filter(item => item.account_group === idx);
+                    //     return { groupName: item, groupList };
+                    // });
                     renderData.permissionAudits = permissionAudits;
                     renderData.accountList = accountList;
                     renderData.accountGroup = accountGroupList;
@@ -450,10 +455,12 @@ module.exports = app => {
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                     });
                     renderData.accountList = accountList;
-                    renderData.accountGroup = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                    const accountGroupList = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
+                    renderData.accountGroup = accountGroupList;
                 }
                 await this.layout('payment/detail.ejs', renderData, 'payment/detail_modal.ejs');
             } catch (err) {
@@ -657,9 +664,10 @@ module.exports = app => {
                     where: { project_id: ctx.session.sessionProject.id, enable: 1 },
                     columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                 });
-                const accountGroupList = accountGroup.map((item, idx) => {
-                    const groupList = accountList.filter(item => item.account_group === idx);
-                    return { groupName: item, groupList };
+                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                const accountGroupList = unitList.map(item => {
+                    const groupList = accountList.filter(item1 => item1.company === item.name);
+                    return { groupName: item.name, groupList };
                 });
                 const renderData = {
                     tender: ctx.tender,
@@ -839,9 +847,10 @@ module.exports = app => {
                             where: { project_id: ctx.session.sessionProject.id, enable: 1 },
                             columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                         });
-                        const accountGroupList = accountGroup.map((item, idx) => {
-                            const groupList = accountList.filter(item => item.account_group === idx);
-                            return { groupName: item, groupList };
+                        const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                        const accountGroupList = unitList.map(item => {
+                            const groupList = accountList.filter(item1 => item1.company === item.name);
+                            return { groupName: item.name, groupList };
                         });
                         renderData.accountList = accountList;
                         renderData.accountGroup = accountGroupList;

app/view/payment/modal.ejs

@@ -134,7 +134,7 @@
                                     <dt><a href="javascript: void(0);" class="acc-btn" data-groupid="<%- idx %>"
                                            data-type="hide"><i class="fa fa-plus-square"></i></a> <%- group.groupName %></dt>
                                     <div class="dd-content" data-toggleid="<%- idx %>">
-                                        <dd class="border-bottom p-2 mb-0" data-groupid="<%- idx %>"><p class="mb-0 d-flex"><span class="text-primary">该单位下所有组员</span></p></dd>
+                                        <dd class="border-bottom p-2 mb-0" data-groupname="<%- group.groupName %>"><p class="mb-0 d-flex"><span class="text-primary">该单位下所有组员</span></p></dd>
                                         <% group.groupList.forEach(item => { %>
                                             <dd class="border-bottom p-2 mb-0 " data-id="<%- item.id %>">
                                                 <p class="mb-0 d-flex"><span class="text-primary"><%- item.name %></span><span
@@ -243,7 +243,7 @@
                             html += `<dt><a href="javascript: void(0);" class="acc-btn" data-groupid="${idx}" data-type="hide"><i class="fa fa-plus-square"></i>
                         </a> ${group.groupName}</dt>
                         <div class="dd-content" data-toggleid="${idx}">
-                        <dd class="border-bottom p-2 mb-0" data-groupid="${idx}"><p class="mb-0 d-flex"><span class="text-primary">该单位下所有组员</span></p></dd>`
+                        <dd class="border-bottom p-2 mb-0" data-groupname="${group.groupName}"><p class="mb-0 d-flex"><span class="text-primary">该单位下所有组员</span></p></dd>`
                             group.groupList.forEach(item => {
                                     html += `<dd class="border-bottom p-2 mb-0 " data-id="${item.id}" >
                                     <p class="mb-0 d-flex"><span class="text-primary">${item.name}</span><span
@@ -280,18 +280,19 @@
         // 添加到成员中
         $('dl').on('click', 'dd', function () {
             const id = parseInt($(this).data('id'));
-            const groupid = parseInt($(this).data('groupid'));
+            const groupName = $(this).data('groupname');
+            console.log(groupName);
             if (!isNaN(id) && id !== 0) {
                 postData('/payment/permission/save', { type: 'add-audit', id: id }, function (result) {
                     permissionAudits = result;
                     setList(permissionAudits);
                 })
-            } else if (!isNaN(groupid) && groupid !== 0) {
-                const groupAuditList = _.filter(accountList, { account_group: groupid });
+            } else if (groupName && groupName !== '') {
+                const groupAuditList = _.filter(accountList, { company: groupName });
                 const groupAidList = _.map(groupAuditList, 'id');
-                const groupPAList = _.map(_.filter(permissionAudits, { groupid }), 'id');
+                const groupPAList = _.map(permissionAudits, 'uid');
                 const addAidList = _.difference(groupAidList, groupPAList);
-                console.log(addAidList);
+                console.log(groupAidList, groupPAList, addAidList);
                 if (addAidList.length > 0) {
                     postData('/payment/permission/save', { type: 'add-audit', id: addAidList }, function (result) {
                         // toastr.success(`成功添加 位用户`);