审核信息完成

src/api/base/auditing.js

@@ -5,6 +5,10 @@ function pageList(formData){
   return request.post(constant.serverUrl + "/base/auditing/pageList", formData);
 }
 
+function listPending(formData){
+  return request.post(constant.serverUrl + "/base/auditing/listPending", formData);
+}
+
 function remove(id){
   return request.post(constant.serverUrl + "/base/auditing/delete/" + id);
 }
@@ -14,5 +18,5 @@ function workflowStart(formData){
 }
 
 export default {
-  pageList,remove,workflowStart
+  pageList,remove,workflowStart,listPending
 }

src/api/base/auditingStep.js

@@ -41,6 +41,26 @@ function batchRemove(idList){
   });
 }
 
+function auditingStepData(formData){
+  return request.post(constant.serverUrl + "/base/auditingStep/auditingStepData",formData);
+}
+
+function auditingStepNext(formModel){  
+  return request.post(constant.serverUrl + "/base/auditingStep/auditingStepNext", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function auditingStepReject(formModel){  
+  return request.post(constant.serverUrl + "/base/auditingStep/auditingStepReject", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,auditingStepData,auditingStepNext,auditingStepReject
 }

src/routers/modules/base.js

@@ -26,6 +26,15 @@ var routers = [
             title: '审核信息管理'
         }
     },
+    {
+        path: '/base/auditing/penging',
+        name: 'BaseAuditingPenging',
+        component: () => import('@/views/base/auditing-pending.vue'),
+        meta: {
+            roles: ["admin"],
+            title: '待办信息'
+        }
+    },
     {
         path: '/base/auditingStep/list',
         name: 'BaseAuditingStepList',

src/views/base/auditing-detail.vue

@@ -10,190 +10,81 @@
     :title="title"
     :modal-append-to-body="false"
     style="text-align: left"
+    width="70%"
     @close="closeDialog"
     :close-on-click-modal="false"
   >
-    <div class="user-panel" v-loading="loading">
-      <el-form
-        ref="form"
-        :model="formModel"
-        :rules="ruleValidate"
-        :label-width="'100px'"
-      >
-        <el-form-item label="工作流程" prop="workflowDetailId">
-          <el-input
-            v-model="formModel.workflowDetailId"
-            placeholder="请输入工作流程"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="合同ID" prop="contractId">
-          <el-input
-            v-model="formModel.contractId"
-            placeholder="请输入合同ID"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="名称" prop="name">
-          <el-input
-            v-model="formModel.name"
-            placeholder="请输入名称"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="描述" prop="description">
-          <el-input
-            v-model="formModel.description"
-            placeholder="请输入描述"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="完成度" prop="completionDegree">
-          <el-input
-            v-model="formModel.completionDegree"
-            placeholder="请输入完成度"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          label="审核状态"
-          prop="state"
-        >
-          <el-input
-            v-model="formModel.state"
-            placeholder="请输入审核状态"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-      </el-form>
+    <div class="user-panel">
+      <el-steps :active="workflowStepCount" align-center>
+        <el-step v-for="workflowStep in workflowStepData" :key="workflowStep.value" :title="workflowStep.userName" :description="workflowStep.opinion"></el-step>
+      </el-steps>
+    </div>
+    <div class="user-panel">
+      <el-table :data="compareResultsData" height="300" style="width: 100%" stripe>
+        <el-table-column prop="contractCode" label="合同编号" width="150px"></el-table-column>
+        <el-table-column prop="item" label="项目名称" width="250px"></el-table-column>
+        <el-table-column prop="result" label="结果">
+          <template slot-scope="{row}">
+            <span v-html="row.result"></span>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
-        >确 定</el-button
-      >
+      <el-button @click="closeDialog">关 闭</el-button>
     </span>
   </el-dialog>
 </template>
 <script>
 import Constant from "@/constant";
 import auditingApi from "@/api/base/auditing";
+import purBillVouchApi from "@/api/base/purBillVouch";
+import auditingStepApi from "@/api/base/auditingStep";
 
 export default {
   props: ["businessKey", "title"],
   data() {
     return {
-      formModel: {},
-      ruleValidate: {
-        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
-        workflowDetailId: [
-          {
-            required: true,
-            message: "工作流程详情编号不能为空",
-            trigger: "blur",
-          },
-        ],
-        contractId: [
-          { required: true, message: "合同ID不能为空", trigger: "blur" },
-        ],
-        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-        description: [
-          { required: true, message: "描述不能为空", trigger: "blur" },
-        ],
-        completionDegree: [
-          { required: true, message: "完成度不能为空", trigger: "blur" },
-        ],
-        state: [
-          {
-            required: true,
-            message: "状态（0-审核失败 1-审核中 2-审核完成）不能为空",
-            trigger: "blur",
-          },
-        ],
-        delFlag: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" },
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" },
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" },
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" },
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" },
-        ],
-      },
       showDialog: true,
-      loading: false,
-      submitting: false,
+      compareResultsData: [],
+      workflowStepData: [],
+      workflowStepCount: 0,
     };
   },
   methods: {
     closeDialog() {
       this.$emit("close", false);
     },
-    handleSubmit() {
-      var self = this;
-
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          (function () {
-            var id = self.formModel.id;
-
-            if (id == null || id.length == 0) {
-              return auditingApi.add(self.formModel);
-            } else {
-              return auditingApi.update(self.formModel);
-            }
-          })().then(function (response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              self.$message({
-                message: "保存成功!",
-                type: "success",
-              });
-
-              self.$emit("close", true);
-            } else {
-              self.$message({
-                message: jsonData.message + "",
-                type: "warning",
-              });
-
-              self.$emit("close", false);
-            }
-          });
-        }
-      });
-    },
   },
   mounted: function () {
     var self = this;
 
-    (function () {
-      if (self.businessKey.length == 0) {
-        return auditingApi.create();
-      } else {
-        return auditingApi.edit(self.businessKey);
-      }
-    })()
-      .then((response) => {
-        var jsonData = response.data;
-        self.loading = false;
+    //审批流程图
+    var parameters = new FormData();
+    parameters.append("invoiceId", self.businessKey);
+    auditingStepApi
+    .auditingStepData(parameters)
+    .then(function (response) {
+      var jsonData = response.data.data;
+      self.workflowStepData = jsonData.list;
+      self.workflowStepCount = jsonData.count;
+    })
+    .catch((error) => {
+      // self.$message.error(error + "");
+    });
 
-        if (jsonData.result) {
-          self.formModel = jsonData.data;
-        } else {
-          self.$message.error(jsonData.message + "");
-        }
-      })
-      .catch((error) => {
-        self.$message.error(error + "");
-      });
+    //对比数据
+    var formData = new FormData();
+    formData.append("PBVID", self.businessKey);
+    purBillVouchApi
+    .compareResults(formData)
+    .then(function (response) {
+      var jsonData = response.data.data;
+      self.compareResultsData = jsonData;
+    })
+    .catch((error) => {
+      // self.$message.error(error + "");
+    });
   },
 };
 </script>

