Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/businessOut.js

@@ -45,6 +45,10 @@ function createWord(formData) {
   return request.post(constant.serverUrl + "/base/businessOut/createWord", formData);
 }
 
+function flowList(id){
+  return request.post(constant.serverUrl + "/base/businessOut/flowList/" + id);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,createWord
+  pageList,create,edit,add,update,remove,batchRemove,createWord,flowList
 }

src/views/base/businessOut-flow.vue

@@ -0,0 +1,137 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonRoleName"
+        label="审批人角色"
+        width="100"
+      ></el-table-column>
+      <el-table-column prop="status" label="审批状态" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 1" style="color: green">同意</span>
+          <span v-else-if="row.status == 2" style="color: red">拒绝</span>
+          <span v-else>待处理</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="approvalContent"
+        label="审核意见"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="approvalTime"
+        label="审核时间"
+        width="150"
+      ></el-table-column>
+    </el-table>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import businessOutApi from "@/api/base/businessOut";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      submitting: false,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      businessOutApi
+        .flowList(self.businessKey)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return businessOutApi.create();
+      } else {
+        return businessOutApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        this.changePage(1);
+
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/businessOut-list.vue

@@ -171,15 +171,15 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column prop="remark" label="备注" width="120"></el-table-column>
-      <el-table-column label="操作" width="100">
+      <el-table-column label="操作" width="140">
         <template slot-scope="{ row }">
           <el-row>
             <el-col :span="12">
               <el-link v-if="row.type == 3" type="primary" @click="createWord(row)">下载</el-link>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
-            </el-col> -->
+            <el-col :span="12">
+              <el-link v-if="row.type == 3" type="success" @click="handleFlow(row)">审核详情</el-link>
+            </el-col>
           </el-row>
         </template>
       </el-table-column>
@@ -198,11 +198,18 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></businessOut-detail>
+    <businessOut-flow
+      v-if="showModal1"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></businessOut-flow>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import BusinessOutDetail from "./businessOut-detail";
+import BusinessOutFlow from "./businessOut-flow";
 import businessOutApi from "@/api/base/businessOut";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -229,6 +236,7 @@ export default {
       pageSizeList: [10, 20, 30],
       multipleSelection: [],
       showModal: false,
+      showModal1: false,
       modalTitle: "",
       businessKey: "",
     };
@@ -327,6 +335,11 @@ export default {
       this.businessKey = record.id;
       this.showModal = true;
     },
+    handleFlow(record) {
+      this.modalTitle = "审核详情";
+      this.businessKey = record.id;
+      this.showModal1 = true;
+    },
     handleDelete(record) {
       var self = this;
 
@@ -382,6 +395,7 @@ export default {
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showModal = false;
+      this.showModal1 = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
@@ -393,6 +407,7 @@ export default {
   },
   components: {
     "businessOut-detail": BusinessOutDetail,
+    "businessOut-flow": BusinessOutFlow,
   },
 };
 </script>