1

app/service/cloudBuildEditionService.js

@@ -305,7 +305,8 @@ var cloudService={
         }else if(data.status==='3'){
             status=3;
         }
-        var postData ={'ssoId':ssoid,'cid':data.compilationId,'deadline':deadline,'smssend':smssend,'status':status};
+        var postData ={'ssoId':ssoid,'cid':data.compilationId,
+            'deadline':deadline,'smssend':smssend,'status':status,'lock':data.lock};
         
         var result= await postRequest(url,postData);
         result=JSON.parse(result);
@@ -350,7 +351,14 @@ var cloudService={
                 id=detail['cloud_curing']['id'];
             }
 
-            let operation=STAFF.username+'升级'+data.name;
+            var lockhtml="";
+            if(data.lock=='1'){
+                lockhtml="借出"
+            }else if(data.lock=='2'){
+                lockhtml="销售"
+            }
+
+            let operation=STAFF.username+lockhtml+data.name;
             if(status==2){
                 operation=STAFF.username+'降级'+data.name+'(学习版)';
             }

app/service/cloudEditionService.js

@@ -306,7 +306,7 @@ var cloudService={
         }else if(data.status==='3'){
             status=3;
         }
-        var postData ={'ssoId':ssoid,'cid':data.compilationId,'deadline':deadline,'smssend':smssend,'status':status};
+        var postData ={'ssoId':ssoid,'cid':data.compilationId,'deadline':deadline,'smssend':smssend,'status':status,'lock':data.lock};
         
         var result= await postRequest(url,postData);
         result=JSON.parse(result);
@@ -351,7 +351,15 @@ var cloudService={
                 id=detail['cloud_curing']['id'];
             }
             //记录锁日志
-            let operation=STAFF.username+'升级'+data.name;
+            //data.lock
+            var lockhtml="";
+            if(data.lock=='1'){
+                lockhtml="借出"
+            }else if(data.lock=='2'){
+                lockhtml="销售"
+            }
+
+            let operation=STAFF.username+lockhtml+data.name;
             if(status==2){
                 operation=STAFF.username+'降级'+data.name+'(学习版)';
             }

global/js/cloud/build.js

@@ -152,12 +152,13 @@ $(function() {
         // 只获取第一个选中的值
         var compilationId = $('#_id').val();
         var name = $('#name').val();
+        var lock=$('#lock').val();
         var curingSsoid = $('#curingSsoid').val();
         var mobile = $('#curingMobile').val();
         var client_id = $('#client_id').val();
         var deadline=$('#deadline').val();
         var smssend=$('input[smssend]').get(0).checked
-        curingDo(compilationId,name,curingSsoid,1,mobile,client_id,deadline,smssend);
+        curingDo(compilationId,name,curingSsoid,1,mobile,client_id,deadline,smssend,lock);
     });
 
     /**
@@ -172,7 +173,7 @@ $(function() {
         var client_id = $('#client_id').val();
         var deadline=$('#deadline').val();
         var smssend=$('input[downsmssend]').get(0).checked;
-        curingDo(compilationId,name,curingSsoid,2,mobile,client_id,deadline,smssend);
+        curingDo(compilationId,name,curingSsoid,2,mobile,client_id,deadline,smssend,0);
     });
 
     $('button[deadlineCuringDo]').on('click', function (e) {
@@ -182,10 +183,10 @@ $(function() {
         var curingSsoid = $('#curingSsoid').val();
         var mobile = $('#curingMobile').val();
         var client_id = $('#client_id').val();
-
+        var lock = $('#lock').val();
         var deadline=$('#deadlineInput').val();
         var smssend=$('input[deadlineSmssend]').get(0).checked;
-        curingDo(compilationId,name,curingSsoid,3,mobile,client_id,deadline,smssend);
+        curingDo(compilationId,name,curingSsoid,3,mobile,client_id,deadline,smssend,lock);
     });
     
     /**

global/js/cloud/buildFN.js

@@ -150,11 +150,19 @@ function init(){
  * @param username
  * @returns
  */
