直转申请-审核

src/api/business/index.js

@@ -157,3 +157,39 @@ export function deleteRedif(id) {
     method: 'delete'
   })
 }
+
+// 直转审核-列表
+export function getDerateList(query) {
+  return request({
+    url: '/material/directAudit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 直转审核-详情
+export function getInfoById(query) {
+  return request({
+    url: '/material/directAudit/getInfoById',
+    method: 'get',
+    params: query
+  })
+}
+
+// 直转审核-流程信息
+export function getAuditInfo(query) {
+  return request({
+    url: '/material/directAudit/getAuditInfo',
+    method: 'get',
+    params: query
+  })
+}
+
+// 直转审核-审核
+export function auditDir(data) {
+  return request({
+    url: '/material/directAudit/auditDir',
+    method: 'post',
+    data
+  })
+}

src/router/index.js

@@ -203,7 +203,7 @@ export const dynamicRoutes = [
         path: '/business-details/direct-rotation-apply',
         component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
         hidden: true,
-        permissions: ['*'], // 权限字符
+        permissions: ['direct-apply:list'], // 权限字符
         children: [
             {
                 path: 'index',

src/views/business-examine/direct-rotation-apply/business-details.vue

@@ -1,22 +1,450 @@
 <template>
-    <div class="business-details-container">
+  <div class="business-details-container">
-        <el-row>
+    <el-row>
-            <el-col :span="18">
+      <el-col :span="18">
-                <div class="left-container">左侧</div>
+        <div class="left-container">
-            </el-col>
+          <div class="pages-title">直转申请详情</div>
-            <el-col :span="6">
+          <TitleTip :title="`基本信息`" />
-                <div class="right-container">右侧</div>
+
-            </el-col>
+          <el-form :model="maForm" ref="maForm" size="small" label-width="100px" disabled style="margin-top: 20px">
-        </el-row>
+            <el-row :gutter="20" class="cont-center" style="margin-bottom: 20px">
-    </div>
+              <el-col :span="10" :offset="0">
+                <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px">
+                  <!-- card body -->
+                  <el-form-item label="转出单位" prop="backUnitId">
+                    <el-input
+                      v-model="maForm.backUnitName"
+                      placeholder="请输入转出单位"
+                      clearable
+                      maxlength="50"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="转出工程" prop="backProId">
+                    <el-input
+                      v-model="maForm.backProName"
+                      placeholder="请输入转出工程"
+                      clearable
+                      maxlength="50"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="转出人" prop="backMan">
+                    <el-input
+                      v-model="maForm.backMan"
+                      placeholder="请输入转出人"
+                      clearable
+                      maxlength="50"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="联系电话" prop="backPhone">
+                    <el-input
+                      v-model="maForm.backPhone"
+                      placeholder="请输入联系电话"
+                      clearable
+                      maxlength="11"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                </el-card>
+              </el-col>
+              <el-col :span="3" :offset="0">
+                <div class="cont-center">
+                  <el-image
+                    style="width: 100px; height: 100px"
+                    :src="require('@/assets/img/transform.png')"
+                    fit="fit"
+                  ></el-image>
+                </div>
+              </el-col>
+              <el-col :span="10" :offset="0">
+                <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px">
+                  <!-- card body -->
+                  <el-form-item label="转入单位" prop="leaseUnitId">
+                    <el-input
+                      v-model="maForm.leaseUnitName"
+                      placeholder="请输入转入单位"
+                      clearable
+                      maxlength="50"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="转入工程" prop="leaseProId">
+                    <el-input
+                      v-model="maForm.leaseProName"
+                      placeholder="请输入转入工程"
+                      clearable
+                      maxlength="50"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="转入人" prop="leaseMan">
+                    <el-input
+                      v-model="maForm.leaseMan"
+                      placeholder="请输入转入人"
+                      clearable
+                      maxlength="50"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="联系电话" prop="leasePhone">
+                    <el-input
+                      v-model="maForm.leasePhone"
+                      placeholder="请输入联系电话"
+                      clearable
+                      maxlength="11"
+                      style="width: 240px"
+                    />
+                  </el-form-item>
+                </el-card>
+              </el-col>
+            </el-row>
+          </el-form>
+          <TitleTip :title="`明细信息`" />
+
+          <el-table ref="equipmentList" :data="equipmentList">
+            <el-table-column align="center" label="序号" type="index" width="55" />
+            <el-table-column
+              v-for="(column, index) in tableColumns"
+              :key="column.prop"
+              :label="column.label"
+              :prop="column.prop"
+              align="center"
+              show-overflow-tooltip
+            ></el-table-column>
+          </el-table>
+          <TitleTip :title="`附件信息`" />
+
+          <div class="file-box">
+            <div v-for="(file, index) in fileList" :key="index">
+              <div v-if="file.type === 'pdf'" style="margin: 10px">
+                <a :href="file.url" target="_blank">
+                  <el-image :src="require('@/assets/file.png')" fit="file" style="width: 100px; height: 100px" />
+                </a>
+              </div>
+              <div v-else-if="file.type === 'image'" style="margin: 10px">
+                <el-image
+                  :src="file.url"
+                  fit="file"
+                  :preview-src-list="previewList"
+                  @click="handleImg(file)"
+                  style="width: 100px; height: 100px"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="6">
+        <div class="right-container">
+          <div class="right-title">
+            <div></div>
+            <div></div>
+            <div>流程记录</div>
+          </div>
+
+          <div class="process-record">
+            <el-steps :space="120" direction="vertical">
+              <el-step v-for="(step, index) in auditingList" :key="index" :title="step.nodeName">
+                <template slot="description">
+                  <div class="custom-description">
+                    {{ step.nodeName }}
+
+                    <el-tag size="mini" type="primary" v-if="step.isAccept == 0 || step.isAccept == null">待审批</el-tag>
+                    <el-tag size="mini" type="success" v-if="step.isAccept == 1">已通过</el-tag>
+                    <el-tag size="mini" type="danger" v-if="step.isAccept == 2">已驳回</el-tag>
+                    <div>{{ step.creator }}</div>
+                    <div>{{ step.createTime }}</div>
+                    <div>{{ step.remark }}</div>
+                  </div>
+                </template>
+              </el-step>
+            </el-steps>
+          </div>
+
+          <div class="auditing-container">
+            <el-input
+              type="textarea"
+              v-model="remark"
+              placeholder="请输入审核意见"
+              :autosize="{ minRows: 2, maxRows: 6 }"
+            />
+
+            <el-row class="btn-container">
+              <el-button type="success" size="mini" @click="onSubmitPass">通过</el-button>
+              <el-button type="danger" size="mini" @click="onSubmitReject">驳回</el-button>
+            </el-row>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
-export default {}
+import TitleTip from './components/title-tip.vue'
+import { getLeaseTaskDetail, receiveDetail, getInfoById, getAuditInfo, auditDir } from '@/api/business/index'
+
+export default {
+  components: {
+    TitleTip
+  },
+  name: 'directRotationApply',
+  data() {
+    return {
+      id: '',
+      flowId: '',
+      isEdit: false, // 是否编辑
+      isDetail: false, // 是否查看
+      isAccept: '',
+      remark: '',
+      maForm: {},
+      auditingList: [], // 流程记录
+      equipmentList: [], // 设备列表
+      // 表头
+      tableColumns: [
+        { label: '直转数量', prop: 'directNum' },
+        { label: '类型名称', prop: 'typeName' },
+        { label: '规格型号', prop: 'typeModelName' },
+        { label: '计量单位', prop: 'unitName' },
+        { label: '领料数量', prop: 'useNum' },
+        { label: '领料人', prop: 'leasePerson' },
+        { label: '领料日期', prop: 'startTime' }
+      ],
+      fileList: [
+        { name: '文件1', url: 'https://s5.aconvert.com/convert/p3r68-cdx67/vqm2g-dwr99.pdf', type: 'pdf' },
+        { name: '文件2', url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', type: 'image' }
+      ],
+      previewList: []
+    }
+  },
+  created() {
+    // 判断当前路由页面是否有查询参数
+    // if (this.$route.query) {
+    //   const { id, taskId } = this.$route.query
+    //   this.getLeaseTaskDetailFun(id, taskId)
+    // }
+    if (this.$route.query.type == 'edit') {
+      this.isEdit = true
+      this.isDetail = false
+      this.id = this.$route.query.id
+      this.flowId = this.$route.query.flowId
+      const obj = Object.assign({}, this.$route, { title: '直转申请审核' })
+      this.$tab.updatePage(obj)
+    } else if (this.$route.query.type == 'detail') {
+      this.isEdit = false
+      this.isDetail = true
+      this.id = this.$route.query.id
+      this.flowId = this.$route.query.flowId
+      const obj = Object.assign({}, this.$route, { title: '直转申请详情' })
+      this.$tab.updatePage(obj)
+    }
+
+    this.getTaskInfo()
+    this.getAuditInfo()
+    // this.getLeaseTaskDetailFun()
+  },
+  methods: {
+    // 通过
+    onSubmitPass() {
+      // 弹框提示
+      this.$confirm('是否确认通过审核？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.isAccept = 1
+          this.submitAuditing()
+        })
+        .catch(() => {
+          this.$message.info('已取消')
+        })
+    },
+    // 驳回
+    onSubmitReject() {
+      // 弹框提示
+      this.$confirm('是否确认驳回审核？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.isAccept = 2
+          this.submitAuditing()
+        })
+        .catch(() => {
+          this.$message.info('已取消')
+        })
+    },
+    // 提交审核
+    async submitAuditing() {
+      const params = {
+        flowId: this.flowId,
+        nodeId: this.auditingList[this.auditingList.length - 1].nodeId,
+        isAccept: this.isAccept,
+        remark: this.remark
+      }
+      try {
+        const res = await auditDir(params)
+        console.log('🚀 ~ submitAuditing ~ res:', res)
+        this.$message.success('审核成功')
+        this.$tab.closePage()
+      } catch (error) {
+        console.log('🚀 ~ submitAuditing ~ error:', error)
+      }
+    },
+    // 获取详情
+    async getTaskInfo() {
+      const loading = this.$loading()
+      try {
+        const res = await receiveDetail({ id: this.id })
+        console.log('🚀 ~ getTaskInfo ~ res:', res)
+        this.maForm = res.data
+        this.equipmentList = res.data.directApplyDetails
+        this.fileList = res.data.dirUrls
+        if (this.fileList.length > 0) {
+          this.fileList.forEach(item => {
+            // 如果url 是 .pdf 结尾 添加 type= pdf
+            if (item.url.includes('.pdf')) {
+              item.type = 'pdf'
+            } else {
+              item.type = 'image'
+            }
+          })
+        }
+        console.log('🚀 ~ getTaskInfo ~ fileList:', this.fileList)
+        console.log('🚀 ~ getTaskInfo ~ this.equipmentList:', this.equipmentList)
+        loading.close()
+      } catch (error) {
+        console.log('🚀 ~ error:', error)
+        loading.close()
+      }
+    },
+    // 获取审批流程
+    async getAuditInfo() {
+      try {
+        const params = {
+          id: this.id,
+          flowId: this.flowId
+        }
+
+        const res = await getAuditInfo(params)
+        console.log('🚀 ~ getAuditInfo ~ res:', res)
+        this.auditingList = res.data
+        console.log('🚀 ~ getAuditInfo ~ this.auditingList:', this.auditingList)
+      } catch (error) {
+        console.log('🚀 ~ getAuditInfo ~ error:', error)
+      }
+    },
+    handleImg(img) {
+      console.log('🚀 ~ handleImg ~ img:', img)
+      this.previewList = this.fileList.filter(file => file.type === 'image').map(file => file.url)
+    }
+  }
+}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .business-details-container {
-    padding: 20px;
+  padding: 20px;
+}
+
+.pages-title {
+  padding: 10px 0 30px 0;
+  font-size: 20px;
+  font-weight: bold;
+  letter-spacing: 2px;
+  text-align: center;
+  color: #19a4a0;
+}
+
+.file-box {
+  padding: 10px;
+  display: flex;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  /* div {
+    width: calc((100% - 110px) / 12);
+    height: 60px;
+    margin-right: 10px;
+    margin-top: 10px;
+    text-align: center;
+    line-height: 60px;
+    background-color: #19a4a0;
+  }
+
+  & div:nth-child(12n) {
+    margin-right: 0;
+  } */
+}
+
+.right-container {
+  padding: 0 20px;
+}
+
+.right-title {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  & div:first-child {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    background-color: #19a4a0;
+    z-index: 9;
+  }
+  & div:nth-child(2) {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    background-color: #b2e1e0;
+    transform: translateX(-50%);
+  }
+}
+
+.process-record {
+  margin-top: 20px;
+  //   height: 60vh;
+}
+
+.btn-container {
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-around;
+}
+
+::v-deep .el-step__icon.is-text {
+  background-color: #19a4a0;
+  color: #19a4a0;
+  border: none;
+  width: 16px;
+  height: 16px;
+}
+
+::v-deep .el-step.is-vertical .el-step__line {
+  width: 2px;
+  top: 26px;
+  bottom: 8px;
+  left: 7px;
+}
+
+::v-deep .el-step__title.is-finish {
+  font-weight: bold;
+  color: #303133;
+  font-size: 16px;
+}
+
+::v-deep .el-step__title.is-wait {
+  font-weight: bold;
+  color: #303133;
+  font-size: 16px;
+}
+// 居中
+.cont-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 </style>

src/views/business-examine/direct-rotation-apply/components/title-tip.vue

@@ -0,0 +1,37 @@
+<template>
+    <div class="title-tip">
+        <div class="is-green"></div>
+        <div class="title-child">{{ title }}</div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        title: {
+            type: String,
+            default: () => '基本信息'
+        }
+    }
+}
+</script>
+
+<style scoped>
+.title-tip {
+    display: flex;
+    align-items: center;
+    background-color: #ebeaea;
+}
+
+.is-green {
+    margin: 0 6px;
+    width: 5px;
+    height: 20px;
+    background-color: #19a4a0;
+}
+.title-child {
+    font-weight: bold;
+    letter-spacing: 1px;
+    font-size: 18px;
+}
+</style>

src/views/business-examine/direct-rotation-apply/index.vue

@@ -1,276 +1,227 @@
 <template>
-    <!-- 业务办理审核 -->
+  <!-- 基础页面 -->
-    <div class="app-container">
+  <div class="app-container">
-        <el-form
+    <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
-            :model="queryParams"
+      <el-form-item label="申请日期" prop="timeRange">
-            ref="queryForm"
+        <el-date-picker
-            size="small"
+          v-model="queryParams.timeRange"
-            :inline="true"
+          type="daterange"
-            v-show="showSearch"
+          range-separator="至"
-            label-width="68px"
+          start-placeholder="开始日期"
-        >
+          end-placeholder="结束日期"
-            <el-form-item prop="keyWord">
+          clearable
-                <el-input
+          value-format="yyyy-MM-dd"
-                    clearable
+          format="yyyy-MM-dd"
-                    maxlength="20"
-                    placeholder="请输入关键词"
-                    v-model="queryParams.keyWord"
-                    @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
-        <el-row :gutter="10" class="mb8">
-            <!-- <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-            </el-col> -->
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="configList" ref="multipleTable">
-            <el-table-column
-                width="80"
-                label="序号"
-                type="index"
-                align="center"
-                :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
-            />
-
-            <!-- 点击跳转到二级页面配置审核流程 -->
-            <el-table-column label="流程名称" align="center" prop="typeName" />
-            <el-table-column label="会签类型" align="center" prop="taskName" show-overflow-tooltip />
-            <el-table-column label="操作" align="center" width="180">
-                <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="primary"
-                        icon="el-icon-zoom-in"
-                        @click="handlePreview(scope.row)"
-                        v-hasPermi="['signConfig:info:edit']"
-                    >
-                        查看
-                    </el-button>
-                    <el-button
-                        size="mini"
-                        type="warning"
-                        icon="el-icon-edit"
-                        @click="handleAuditing(scope.row)"
-                        v-hasPermi="['signConfig:info:remove']"
-                    >
-                        审核
-                    </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <pagination
-            :total="total"
-            v-show="total > 0"
-            @pagination="getList"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
         />
+      </el-form-item>
+      <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable>
+          <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
 
-        <!-- 新增或修改弹窗 -->
+      <!-- 表单按钮 -->
-        <el-dialog :title="title" :visible.sync="showConfig" width="40%" append-to-body @close="onDialogClose">
+      <el-form-item>
-            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-                <el-row :gutter="24">
+        <el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
-                    <el-col :span="20">
+      </el-form-item>
-                        <el-form-item label="流程名称" prop="typeName">
+    </el-form>
-                            <el-input v-model="form.typeName" placeholder="请输入流程名称" clearable />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
 
-                <el-row :gutter="24">
+    <!-- <el-row :gutter="10" class="mb8">
-                    <el-col :span="20">
+      <el-col :span="1.5">
-                        <el-form-item label="会签类型" prop="taskType">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">直转申请</el-button>
-                            <el-select
+      </el-col>
-                                filterable
+      <el-col :span="1.5">
-                                clearable
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
-                                style="width: 100%"
+      </el-col>
-                                v-model="form.taskType"
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-                                placeholder="请选择会签类型"
+    </el-row> -->
-                            >
+
-                                <el-option
+    <el-table :data="tableList" fit highlight-current-row style="width: 100%">
-                                    :key="dict.value"
+      <!-- 多选 -->
-                                    :label="dict.label"
+      <el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" />
-                                    :value="dict.value"
+      <el-table-column
-                                    v-for="dict in dict.type.countersign_type_name"
+        type="index"
-                                />
+        width="55"
-                            </el-select>
+        label="序号"
-                        </el-form-item>
+        align="center"
-                    </el-col>
+        :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
-                </el-row>
+      />
-            </el-form>
+      <el-table-column
-            <div slot="footer" class="dialog-footer">
+        v-for="(column, index) in tableColumns"
-                <el-button @click="cancel">取 消</el-button>
+        show-overflow-tooltip
-                <el-button type="primary" @click="submitForm">确 定</el-button>
+        :key="column.prop"
-            </div>
+        :label="column.label"
-        </el-dialog>
+        :prop="column.prop"
-    </div>
+        align="center"
+      >
+        <!-- 插槽 -->
+        <template v-slot="scope" v-if="column.prop == 'flowStatus'">
+          <el-tag v-if="scope.row.flowStatus == '0'" type="warning" size="mini" style="margin-right: 5px">
+            待审核
+          </el-tag>
+          <el-tag v-else-if="scope.row.flowStatus == '1'" size="mini" style="margin-right: 5px">审核中</el-tag>
+          <el-tag v-else-if="scope.row.flowStatus == '2'" type="success" size="mini" style="margin-right: 5px">
+            已审核
+          </el-tag>
+          <el-tag v-else-if="scope.row.flowStatus == '3'" type="error" size="mini" style="margin-right: 5px">
+            已驳回
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!-- 操作 -->
+      <el-table-column label="操作" align="center" width="180">
+        <template slot-scope="scope">
+          <!-- <el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button> -->
+          <el-button
+            v-if="scope.row.flowStatus == '0'"
+            type="text"
+            size="mini"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.row, 2)"
+          >
+            审核
+          </el-button>
+          <!-- <el-button
+            v-if="scope.row.status == '0'"
+            type="text"
+            size="mini"
+            icon="el-icon-delete"
+            style="color: #f56c6c"
+            @click="handleDelete(scope.row)"
+          >
+            删除
+          </el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
 </template>
 
 <script>
-import { getConfigListApi, addConfigApi, editConfigApi, deleteConfigApi } from '@/api/countersign/countersign'
+import { getReceiveList, receiveDelete, getDerateList } from '@/api/business/index'
+
 export default {
-    name: 'signConfig',
+  data() {
-    dicts: ['countersign_process_name', 'countersign_type_name'],
+    return {
-    data() {
+      showSearch: true,
-        return {
+      queryParams: {
-            // 遮罩层
+        pageNum: 1,
-            loading: false,
+        pageSize: 10,
-            // 显示搜索条件
+        keyWord: '', // 关键字
-            showSearch: true,
+        status: '', // 审核状态
-            showConfig: false,
+        timeRange: [] // 日期范围
-            // 总条数
+      },
-            total: 0,
+      // 考勤状态
-            // 会签配置表格数据
+      statusOptions: [
-            configList: [],
+        { label: '待审核', value: '1' },
-            // 弹出层标题
+        { label: '审核中', value: '2' },
-            title: '',
+        { label: '已完成', value: '3' }
-            // 是否显示弹出层
+      ],
-            open: false,
+      total: 0, // 总条数
-            // 查询参数
+      // 表头
-            queryParams: {
+      tableColumns: [
-                pageNum: 1,
+        { label: '申请时间', prop: 'createTime' },
-                pageSize: 10,
+        { label: '申请人', prop: 'leaseMan' },
-                keyWord: undefined
+        { label: '转出单位', prop: 'backUnitName' },
-            },
+        { label: '转出工程', prop: 'backProName' },
-            // 表单参数
+        { label: '转入单位', prop: 'leaseUnitName' },
-            form: {
+        { label: '转入工程', prop: 'leaseProName' },
-                typeName: '',
+        // { label: '物资类型', prop: 'typeName' },
-                taskType: ''
+        { label: '状态', prop: 'flowStatus' }
-            },
+      ],
-            // 表单校验
+      // 表格数据
-            rules: {
+      tableList: []
-                typeName: [
-                    {
-                        required: true,
-                        message: '请输入流程名称',
-                        trigger: 'blur'
-                    },
-                    { max: 30, message: '长度不能超过30个字符', trigger: 'blur' }
-                ],
-                taskType: [
-                    {
-                        required: true,
-                        message: '请选择会签类型',
-                        trigger: 'blur'
-                    }
-                ]
-            }
-        }
-    },
-    created() {
-        this.getList()
-    },
-
-    methods: {
-        // 取消按钮
-        cancel() {
-            this.showConfig = false
-        },
-
-        // 搜索
-        handleQuery() {
-            this.getList()
-        },
-
-        // 弹框关闭时触发
-        onDialogClose() {
-            this.$refs.form.resetFields()
-        },
-
-        // 表单重置
-        reset() {
-            this.form = {
-                typeName: '',
-                taskType: ''
-            }
-            this.resetForm('form')
-        },
-
-        // 新增
-        handleAdd() {
-            this.reset()
-            this.showConfig = true
-            this.title = '新增'
-        },
-
-        // 重置
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.queryParams.keyWord = null
-            this.queryParams.pageNum = 1
-            this.queryParams.pageSize = 10
-            this.handleQuery()
-        },
-
-        // 编辑
-        handleUpdate(row) {
-            const { typeName, taskType, id } = row
-            this.form.typeName = typeName
-            this.form.taskType = taskType + ''
-            this.form.id = id
-            this.title = '编辑'
-            this.showConfig = true
-        },
-
-        // 查询列表
-        async getList() {
-            this.loading = true
-            const res = await getConfigListApi(this.queryParams)
-            this.configList = res.rows
-            this.total = res.total
-            this.loading = false
-        },
-
-        // 删除
-        handleDelete(row) {
-            const id = row.id
-            this.$modal
-                .confirm('是否确认删除数据项？')
-                .then(function () {
-                    return deleteConfigApi({ id })
-                })
-                .then(() => {
-                    this.$modal.msgSuccess('删除成功')
-                    this.getList()
-                })
-                .catch(() => {})
-        },
-
-        // 提交
-        submitForm() {
-            this.$refs['form'].validate(valid => {
-                if (valid) {
-                    if (this.form.id != undefined) {
-                        editConfigApi(this.form).then(res => {
-                            this.$modal.msgSuccess('修改成功')
-                            this.showConfig = false
-                            this.getList()
-                        })
-                    } else {
-                        addConfigApi(this.form).then(res => {
-                            this.$modal.msgSuccess('新增成功')
-                            this.showConfig = false
-                            this.getList()
-                        })
-                    }
-                }
-            })
-        },
-        // 查询
-        handlePreview() {
-            this.$router.push({ name: 'receive-apply-details' }) // 跳转业务详情页面
-        },
-        // 审核
-        handleAuditing() {}
     }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    // 查询
+    handleQuery() {
+      this.getList()
+    },
+    // 重置
+    handleReset() {
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      this.$refs.queryForm.resetFields()
+      this.getList()
+    },
+    // 获取列表
+    async getList() {
+      console.log('列表-查询', this.queryParams)
+      try {
+        const params = {
+          ...this.queryParams,
+          startTime: this.queryParams.timeRange[0] || '',
+          endTime: this.queryParams.timeRange[1] || ''
+        }
+        const res = await getDerateList(params)
+        console.log('🚀 ~ 获取列表 ~ res:', res)
+        this.tableList = res.rows
+        this.total = res.total || 0
+      } catch (error) {
+        console.log('🚀 ~ 获取列表 ~ error:', error)
+        this.tableList = []
+        this.total = 0
+      }
+    },
+    // 多选
+    selectionChange(val) {
+      console.log('selectionChange', val)
+    },
+    // 编辑
+    handleEdit(row, type) {
+      console.log('编辑', row)
+      // 跳转审核详情页面
+      this.$router.push({
+        name: 'direct-rotation-apply',
+        query: {
+          id: row.id,
+          flowId: row.flowId,
+          taskId: row.taskId,
+          type: type === 1 ? 'detail' : 'edit'
+        }
+      })
+    },
+    // 删除
+    handleDelete(row) {
+      console.log('删除', row)
+      this.$confirm('是否删除该数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        const res = await receiveDelete(row.id)
+        console.log('🚀 ~ 删除 ~ res:', res)
+        this.getList()
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+      })
+    }
+  }
 }
 </script>
+
+<style lang="scss" scoped></style>

src/views/business/businessHandling/directApply.vue

@@ -654,8 +654,8 @@ export default {
     },
     //获取任务详情--- 编辑回显数据
     async getTaskInfo() {
+      const loading = this.$loading()
       try {
-        const loading = this.$loading()
         const res = await receiveDetail({ id: this.id })
         console.log('🚀 ~ getTaskInfo ~ res:', res)
         this.maForm = res.data

src/views/business/businessHandling/index.vue

@@ -488,8 +488,8 @@ export default {
     },
     async standardConfigChange(val) {
       console.log('🚀 ~ standardConfigChange ~ val:', val)
+      const loading = this.$loading()
       try {
-        const loading = this.$loading()
         const params = {
           configId: val.id
         }
@@ -625,8 +625,8 @@ export default {
     },
     //获取任务详情--- 编辑回显数据
     async getTaskInfo() {
+      const loading = this.$loading()
       try {
-        const loading = this.$loading()
         const res = await getLeaseTaskDetail(this.id)
         console.log('🚀 ~ getTaskInfo ~ res:', res)
         this.maForm = res.data.leaseApplyInfo

src/views/material/ma/mechEquipConfigMgmt/index.vue

@@ -469,8 +469,8 @@ export default {
       console.log(this.form, '提交参数---')
       this.$refs['form'].validate(valid => {
         if (valid) {
+          const loading = this.$loading()
           try {
-            const loading = this.$loading()
             const params = {
               configId: this.form.configId,
               typeIds: this.form.typeModel