src/views/base/auditing-list.vue

@@ -34,19 +34,12 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      <el-form-item label="发票号" prop="cpbvCode">
+        <el-input type="text" size="mini" v-model="queryModel.cpbvCode"></el-input>
       </el-form-item>
-      <el-form-item label="描述" prop="description">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.description"
-        ></el-input>
+      <el-form-item label="供应商" prop="cvenName">
+        <el-input type="text" size="mini" v-model="queryModel.cvenName"></el-input>
       </el-form-item>
-      <!-- <el-form-item label="状态" prop="state">
-        <el-input type="text" size="mini" v-model="queryModel.state"></el-input>
-      </el-form-item> -->
       <el-form-item label="审核状态" prop="state">
         <el-select
           v-model="queryModel.state"
@@ -81,25 +74,6 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <!-- <el-row class="button-group">
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        @click="handleAdd"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
-    </el-row> -->
     <el-table
       :data="tableData"
       style="min-height: 400px"
@@ -110,27 +84,14 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="workflowDetailName" label="工作流程" width="180"></el-table-column>
-      <el-table-column prop="name" label="名称" width="180"></el-table-column>
-      <el-table-column
-        prop="description"
-        label="描述"
-        width="380"
-      ></el-table-column>
-      <el-table-column
-        prop="completionDegree"
-        label="完成度"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="stateName"
-        label="审核状态"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="cpbvCode" label="发票号" width="180"></el-table-column>
+      <el-table-column prop="cvenName" label="供应商" width="380"></el-table-column>
+      <el-table-column prop="stateName" label="审核状态" width="180"></el-table-column>
       <el-table-column label="操作">
