Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

config/gulpConfig.js

@@ -238,7 +238,6 @@ module.exports = {
         'web/building_saas/complementary_ration_lib/js/explanatory.js',
         'web/building_saas/complementary_ration_lib/js/jobContent.js',
         'web/building_saas/complementary_ration_lib/js/annotation.js',
-        'public/web/scMathUtil.js',
         'public/web/common_ajax.js',
         'public/web/ztree_common.js',
         'public/web/ration_glj_units.js',

gulpfile.js

@@ -98,8 +98,8 @@ let compleGljOptions = {
     htmlDest: 'web/building_saas/complementary_glj_lib/html',
     htmlName: 'tools-gongliaoji.html',
     injectList: [
-        'web/dest/scripts/compleGlj.all.min' + version + '.js',
-        'web/dest/css/compleGlj.all.min' + version + '.css',
+        'web/dest/scripts/compleGlj.all.min.' + version + '.js',
+        'web/dest/css/compleGlj.all.min.' + version + '.css',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -114,9 +114,8 @@ let compleRation_rationOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'dinge.html',
     injectList: [
-        'web/dest/scripts/compleRation_ration.all.min' + version + '.js',
-        'web/dest/css/compleRation_ration.all.min' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
+        'web/dest/scripts/compleRation_ration.all.min.' + version + '.js',
+        'web/dest/css/compleRation_ration.all.min.' + version + '.css',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -131,9 +130,8 @@ let compleRation_gljOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'gongliao.html',
     injectList: [
-        'web/dest/scripts/compleRation_glj.all.min' + version + '.js',
-        'web/dest/scripts/compleRation_glj.all.min' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
+        'web/dest/scripts/compleRation_glj.all.min.' + version + '.js',
+        'web/dest/scripts/compleRation_glj.all.min.' + version + '.css',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -148,9 +146,8 @@ let compleRation_coeOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'fuzhu.html',
     injectList: [
-        'web/dest/scripts/compleRation_coe.all.min' + version + '.js',
-        'web/dest/scripts/compleRation_coe.all.min' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
+        'web/dest/scripts/compleRation_coe.all.min.' + version + '.js',
+        'web/dest/scripts/compleRation_coe.all.min.' + version + '.css',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -165,9 +162,8 @@ let compleRation_instOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'anzhuang.html',
     injectList: [
-        'web/dest/scripts/compleRation_inst.all.min' + version + '.js',
-        'web/dest/scripts/compleRation_inst.all.min' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
+        'web/dest/scripts/compleRation_inst.all.min.' + version + '.js',
+        'web/dest/scripts/compleRation_inst.all.min.' + version + '.css',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 }

modules/all_models/user.js

@@ -34,6 +34,10 @@ let upgrade = mongoose.Schema({
         type:String,
         default: '',
     },
+    lock: { // 锁信息 1：借出；2：销售；
+        type: Number,
+        default: 0
+    }
 }, { _id: false })
 
 const userdList = mongoose.Schema({

modules/reports/rpt_component/jpc_flow_tab.js

@@ -690,7 +690,8 @@ JpcFlowTabSrv.prototype.createNew = function(){
                             // 2018-08-04 其实之前的判断逻辑完全是自找麻烦，而且还不够正确。其实只需要判断已经处理了多少行纪录(所有的都算，包括空白行)，
                             // 与总的seg纪录数想比较，就很容易得到结果，而且能处理极端边界的情况。
                             pageStatus[JV.STATUS_SEGMENT_END] = true;
-                            pageStatus[JV.STATUS_REPORT_END] = true;
+                            // pageStatus[JV.STATUS_REPORT_END] = true;
+                            pageStatus[JV.STATUS_REPORT_END] = (segIdx === me.segments.length - 1);
                             private_resetBandArea();
                             let hasAdHocRow = ((adHocAutoHeightAmt > maxRowRec) || !JpcFlowTabHelper.chkSegEnd(bands, rptTpl, ttlSegRecAmt, handledRowAmt, maxRowRec, me.isEx));
                                               // !JpcFlowTabHelper.chkSegEnd(bands, rptTpl, ttlSegRecAmt, currentRecAmt + adHocAutoHeightAmt, maxRowRec, me.isEx));

modules/reports/util/rpt_excel_util.js

@@ -310,6 +310,23 @@ function writeSharedString(sharedStrList){
     }
     return rst;
 }
+function _setupPgBrks(pageData) {
+    pageData.pageBreaks = [];
+    let pgBrkIdx = 0;
+    const pgBrk = [];
+    for (const page of pageData.items) {
+        const maxBottomArr = [];
+        for (const cell of page.cells) {
+            if (maxBottomArr.indexOf(cell[JV.PROP_AREA][JV.PROP_BOTTOM]) < 0) {
+                maxBottomArr.push(cell[JV.PROP_AREA][JV.PROP_BOTTOM]);
+            }
+        }
+        pgBrkIdx += maxBottomArr.length;
+        pgBrk.push(pgBrkIdx);
+    }
+    pageData.pageBreaks.push(pgBrk);
+}
+
 function writeSheets(pageData, paperSize, sharedStrList, stylesObj, isSinglePage, custSheetMergeBands){
     let rst = [];
     let private_pushDftFont = function(){
@@ -352,19 +369,19 @@ function writeSheets(pageData, paperSize, sharedStrList, stylesObj, isSinglePage
     private_pushDftFont();
     private_buildFirstDftStyle();
     if (isSinglePage) {
-        rst.push(writeSheet(pageData, null, paperSize, sharedStrList, stylesObj, null, true));
+        rst.push(writeSheet(pageData, null, paperSize, sharedStrList, stylesObj, null, true, -1));
     } else {
         for (let i = 0; i < pageData.items.length; i++) {
             let appointedMergeBand = null;
             if (custSheetMergeBands && custSheetMergeBands.length > i) {
                 appointedMergeBand = custSheetMergeBands[i];
             }
-            rst.push(writeSheet(pageData, pageData.items[i], paperSize, sharedStrList, stylesObj, appointedMergeBand, i === 0));
+            rst.push(writeSheet(pageData, pageData.items[i], paperSize, sharedStrList, stylesObj, appointedMergeBand, i === 0, i));
         }
     }
     return rst;
 }
-function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, appointedMergeBand, isFirstSheet){
+function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, appointedMergeBand, isFirstSheet, pgBrkIdx){
     let rst = [], xPos = [], yPos = [], yMultiPos = [], currentMergeBorder = null,
         headerStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     let currentPageMergePos = null; //在 JV.PAGING_OPTION_INFINITY 场合应用
@@ -834,6 +851,23 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, ap
     }
     rst.push('<pageSetup ' + pStr + ' fitToWidth="0" fitToHeight="0" orientation="' + orientationStr + '" />');
     rst.push('<headerFooter alignWithMargins="0"/>');
+    //插入分页符---------------------------
+    if (pageData.pageBreaks) {
+        let pgBrks = [];
+        if (sheetData !== null) {
+            pgBrks = pageData.pageBreaks[pgBrkIdx];
+        } else {
+            pgBrks = pageData.pageBreaks[0];
+        }
+        if (pgBrks.length > 1) {
+            rst.push('<rowBreaks count="' + pgBrks.length + '" manualBreakCount="' + pgBrks.length + '" >');
+            for (let pbi = 0; pbi < pgBrks.length; pbi++) {
+                rst.push('<brk id="' + pgBrks[pbi] + '" max="16383" man="1" />');
+            }
+            rst.push('</rowBreaks>');
+        }
+    }
+    //插入分页符结束---------------------------
     rst.push('</worksheet>');
     return rst;
 }
@@ -862,6 +896,9 @@ module.exports = {
         let isSinglePage = rptOptions.singlePage;
         let sheets = [];
         if (isSinglePage) {
+            //加分页符(分页符要在外部处理好)-------------------
+            _setupPgBrks(pageData);
+            //加分页符结束-------------------
             sheets.push({sheetName: '全部页'});
         } else {
             if (custSheetNames && custSheetNames.length === pageData.items.length) {
@@ -981,6 +1018,10 @@ module.exports = {
                 mergeBand[JV.PROP_RIGHT].push(pageDataArray[i][JV.BAND_PROP_MERGE_BAND][JV.PROP_RIGHT]);
                 sheetNames.push(pageDataArray[i][JV.NODE_PAGE_INFO][JV.NODE_MAIN_INFO_RPT_NAME]);
 
+                //加分页符(分页符要在外部处理好)-------------------
+                _setupPgBrks(pageDataArray[i]);
+                //加分页符结束-------------------
+
                 for (let j = 0; j < pageDataArray[i].items.length; j++) {
                     let maxY = 0, minY = 100000;
                     if (pageDataArray[i].items[j][JV.PAGE_SPECIAL_MERGE_POS]) {
@@ -1014,8 +1055,9 @@ module.exports = {
                     }
                 }
             }
-            //2. newPageData的items属性
+            //2. newPageData的items属性及相关分页符
             newPageData.items = [];
+            newPageData.pageBreaks = [];
             for (let i = 0; i < pageDataArray.length; i++) {
                 let pageItem = {};
                 pageItem[JV.PROP_PAGE_SEQ] = i + 1;
@@ -1028,6 +1070,13 @@ module.exports = {
                 newPagePos[i][JV.NODE_PAGE_SIZE] = pageDataArray[i][JV.NODE_PAGE_INFO][JV.NODE_PAGE_SIZE];
                 pageItem[JV.PAGE_SPECIAL_MERGE_POS] = newPagePos[i];
                 newPageData.items.push(pageItem);
+                //重新分配分页符()------------------
+                if (pageDataArray[i].pageBreaks.length === 1) {
+                    newPageData.pageBreaks.push(pageDataArray[i].pageBreaks[0]);
+                } else {
+                    newPageData.pageBreaks.push([]);
+                }
+                //重新分配分页符结束------------------
             }
             //3. everything is ok, then call me
             me.exportExcel(newPageData, paperSize, fName, 'false', sheetNames, custMergeBands, callback);

modules/users/controllers/boot_controller.js

@@ -32,7 +32,7 @@ class BootController extends BaseController {
             // 判断当前用户的是使用免费版还是专业版
             compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, compilationId);
             request.session.compilationVersion = compilationVersion.version;
-            request.session.sessionUser.compilationDeadline = compilationVersion.deadline;
+            request.session.sessionUser.compilationLock = compilationVersion.lock;
             request.session.sessionCompilation = compilationData;
             if(sessionUser.latest_used !== compilationId) userModel.updateLatestUsed(sessionUser.id,compilationId);
         }

modules/users/controllers/cld_controller.js

@@ -88,6 +88,8 @@ class CLDController {
                     });
                     if (oneCompilationIndex !== -1) {
                         compilationList[oneCompilationIndex].isUpgrade = userUpgradeList[i].isUpgrade;
+                        compilationList[oneCompilationIndex].deadline = userUpgradeList[i].deadline;
+                        compilationList[oneCompilationIndex].lock = userUpgradeList[i].lock;
                     }
                 }
             }
@@ -110,6 +112,7 @@ class CLDController {
         let deadline = request.body.deadline || '';
         let status = parseInt(request.body.status); // 1.升级、2.降级、3.续期
         let smssend = parseInt(request.body.smssend);
+        let lock = parseInt(request.body.lock);// 0.默认、1.借出（借用）、2.销售（购买）
         try {
 
             let userModel = new UserModel();
@@ -135,6 +138,7 @@ class CLDController {
                 isUpgrade: status !== 2,
                 remark: '',
                 deadline: deadline,
+                lock: lock,
             };
 
             if (upgradeIndex === -1) {

modules/users/controllers/login_controller.js

@@ -108,7 +108,7 @@ class LoginController {
                     // 判断当前用户的是使用免费版还是专业版
                     let compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, preferenceSetting.select_version);
                     request.session.compilationVersion = compilationVersion.version;
-                    request.session.sessionUser.compilationDeadline = compilationVersion.deadline;
+                    request.session.sessionUser.compilationLock = compilationVersion.lock;
                     request.session.sessionCompilation = compilationData;
                     if(request.session.sessionUser.latest_used !== preferenceSetting.select_version) await userModel.updateLatestUsed(request.session.sessionUser.id,preferenceSetting.select_version);
                 }
@@ -297,7 +297,7 @@ class LoginController {
                 let compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, preferenceSetting.select_version);
                 console.log("当前用户的是使用免费版还是专业版 完成------------------");
                 request.session.compilationVersion = compilationVersion.version;
-                request.session.sessionUser.compilationDeadline = compilationVersion.deadline;
+                request.session.sessionUser.compilationLock = compilationVersion.lock;
                 request.session.sessionCompilation = compilationData;
                 if(request.session.sessionUser.latest_used !== preferenceSetting.select_version) await userModel.updateLatestUsed(request.session.sessionUser.id,preferenceSetting.select_version);
             }

modules/users/controllers/user_controller.js

@@ -30,7 +30,7 @@ class UserController extends BaseController {
         let sessionUser = request.session.sessionUser;
 
         let userModel = new UserModel();
-        let userData = await userModel.findDataByName(sessionUser.username);
+        let userData = await userModel.findDataBySsoId(sessionUser.ssoId);
         userData = Object.keys(userData).length <= 0 ? [] : userData;
 
         let renderData = {
@@ -95,8 +95,10 @@ class UserController extends BaseController {
         try {
             // 获取当前用户信息
             let sessionUser = request.session.sessionUser;
+            console.log(sessionUser);
             let userModel = new UserModel();
-            userData = await userModel.findDataByName(sessionUser.username);
+            userData = await userModel.findDataBySsoId(sessionUser.ssoId);
+            console.log(userData);
 
             let page = request.query.page === undefined ? 1 : request.query.page;
 
@@ -155,6 +157,7 @@ class UserController extends BaseController {
                     if (oneCompilationIndex !== -1) {
                         compilationList[oneCompilationIndex].isUpgrade = userUpgradeList[index].isUpgrade;
                         compilationList[oneCompilationIndex].deadline = userUpgradeList[index].deadline;
+                        compilationList[oneCompilationIndex].lock = userUpgradeList[index].lock;
                     }
                 }
             }
@@ -237,7 +240,7 @@ class UserController extends BaseController {
                 let userModel = new UserModel();
                 let compilationVersion = await userModel.getVersionFromUpgrade(sessionUserData.ssoId, compilationData._id);
                 request.session.compilationVersion = compilationVersion.version;
-                request.session.sessionUser.compilationDeadline = compilationVersion.deadline;
+                request.session.sessionUser.compilationLock = compilationVersion.lock;
                 request.session.sessionCompilation = compilationData;
             }
         } catch (error) {

modules/users/models/user_model.js

@@ -350,7 +350,7 @@ class UserModel extends BaseModel {
      */
     async getVersionFromUpgrade(ssoId, compilationId){
         let version = '大司空云计价(免费公用版)';
-        let deadline = '';
+        let lock = 0;
         let userData = await this.findDataBySsoId(ssoId);
         if (userData.upgrade_list !== undefined) {
             let compilationInfo = userData.upgrade_list.find(function (item) {
@@ -358,12 +358,12 @@ class UserModel extends BaseModel {
             });
             if (compilationInfo !== undefined && compilationInfo.isUpgrade === true) {
                 version = '大司空云计价(专业版)';
-                if (compilationInfo.deadline !== undefined && compilationInfo.deadline !== '') {
-                    deadline = compilationInfo.deadline;
+                if (compilationInfo.lock !== undefined && compilationInfo.lock !== '') {
+                    lock = compilationInfo.lock;
                 }
             }
         }
-        return {version: version, deadline: deadline};
+        return {version: version, lock: lock};
     }
 
     /**

web/building_saas/complementary_ration_lib/html/gongliao.html

@@ -11,9 +11,9 @@
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" type="text/css">
+    <!--endinject-->
     <!--zTree-->
   	<link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
-    <!--endinject-->
     <link rel="shortcut icon" href="/web/building_saas/css/favicon.ico">
     <link rel="icon" type="image/gif" href="/web/building_saas/css/animated_favicon1.gif">
     <style type="text/css">
@@ -226,13 +226,13 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="/public/web/PerfectLoad.js"></script>
     <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.11.1.2.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey =  '<%- LicenseKey %>';</script>
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
     <!--inject:js-->
+    <script src="/public/web/PerfectLoad.js"></script>
     <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/global.js"></script>
     <!-- zTree -->
     <script type="text/javascript" src="/public/web/common_ajax.js"></script>

web/building_saas/glj/html/project_glj.html

@@ -95,7 +95,7 @@
             <a class="nav-link " id="ration-nav" data-toggle="tab" href="#ph_div" role="tab"
               aria-selected="true">相关定额</a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item" id="info-nav-li">
             <a class="nav-link" id="info-nav" data-toggle="tab" data-name="info" href="#info_price_div"
               role="tab">信息价</a>
           </li>

web/building_saas/main/js/controllers/block_controller.js

@@ -29,8 +29,22 @@ let BlockController = {
         if(blockData == null){
             return true;
         }
-        if(blockData.firstNodeType != blockType.RATION && blockData.isFBFX !=  Bills.isFBFX(selected)){//除了复制定额外，焦点行和复制的块不是来自同一个地方（分部分项工其它）
-            return true;
+        if(blockData.firstNodeType != blockType.RATION ){//复制的不是定额
+          //&& blockData.isFBFX !=  Bills.isFBFX(selected)  
+          if (this.blockIsFB(blockData.firstNodeType) && !Bills.isFBFX(selected)) return true; //第一层是分部，不允许复制到非分部分项
+          //分项\补项不允许粘贴到“施工组织措施项目”下
+          if (this.blockIsFXorBX(blockData.firstNodeType) && Bills.isOrgMeasure(selected)) return true;
+          
+          if (blockData.firstNodeType == blockType.BILL && Bills.isFBFX(selected) ) { //如果是清单 到分部分项          
+            for (let d of blockData.datas) { 
+               //如果清单有多层，不允许复制 
+              if (!this.blockIsLeaveBills(d)) return true;
+              ///如果有清单基数，不允许复制
+              if (this.ifCalcBase(d.calcBase)) return true;
+               //如果清单有费率引用，不允许复制
+              if (gljUtil.isNotEmpty(d.feeRateID)) return true;
+            }
+          }
         }
         if(this.blockIsFXorBX(blockData.firstNodeType) && this.isFB(selected)){//复制块的第一层是分项或补项，焦点行是分部，且分部有子项并且子项不是分项或补项，则无效。
             if(selected.children.length && !this.isFXorBX(selected.children[0])){
@@ -80,10 +94,13 @@ let BlockController = {
         return false;
     },
     haveCalcBase : function (node) {
-        if(node.data.calcBase ==null||node.data.calcBase ==undefined|| node.data.calcBase == ""){
-            return false;
-        }
-        return true;
+      return this.ifCalcBase(node.data.calcBase);
+    },
+    ifCalcBase: function (calcBase) {
+      if (calcBase == null || calcBase == undefined || calcBase == "") {
+        return false;
+      }
+      return true;
     },
     isDXFYorMainEq:function (node) {//焦点行是大项费用或定额下的主材设备
         if(node.sourceType == ModuleNames.bills && node.data.type == billType.DXFY){//焦点行是大项费用则无效；
@@ -227,8 +244,8 @@ let BlockController = {
                 //默认为当前行的后项，可选前项，子项灰显不可选。
                 setRadioProp('sub_node',{checked:false,disabled:true});
             }
-            //复制块的第一层是分项，焦点行是分部，且分部下无子项或者子项是分项
-            if(this.blockIsFXorBX(blockData.firstNodeType)&& this.isFB(selected)){
+            //复制块的第一层是分项，清单，焦点行是分部，且分部下无子项或者子项是分项
+            if((blockData.firstNodeType ==blockType.BILL||  this.blockIsFXorBX(blockData.firstNodeType))&& this.isFB(selected)){
                 if(selected.children.length == 0 || this.isFXorBX(selected.children[0])){
                     return 'sub';//不弹出选择窗口,直接粘贴为子项。
                 }
@@ -315,7 +332,7 @@ let BlockController = {
                 billUpdate = {type:blockData.datas[0].sourceType,query:{ID:pre.getID()},doc:{NextSiblingID:blockData.datas[0].ID}};
             }
         }
-        let dataMap = this.preparePasteData(blockData.datas,billsIDMap,firstParentID,lastNextID);
+        let dataMap = this.preparePasteData(blockData.datas,billsIDMap,firstParentID,lastNextID,selected);
         if(billUpdate){
             billUpdate.doc.NextSiblingID = billsIDMap[billUpdate.doc.NextSiblingID];
             updateData.push(billUpdate);
@@ -456,7 +473,7 @@ let BlockController = {
 
     },
 
-    preparePasteData : function (datas,billsIDMap,firstParentID,lastNextID) {
+    preparePasteData : function (datas,billsIDMap,firstParentID,lastNextID,selected) {
         let me = this;
         me.datas = _.cloneDeep(projectObj.project.Bills.datas);
         let bills = [],rations=[],ration_gljs = [],ration_coes = [],quantity_details = [],ration_installations = [],ration_templates=[];
@@ -469,7 +486,7 @@ let BlockController = {
                     lastBillID =  datas[i].ID
                 }
             }
-            eachData(datas[i]);
+            eachData(datas[i],selected);
         }
         for(let f of firstBillIDs){
             firstIDMap[billsIDMap[f]]  = f //反向映射
@@ -491,9 +508,9 @@ let BlockController = {
 
         return {bills:bills,rations:rations,ration_gljs:ration_gljs,ration_coes:ration_coes,quantity_details:quantity_details,ration_installations:ration_installations,ration_templates:ration_templates};
 
-        function eachData(data) {
+        function eachData(data,selected) {
             if(data.sourceType == 'bills'){
-                let tem_b = createBillsData(data);
+                let tem_b = createBillsData(data,selected);
                 bills.push(tem_b);
                 for(let d of data.quantity_details){
                     quantity_details.push(createQuantityDetails(d,tem_b,'bills'));
@@ -598,7 +615,8 @@ let BlockController = {
 
         }
 
-        function createBillsData(billsData) { //ID、重新生成code
+      function createBillsData(billsData, selected) { //ID、重新生成code
+            let Bills = projectObj.project.Bills;
             let temData = _.cloneDeep(billsData);
             //删除旧数据
             if(temData.children && temData.children.length>0){//如果是有子项，说明是计算得到的，要删除重新计算，没有子项，但是fees有值，说明是自已输入的，值要一起粘贴
@@ -611,8 +629,12 @@ let BlockController = {
             delete  temData.__v;
             delete  temData.sourceType;
             delete  temData.quantityCoe;
-            delete  temData.rationQuantityCoe;
-
+            delete temData.rationQuantityCoe;
+            //从分项、补项 到清单
+            if ((temData.type == billType.FX || temData.type == billType.BX) && !Bills.isFBFX(selected)) temData.type = billType.BILL;
+            //从清单到分部分项
+            if (temData.type == billType.BILL && Bills.isFBFX(selected)) temData.type = billType.FX;
+          
             temData.projectID = projectObj.project.ID();
             let newID = uuid.v1(); //新的清单ID
             billsIDMap[temData.ID] = newID;
@@ -709,9 +731,18 @@ let BlockController = {
     isFXorBX:function (selected) {//是分项或者补项
         return projectObj.project.Bills.isFXorBX(selected);
     },
+    blockIsFB: function (type) { 
+      return type == blockType.FB
+    },
     blockIsFXorBX: function (type) {
         return type == blockType.FX||type == blockType.BX;
     },
+    blockIsLeaveBills: function (bills) { 
+      if (bills.children && bills.children.length > 0) { 
+        return bills.children[0].sourceType == "ration" //如果子节点是定额，则说明是页子清单
+      }
+      return true;
+    },
     removeBlock:function () {
         removeLocalCache('project_block');
     }

web/building_saas/main/js/models/bills.js

@@ -622,7 +622,22 @@ var Bills = {
                 }
             }
             return techMeasureCheck(node);
-        };
+    };
+    bills.prototype.isOrgMeasure = function (node) {//判读是否属于施工组织措施项目部分
+      let OrgMeasureCheck = function (checkNode) {
+          if(isFlag(checkNode.data)&&checkNode.data.flagsIndex.fixed.flag==fixedFlag.CONSTRUCTION_ORGANIZATION){
+              return true;
+          }else {
+              if(checkNode.parent){
+                  return OrgMeasureCheck(checkNode.parent);
+              }else {
+                  return false;
+              }
+          }
+      }
+      return OrgMeasureCheck(node);
+    };
+
         // 相关固定类别清单部分，【不】允许清单自身计算得到合价： “数量 * 单价 = 合价”
         // 删除【不】允许通过自身数据计算的清单的定额时，该清单价格【会清空】
         // 这种清单的单价和合价都是只读的

web/building_saas/main/js/models/calc_program.js

@@ -2244,7 +2244,7 @@ class CalcProgram {
     // 反向调价
     calcTenderReverse(treeNode, tender){
         if (tender == tenderTypes.ttReverseRation) {
-            if (treeNode.data.feesIndex.common.tenderUnitFee != treeNode.data.feesIndex.common.unitFee) {
+            if (treeNode.data.feesIndex.common && treeNode.data.feesIndex.common.tenderUnitFee != treeNode.data.feesIndex.common.unitFee) {
                 treeNode.data.feesIndex.common.tenderUnitFee = treeNode.data.feesIndex.common.unitFee;
                 treeNode.changed = true;
             }
@@ -2256,11 +2256,11 @@ class CalcProgram {
                 treeNode.changed = true;
             }
             else{    // 既没有目标金额也没有目标单价，此时要初始化使调价合价＝原始综合合价，调价单价＝原始综合单价。
-                if (treeNode.data.feesIndex.common.tenderUnitFee != treeNode.data.feesIndex.common.unitFee) {
+                if (treeNode.data.feesIndex.common && treeNode.data.feesIndex.common.tenderUnitFee != treeNode.data.feesIndex.common.unitFee) {
                     treeNode.data.feesIndex.common.tenderUnitFee = treeNode.data.feesIndex.common.unitFee;
                     treeNode.changed = true;
                 };
-                if (treeNode.data.feesIndex.common.tenderTotalFee != treeNode.data.feesIndex.common.totalFee) {
+                if (treeNode.data.feesIndex.common && treeNode.data.feesIndex.common.tenderTotalFee != treeNode.data.feesIndex.common.totalFee) {
                     treeNode.data.feesIndex.common.tenderTotalFee = treeNode.data.feesIndex.common.totalFee;
                     treeNode.changed = true;
                 };

web/building_saas/main/js/views/glj_col.js

@@ -2,7 +2,8 @@
  * Created by zhang on 2018/7/3.
  */
 let gljCol = {
-    showTaxRate:false,
+    showTaxRate: false,
+    hideInfoPrice:true,
     ration_glj_setting: {
         header: [
             {headerName: "编码", headerWidth: 110, dataCode: "code", dataType: "String", formatter: "@"},
@@ -63,7 +64,7 @@ let gljCol = {
             {headerName: "质量等级", headerWidth: 80, dataCode: "qualityGrace", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "品牌", headerWidth: 80, dataCode: "brand", hAlign: "left", dataType: "String",spanRows: [2]},
             {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String",spanRows: [2]},
-            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox",spanRows: [2], visible: false},
+            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox",spanRows: [2], visible: true},
             {headerName: ["调价后","市场价"], headerWidth: 75, dataCode: "tenderPrice", hAlign: "right", dataType: "Number",validator:"number",spanCols: [2,1], visible: false},
             {headerName: ["","总消耗量"], headerWidth: 90, dataCode: "tenderQuantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity',spanCols: [0,1], visible: false}
         ],
@@ -249,21 +250,26 @@ let gljCol = {
             setting.view.lockColumns = newArray;
         }
     },
-    initGljCol:function (showAdjustPrice, showTenderFields) {
-        let me = gljCol;
-        if(showAdjustPrice !== true){
-            me.removeCol('adjustPrice',me.ration_glj_setting);
-            me.removeCol('adjustPrice',me.project_glj_setting);
-            me.removeCol('adjustPrice',me.mixRatio_Setting);
-        };
-        if(me.showTaxRate == false)  me.removeCol('taxRate',me.project_glj_setting);
-        me.showTenderFields(showTenderFields, false);
+    initGljCol: function (showAdjustPrice, showTenderFields) {
+      let me = gljCol;
+      if (showAdjustPrice !== true) {
+        me.removeCol('adjustPrice', me.ration_glj_setting);
+        me.removeCol('adjustPrice', me.project_glj_setting);
+        me.removeCol('adjustPrice', me.mixRatio_Setting);
+      };
+      if (me.showTaxRate == false) me.removeCol('taxRate', me.project_glj_setting);
+      if (me.hideInfoPrice == true) { 
+        $("#info-nav-li").hide();
+        me.removeCol('priceFrom', me.project_glj_setting);
+      } 
+      
+      me.showTenderFields(showTenderFields, false);
 
-        gljOprObj.setting = me.ration_glj_setting;
-        projectGljObject.projectGljSetting = me.project_glj_setting;
-        projectGljObject.mixRatioSetting = me.mixRatio_Setting;
-        me.setScopeFormater();
-        gljOprObj.scopeSetting = me.scopeSetting;
+      gljOprObj.setting = me.ration_glj_setting;
+      projectGljObject.projectGljSetting = me.project_glj_setting;
+      projectGljObject.mixRatioSetting = me.mixRatio_Setting;
+      me.setScopeFormater();
+      gljOprObj.scopeSetting = me.scopeSetting;
     },
     showTenderFields: function (showFields = false, needRefresh = false){
         let me = gljCol;

web/building_saas/pm/js/pm_tree.js

@@ -332,7 +332,7 @@ const pmTree = {
                     node.children = parentMap[node.data.ID] || [];
                     node.parent = IDMap[node.data.ParentID] || this._root;
                 });
-                const roots = parentMap['-1'];
+                const roots = parentMap['-1']||[];
                 // 将各节点的children进行排序，并设置nextSibling
                 this._root.children = sortChildren(roots);
                 // 生成tree.items

web/building_saas/unit_price_file/index.js

@@ -253,7 +253,7 @@ let unitPriceObj = {
   },
   showSubDatas:function(){
     let parentData = this.getSelectedUnitPrice();
-    this.mixRatioList = mixRatioMap[gljUtil.getIndex(parentData)];
+    this.mixRatioList = parentData?mixRatioMap[gljUtil.getIndex(parentData)]:[];
     this.mixRatioList = this.mixRatioList?this.mixRatioList:[];
     this.setMixRatioData(this.mixRatioList);
     let sel = this.subSheet.getSelections()[0];

web/common/html/header.html

@@ -54,10 +54,10 @@
             <% if (!versionName.includes('免费')) {%>
               <li class="nav-item">
                 <a href="/user/buy" target="_blank">
-                    <% if (sessionUser.compilationDeadline !== '') { %>
-                    <img src="/web/building_saas/img/vip2.png" data-toggle="tooltip" data-placement="bottom" data-original-title="年限版用户">
-                    <% } else { %>
-                    <img src="/web/building_saas/img/vip.png" data-toggle="tooltip" data-placement="bottom" data-original-title="专业版用户">
+                    <% if (sessionUser.compilationLock === 1) { %>
+                    <img width="38" src="/web/building_saas/img/vip2.png" data-toggle="tooltip" data-placement="bottom" data-original-title="借用">
+                    <% } else if (sessionUser.compilationLock === 2) { %>
+                    <img width="38" src="/web/building_saas/img/vip.png" data-toggle="tooltip" data-placement="bottom" data-original-title="购买">
                     <% } %>
                 </a>
               </li>
@@ -80,7 +80,7 @@
                     <!--<a class="dropdown-item" href="/web/common/html/pdfViewer.html?type=userGuide" target="_blank">用户手册</a>
                     <a class="dropdown-item" href="/web/common/html/pdfViewer.html?type=upgradeGuide" target="_blank">升级说明</a>-->
                     <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dsk_yhsc" target="_blank">用户手册</a>
-                    <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dasikongupdate/dasikongupdate-1c6lsks1552q8" target="_blank">升级说明</a>
+                    <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dasikongupdate" target="_blank">升级说明</a>
                     <a class="dropdown-item" href="http://zhzdwk.com/special/detail/36" target="_blank">计价依据</a>
                     <a class="dropdown-item" href="https://smartcost.com.cn/" target="_blank">纵横官网</a>
                     <!--  <a class="dropdown-item" href="#">动画教程</a>-->

web/over_write/js/chongqing_2018.js

@@ -321,6 +321,10 @@ if(typeof figureClassTemplate !== 'undefined'){
     figureClassTemplate['ADDED_VALUE_TAX'] = {flag: fixedFlag.ADDED_VALUE_TAX, filter: ['SJ', 'ZZS', 'SQGCZJ']}
 };
 
+if(typeof gljCol !== 'undefined'){
+  gljCol.hideInfoPrice = false;
+};
+
 //这个文档浏览器库和服务器端共用，所以这个文件中用到的变量都要记得做undefined判断，不然后端读取时会有问题
 //=================================================== 前后端分割线 ======================================================================
 if(typeof module !== 'undefined'){

web/users/html/index.html

@@ -33,7 +33,7 @@
       <!--banner-->
       <div class="hero bg-dark section " style="background-image: url(/web/users/images/bg_01.png);" id="home">
          <div class="container text-center">
-            <h1 class="text-white mb-4 f-50 ">大司空市政云计价，正版软件永久免费</h1>
+            <h1 class="text-white mb-4 f-50 ">大司空市政云计价，免费公用版软件</h1>
             <p class="lead text-white mb-5">跨平台，打开浏览器即可使用，全新在线计价体验。
             <div class="btn_hero">
                <a href="/login" class="btn btn-danger mr-2">登录软件</a>

web/users/html/login-sms.html

@@ -36,10 +36,10 @@
                     <strong>登录失败</strong> <span id="message"></span>
                 </div>
             </div>
-            <div class="form-group">
-                <div id="captcha-box"></div>
-            </div>
-            <div class="form-group btn-area" style="display: none;">
+            <!--<div class="form-group">-->
+                <!--<div id="captcha-box"></div>-->
+            <!--</div>-->
+            <div class="form-group btn-area">
                 <button id="login" type="button" class="btn btn-primary btn-block">登录</button>
             </div>
         </form>

web/users/html/login-ver.html

@@ -26,7 +26,7 @@
             <div class="">
             <div class="row  modal-auto-height">
                 <% for (const ver of versionData) { %>
-                        <div class="col-sm-6">
+                        <div class="col-sm-4 mb-3">
                             <div class="card card-block">
                                 <div class="card-body">
                                     <h3 class="card-title"><%= ver.name %></h3>

web/users/html/login.html

@@ -47,10 +47,10 @@
                     <strong>登录失败</strong> <span id="message"></span>
                 </div>
             </div>
-            <div class="form-group">
-                <div id="captcha-box"></div>
-            </div>
-            <div class="form-group btn-area" style="display: none">
+            <!--<div class="form-group">-->
+                <!--<div id="captcha-box"></div>-->
+            <!--</div>-->
+            <div class="form-group btn-area">
                 <button id="login" type="button" class="btn btn-primary btn-block">登录</button>
             </div>
             <div class="pt-1 d-flex justify-content-between">

web/users/html/user-buy.html

@@ -75,12 +75,16 @@
                             </div>
                             <div class="col-sm-5 mb-5">
                                 <div class="card pro-version">
-                                  <div class="card-body">
-                                    <h3 class="card-title">
-                                        专业版
-                                        <img src="/web/building_saas/img/vip.png" data-toggle="tooltip" data-placement="bottom" data-original-title="专业版用户">
-                                        <img src="/web/building_saas/img/vip2.png" data-toggle="tooltip" data-placement="bottom" data-original-title="年限版用户">
-                                    </h3>
+                                    <div class="card-body d-flex justify-content-between">
+                                        <h3 class="card-title">专业版</h3>
+                                        <div>
+                                            <div class="d-inline-block mr-3">
+                                                <img width="24" src="/web/building_saas/img/vip.png">购买
+                                            </div>
+                                            <div class="d-inline-block">
+                                                <img width="24" src="/web/building_saas/img/vip2.png">借用
+                                            </div>
+                                        </div>
                                       <!--<p class="card-text">-->
                                       <!--&lt;!&ndash;<ul class="pl-3">-->
                                           <!--<li>创建单位工程无限制</li>-->
@@ -94,27 +98,24 @@
                                         <li class="list-group-item d-flex justify-content-between">
                                             <div class="col-6">
                                                 <%= compilation.name %>
-                                                <% if (compilation.isUpgrade !== undefined && compilation.isUpgrade === true && compilation.deadline !== undefined && compilation.deadline !== '') { %>
-                                                <img src="/web/building_saas/img/vip2.png" data-toggle="tooltip" data-placement="bottom" data-original-title="年限版用户">
-                                                <% } else if (compilation.isUpgrade !== undefined && compilation.isUpgrade === true && (compilation.deadline === undefined || compilation.deadline === '')) { %>
-                                                <img src="/web/building_saas/img/vip.png" data-toggle="tooltip" data-placement="bottom" data-original-title="专业版用户">
+                                                <% if (compilation.lock !== undefined && compilation.lock === 1) { %>
+                                                <img width="38" src="/web/building_saas/img/vip2.png" data-toggle="tooltip" data-placement="bottom" data-original-title="借用">
+                                                <% } else if (compilation.lock !== undefined && compilation.lock === 2) { %>
+                                                <img width="38" src="/web/building_saas/img/vip.png" data-toggle="tooltip" data-placement="bottom" data-original-title="购买">
                                                 <% } %>
                                             </div>
                                             <div class="ml-auto text-right">
-                                            <% if (compilation.isUpgrade === undefined || compilation.isUpgrade !== true) { %>
-                                            <a href="javascript:void(0);" class="btn btn-primary btn-sm getcategory" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>">立即激活</a>
-                                            <% } else { %>
-                                            <a href="javascript:void(0);" class="btn btn-outline-secondary btn-sm getcategory" data-title="<%= compilation.name %>" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>"><i class="fa fa-check"></i> 已激活</a>
-                                            <% if (compilation.deadline !== undefined && compilation.deadline !== '') { %><span class="d-block text-muted">到期：<%= compilation.deadline %></span><% } %>
-                                            <% } %>
+                                                <% if (compilation.isUpgrade === undefined || compilation.isUpgrade !== true) { %>
+                                                <a href="javascript:void(0);" class="btn btn-primary btn-sm getcategory" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>">立即激活</a>
+                                                <% if (compilation.deadline !== undefined && compilation.deadline !== '') { %><span class="d-block text-danger">已到期：<%= compilation.deadline %></span><% } %>
+                                                <% } else { %>
+                                                <a href="javascript:void(0);" class="btn btn-outline-secondary btn-sm getcategory" data-title="<%= compilation.name %>" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>"><i class="fa fa-check"></i> 已激活</a>
+                                                <% if (compilation.deadline !== undefined && compilation.deadline !== '') { %><span class="d-block text-muted">到期：<%= compilation.deadline %></span><% } %>
+                                                <% } %>
                                             </div>
                                         </li>
                                         <% }) %>
                                         <% } %>
-                                        <!--<li class="list-group-item d-flex justify-content-between">-->
-                                        <!--重庆（2015）-->
-                                        <!--<a class="btn btn-outline-secondary btn-sm" href="activ2" data-toggle="modal" data-target="#activ2"><i class="fa fa-check"></i> 已激活</a>-->
-                                        <!--</li>-->
                                     </ul>
                                 </div>
                             </div>

web/users/js/login.js

@@ -9,42 +9,42 @@ $(document).ready(function () {
     let referer = scUrlUtil.GetQueryString('referer');
 
     // 载入时先获取相关参数
-    $.ajax({
-        url: '/captcha',
-        type: 'get',
-        data: '',
-        timeout: 5000,
-        error: function() {
-            $("#captcha-box").html('验证码加载失败');
-        },
-        beforeSend: function() {
-            $("#captcha-box").html('正在加载验证码');
-        },
-        success: function(response) {
-            $("#captcha-box").html('');
-            if (response.success === 0) {
-                alert('验证码初始化失败!');
-                return false;
-            }
-
-            initGeetest({
-                // 以下配置参数来自服务端 SDK
-                gt: response.gt,
-                challenge: response.challenge,
-                offline: !response.success,
-                new_captcha: response.new_captcha,
-                width: '100%'
-            }, handler);
-        }
-    });
+    // $.ajax({
+    //     url: '/captcha',
+    //     type: 'get',
+    //     data: '',
+    //     timeout: 5000,
+    //     error: function() {
+    //         $("#captcha-box").html('验证码加载失败');
+    //     },
+    //     beforeSend: function() {
+    //         $("#captcha-box").html('正在加载验证码');
+    //     },
+    //     success: function(response) {
+    //         $("#captcha-box").html('');
+    //         if (response.success === 0) {
+    //             alert('验证码初始化失败!');
+    //             return false;
+    //         }
+    //
+    //         initGeetest({
+    //             // 以下配置参数来自服务端 SDK
+    //             gt: response.gt,
+    //             challenge: response.challenge,
+    //             offline: !response.success,
+    //             new_captcha: response.new_captcha,
+    //             width: '100%'
+    //         }, handler);
+    //     }
+    // });
 
-    const handler = function(captchaObj) {
-        captchaObj.appendTo('#captcha-box');
-        captchaObj.onSuccess(function () {
-            $(".btn-area").slideDown("fast");
-            // $('#login').click();
-            // captchaObj.getValidate();
-        });
+    // const handler = function(captchaObj) {
+    //     captchaObj.appendTo('#captcha-box');
+    //     captchaObj.onSuccess(function () {
+    //         $(".btn-area").slideDown("fast");
+    //         // $('#login').click();
+    //         // captchaObj.getValidate();
+    //     });
 
         $("#login").click(function () {
             if (!valid()) {
@@ -53,14 +53,14 @@ $(document).ready(function () {
             if ($('#changeLogin').attr('data-status') === 'user') {
                 let account = $("#inputEmail").val();
                 if(/^1[3456789]\d{9}$/.test(account) || /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/.test(account)) {
-                    login(captchaObj);
+                    login();
                 } else {
                     $('#emailHelp').text('您输入的 邮箱/手机 格式不对');
                 }
             } else {
                 let account = $("#mobileLogin").val();
                 if(/^1[3456789]\d{9}$/.test(account)) {
-                    login(captchaObj);
+                    login();
                 } else {
                     $('#phoneHelp').text('您输入的 手机 格式不对');
                 }
@@ -142,7 +142,7 @@ $(document).ready(function () {
                 }
             })
         });
-    };
+    // };
 
     $("input").blur(function () {
         cleanError();
@@ -265,73 +265,117 @@ $(document).ready(function () {
     });
 });
 
-function login(captchaObj) {
-    $('#login').attr('disabled', true);
-    let geetest_challenge = $('input[name="geetest_challenge"]').val();
-    let geetest_validate = $('input[name="geetest_validate"]').val();
-    let geetest_seccode = $('input[name="geetest_seccode"]').val();
+function login() {
+    $.ajax({
+        url: '/captcha?t='+ (new Date()).getTime(),
+        type: 'get',
+        dataType: 'json',
+        timeout: 5000,
+        error: function() {
+            // $("#captcha-box").html('验证码加载失败');
+        },
+        beforeSend: function() {
+            // $("#captcha-box").html('正在加载验证码');
+        },
+        success: function(response) {
+            $("#captcha-box").html('');
+            if (response.success === 0) {
+                alert('验证码初始化失败!');
+                return false;
+            }
 
-    const postData = {
-        geetest_challenge: geetest_challenge,
-        geetest_validate: geetest_validate,
-        geetest_seccode: geetest_seccode,
-    };
-    if ($('#changeLogin').attr('data-status') === 'user') {
-        let account = $("#inputEmail").val();
-        let pw = $("#inputPassword").val();
-        postData.account = account;
-        postData.pw = pw;
-    } else {
-        let mobile = $('#mobileLogin').val();
-        let code = $("#codeLogin").val();
-        postData.mobile = mobile;
-        postData.code = code;
-    }
+            initGeetest({
+                // 以下配置参数来自服务端 SDK
+                gt: response.gt,
+                challenge: response.challenge,
+                offline: !response.success,
+                new_captcha: response.new_captcha,
+                // width: '100%',
+                product: "bind"
+            }, function (catpchaObj) {
+                catpchaObj.onReady(function () {
+                    catpchaObj.verify();
+                }).onClose(function () {
+                }).onSuccess(function () {
+                    /* 延迟到动画结束后再alert */
+                    var lastUTC = new Date(), duration = 1100;
+                    function _alert(msg) {
+                        var elapsed = new Date() - lastUTC;
+                        if (elapsed >= duration) { return alert(msg) }
+                        setTimeout(function () { alert(msg) }, duration - elapsed);
+                    }
+                    var result = catpchaObj.getValidate();
+                    if (!result) {return alert('请完成验证');}
+                    $('#login').attr('disabled', true);
+                    let geetest_challenge = $('input[name="geetest_challenge"]').val();
+                    let geetest_validate = $('input[name="geetest_validate"]').val();
+                    let geetest_seccode = $('input[name="geetest_seccode"]').val();
 
-    $.ajax({
-        url: '/login',
-        type: 'post',
-        data: postData,
-        success: function (response) {
-            if (response.error === 0) {
-                // $('#phonepass').modal('hide');
-                const url = response.last_page !== null && response.last_page !== undefined && response.last_page !== '' ?
-                    response.last_page : '/pm';
-                if (response.login_ask === 0) {
-                    location.href = url;
-                } else {
-                    response.compilation_list = response.compilation_list === undefined || response.compilation_list === '' ?
-                        null : JSON.parse(response.compilation_list);
-                    if (response.compilation_list === null || response.compilation_list.length <= 0) {
-                        location.href = url;
-                        return false;
+                    const postData = {
+                        geetest_challenge: geetest_challenge,
+                        geetest_validate: geetest_validate,
+                        geetest_seccode: geetest_seccode,
+                    };
+                    if ($('#changeLogin').attr('data-status') === 'user') {
+                        let account = $("#inputEmail").val();
+                        let pw = $("#inputPassword").val();
+                        postData.account = account;
+                        postData.pw = pw;
+                    } else {
+                        let mobile = $('#mobileLogin').val();
+                        let code = $("#codeLogin").val();
+                        postData.mobile = mobile;
+                        postData.code = code;
                     }
-                    console.log(response.compilation_list);
-                    setVersion(response.compilation_list);
-                    $('#ver').modal('show');
-                }
-            } else if(response.error === 2) {
-                // $('#phonepass').modal('hide');
-                // captchaObj.reset();
-                $('#check_ssoId').val(response.ssoId);
-                $('#phone').modal('show');
-                $('#login').removeAttr('disabled');
-            } else if(response.error === 3) {
-                // captchaObj.reset();
-                $('#phonepass').modal('show');
-                $('#mobileLogin').val(response.data);
-                $('#login').removeAttr('disabled');
-            } else {
-                // $('#phonepass').modal('hide');
-                let msg = response.msg !== undefined ? response.msg : '未知错误';
-                showError(msg, $("input"));
-                $('#login').removeAttr('disabled');
-                // captchaObj.reset();
-            }
-        },
-        error: function (result) {
-            showError('内部程序错误', null);
-            $('#login').removeAttr('disabled');
+
+                    $.ajax({
+                        url: '/login',
+                        type: 'post',
+                        data: postData,
+                        success: function (response) {
+                            if (response.error === 0) {
+                                // $('#phonepass').modal('hide');
+                                const url = response.last_page !== null && response.last_page !== undefined && response.last_page !== '' ?
+                                    response.last_page : '/pm';
+                                if (response.login_ask === 0) {
+                                    location.href = url;
+                                } else {
+                                    response.compilation_list = response.compilation_list === undefined || response.compilation_list === '' ?
+                                        null : JSON.parse(response.compilation_list);
+                                    if (response.compilation_list === null || response.compilation_list.length <= 0) {
+                                        location.href = url;
+                                        return false;
+                                    }
+                                    console.log(response.compilation_list);
+                                    setVersion(response.compilation_list);
+                                    $('#ver').modal('show');
+                                }
+                            } else if(response.error === 2) {
+                                // $('#phonepass').modal('hide');
+                                // captchaObj.reset();
+                                $('#check_ssoId').val(response.ssoId);
+                                $('#phone').modal('show');
+                                $('#login').removeAttr('disabled');
+                            } else if(response.error === 3) {
+                                // captchaObj.reset();
+                                $('#phonepass').modal('show');
+                                $('#mobileLogin').val(response.data);
+                                $('#login').removeAttr('disabled');
+                            } else {
+                                // $('#phonepass').modal('hide');
+                                let msg = response.msg !== undefined ? response.msg : '未知错误';
+                                showError(msg, $("input"));
+                                $('#login').removeAttr('disabled');
+                                // captchaObj.reset();
+                            }
+                        },
+                        error: function (result) {
+                            showError('内部程序错误', null);
+                            $('#login').removeAttr('disabled');
+                        }
+                    });
+                })
+            });
         }
     });
 }