Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/views/assemblyPlanManagement/instructionIdentification/components/left/tree.vue

@@ -194,7 +194,7 @@ export default {
             isLeaf: true,
             disabled: true,
             level: 1,
-            children: res.items.content.map((t) => {
+            children: res.items && res.items.content.map((t) => {
               // quantity += t.completeCount
               // total += t.carryCount
               return {

applications/dee-mes/src/views/assemblyPlanManagement/instructionIdentification/components/right/index.vue

@@ -174,7 +174,6 @@
       <div>
         <div>
           <el-table
-            v-loading="workProcedureLoading"
             :data="workProcedureData"
             height="100%"
             border

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/instructionIdentificationBatch/components/left/tree.vue

@@ -197,7 +197,7 @@ export default {
             isLeaf: true,
             disabled: true,
             level: 1,
-            children: res.items.map((t) => {
+            children: res.items && res.items.map((t) => {
               quantity += t.completeCount
               total += t.carryCount
               return {

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/instructionIdentificationBatch/components/right/index.vue

@@ -159,7 +159,6 @@
       <div>
         <div>
           <el-table
-            v-loading="workProcedureLoading"
             :data="workProcedureData"
             height="100%"
             border