Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/resources/templates/AttendanceNote/js/index.js

@@ -123,7 +123,7 @@
                     + '<td>'
                     + '<div class="form-item">'
                     + '<div class="z-comp-input" name="AttendanceNoteTimeDO[' + i + ']$bz1">'
-                    + '<input type="text" value="">'
+                    + '<input type="text" value="'+ arrays[i].bz1 +'" title="'+ arrays[i].bz1 +'">'
                     + '</div>'
                     + '</div>'
                     + '</td>'

zjugis-business/src/main/resources/templates/CommonCost/js/agentIndex.js

@@ -194,24 +194,30 @@
         }
         if (!(!isTimes[i].projectName || isTimes[i].projectName.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$projectName']").setValue(isTimes[i].projectName);
+            $("[name='CommonCostDetailDO[" + i + "]$projectName']").attr('title',isTimes[i].projectName);
         }
         if (!(!isTimes[i].projectDeptName || isTimes[i].projectDeptName.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$xmzrbm']").setValue(isTimes[i].projectDeptName);
+            $("[name='CommonCostDetailDO[" + i + "]$xmzrbm']").attr('title',isTimes[i].projectDeptName);
         }
         if (!(!isTimes[i].costDate || isTimes[i].costDate.trim() === '')) {
             z.ui.date("[name='CommonCostDetailDO[" + i + "]$costDate']").setValue(isTimes[i].costDate);
         }
         if (!(!isTimes[i].costContent || isTimes[i].costContent.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$costContent']").setValue(isTimes[i].costContent);
+            $("[name='CommonCostDetailDO[" + i + "]$costContent']").attr('title',isTimes[i].costContent);
         }
         if (isTimes[i].invoiceNums != '') {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$invoiceNums']").setValue(isTimes[i].invoiceNums);
+            $("[name='CommonCostDetailDO[" + i + "]$invoiceNums']").attr('title',isTimes[i].invoiceNums);
         }
         if (isTimes[i].amount != '') {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$amount']").setValue(isTimes[i].amount);
+            $("[name='CommonCostDetailDO[" + i + "]$amount']").attr('title',isTimes[i].amount);
         }
         if (!(!isTimes[i].bz1 || isTimes[i].bz1.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$bz1']").setValue(isTimes[i].bz1);
+            $("[name='CommonCostDetailDO[" + i + "]$bz1']").attr('title',isTimes[i].bz1);
         }
         if (!(!isTimes[i].commonCostId || isTimes[i].commonCostId.trim() === '')) {
             $("#editBtn_" + i).find("span").html("编辑")

zjugis-business/src/main/resources/templates/CommonCost/js/index.js

@@ -194,24 +194,30 @@
         }
         if (!(!isTimes[i].projectName || isTimes[i].projectName.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$projectName']").setValue(isTimes[i].projectName);
+            $("[name='CommonCostDetailDO[" + i + "]$projectName']").attr('title',isTimes[i].projectName);
         }
         if (!(!isTimes[i].projectDeptName || isTimes[i].projectDeptName.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$xmzrbm']").setValue(isTimes[i].projectDeptName);
+            $("[name='CommonCostDetailDO[" + i + "]$xmzrbm']").attr('title',isTimes[i].projectDeptName);
         }
         if (!(!isTimes[i].costDate || isTimes[i].costDate.trim() === '')) {
             z.ui.date("[name='CommonCostDetailDO[" + i + "]$costDate']").setValue(isTimes[i].costDate);
         }
         if (!(!isTimes[i].costContent || isTimes[i].costContent.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$costContent']").setValue(isTimes[i].costContent);
+            $("[name='CommonCostDetailDO[" + i + "]$costContent']").attr('title',isTimes[i].costContent);
         }
         if (isTimes[i].invoiceNums != '') {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$invoiceNums']").setValue(isTimes[i].invoiceNums);
+            $("[name='CommonCostDetailDO[" + i + "]$invoiceNums']").attr('title',isTimes[i].invoiceNums);
         }
         if (isTimes[i].amount != '') {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$amount']").setValue(isTimes[i].amount);
+            $("[name='CommonCostDetailDO[" + i + "]$amount']").attr('title',isTimes[i].amount);
         }
         if (!(!isTimes[i].bz1 || isTimes[i].bz1.trim() === '')) {
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$bz1']").setValue(isTimes[i].bz1);
+            $("[name='CommonCostDetailDO[" + i + "]$bz1']").attr('title',isTimes[i].bz1);
         }
         if (!(!isTimes[i].commonCostId || isTimes[i].commonCostId.trim() === '')) {
             $("#editBtn_" + i).find("span").html("编辑")

zjugis-business/src/main/resources/templates/Leave/js/index.js

@@ -45,6 +45,7 @@
                 startTime: "",
                 endTime: '',
             }
+            isTimes.push(timeObj);
             timeSelector({
                 ele: ".startTimeRange" + listsLength,
                 name: "LeaveTimeDO[" + listsLength + "]$startTimeRange",
@@ -181,7 +182,7 @@
                     + '<td>'
                     + '<div class="form-item">'
                     + '<div class="z-comp-input" name="LeaveTimeDO[' + i + ']$bz1">'
-                    + '<input type="text" value="">'
+                    + '<input type="text" value="'+ arrays[i].bz1 +'" title="'+ arrays[i].bz1 +'">'
                     + '</div>'
                     + '</div>'
                     + '</td>'

zjugis-business/src/main/resources/templates/Travel/js/index.js

@@ -106,7 +106,7 @@
                     + '<div class="form-flex">'
                     + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
                     + '<div class="z-comp-date" name="TravelTimeDO[' + i + ']$startTime">'
-                    + '<input type="text" value="' + startDate + '">'
+                    + '<input type="text" value="' + startDate + '" title="' + startDate + '">'
                     + '</div>'
                     + '</div>'
                     + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange startTimeRange' + (i) + '">'
@@ -118,7 +118,7 @@
                     + '<div class="form-flex">'
                     + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
                     + '<div class="z-comp-date" name="TravelTimeDO[' + i + ']$endTime">'
-                    + '<input type="text" value="' + endDate + '">'
+                    + '<input type="text" value="' + endDate + '" title="' + endDate + '">'
                     + '</div>'
                     + '</div>'
                     + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange endTimeRange' + (i) + '">'
@@ -128,7 +128,7 @@
                     + '<td>'
                     + '<div class="form-item">'
                     + '<div class="z-comp-input" name="TravelTimeDO[0]$bz1">'
-                    + '<input type="text" value="">'
+                    + '<input type="text" value="'+ arrays[i].bz1 +'" title="'+ arrays[i].bz1 +'">'
                     + '</div>'
                     + '</div>'
                     + '</td>'

zjugis-business/src/main/resources/templates/TravelCost/js/index.js

@@ -264,23 +264,28 @@
         }
         if (!(!boatCarArr[i].departPlace || boatCarArr[i].departPlace.trim() === '')) {
             z.ui.input("[name='TravelCostBoatCarDO[" + i + "]$departPlace']").setValue(boatCarArr[i].departPlace);
+            $("[name='TravelCostBoatCarDO[" + i + "]$departPlace']").attr('title',boatCarArr[i].departPlace);
         }
         if (!(!boatCarArr[i].arriveDate || boatCarArr[i].arriveDate.trim() === '')) {
             z.ui.laydate("[name='TravelCostBoatCarDO[" + i + "]$arriveDate']").setValue(boatCarArr[i].arriveDate);
         }
         if (!(!boatCarArr[i].arrivePlace || boatCarArr[i].arrivePlace.trim() === '')) {
             z.ui.input("[name='TravelCostBoatCarDO[" + i + "]$arrivePlace']").setValue(boatCarArr[i].arrivePlace);
+            $("[name='TravelCostBoatCarDO[" + i + "]$arrivePlace']").attr('title',boatCarArr[i].arrivePlace);
         }
         if (boatCarArr[i].invoiceNums != '') {
             z.ui.input("[name='TravelCostBoatCarDO[" + i + "]$invoiceNums']").setValue(boatCarArr[i].invoiceNums);
+            $("[name='TravelCostBoatCarDO[" + i + "]$invoiceNums']").attr('title',boatCarArr[i].invoiceNums);
         }
         if (boatCarArr[i].amount != '') {
             z.ui.input("[name='TravelCostBoatCarDO[" + i + "]$amount']").setValue(boatCarArr[i].amount);
+            $("[name='TravelCostBoatCarDO[" + i + "]$amount']").attr('title',boatCarArr[i].amount);
             totalBoatCarAmount()
             totalAmount()
         }
         if (!(!boatCarArr[i].remark || boatCarArr[i].remark.trim() === '')) {
             z.ui.input("[name='TravelCostBoatCarDO[" + i + "]$remark']").setValue(boatCarArr[i].remark);
+            $("[name='TravelCostBoatCarDO[" + i + "]$remark']").attr('title',boatCarArr[i].remark);
         }
         if (!(!boatCarArr[i].travelCostId || boatCarArr[i].travelCostId.trim() === '')) {
             $("#editBtn_boat_car_" + i).find("span").html("编辑")
@@ -488,17 +493,21 @@
         }
         if (!(!otherArr[i].costPlace || otherArr[i].costPlace.trim() === '')) {
             z.ui.input("[name='TravelCostOtherDO[" + i + "]$costPlace']").setValue(otherArr[i].costPlace);
+            $("[name='TravelCostOtherDO[" + i + "]$costPlace']").attr('title',otherArr[i].costPlace);
         }
         if (otherArr[i].invoiceNums != '') {
             z.ui.input("[name='TravelCostOtherDO[" + i + "]$invoiceNums']").setValue(otherArr[i].invoiceNums);
+            $("[name='TravelCostOtherDO[" + i + "]$invoiceNums']").attr('title',otherArr[i].invoiceNums);
         }
         if (otherArr[i].amount != '') {
             z.ui.input("[name='TravelCostOtherDO[" + i + "]$amount']").setValue(otherArr[i].amount);
+            $("[name='TravelCostOtherDO[" + i + "]$amount']").attr('title',otherArr[i].amount);
             totalOtherAmount()
             totalAmount()
         }
         if (!(!otherArr[i].remark || otherArr[i].remark.trim() === '')) {
             z.ui.input("[name='TravelCostOtherDO[" + i + "]$remark']").setValue(otherArr[i].remark);
+            $("[name='TravelCostOtherDO[" + i + "]$remark']").attr('title',otherArr[i].remark);
         }
         if (!(!otherArr[i].travelCostId || otherArr[i].travelCostId.trim() === '')) {
             $("#editBtn_other_" + i).find("span").html("编辑")