-        <template slot-scope="{ row }">
-          <el-button size="mini" type="primary" @click="handleNext(row)">审核</el-button>
-          <!-- <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button> -->
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        <template slot-scope="{row}">
+          <!-- <el-button size="mini" type="primary" @click="handleNext(row)">审核</el-button> -->
+          <el-button size="mini" type="info" @click="handleEdit(row)">详情</el-button>
+          <!-- <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -173,9 +134,8 @@ export default {
     return {
       queryModel: {
         workflowDetailId: "",
-        contractId: "",
-        name: "",
-        description: "",
+        cpbvCode: "",
+        cvenName: "",
         state: "",
       },
       loading: false,
@@ -209,9 +169,8 @@ export default {
       formData.append("pageSize", self.pageSize);
 
       formData.append("workflowDetailId", self.queryModel.workflowDetailId);
-      formData.append("contractId", self.queryModel.contractId);
-      formData.append("name", self.queryModel.name);
-      formData.append("description", self.queryModel.description);
+      formData.append("cpbvCode", self.queryModel.cpbvCode);
+      formData.append("cvenName", self.queryModel.cvenName);
       formData.append("state", self.queryModel.state);
 
       if (this.field != null) {
@@ -263,8 +222,8 @@ export default {
       this.showModal = true;
     },
     handleEdit(record) {
-      this.modalTitle = "编辑";
-      this.businessKey = record.id;
+      this.modalTitle = "详情";
+      this.businessKey = record.invoiceId;
       this.showModal = true;
     },
     handleNext(record) {

src/views/base/auditing-next.vue

@@ -10,125 +10,51 @@
     :title="title"
     :modal-append-to-body="false"
     style="text-align: left"
+    width="70%"
     @close="closeDialog"
     :close-on-click-modal="false"
   >
-    <div class="user-panel" v-loading="loading">
-      <el-form
-        ref="form"
-        :model="formModel"
-        :rules="ruleValidate"
-        :label-width="'100px'"
-      >
-        <el-form-item label="工作流程" prop="workflowDetailId">
-          <el-input
-            v-model="formModel.workflowDetailId"
-            placeholder="请输入工作流程"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="合同ID" prop="contractId">
-          <el-input
-            v-model="formModel.contractId"
-            placeholder="请输入合同ID"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="名称" prop="name">
-          <el-input
-            v-model="formModel.name"
-            placeholder="请输入名称"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="描述" prop="description">
-          <el-input
-            v-model="formModel.description"
-            placeholder="请输入描述"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="完成度" prop="completionDegree">
-          <el-input
-            v-model="formModel.completionDegree"
-            placeholder="请输入完成度"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          label="审核状态"
-          prop="state"
-        >
-          <el-input
-            v-model="formModel.state"
-            placeholder="请输入审核状态"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-      </el-form>
+    <div class="user-panel">
+      <el-steps :active="workflowStepCount" align-center>
+        <el-step v-for="workflowStep in workflowStepData" :key="workflowStep.value" :title="workflowStep.userName" :description="workflowStep.opinion"></el-step>
+      </el-steps>
+    </div>
+    <div class="user-panel">
+      <el-table :data="compareResultsData" height="300" style="width: 100%" stripe>
+        <el-table-column prop="contractCode" label="合同编号" width="150px"></el-table-column>
+        <el-table-column prop="item" label="项目名称" width="250px"></el-table-column>
+        <el-table-column prop="result" label="结果">
+          <template slot-scope="{row}">
+            <span v-html="row.result"></span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="user-panel">
+      <el-input type="textarea" :rows="4" v-model="opinion" placeholder="请输入意见"></el-input>
     </div>
     <span slot="footer" class="dialog-footer">
+      <el-button type="success" @click="handleSubmit">通 过</el-button>
+      <el-button type="danger" @click="handleReject">驳 回</el-button>
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
-        >确 定</el-button
-      >
     </span>
   </el-dialog>
 </template>
 <script>
 import Constant from "@/constant";
 import auditingApi from "@/api/base/auditing";
+import purBillVouchApi from "@/api/base/purBillVouch";
+import auditingStepApi from "@/api/base/auditingStep";
 
 export default {
   props: ["businessKey", "title"],
   data() {
     return {
-      formModel: {},
-      ruleValidate: {
-        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
-        workflowDetailId: [
-          {
-            required: true,
-            message: "工作流程详情编号不能为空",
-            trigger: "blur",
-          },
-        ],
-        contractId: [
-          { required: true, message: "合同ID不能为空", trigger: "blur" },
-        ],
-        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-        description: [
-          { required: true, message: "描述不能为空", trigger: "blur" },
-        ],
-        completionDegree: [
-          { required: true, message: "完成度不能为空", trigger: "blur" },
-        ],
-        state: [
-          {
-            required: true,
-            message: "状态（0-审核失败 1-审核中 2-审核完成）不能为空",
-            trigger: "blur",
-          },
-        ],
-        delFlag: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" },
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" },
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" },
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" },
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" },
-        ],
-      },
       showDialog: true,
-      loading: false,
-      submitting: false,
+      compareResultsData: [],
+      workflowStepData: [],
+      workflowStepCount: 0,
+      opinion: "",
     };
   },
   methods: {
@@ -137,63 +63,80 @@ export default {
     },
     handleSubmit() {
       var self = this;
+      
+      var formData = new FormData();
+      formData.append("invoiceId", self.businessKey);
+      formData.append("opinion", self.opinion);
+      auditingStepApi
+      .auditingStepNext(formData)
+      .then(function (response) {
+        var jsonData = response.data;
 
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          (function () {
-            var id = self.formModel.id;
-
-            if (id == null || id.length == 0) {
-              return auditingApi.add(self.formModel);
-            } else {
-              return auditingApi.update(self.formModel);
-            }
-          })().then(function (response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              self.$message({
-                message: "保存成功!",
-                type: "success",
-              });
-
-              self.$emit("close", true);
-            } else {
-              self.$message({
-                message: jsonData.message + "",
-                type: "warning",
-              });
-
-              self.$emit("close", false);
-            }
-          });
+        if (jsonData.result) {
+          self.$message({message: "提交成功!", type: "success"});
+          self.$emit("close", true);
+        } else {
+          self.$message({message: jsonData.message + "",type: "warning"});
+          self.$emit("close", false);
         }
+      })
+      .catch((error) => {
+        // self.$message.error(error + "");
       });
     },
-  },
-  mounted: function () {
-    var self = this;
-
-    (function () {
-      if (self.businessKey.length == 0) {
-        return auditingApi.create();
-      } else {
-        return auditingApi.edit(self.businessKey);
-      }
-    })()
-      .then((response) => {
+    handleReject() {
+      var self = this;
+      
+      var formData = new FormData();
+      formData.append("invoiceId", self.businessKey);
+      formData.append("opinion", self.opinion);
+      auditingStepApi
+      .auditingStepReject(formData)
+      .then(function (response) {
         var jsonData = response.data;
-        self.loading = false;
 
         if (jsonData.result) {
-          self.formModel = jsonData.data;
+          self.$message({message: "驳回成功!", type: "success"});
+          self.$emit("close", true);
         } else {
-          self.$message.error(jsonData.message + "");
+          self.$message({message: jsonData.message + "",type: "warning"});
+          self.$emit("close", false);
         }
       })
       .catch((error) => {
-        self.$message.error(error + "");
+        // self.$message.error(error + "");
       });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    //审批流程图
+    var parameters = new FormData();
+    parameters.append("invoiceId", self.businessKey);
+    auditingStepApi
+    .auditingStepData(parameters)
+    .then(function (response) {
+      var jsonData = response.data.data;
+      self.workflowStepData = jsonData.list;
+      self.workflowStepCount = jsonData.count;
+    })
+    .catch((error) => {
+      // self.$message.error(error + "");
+    });
+
+    //对比数据
+    var formData = new FormData();
+    formData.append("PBVID", self.businessKey);
+    purBillVouchApi
+    .compareResults(formData)
+    .then(function (response) {
+      var jsonData = response.data.data;
+      self.compareResultsData = jsonData;
+    })
+    .catch((error) => {
+      // self.$message.error(error + "");
+    });
   },
 };
 </script>

src/views/base/auditing-pending.vue

@@ -0,0 +1,135 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/base/auditingPending">待办信息</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-table :data="tableData" style="min-height: 400px" stripe>
+      <el-table-column prop="workflowDetailName" label="工作流程" width="180"></el-table-column>
+      <el-table-column prop="cpbvCode" label="发票号" width="180"></el-table-column>
+      <el-table-column prop="cvenName" label="供应商" width="380"></el-table-column>
+      <el-table-column prop="stateName" label="审核状态" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="primary" @click="handleNext(row)">审核</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <auditing-next
+      v-if="showNext"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></auditing-next>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import AuditingDetail from "./auditing-detail";
+import AuditingNext from "./auditing-next";
+import auditingApi from "@/api/base/auditing";
+import workflowDetailApi from "@/api/base/workflowDetail";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      pageSizeList: [10, 20, 30],
+      showNext: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+      // formData.append("workflowDetailId", self.queryModel.workflowDetailId);
+
+      auditingApi
+      .listPending(formData)
+      .then(function (response) {
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      })
+      .catch((error) => {
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    handleNext(record) {
+      this.modalTitle = "审核";
+      this.businessKey = record.invoiceId;
+      this.showNext = true;
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showNext = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "auditing-next": AuditingNext,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/dataComparison-main.vue

@@ -103,23 +103,8 @@
       <div class="bxo">
         <div class="flptit">审批流程图</div>
         <div class="second1" style="margin-left: 30px">
-          <el-steps :active="0" align-center>
-            <el-step
-              title="步骤1"
-              description="这是一段很长很长很长的描述性文字"
-            ></el-step>
-            <el-step
-              title="步骤2"
-              description="这是一段很长很长很长的描述性文字"
-            ></el-step>
-            <el-step
-              title="步骤3"
-              description="这是一段很长很长很长的描述性文字"
-            ></el-step>
-            <el-step
-              title="步骤4"
-              description="这是一段很长很长很长的描述性文字"
-            ></el-step>
+          <el-steps :active="workflowStepCount" align-center>
+            <el-step v-for="workflowStep in workflowStepData" :key="workflowStep.value" :title="workflowStep.userName"></el-step>
           </el-steps>
         </div>
       </div>
@@ -169,6 +154,7 @@ import purBillVouchApi from "@/api/base/purBillVouch";
 import vendorApi from "@/api/base/vendor";
 import reviewInformationApi from "@/api/base/reviewInformation";
 import auditingApi from "@/api/base/auditing";
+import workflowStepApi from "@/api/base/workflowStep";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -192,7 +178,9 @@ export default {
       purBillVouchCurrentRow: "",
       btnDisabled: true,
       dialogFormVisible: false,
-      opinion: ""
+      opinion: "",
+      workflowStepData: [],
+      workflowStepCount: 0,
     };
   },
   methods: {
@@ -286,9 +274,22 @@ export default {
     },
   },
   mounted: function () {
+    var self = this;
+    //审批流程图
+    var parameters = new FormData();
+    parameters.append("workflowDetailId", "d518eac2-f162-4ea3-a1a3-c90fbf5aa806");
+    workflowStepApi
+    .pageList(parameters)
+    .then(function (response) {
+      var jsonData = response.data.data;
+      self.workflowStepData = jsonData.data;
+    })
+    .catch((error) => {
+      // self.$message.error(error + "");
+    });
+
     //工作流程选项
     var formData = new FormData();
-    // formData.append("orgId",newVal);
 
     vendorApi.query(formData).then((response) => {
       var jsonData = response.data;

src/views/base/workflowStep-detail.vue

@@ -35,17 +35,17 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="审核人" prop="userId">
+      <el-form-item label="审核角色" prop="userId">
         <el-select
           v-model="formModel.userId"
           filterable
           style="width: 300px"
-          placeholder="请选择审核人"
+          placeholder="请选择审核角色"
         >
           <el-option
             v-for="userId in userResult"
             :key="userId.id"
-            :label="userId.realName"
+            :label="userId.name"
             :value="userId.id"
           ></el-option>
         </el-select>
@@ -72,7 +72,7 @@
 import Constant from "@/constant";
 import workflowStepApi from "@/api/base/workflowStep";
 import workflowDetailApi from "@/api/base/workflowDetail";
-import userApi from "@/api/sys/user";
+import roleApi from "@/api/sys/role";
 
 export default {
   props: ["businessKey", "title"],
@@ -175,8 +175,8 @@ export default {
       }
     });
 
-    //用户选项
-    userApi.query(formData).then(response=>{
+    //角色选项
+    roleApi.selectAll().then(response=>{
       var jsonData = response.data;
 
       if(jsonData.result){

src/views/base/workflowStep-list.vue

@@ -34,17 +34,17 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="审核人" prop="userId">
+      <el-form-item label="审核角色" prop="userId">
         <el-select
           v-model="queryModel.userId"
           filterable
           size="mini"
-          placeholder="请选择审核人"
+          placeholder="请选择审核角色"
         >
           <el-option
             v-for="userId in userResult"
             :key="userId.id"
-            :label="userId.realName"
+            :label="userId.name"
             :value="userId.id"
           ></el-option>
         </el-select>
@@ -106,7 +106,7 @@
       ></el-table-column>
       <el-table-column
         prop="userName"
-        label="审核人"
+        label="审核角色"
         width="180"
       ></el-table-column>
       <el-table-column
@@ -152,7 +152,7 @@ import Constant from "@/constant";
 import WorkflowStepDetail from "./workflowStep-detail";
 import workflowStepApi from "@/api/base/workflowStep";
 import workflowDetailApi from "@/api/base/workflowDetail";
-import userApi from "@/api/sys/user";
+import roleApi from "@/api/sys/role";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -329,8 +329,8 @@ export default {
       }
     });
 
-    //用户选项
-    userApi.query(formData).then(response=>{
+    //角色选项
+    roleApi.selectAll().then(response=>{
       var jsonData = response.data;
 
       if(jsonData.result){