流程+任务分发+报销功能完成

ruoyi-ui/src/views/oa/claim/index.vue

@@ -17,17 +17,6 @@
           v-hasPermi="['system:oaClaim:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:oaClaim:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -55,12 +44,19 @@
     <el-table v-loading="loading" :data="oaClaimList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" v-if="true"/>
-      <el-table-column label="报销缘由/备注" align="center" prop="remark" />
+      <el-table-column label="描述" align="center" prop="remark" />
       <el-table-column label="出差天数" align="center" prop="tripDays" />
       <el-table-column label="报销金额" align="center" prop="cost" />
-      <el-table-column label="票据总数" align="center" prop="detailNumber" />
-      <el-table-column label="关联项目" align="center" prop="projectId" />
-      <el-table-column label="关联流程id" align="center" prop="procInsId" />
+      <el-table-column label="关联项目" align="center" prop="projectName" >
+        <template slot-scope="scope">
+          <el-button type="text" >{{ scope.row.projectName!==null?scope.row.projectName:'未关联项目' }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="projectId">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status_===1?'success':'warning'">{{scope.row.status_===1?'完成':'进行中'}}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="报销时间" align="center" prop="completedTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completedTime, '{y}-{m}-{d}') }}</span>
@@ -72,9 +68,9 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleDetail(scope.row)"
             v-hasPermi="['system:oaClaim:edit']"
-          >修改</el-button>
+          >详情</el-button>
           <el-button
             size="mini"
             type="text"
@@ -241,6 +237,7 @@ export default {
     getList() {
       this.loading = true;
       listOaClaim(this.queryParams).then(response => {
+        console.log(response.rows)
         this.oaClaimList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -292,9 +289,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加差旅费报销";
+      this.$router.push('/claim/addTripClaim')
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -353,6 +348,11 @@ export default {
       this.download('system/oaClaim/export', {
         ...this.queryParams
       }, `oaClaim_${new Date().getTime()}.xlsx`)
+    },
+
+    /******************路由*******************/
+    handleDetail(row){
+      this.$router.push('/claim/detail/'+row.claimId);
     }
   }
 };