Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/workflow/process/nodes/Node.vue

src/views/projectdemand/demandcollection/detail.vue

@@ -68,7 +68,7 @@
       <!--        </el-col>-->
       <!--      </el-row>-->
     </el-form>
-    <div class="oper-page-btn" v-if="processInstanceData.taskId">
+    <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
       <el-button @click="handleReject">驳回</el-button>
       <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>

src/views/projectdemand/demandcollection/index.vue

@@ -73,7 +73,7 @@ const tableConfig = reactive({
       prop: 'state',
       label: '状态',
       align: 'center',
-      width:200,
+      width: 200,
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
     },
@@ -83,12 +83,27 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        if (row.state === '3' || row.state === '2') {
+          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '删除', func: () => handleDel(row), type: 'danger'})
+        }else if (row.state === '4'){
+          btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
+        }
         return (
-            <div>
+            <div style={{width: '100%'}}>
-              <el-button type="primary" link onClick={() => handleDetail(row)}>详情
+              {
-              </el-button>
+                btn.map(item => (
-              <el-button type="primary" link onClick={() => handleEdit(row)}>编辑</el-button>
+                    <el-button
-              <el-button type="primary" link onClick={() => handleReport(row)}>上报</el-button>
+                        type={item.type}
+                        // v-perm={item.auth}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
             </div>
         )
       }