فهرست منبع

1. 修订内容,特定情况下,无法保存
2. 等待窗调整

MaiXinRong 5 سال پیش
والد
کامیت
ee89cb43af
4فایلهای تغییر یافته به همراه56 افزوده شده و 46 حذف شده
  1. 0 1
      app/controller/revise_controller.js
  2. 53 42
      app/public/js/global.js
  3. 2 2
      app/public/js/revise.js
  4. 1 1
      app/view/revise/info.ejs

+ 0 - 1
app/controller/revise_controller.js

@@ -453,7 +453,6 @@ module.exports = app => {
             }
         }
         async _addDeal(revise, data) {
-            console.log(data);
             if (!data.type || !data.dealBills) throw '数据错误';
             if (data.type === 'child') {
                 return await this.ctx.service.reviseBills.addChild(revise.tid, data.id, data.dealBills, revise.id);

+ 53 - 42
app/public/js/global.js

@@ -278,57 +278,68 @@ function checkZero(value) {
 function checkFieldChange(o, n) {
     return o == n || ((!o || o === '') && (n === ''));
 }
+
+var bShowWaiting = false, beginWaitingTime;
 //关闭等待窗口
 function closeWaitingView() {
-    var bgDiv = document.getElementById("bgDiv");
-    var msgDiv = document.getElementById("msgDiv");
-    //移除背景遮罩层div
-    if(bgDiv != null){
-        document.body.removeChild(bgDiv);
-    }
-    //移除中间信息提示层div
-    if(msgDiv != null){
-        document.body.removeChild(msgDiv);
-    }
+    bShowWaiting = false;
+    const time = parseInt(new Date());
+    setTimeout(function () {
+        var bgDiv = document.getElementById("bgDiv");
+        var msgDiv = document.getElementById("msgDiv");
+        //移除背景遮罩层div
+        if(bgDiv != null){
+            document.body.removeChild(bgDiv);
+        }
+        //移除中间信息提示层div
+        if(msgDiv != null){
+            document.body.removeChild(msgDiv);
+        }
+    }, Math.max(beginWaitingTime - time + 1000, 0));
 }
 //显示等待窗口
 function showWaitingView() {
-    var msgw = 300; //提示窗口的宽度
-    var msgh = 100; //提示窗口的高度
+    bShowWaiting = true;
+    setTimeout(function () {
+        if (!bShowWaiting) return;
+        beginWaitingTime = parseInt(new Date());
+        var msgw = 300; //提示窗口的宽度
+        var msgh = 100; //提示窗口的高度
 
-    var sWidth, sHeight;
-    sWidth = document.body.clientWidth;
-    sHeight = document.body.clientHeight;
+        var sWidth, sHeight;
+        sWidth = document.body.clientWidth;
+        sHeight = document.body.clientHeight;
 
-    //背景遮罩层div
-    var bgObj = document.createElement("div");
-    bgObj.setAttribute('id', 'bgDiv');
-    bgObj.style.zIndex = '9998';
-    bgObj.style.position = "absolute";
-    bgObj.style.top = "0px";
-    bgObj.style.background = "#888";
-    bgObj.style.filter = "progid:DXImageTransform.Microsoft.Alpha(style=3,opacity=25,finishOpacity=75";
-    bgObj.style.opacity = "0.6";
-    bgObj.style.left = "0px";
-    bgObj.style.width = sWidth + "px";
-    bgObj.style.height = sHeight + "px";
-    document.body.appendChild(bgObj);
+        //背景遮罩层div
+        var bgObj = document.createElement("div");
+        bgObj.setAttribute('id', 'bgDiv');
+        bgObj.style.zIndex = '9998';
+        bgObj.style.position = "absolute";
+        bgObj.style.top = "0px";
+        bgObj.style.background = "#888";
+        bgObj.style.filter = "progid:DXImageTransform.Microsoft.Alpha(style=3,opacity=25,finishOpacity=75";
+        bgObj.style.opacity = "0.6";
+        bgObj.style.left = "0px";
+        bgObj.style.width = sWidth + "px";
+        bgObj.style.height = sHeight + "px";
+        document.body.appendChild(bgObj);
 
-    //信息提示层div
-    var msgObj = document.createElement("div");
-    msgObj.style.zIndex = '9999';
-    msgObj.setAttribute("id", "msgDiv");
-    msgObj.setAttribute("align", "center");
-    msgObj.style.position = "absolute";
-    msgObj.style.font = "12px/1.6em Verdana, Geneva, Arial, Helvetica, sans-serif";
-    msgObj.style.width = msgw + "px";
-    msgObj.style.height = msgh + "px";
-    msgObj.style.top = (document.documentElement.scrollTop + (sHeight - msgh) / 2) + "px";
-    msgObj.style.left = (sWidth - msgw) / 2 + "px";
-    document.body.appendChild(msgObj);
+        //信息提示层div
+        var msgObj = document.createElement("div");
+        msgObj.style.zIndex = '9999';
+        msgObj.setAttribute("id", "msgDiv");
+        msgObj.setAttribute("align", "center");
+        msgObj.style.position = "absolute";
+        msgObj.style.font = "12px/1.6em Verdana, Geneva, Arial, Helvetica, sans-serif";
+        msgObj.style.width = msgw + "px";
+        msgObj.style.height = msgh + "px";
+        msgObj.style.top = (document.documentElement.scrollTop + (sHeight - msgh) / 2) + "px";
+        msgObj.style.left = (sWidth - msgw) / 2 + "px";
+        document.body.appendChild(msgObj);
 
-    //中间等待图标
-    document.getElementById("msgDiv").innerHTML = '<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>';
+        //中间等待图标
+        document.getElementById("msgDiv").innerHTML = '<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>';
+    }, 1000);
 }
 
 /**

+ 2 - 2
app/public/js/revise.js

@@ -700,7 +700,7 @@ $(document).ready(() => {
                         return;
                     }
                 } else {
-                    data.posPostType = 'update-pos';
+                    data.posPostType = 'update';
                     data.postData = {id: posData.id, name: newText};
                 }
             } else if (!posData) {
@@ -1466,7 +1466,7 @@ $(document).ready(() => {
     if (!readOnly) {
         // 修订详情 保存
         $('#save').click(function () {
-            const content = $('textarea').val();
+            const content = $('#content').val();
             postData('save', { content: content });
         });
     }

+ 1 - 1
app/view/revise/info.ejs

@@ -121,7 +121,7 @@
                             </div>
                             <div class="form-group">
                                 <label >修订内容<b class="text-danger">*</b></label>
-                                <textarea class="form-control" value="编写错漏5" rows="12"><%- revise.content %></textarea>
+                                <textarea class="form-control" id="content" value="<%- revise.content %>" rows="12"><%- revise.content %></textarea>
                             </div>
                         </div>
                     </div>