-function upCuring(name, _id, username) {
+function upCuring(name, _id, username,lock) {
     $('#name').val(name);
     $('#_id').val(_id);
+    $('#lock').val(lock);
+    var lockHtml="";
+    if(lock==1){
+        lockHtml="借出";
+    }else if(lock==2){
+        lockHtml="销售";
+    }
+
     var curingMobile = $('#curingMobile').val();
-    var html = '<p>为用户 <b>' + curingMobile + ',' + username + '</b> 升级 <b>' + name + '</b></p>';
+    var html = '<p>为用户 <b>' + curingMobile + ',' + username + '</b> '+lockHtml+' <b>' + name + '</b></p>';
     html += `<div class="form-group">
         <div class="custom-control custom-switch">
         <input type="checkbox" class="custom-control-input" deadline id="customSwitch2" >
@@ -165,7 +173,7 @@ function upCuring(name, _id, username) {
     <label class="form-label" for="example-date">到期时间</label>
     <input class="form-control" id="deadline" type="date"  name="deadline" disabled  value="">
 </div>`;
-    html += `<div class="form-group">
+    html += `<div class="form-group" style="display:none">
     <div class="custom-control custom-switch">
         <input type="checkbox" class="custom-control-input" smssend id="customSwitch22" >
         <label class="custom-control-label" for="customSwitch22">给客户发送短信通知</label>
@@ -185,29 +193,32 @@ function downCuring(name, _id, username) {
     $('#name').val(name);
     $('#_id').val(_id);
     var curingMobile = $('#curingMobile').val();
-    var html = '<p>为用户 <b>'+curingMobile+','+username+'</b> <span class="text-danger">降级</span> <b>'+name+'免费版</b></p><div class="form-group"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" downSmssend id="customSwitch23" ><label class="custom-control-label"  for="customSwitch23">给客户发送短信通知</label></div></div>';
-    
+    var html = '<p>为用户 <b>'+curingMobile+','+username+'</b> <span class="text-danger">降级</span> <b>'+name+'免费版</b></p><div class="form-group" style="display: none"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" downSmssend id="customSwitch23" ><label class="custom-control-label"  for="customSwitch23">给客户发送短信通知</label></div></div>';
+    //
     $('div[downCuring] span').html(html);
 }
 
-function deadlineCuring(name, _id, username,deadline){
+function deadlineCuring(name, _id, username,deadline,lock){
     $('#name').val(name);
     $('#_id').val(_id);
+    $('#lock').val(lock);
     var curingMobile = $('#curingMobile').val();
     var html = '<p>为用户 <b>'+curingMobile+','+username+'</b> <b>'+name+'</b> 设置延期</p><p>当前限期为：'+deadline+'</p>';
 
-    html +='<div class="form-group"><label class="form-label" for="example-date">到期时间</label><input class="form-control"  id="deadlineInput" type="date" name="date" value=""></div><div class="form-group"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" deadlineSmssend id="customSwitch222" ><label class="custom-control-label" for="customSwitch222">给客户发送短信通知</label></div></div>';
+    html +='<div class="form-group"><label class="form-label" for="example-date">到期时间</label><input class="form-control"  id="deadlineInput" type="date" name="date" value=""></div>' ;
+    html +='<div class="form-group" style="display: none"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" deadlineSmssend id="customSwitch222" ><label class="custom-control-label" for="customSwitch222">给客户发送短信通知</label></div></div>';
     
     $('div[deadlineCuring] span').html(html);
 }
 
-function curingDo(compilationId, name, curingSsoid, status, mobile, client_id, deadline, smssend) {
+function curingDo(compilationId, name, curingSsoid, status, mobile, client_id, deadline, smssend,lock) {
     if (curingSsoid != '' && compilationId != '') {
         $.ajax({
             cache: false,
             type: 'post',
             url: '/cloud/build/ajax/upCuringDo',
-            data: { ssoid: curingSsoid, compilationId: compilationId, mobile: mobile, client_id: client_id, name: name, deadline: deadline, smssend: smssend, status: status },
+            data: { ssoid: curingSsoid, compilationId: compilationId, mobile: mobile, client_id: client_id,
+                name: name, deadline: deadline, smssend: smssend, status: status,lock:lock },
             dataType: 'json',
             success: function (data) {
                 if (data.status == 1) {

global/js/cloud/buildHtml.js

@@ -139,24 +139,46 @@ function buildCuringCompilation(data){
             }
         });
 
-        if(v.isUpgrade !== undefined && v.isUpgrade === true){
-            upMajorBoxHtml+=`已升级
-            <a href="#degrade-confirm" onclick=downCuring("${v.name}","${v._id}","${data.detail.userInfo.username}") class="btn btn-xs btn-outline-danger ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#degrade-confirm">降级</a>
-            `;
-        }else{
-            upMajorBoxHtml+='<a onclick=upCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'")  ' +
-                'href="#update-confirm"  class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">升级</a>';
-        }
-        upMajorBoxHtml+='</td>';
+    if(v.isUpgrade !== undefined && v.isUpgrade === true){
+        upMajorBoxHtml+='已升级';
+    }else{}
+    upMajorBoxHtml+='</td>';
+
+    if(v.isUpgrade !== undefined && v.isUpgrade === true){
+        upMajorBoxHtml+='<td>'+deadline+'</td>';
+    }else{
+        upMajorBoxHtml+='<td></td>';
+    }
 
-        if(v.isUpgrade !== undefined && v.isUpgrade === true){
-            upMajorBoxHtml+=`<td>
-            ${setUndefined(deadline)}<a href="#deadline-confirm" onclick=deadlineCuring("${v.name}","${v._id}","${data.detail.userInfo.username}","${deadline}") class="btn btn-xs btn-outline-primary ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#deadline-confirm">限期</a>
-            </td>`;
-            upMajorBoxHtml+='</tr>';
+    //操作相关
+    upMajorBoxHtml+='<td>';
+    if(v.isUpgrade !== undefined && v.isUpgrade === true){
+        upMajorBoxHtml+='<a href="#degrade-confirm" onclick=downCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","0") class="btn btn-xs btn-outline-danger ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#degrade-confirm">降级</a>';
+        if(v.lock==1){
+            upMajorBoxHtml+='<a onclick=upCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","2")  ' +
+                'href="#update-confirm"  class="btn btn-xs btn-outline-danger ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">销售</a>';
+        }
+    }else{
+        //借出，销售
+        if(v.lock==1){
+            upMajorBoxHtml+='<a onclick=upCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","2")  ' +
+                'href="#update-confirm"  class="btn btn-xs btn-outline-danger ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">销售</a>';
+        }else if(v.lock==2){
         }else{
-            upMajorBoxHtml+=`<td></td>`;
+            upMajorBoxHtml+='<a onclick=upCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","1")  ' +
+                'href="#update-confirm"  class="btn btn-xs btn-outline-danger ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">借出</a>';
+            upMajorBoxHtml+='<a onclick=upCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","2")  ' +
+                'href="#update-confirm"  class="btn btn-xs btn-outline-danger ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">销售</a>';
         }
+    }
+    if(v.isUpgrade !== undefined && v.isUpgrade === true){
+        //期限
+        upMajorBoxHtml+='<a href="#deadline-confirm" onclick=deadlineCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","'+deadline+'","'+ v.lock+'") class="btn btn-xs btn-outline-primary ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#deadline-confirm">限期</a>';
+    }
+
+    upMajorBoxHtml+='</td>';
+
+    upMajorBoxHtml+='</tr>';
 
     });
     

global/js/cloud/curing.js

@@ -188,12 +188,13 @@ $(function () {
         // 只获取第一个选中的值
         var compilationId = $('#_id').val();
         var name = $('#name').val();
+        var lock = $('#lock').val();
         var curingSsoid = $('#curingSsoid').val();
         var mobile = $('#curingMobile').val();
         var client_id = $('#client_id').val();
         var deadline1=$('#deadline').val();
         var smssend=$('input[smssend]').get(0).checked
-        curingDo(compilationId,name,curingSsoid,1,mobile,client_id,deadline1,smssend);
+        curingDo(compilationId,name,curingSsoid,1,mobile,client_id,deadline1,smssend,lock);
     });
 
     /**
@@ -208,7 +209,7 @@ $(function () {
         var client_id = $('#client_id').val();
         var deadline1=$('#deadline').val();
         var smssend=$('input[downsmssend]').get(0).checked;
-        curingDo(compilationId,name,curingSsoid,2,mobile,client_id,deadline1,smssend);
+        curingDo(compilationId,name,curingSsoid,2,mobile,client_id,deadline1,smssend,0);
     });
 
     $('button[deadlineCuringDo]').on('click', function (e) {
@@ -218,10 +219,11 @@ $(function () {
         var curingSsoid = $('#curingSsoid').val();
         var mobile = $('#curingMobile').val();
         var client_id = $('#client_id').val();
+        var lock = $('#lock').val();
 
         var deadline=$('#deadlineInput').val();
         var smssend=$('input[deadlineSmssend]').get(0).checked;
-        curingDo(compilationId,name,curingSsoid,3,mobile,client_id,deadline,smssend);
+        curingDo(compilationId,name,curingSsoid,3,mobile,client_id,deadline,smssend,lock);
     });
     
 

global/js/cloud/curingFN.js

@@ -151,16 +151,24 @@ function init() {
  * @param username
  * @returns
  */
-function upCuring(name, _id, username) {
+function upCuring(name, _id, username,lock) {
     $('#name').val(name);
     $('#_id').val(_id);
+    $('#lock').val(lock);
     var curingMobile = $('#curingMobile').val();
-    var html = '<p>为用户 <b>' + curingMobile + ',' + username + '</b> 升级 <b>' + name + '</b></p>';
+    var lockHtml="";
+    if(lock==1){
+        lockHtml="借出";
+    }else if(lock==2){
+        lockHtml="销售";
+    }
+
+    var html = '<p>为用户 <b>' + curingMobile + ',' + username + '</b> '+lockHtml+' <b>' + name + '</b></p>';
     html += '<div class="form-group"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" deadline id="customSwitch2" ><label class="custom-control-label" deadlineLabel for="customSwitch2">限期</label></div></div>';
     
     html += '<div class="form-group"><label class="form-label" for="example-date">到期时间</label><input class="form-control" id="deadline" type="date"  name="deadline" disabled  value=""></div>';
     
-    html += '<div class="form-group"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" smssend id="customSwitch22" ><label class="custom-control-label" for="customSwitch22">给客户发送短信通知</label></div></div>';
+    html += '<div class="form-group" style="display: none"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" smssend id="customSwitch22" ><label class="custom-control-label" for="customSwitch22">给客户发送短信通知</label></div></div>';
 
     $('div[upCuring] span').html(html);
 }
@@ -182,22 +190,24 @@ function downCuring(name, _id, username) {
     //         <label class="custom-control-label"  for="customSwitch23">给客户发送短信通知</label>
     //     </div>
     // </div>`;
-    var html = '<p>为用户 <b>'+curingMobile+','+username+'</b> <span class="text-danger">降级</span> <b>'+name+'免费版</b></p><div class="form-group"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" downSmssend id="customSwitch23" ><label class="custom-control-label"  for="customSwitch23">给客户发送短信通知</label></div></div>';
-    
+    var html = '<p>为用户 <b>'+curingMobile+','+username+'</b> <span class="text-danger">降级</span> <b>'+name+'免费版</b></p><div class="form-group" style="display: none"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" downSmssend id="customSwitch23" ><label class="custom-control-label"  for="customSwitch23">给客户发送短信通知</label></div></div>';
+
     $('div[downCuring] span').html(html);
 }
 
-function deadlineCuring(name, _id, username,deadline){
+function deadlineCuring(name, _id, username,deadline,lock){
     $('#name').val(name);
     $('#_id').val(_id);
+    $('#lock').val(lock);
     var curingMobile = $('#curingMobile').val();
 
     var html = '<p>为用户 <b>'+curingMobile+','+username+'</b> <b>'+name+'</b> 设置延期</p><p>当前限期为：'+deadline+'</p>';
 
     html+='<div class="form-group"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" deadlineEver id="customSwitch2"><label class="custom-control-label" deadlinelabel="" for="customSwitch2">升级为永久版</label></div></div>';
 
-    html +='<div class="form-group"><label class="form-label" for="example-date">到期时间</label><input class="form-control"  id="deadlineInput" type="date" name="date" value=""></div><div class="form-group"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" deadlineSmssend id="customSwitch222" ><label class="custom-control-label" for="customSwitch222">给客户发送短信通知</label></div></div>';
-    
+    html +='<div class="form-group"><label class="form-label" for="example-date">到期时间</label><input class="form-control"  id="deadlineInput" type="date" name="date" value=""></div><div class="form-group" style="display: none"><div class="custom-control custom-switch"><input type="checkbox" class="custom-control-input" deadlineSmssend id="customSwitch222" ><label class="custom-control-label" for="customSwitch222">给客户发送短信通知</label></div></div>';
+
+    //
 
     // let html = `<p>为用户 <b>${curingMobile},${username}</b> <b>${name}</b> 设置延期</p>
     // <p>当前限期为：${deadline}</p>
@@ -215,13 +225,14 @@ function deadlineCuring(name, _id, username,deadline){
     $('div[deadlineCuring] span').html(html);
 }
 
-function curingDo(compilationId, name, curingSsoid, status, mobile, client_id, deadline, smssend) {
+function curingDo(compilationId, name, curingSsoid, status, mobile, client_id, deadline, smssend,lock) {
     if (curingSsoid != '' && compilationId != '') {
         $.ajax({
             cache: false,
             type: 'post',
             url: '/cloud/curing/ajax/upCuringDo',
-            data: { ssoid: curingSsoid, compilationId: compilationId, mobile: mobile, client_id: client_id, name: name, deadline: deadline, smssend: smssend, status: status },
+            data: { ssoid: curingSsoid, compilationId: compilationId, mobile: mobile, client_id: client_id, name: name,
+                deadline: deadline, smssend: smssend, status: status,lock:lock },
             dataType: 'json',
             success: function (data) {
                 if (data.status == 1) {

global/js/cloud/curingHtml.js

@@ -138,6 +138,7 @@ function buildCuringCompilation(data){
                 deadline=element.deadline;
             }
         });
+
         if(v.isUpgrade !== undefined && v.isUpgrade === true){
             upMajorBoxHtml+='已升级';
         }else{}
@@ -172,7 +173,7 @@ function buildCuringCompilation(data){
         }
         if(v.isUpgrade !== undefined && v.isUpgrade === true){
             //期限
-            upMajorBoxHtml+='<a href="#deadline-confirm" onclick=deadlineCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","'+deadline+'") class="btn btn-xs btn-outline-primary ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#deadline-confirm">限期</a>';
+            upMajorBoxHtml+='<a href="#deadline-confirm" onclick=deadlineCuring("'+ v.name+'","'+ v._id+'","'+data.detail.userInfo.username+'","'+deadline+'","'+ v.lock+'") class="btn btn-xs btn-outline-primary ml-2 waves-effect waves-themed" data-toggle="modal" data-target="#deadline-confirm">限期</a>';
         }
 
         upMajorBoxHtml+='</td>';

views/cloud/build.html

@@ -354,6 +354,7 @@
                         <input type="hidden" id="client_id" value="">
                         <input type="hidden" id="name" value="">
                         <input type="hidden" id="_id" value="">
+                        <input type="hidden" id="lock" value="">
     <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="dialog-sheet">

views/cloud/cloudMenu.html

@@ -25,7 +25,13 @@
                         <span class="nav-link-text">大司空云计价</span>
                     </a>
                 </li>
-                
+
+                <li data="/cloud/highway/edition" do style="display:" >
+                    <a href="/cloud/highway/edition" title="公路运造价" data-filter-tags="application intel marketing dashboard">
+                        <span class="nav-link-text">公路运造价</span>
+                    </a>
+                </li>
+
             </ul>
         </li>
     </ul>

views/cloud/curing.html

@@ -350,6 +350,7 @@
                         <input type="hidden" id="client_id" value="">
                         <input type="hidden" id="name" value="">
                         <input type="hidden" id="_id" value="">
+                        <input type="hidden" id="lock" value="">
     <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="dialog-sheet">