Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/module-iTDM/flowpath/ItdmRunFlowPathList.vue

@@ -118,12 +118,12 @@
         </template>
 
         <span slot='action' slot-scope='text, record'>
-          <a v-show='record.isokview===true' @click='tongguo(record)'>下一步</a>
-          <a-divider v-show='record.isokview===true' type='vertical' />
-          <a v-show='record.isbohuiview===true' @click='bohui(record)'>驳回</a>
-          <a-divider  v-show='record.isbohuiview===true' type='vertical' />
-          <a v-show='record.isbohuiview===true' @click='bohui1(record)'>驳回指定节点</a>
-          <a-divider v-show='record.isbohuiview===true' type='vertical' />
+          <a v-show='record.isokview===true&&record.status==="0"' @click='tongguo(record)'>下一步</a>
+          <a-divider v-show='record.isokview===true&&record.status==="0"' type='vertical' />
+          <a v-show='record.isbohuiview===true&&record.status==="0"' @click='bohui(record)'>驳回</a>
+          <a-divider  v-show='record.isbohuiview===true&&record.status==="0"' type='vertical' />
+          <a v-show='record.isbohuiview===true&&record.status==="0"' @click='bohui1(record)'>驳回指定节点</a>
+          <a-divider v-show='record.isbohuiview===true&&record.status==="0"' type='vertical' />
           <!-- <a @click='handleEdit(record)'>编辑</a> -->
           <a @click='handleEdit2(record)'>流程编辑</a>
 
@@ -219,11 +219,11 @@ export default {
           align: 'center',
           dataIndex: 'dqSetp_dictText'
         },
-        // {
-        //   title: '状态',
-        //   align: 'center',
-        //   dataIndex: 'status'
-        // },
+        {
+          title: '状态',
+          align: 'center',
+          dataIndex: 'status_dictText'
+        },
         {
           title: '操作',
           dataIndex: 'action',