新用户登录Bug、特征及内容bug

modules/users/controllers/boot_controller.js

@@ -43,7 +43,8 @@ class BootController extends BaseController {
             provinceList: userModel.province,
             companyTypeList: userModel.companyType,
             companyScaleList: userModel.companyScale,
-            compilation: request.params.compilation
+            compilation: request.params.compilation,
+            versionName: request.session.sessionCompilation.name + '免费版'
         };
         response.render('users/html/login-infoinput', renderData);
     }

web/building_saas/main/js/views/character_content_view.js

@@ -1103,14 +1103,14 @@ let pageCCOprObj = {
         for (const index in updateData) {
             saveObj.push({field: index, value: updateData[index]});
         }
-        saveObj.push({field: 'addRule', value: setting});
+        //saveObj.push({field: 'addRule', value: setting});
         saveObj.push({field: 'jobContent', value: node.data.jobContent});
         saveObj.push({field: 'itemCharacter', value: node.data.itemCharacter});
         // 更新到数据库
         pageCCOprObj.updateBill(findSet, saveObj, function(response) {
             self.refreshView(node, updateData);
             // 更新项目属性的配置
-            projectObj.project.property.addRule = setting;
+            //projectObj.project.property.addRule = setting;
             // 更新节点数据
             node.data.name = updateData.name;
             node.data.itemCharacterText = updateData.itemCharacterText;

web/building_saas/main/js/views/sub_view.js

@@ -181,6 +181,26 @@ $("#use-to-all").click(function() {
     }
 });
 
+function saveAddRule(){
+    let setting = getAddRuleSetting();
+    let toUpdate = false;
+    if(!projectObj.project.property.addRule){
+        toUpdate = true;
+    }
+    else {
+        for(let attr in setting){
+            if(setting[attr] !== projectObj.project.property.addRule[attr]){
+                toUpdate = true;
+                break;
+            }
+        }
+    }
+    if(toUpdate){
+        projectObj.project.property.addRule = setting;
+        projectObj.project.saveProperty('addRule', setting);
+    }
+}
+
 // 添加位置选择
 $("#add-position").change(function() {
     const selected = $(this).children(":selected").val();
@@ -205,6 +225,7 @@ $("#add-position").change(function() {
             addContentEle.val(1);
             break;
     }
+    saveAddRule();
 });
 // 添加内容选择
 $("#add-content").change(function() {
@@ -245,6 +266,17 @@ $("#add-content").change(function() {
             childDisplayFormatEle.attr('disabled', 'disabled');
             break;
     }
+    saveAddRule();
+});
+
+//显示格式
+$('#display-format').change(function () {
+    saveAddRule();
+});
+
+//特征生成方式
+$('#character-format').change(function () {
+    saveAddRule();
 });
 
 // 子目生成方式选择事件
@@ -260,6 +292,12 @@ $("#child-display-format").change(function() {
         serialTypeEle.val(1);
         serialTypeEle.removeAttr('disabled');
     }
+    saveAddRule();
+});
+
+//序号格式
+$('#serial-type').change(function () {
+    saveAddRule();
 });
 
 /**

web/building_saas/pm/html/project-management-Recycle.html

@@ -25,8 +25,8 @@
                 <p> 点“确定”按钮，确认从回收站中恢复。</p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 <a href="javascript:void(0);" class="btn btn-primary" data-dismiss="modal" id="rePojBtn">确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
     </div>
@@ -44,8 +44,8 @@
             <div class="modal-body">
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 <a href="javascript:void(0);" class="btn btn-primary" data-dismiss="modal" id="delPojBtn">确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
     </div>
@@ -70,8 +70,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 <a href="javascript:void(0);" class="btn btn-primary" id="reFileBtn" data-dismiss="modal">确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
     </div>
@@ -96,8 +96,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 <a href="javascript:void(0);" class="btn btn-primary" id="delFileBtn" data-dismiss="modal">确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
     </div>