云版升级降级 期限设置

app/config/common.config.js

@@ -7,13 +7,13 @@ global.CRYPTO_KEY='CLDV2_CP';
 
 global.STAFF='';
 //测试
-global.CURINGURL='http://qa.smartcost.com.cn:6060/cld';
+//global.CURINGURL='http://qa.smartcost.com.cn:6060/cld';
 //养护云
-//global.CURINGURL='https://yhuat.smartcost.com.cn/cld';
+global.CURINGURL='https://yhuat.smartcost.com.cn/cld';
 //
-global.BUILD_CURINGURL='http://qa.smartcost.com.cn:6060/cld';
+//global.BUILD_CURINGURL='http://qa.smartcost.com.cn:6060/cld';
 // 大司空
-// global.BUILD_CURINGURL='https://yhyun.smartcost.com.cn/cld';
+global.BUILD_CURINGURL='https://yhyun.smartcost.com.cn/cld';
 
 
 

app/controller/cloudBuildEditionAjaxController.js

@@ -50,8 +50,9 @@ var cloudEditionAjaxController={
 		    var compilationId=req.body.compilationId;//编办ID
 
 		    if(hash.isExistence(ssoid)&&hash.isExistence(compilationId)) {
+				console.log('sdfsdf');
 		        var flag= await cloudService.upCuringDo(req.body);
-
+				
 		        if(flag){
 		            res.json({ 'status': 1,'msg':'升级成功' });
 		        }else{

app/service/cloudBuildEditionService.js

@@ -277,9 +277,9 @@ var cloudService={
         //获得操作日志
         userData['operateLog']=[];
         if(hash.isExistence(userData['curingInfo'])){
-            userData['operateLog']=await models.operate_log.findByCondition(2,hash.hashDecode(userData['curingInfo']['id']));
+            userData['operateLog']=await models.buildOperate_log.findByCondition(2,hash.hashDecode(userData['curingInfo']['id']));
         }
-
+        
         return userData;
     },
     
@@ -289,7 +289,19 @@ var cloudService={
     upCuringDo: async function(data){
         var url =  curingUrl+'/setUserUpgrade';
         var ssoid=hash.hashDecode(data.ssoid);
-        var postData ={'ssoId':ssoid,'cid':data.compilationId};
+        let deadline=data.deadline;
+        let smssend=0;
+        if(data.smssend==='true'){
+            smssend=1;
+        }
+        let status=1;
+        if(data.status==='2'){
+            status=2;
+        }else if(data.status==='3'){
+            status=3;
+        }
+        var postData ={'ssoId':ssoid,'cid':data.compilationId,'deadline':deadline,'smssend':smssend,'status':status};
+        
         var result= await postRequest(url,postData);
         result=JSON.parse(result);
 
@@ -333,10 +345,19 @@ var cloudService={
                 id=detail['cloud_curing']['id'];
             }
 
-            var operation=STAFF.username+'升级'+data.name;
-            //记录锁日志
-            await models.operate_log.createOperateLog(2,id,operation);
-
+            let operation=STAFF.username+'升级'+data.name;
+            if(status==2){
+                operation=STAFF.username+'降级'+data.name+'(免费版)';
+            }
+            if(status!=3){
+                await models.buildOperate_log.createOperateLog(2,id,operation);
+            }
+            
+            if(typeof deadline === 'string' && deadline !== 'undefined' && deadline.trim() !== ""){
+                operation=data.name+'期限改为'+deadline;
+                await models.buildOperate_log.createOperateLog(2,id,operation);
+            }
+            console.log('buildOperate_log---------------------------');
             return true;
         }else{
             return false;
@@ -373,7 +394,7 @@ var cloudService={
 
                 //记录操作日志
                 var operation=STAFF.username+'关联CLD联系人'+clientDetail.clientname;
-                await models.operate_log.createOperateLog(2,id,operation);
+                await models.buildOperate_log.createOperateLog(2,id,operation);
                 return true;
             }else{
                 return false;
@@ -398,17 +419,17 @@ var cloudService={
         	var id=hash.hashDecode(curingDetail['id']);
         	//更新数量
             var values = {
-                client_id: ''
+                client_id: 0
             }
             var where={
                 where: {id: id}
             };
             await models.cloud_build.update(values,where);
-
+ 
             var clientDetail=await models.CLD_client.findById(curingDetail['client_id']);
             //记录操作日志
             var operation=STAFF.username+'移除CLD联系人'+clientDetail.clientname;
-            await models.operate_log.createOperateLog(2,id,operation);
+            await models.buildOperate_log.createOperateLog(2,id,operation);
 
             return true;
         }else{

app/service/cloudEditionService.js

@@ -421,7 +421,7 @@ var cloudService={
         	var id=hash.hashDecode(curingDetail['id']);
         	//更新数量
             var values = {
-                client_id: ''
+                client_id: 0
             }
             var where={
                 where: {id: id}

global/js/cloud/build.js

@@ -47,20 +47,6 @@ function getClentList(){
     })
 }
 
-/**
- * 用户升级专业版 弹框提示--用户详情界面
- * @param name
- * @param _id
- * @param username
- * @returns
- */
-function upCuring(name,_id,username){
-    $('#name').val(name);
-    $('#_id').val(_id);
-    var curingMobile=$('#curingMobile').val();
-    var html='为用户 <b>'+curingMobile+','+username+'</b> 升级 <b>'+name+'</b>';
-    $('div[upCuring] span').html(html);
-}
 
 $(document).ready(function(){
 	init();
@@ -162,31 +148,44 @@ $(function() {
     /**
      * 确定升级专业版--用户详情界面
      */
-    $('button[upCuringDo]').on('click', function(e){
+    $('button[upCuringDo]').on('click', function (e) {
         // 只获取第一个选中的值
         var compilationId = $('#_id').val();
         var name = $('#name').val();
         var curingSsoid = $('#curingSsoid').val();
         var mobile = $('#curingMobile').val();
         var client_id = $('#client_id').val();
-        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},
-                dataType: 'json',
-                success: function(data) {
-                    if (data.status == 1) {
-                    	refreshCuringPageDetail(curingSsoid,client_id);
-                    } else {
-                        alert(data.msg);
-                    }
-                }
-            })
-        } else {
-            alert('请选择需要升级的版本');
-        }
+        let deadline=$('#deadline').val();
+        let smssend=$('input[smssend]').get(0).checked
+        curingDo(compilationId,name,curingSsoid,1,mobile,client_id,deadline,smssend);
+    });
+
+    /**
+     * 确定降级免费版--用户详情界面
+     */
+    $('button[downCuringDo]').on('click', function (e) {
+        // 只获取第一个选中的值
+        var compilationId = $('#_id').val();
+        var name = $('#name').val();
+        var curingSsoid = $('#curingSsoid').val();
+        var mobile = $('#curingMobile').val();
+        var client_id = $('#client_id').val();
+        let deadline=$('#deadline').val();
+        let smssend=$('input[downsmssend]').get(0).checked;
+        curingDo(compilationId,name,curingSsoid,2,mobile,client_id,deadline,smssend);
+    });
+
+    $('button[deadlineCuringDo]').on('click', function (e) {
+        // 只获取第一个选中的值
+        var compilationId = $('#_id').val();
+        var name = $('#name').val();
+        var curingSsoid = $('#curingSsoid').val();
+        var mobile = $('#curingMobile').val();
+        var client_id = $('#client_id').val();
+
+        let deadline=$('#deadlineInput').val();
+        let smssend=$('input[deadlineSmssend]').get(0).checked;
+        curingDo(compilationId,name,curingSsoid,3,mobile,client_id,deadline,smssend);
     });
     
     /**

global/js/cloud/buildFN.js

@@ -124,5 +124,111 @@ function init(){
 	refreshColumn(columnLength);
 }
 
+/**
+ * 用户升级专业版 弹框提示--用户详情界面
+ * @param name
+ * @param _id
+ * @param username
+ * @returns
+ */
+function upCuring(name, _id, username) {
+    $('#name').val(name);
+    $('#_id').val(_id);
+    var curingMobile = $('#curingMobile').val();
+    var html = '<p>为用户 <b>' + curingMobile + ',' + username + '</b> 升级 <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>`;
+
+    $('div[upCuring] span').html(html);
+}
+
+/**
+ * 养护产品降级
+ * @param {} name 
+ * @param {*} _id 
+ * @param {*} username 
+ */
+function downCuring(name, _id, username) {
+    $('#name').val(name);
+    $('#_id').val(_id);
+    var curingMobile = $('#curingMobile').val();
+    let 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>`;
+    $('div[downCuring] span').html(html);
+}
 
+function deadlineCuring(name, _id, username,deadline){
+    $('#name').val(name);
+    $('#_id').val(_id);
+    var curingMobile = $('#curingMobile').val();
+    let html = `<p>为用户 <b>${curingMobile},${username}</b> <b>${name}</b> 设置延期</p>
+    <p>当前限期为：${deadline}</p>
+    <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>`;
+    $('div[deadlineCuring] span').html(html);
+}
+
+function curingDo(compilationId, name, curingSsoid, status, mobile, client_id, deadline, smssend) {
+    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 },
+            dataType: 'json',
+            success: function (data) {
+                if (data.status == 1) {
+                    refreshCuringPageDetail(curingSsoid, client_id);
+                } else {
+                    alert(data.msg);
+                }
+            }
+        })
+    } else {
+        alert('请选择需要升级的版本');
+    }
+}
+
+$(function () {
+
+    $('div[upcuring]').delegate('label[deadlineLabel]', 'click', function () {
+        $('#deadline').attr('disabled', 'disabled');
+        
+        if($('input[deadline]').prop('checked')){
+            $('input[deadline]').prop("checked",false);
+        }else{
+            $('input[deadline]').prop("checked",true);
+        }
+        if ($('input[deadline]').get(0).checked) {
+            $('#deadline').removeAttr('disabled');
+        }
+    });
 
+})

global/js/cloud/buildHtml.js

@@ -123,14 +123,33 @@ function buildCuringCompilation(data){
         upMajorBoxHtml+='<td></td>';
         upMajorBoxHtml+='<td>'+ v.name+'</td>';
         upMajorBoxHtml+='<td>';
+        
+        let deadline='';
+        data.detail.userInfo.upgrade_list.forEach(element => {
+            if(v._id===element.compilationID){
+                deadline=element.deadline;
+            }
+        });
+
         if(v.isUpgrade !== undefined && v.isUpgrade === true){
-            upMajorBoxHtml+='已升级';
+            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>';
-        upMajorBoxHtml+='</tr>';
+
+        if(v.isUpgrade !== undefined && v.isUpgrade === true){
+            upMajorBoxHtml+=`<td>
+            ${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>';
+        }else{
+            upMajorBoxHtml+=`<td></td>`;
+        }
+
     });
     
     return upMajorBoxHtml;

views/cloud/build.html

@@ -1,7 +1,7 @@
 <% include ../header.html %>
 <script src="<%= WEB_SITE_GLOBAL %>js/jquery-3.4.1.min.js"></script>
 
-<% include buildJs.html %>
+<% include buildJsDev.html %>
 
 <style>
     input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
@@ -567,28 +567,7 @@
 </div> -->
 
 
-<!--BEGIN 升级确认-->
-<div class="modal fade" id="update-confirm" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-dialog-centered" >
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">
-                    确认升级
-                </h4>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                </button>
-            </div>
-            <div class="modal-body" upCuring>
-                <span></span>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
-                <button type="button" data-dismiss="modal" upCuringDo class="btn btn-primary waves-effect waves-themed">确认升级</button>
-            </div>
-        </div>
-    </div>
-</div>
+
 <!--BEGIN 移除单位确认-->
 <div class="modal fade" id="remover-com" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-dialog-centered">
@@ -749,6 +728,75 @@
         </div>
     </div>
 </div>
+
+<!--BEGIN 升级确认-->
+<div class="modal fade" id="update-confirm" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered" >
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">
+                    确认升级
+                </h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true"><i class="fal fa-times"></i></span>
+                </button>
+            </div>
+            <div class="modal-body" upCuring>
+                <span></span>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+                <button type="button" data-dismiss="modal" upCuringDo class="btn btn-primary waves-effect waves-themed">确认升级</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--BEGIN 降级确认-->
+<div class="modal fade" id="degrade-confirm" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">
+                    确认降级
+                </h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true"><i class="fal fa-times"></i></span>
+                </button>
+            </div>
+            <div class="modal-body" downCuring>
+                <span></span>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+                <button type="button" downCuringDo data-dismiss="modal" class="btn btn-danger waves-effect waves-themed">确认降级</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--BEGIN 限期设置-->
+<div class="modal fade" id="deadline-confirm" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">
+                    设置限期
+                </h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true"><i class="fal fa-times"></i></span>
+                </button>
+            </div>
+            <div class="modal-body" deadlineCuring >
+                <span></span>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+                <button type="button" deadlineCuringDo class="btn btn-primary waves-effect waves-themed" data-dismiss="modal" >确认升级</button>
+            </div>
+        </div>
+    </div>
+
+
 </body>
 
 

views/cloud/buildJs.html

@@ -0,0 +1 @@
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/build.min.js"></script>

views/cloud/buildJsDev.html

@@ -0,0 +1,10 @@
+<script src="<%= WEB_SITE_GLOBAL %>js/pagination/page.js"></script>
+<script src="<%= WEB_SITE_GLOBAL %>js/tools.js"></script>
+
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/buildFN.js"></script>
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/build.js"></script>
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/buildHtml.js"></script>
+
+<script src="<%= WEB_SITE_GLOBAL %>js/columnShow/columnShow.js"></script>
+
+<script src="<%= WEB_SITE_GLOBAL %>js/contacts/buildHtml.js"></script>

views/cloud/curingJs.html

@@ -0,0 +1 @@
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curing.min.js"></script>

views/cloud/curingJsDev.html

@@ -0,0 +1,12 @@
+
+<script src="<%= WEB_SITE_GLOBAL %>js/tools.js"></script>
+
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/page.js"></script>
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curing.js"></script>
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curingFN.js"></script>
+<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curingHtml.js"></script>
+
+<script src="<%= WEB_SITE_GLOBAL %>js/contacts/buildHtml.js"></script>
+
+<script src="<%= WEB_SITE_GLOBAL %>js/columnShow/columnShow.js"></script>
+