Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): 清除子表公式修改

See merge request GFP/RBC/rbc-frontend!148

develop/@gms/gms-plugin-billexpand/src/control/workflow-track.vue

@@ -115,7 +115,7 @@ export default {
     formatStepTime(step) {
       const currentTimestamp = Date.now()
       if (step.state === 1) {
-        let ans = '已等待'
+        let ans = ''
         const createTimestamp = (new Date(step.createTime)).getTime()
         let seconds = (currentTimestamp - createTimestamp) / 1000
         const formatList = [
@@ -147,6 +147,7 @@ export default {
             seconds -= num * o.rate
           }
         }
+        ans = '已等待' + ans
         return ans
       }
       else {
@@ -166,6 +167,46 @@ export default {
     }).then((res) => {
       const formatTrack = (curTrack) => {
         if (!curTrack) return []
+        curTrack.steps = curTrack.steps.reverse()
+        curTrack.steps = curTrack.steps.map((step) => {
+          if (step.subTasks && step.subTasks.length) {
+            let participants = []
+            let actualOwnerList = []
+            let resultFlag = 0
+            let rejectFlag = false
+            for (let task of step.subTasks) {
+              if (task.state == 2 && task.result == 3 || task.state == 3) {
+                rejectFlag = true
+                break
+              }
+            }
+
+            for (let task of step.subTasks) {
+              if (task.participants) {
+                participants = participants.concat(task.participants)
+              }
+              if (task.actualOwner) {
+                if (!rejectFlag || task.state == 2 && task.result == 3) {
+                  actualOwnerList.push(task.actualOwner)
+                }
+              }
+              const curResult = task.result || 0
+              resultFlag |= 1 << curResult
+            }
+
+            step.result =
+              resultFlag & 8
+              ? 3
+              : resultFlag & 1
+              ? 0
+              : 1
+
+            rejectFlag && (step.state = 2)
+            step.participants = participants
+            step.actualOwner = actualOwnerList.join('、')
+          }
+          return step
+        })
         curTrack.steps.push({
           title: "提交申请",
           state: 2,

develop/@gms/gms-plugin-billexpand/src/formula/ClearSubData.js

@@ -8,13 +8,7 @@ export default {
         if (arguments && arguments[0] && arguments[1]) {
             let context = arguments[1]
             let tableName = arguments[0][0].StaticValue
-            let data = context.getSubData(tableName)
-            let dataLength = data.length
-            if (data.length > 0) {
-                for (let i = 0; i < dataLength; i++) {
-                    context.deleteSubData(tableName, 0,null)
-                }
-            }
+            context.clearSubDatas(tableName)
         }
     },
     getResultType: function () {