m

youxiw2000
1 parent 9d500e9d
Showing 4 changed files with 11 additions and 21 deletions
trash-ui/src/layout/index.vue
trash-ui/src/layout/index55.vue → trash-ui/src/layout/index5.vue
trash-ui/src/views/activiti/task/contractInfo.vue
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
 <template>
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container" />
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <tags-view v-if="needTagsView" />
       <app-main />
+      
+      </div>
+  </div>
 </template>
 <script>
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-        <tags-view v-if="needTagsView" />
       <app-main />
-      
-      </div>
-  </div>
 </template>
 <script>
@@ -18,13 +18,6 @@
           <el-col :span="6" class="bd bd_left">有效期结束时间</el-col>
           <el-col :span="6" class="bd">{{infoData.endTime}}</el-col>
         </el-row>
-        <el-row  >
-          <el-col :span="6" class="bd">消纳场名称</el-col>
-          <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
-          <el-col :span="6" class="bd bd_left">工程名称</el-col>
-          <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
-        </el-row>
-
         <el-row  >
           <el-col :span="6" class="bd">消纳合同编号</el-col>
@@ -103,6 +103,9 @@ public class WorkflowServiceImpl implements IWorkflowService {
         String reason = map.get("reason").toString();
         String startTime = map.get("startTime").toString();
         String endTime = map.get("endTime").toString();
+        String areaCode = null;
+        if(map.get("area") != null)
+        	areaCode = map.get("area").toString();
         ProcessInstance processInstance = null;
@@ -113,11 +116,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
             if (flowType.equals("workflow_earthsites")) {
-                JSONObject earthsites = RemoteServerUtils.getEarthSitesInfo(map.get("id").toString());
-
-                if (earthsites != null) {
-                    updateProcess(processInstance, earthsites.getString("areaName"));
-                }
+            	PorcThreeStepTask(processInstance, areaCode);
             }
             Workflow workflow = new Workflow();
@@ -436,8 +435,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
         }
     }
-    ;
-
     void updateProcessKafka(org.activiti.engine.runtime.ProcessInstance processInstance, String placeName, String token) {
         Map map = new HashedMap<>();