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

app/public/js/profile_cert.js

@@ -346,13 +346,13 @@ $(document).ready(function() {
                                                         <label for="uname" class="ml-3 col-form-label">证件名称：</label>
                                                         <div class="row col-sm-10 pr-0">
                                                             <div class="col-6 pr-0">
-                                                                <select class="form-control form-control-sm select—cert-type" data-type="type">
+                                                                <select class="form-control form-control-sm select-cert-type" data-type="type">
                                                                     <option value="0">请选择</option>
                                                                     ${typeHtml}
                                                                 </select>
                                                             </div>
                                                             <div class="col-6 pr-0">
-                                                                <select class="form-control form-control-sm select—cert-name" data-type="name">
+                                                                <select class="form-control form-control-sm select-cert-name" data-type="name">
                                                                     <option value="0">请选择</option>
                                                                 </select>
                                                             </div>

app/service/filing.js

@@ -189,7 +189,7 @@ module.exports = app => {
             const posterity = await this.getPosterityData(filing.id);
             const updateData = { id: filing.id, tree_order: data.tree_order, tree_pid: data.tree_pid, tree_level: parent.tree_level + 1 };
             const posterityUpdateData = posterity.map(x => {
-               updateData.push({ id: x.id,  tree_level: parent.tree_level + 1 - filing.tree_level + x.tree_level });
+               return { id: x.id,  tree_level: parent.tree_level + 1 - filing.tree_level + x.tree_level };
             });
             const siblingUpdateData = [];
             if (data.tree_pid === filing.tree_pid) {

app/service/filing_template.js

@@ -163,7 +163,6 @@ module.exports = app => {
             }
         }
         async move(templateId, data) {
-            console.log(data);
             const filing = await this.getDataById(data.id);
             if (!filing) throw '移动的分类不存在，请刷新页面后重试';
             const parent = await this.getDataById(data.tree_pid);
@@ -174,7 +173,7 @@ module.exports = app => {
             const result = [];
             const updateData = { id: filing.id, tree_order: data.tree_order, tree_pid: data.tree_pid, tree_level: parent ? parent.tree_level + 1 : 1, filing_type };
             result.push(updateData);
-            const posterityUpdateData = posterity.map(x => { return { id: x.id, filing_type, tree_level: parent.tree_level + 1 - filing.tree_level + x.tree_level }});
+            const posterityUpdateData = posterity.map(x => { return { id: x.id, filing_type, tree_level: updateData.tree_level - filing.tree_level + x.tree_level }});
             result.push(posterityUpdateData);
             const siblingUpdateData = [];
             if (data.tree_pid === filing.tree_pid) {