فهرست منبع

后台-前端

armg 1 سال پیش
والد
کامیت
29d8b5aec4

+ 2 - 0
ruoyi-ui/src/assets/styles/index.scss

@@ -4,6 +4,7 @@
 @import './element-ui.scss';
 @import './sidebar.scss';
 @import './btn.scss';
+@import './public.scss';
 
 body {
   height: 100%;
@@ -189,3 +190,4 @@ aside {
 .multiselect--active {
   z-index: 1000 !important;
 }
+

+ 332 - 0
ruoyi-ui/src/assets/styles/public.scss

@@ -0,0 +1,332 @@
+// public
+/* flex */
+.public-flex {
+    display: flex;
+    align-items: center;
+  }
+  
+  .public-flex-around {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+  }
+  
+  .public-flex-center {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .public-flex-between {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  
+  .public-flex-end {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  
+  .public-flex-column {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  
+  .public-flex-around-column {
+    display: flex;
+    justify-content: space-around;
+    flex-direction: column;
+  }
+  
+  .public-flex-between-column {
+    display: flex;
+    justify-content: space-between;
+    flex-direction: column;
+  }
+  
+  .public-flex-center-column {
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+  }
+  
+  .flex {
+    flex: 1;
+  }
+  
+  .public-color {
+    color: #e85298;
+  }
+  
+  .white {
+    color: #fff !important;
+  }
+  
+  .public-font-size-12 {
+    font-size: 12px !important;
+  }
+  
+  .public-font-size-14 {
+    font-size: 14px !important;
+  }
+  
+  .public-font-size-15 {
+    font-size: 15px !important;
+  }
+  
+  .public-font-size-16 {
+    font-size: 16px !important;
+  }
+  
+  .public-font-size-17 {
+    font-size: 17px !important;
+  }
+  
+  .public-font-size-18 {
+    font-size: 18px !important;
+  }
+  
+  .public-font-size-20 {
+    font-size: 20px !important;
+  }
+  
+  .public-font-size-22 {
+    font-size: 22px !important;
+  }
+  
+  .public-font-size-24 {
+    font-size: 24px !important;
+  }
+  
+  /* 边距 */
+  /*内外边距类*/
+  .public-padded-0 {
+    padding: 0 !important;
+  }
+  
+  .public-padded-5 {
+    padding: 5px !important;
+  }
+  
+  .public-padded-10 {
+    padding: 10px !important;
+  }
+  
+  .public-padded-15 {
+    padding: 15px !important;
+  } 
+  .public-padded-20 {
+    padding: 20px !important;
+  }
+  .public-padded-30 {
+    padding: 30px !important;
+  }
+  
+  .public-padded-t-0 {
+    padding-top: 0 !important;
+  }
+  
+  .public-padded-t-5 {
+    padding-top: 5px !important;
+  }
+  
+  .public-padded-t-10 {
+    padding-top: 10px !important;
+  }
+  
+  .public-padded-t-15 {
+    padding-top: 15px !important;
+  }
+  .public-padded-t-20 {
+    padding-top: 20px !important;
+  }
+  .public-padded-b-0 {
+    padding-bottom: 0 !important;
+  }
+  
+  .public-padded-b-5 {
+    padding-bottom: 5px !important;
+  }
+  
+  .public-padded-b-10 {
+    padding-bottom: 10px !important;
+  }
+  
+  .public-padded-b-15 {
+    padding-bottom: 15px !important;
+  }
+  .public-padded-b-20 {
+    padding-bottom: 20px !important;
+  }
+  .public-padded-b-30 {
+    padding-bottom: 30px !important;
+  }
+  
+  .public-padded-l-0 {
+    padding-left: 0 !important;
+  }
+  
+  .public-padded-l-5 {
+    padding-left: 5px !important;
+  }
+  
+  .public-padded-l-10 {
+    padding-left: 10px !important;
+  }
+  
+  .public-padded-l-15 {
+    padding-left: 15px !important;
+  }
+  .public-padded-l-20 {
+    padding-left: 20px !important;
+  }
+  .public-padded-l-30 {
+    padding-left: 30px !important;
+  }
+  
+  .public-padded-r-0 {
+    padding-right: 0 !important;
+  }
+  
+  .public-padded-r-5 {
+    padding-right: 5px !important;
+  }
+  
+  .public-padded-r-10 {
+    padding-right: 10px !important;
+  }
+  
+  .public-padded-r-15 {
+    padding-right: 15px !important;
+  }
+  .public-padded-r-20 {
+    padding-right: 20px !important;
+  }
+  .public-padded-r-30 {
+    padding-right: 30px !important;
+  }
+  
+  .public-margin-0 {
+    margin: 0 !important;
+  }
+  
+  .public-margin-5 {
+    margin: 5px !important;
+  }
+  
+  .public-margin-10 {
+    margin: 10px !important;
+  }
+  
+  .public-margin-15 {
+    margin: 15px !important;
+  }
+  .public-margin-20 {
+    margin: 20px !important;
+  }
+  .public-margin-30 {
+    margin: 30px !important;
+  }
+  
+  
+  .public-margin-t-0 {
+    margin-top: 0px !important;
+  }
+  
+  .public-margin-t-5 {
+    margin-top: 5px !important;
+  }
+  
+  .public-margin-t-10 {
+    margin-top: 10px !important;
+  }
+  
+  .public-margin-t-15 {
+    margin-top: 15px !important;
+  }
+  .public-margin-t-20 {
+    margin-top: 20px !important;
+  }
+  .public-margin-t-30 {
+    margin-top: 30px !important;
+  }
+  
+  .public-margin-b-0 {
+    margin-bottom: 0 !important;
+  }
+  
+  .public-margin-b-5 {
+    margin-bottom: 5px !important;
+  }
+  
+  .public-margin-b-10 {
+    margin-bottom: 10px !important;
+  }
+  
+  .public-margin-b-15 {
+    margin-bottom: 15px !important;
+  }
+  .public-margin-b-20 {
+    margin-bottom: 20px !important;
+  }
+  .public-margin-b-30 {
+    margin-bottom: 30px !important;
+  }
+  .public-margin-l-0 {
+    margin-left: 0 !important;
+  }
+  
+  .public-margin-l-5 {
+    margin-left: 5px !important;
+  }
+  
+  .public-margin-l-10 {
+    margin-left: 10px !important;
+  }
+  
+  .public-margin-l-15 {
+    margin-left: 15px !important;
+  }
+  .public-margin-l-20 {
+    margin-left: 20px !important;
+  }
+  .public-margin-l-30 {
+    margin-left: 30px !important;
+  }
+  
+  .public-margin-r-0 {
+    margin-right: 0 !important;
+  }
+  
+  .public-margin-r-5 {
+    margin-right: 5px !important;
+  }
+  
+  .public-margin-r-10 {
+    margin-right: 10px !important;
+  }
+  
+  .public-margin-r-15 {
+    margin-right: 15px !important;
+  }
+  .public-margin-r-20 {
+    margin-right: 20px !important;
+  }
+  .public-margin-r-30 {
+    margin-right: 30px !important;
+  }
+  
+  .zhezhao {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: rgba(0, 0, 0, 0.7);
+    z-index: 4;
+  }
+  

+ 7 - 0
ruoyi-ui/src/router/index.js

@@ -91,6 +91,13 @@ export const constantRoutes = [
         name: 'customerInformationIndex',
         meta: { title: '客户信息', icon: 'dashboard' }
       },
+      {
+        path: 'customerInformation/add',
+        component: () => import('@/views/crmSystem/customerInformation/add'),
+        name: 'customerInformationAdd',
+        meta: { title: '新增客户' },
+        hidden:true
+      },
     ]
   },
   {

+ 370 - 15
ruoyi-ui/src/views/crmSystem/approveQuery/index.vue

@@ -1,22 +1,377 @@
 <template>
-    <div>2222</div>
+  <div class="app-container">
+    <el-tabs @tab-click="handleClick">
+      <el-tab-pane label="未完成">
+        <el-table
+          :header-cell-style="{ background: '#f8f8f9' }"
+          v-loading="loading1"
+          :data="myList"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column
+            label="客户名称"
+            align="center"
+            prop="customerName"
+          />
+          <el-table-column label="申请人" align="center" prop="userId" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="员工状态" align="center" prop="staffStatus" />
+          <el-table-column label="职位" align="center" prop="postName" />
+          <el-table-column label="申请时间" align="center" prop="applyTime" />
+          <el-table-column
+            label="审批时间"
+            align="center"
+            prop="taskCreateTiem"
+          />
+          <!-- <el-table-column
+            label="流程实例定义id"
+            align="center"
+            prop="processDefinitionId"
+          /> -->
+          <!-- <el-table-column
+            label="流程实例id"
+            align="center"
+            prop="processInstanceId"
+          /> -->
+          <el-table-column label="当前节点" align="center" prop="taskName" />
+          <!-- <el-table-column
+            label="当前节点key"
+            align="center"
+            prop="taskUserId"
+          /> -->
+          <el-table-column
+            label="当前处理人"
+            align="center"
+            prop="taskUserId"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:file:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:file:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total1 > 0"
+          :total="total1"
+          :page.sync="queryParams1.pageNum"
+          :limit.sync="queryParams1.pageSize"
+          @pagination="getList1"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="正在处理">
+        <el-table
+          :header-cell-style="{ background: '#f8f8f9' }"
+          v-loading="loading2"
+          :data="myList"
+        >
+          <el-table-column
+            label="客户名称"
+            align="center"
+            prop="customerName"
+          />
+          <el-table-column label="申请人" align="center" prop="userId" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="员工状态" align="center" prop="staffStatus" />
+          <el-table-column label="职位" align="center" prop="postName" />
+          <el-table-column label="申请时间" align="center" prop="applyTime" />
+          <el-table-column
+            label="审批时间"
+            align="center"
+            prop="taskCreateTiem"
+          />
+          <el-table-column label="状态" align="center" prop="state" />
+          <!-- <el-table-column
+            label="流程实例定义id"
+            align="center"
+            prop="processDefinitionId"
+          />
+          <el-table-column
+            label="流程实例id"
+            align="center"
+            prop="processInstanceId"
+          /> -->
+          <el-table-column label="当前节点" align="center" prop="taskName" />
+          <el-table-column
+            label="当前处理人"
+            align="center"
+            prop="taskUserId"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:file:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:file:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total2 > 0"
+          :total="total2"
+          :page.sync="queryParams2.pageNum"
+          :limit.sync="queryParams2.pageSize"
+          @pagination="getList2"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="已完成">
+        <el-table
+          :header-cell-style="{ background: '#f8f8f9' }"
+          v-loading="loading3"
+          :data="myEndList"
+        >
+          <!-- "客户名称","申请人","部门" ,"员工状态","职位","申请时间",
+          "结束时间", "结束原因", "操作" -->
+          <el-table-column
+            label="客户名称"
+            align="center"
+            prop="customerName"
+          />
+          <el-table-column label="申请人" align="center" prop="userId" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="员工状态" align="center" prop="staffStatus" />
+          <el-table-column label="职位" align="center" prop="postName" />
+          <el-table-column label="申请时间" align="center" prop="applyTime" />
+          <el-table-column label="结束时间" align="center" prop="endTime" />
+          <el-table-column label="结束原因" align="center" prop="status" />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:file:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:file:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total3 > 0"
+          :total="total3"
+          :page.sync="queryParams3.pageNum"
+          :limit.sync="queryParams3.pageSize"
+          @pagination="getList3"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- 添加或修改DGT请假流程审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="原文件名" prop="fileName">
+          <el-input v-model="form.fileName" placeholder="请输入原文件名" />
+        </el-form-item>
+        <el-form-item label="文件路径" prop="filePath">
+          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
+        </el-form-item>
+        <el-form-item label="新文件名" prop="newFileName">
+          <el-input v-model="form.newFileName" placeholder="请输入新文件名" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
+
 <script>
-export default {
-    data(){
-        return{
+// import { listFile, getFile, delFile, addFile, updateFile } from "@/api/system/file";
 
-        }
+export default {
+  name: "myTaskIndex",
+  data() {
+    return {
+      // 遮罩层
+      loading1: false,
+      loading2: false,
+      loading3: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total1: 0,
+      total2: 0,
+      total3: 0,
+      // DGT请假流程审批表格数据
+      myTaskList: [],
+      myList: [],
+      myEndList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 查询参数
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 查询参数
+      queryParams3: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        leaveAuditId: [
+          { required: true, message: "$comment不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    // this.getList();
+  },
+  methods: {
+    submitForm() {},
+    /** 查询DGT请假流程审批列表 */
+    getList1() {
+      this.loading1 = true;
+      listFile(this.queryParams1).then((response) => {
+        this.myTaskList = response.rows;
+        this.total1 = response.total;
+        this.loading1 = false;
+      });
     },
-    created(){
-
+    getList2() {
+      this.loading2 = true;
+      listFile(this.queryParams2).then((response) => {
+        this.myList = response.rows;
+        this.total2 = response.total;
+        this.loading2 = false;
+      });
     },
-    mounted(){
-
-    }
-
-}
+    getList3() {},
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        leaveAuditId: null,
+        fileName: null,
+        filePath: null,
+        fileType: null,
+        newFileName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams1.pageNum = 1;
+      this.queryParams2.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加DGT请假流程审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getFile(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改DGT请假流程审批";
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除DGT请假流程审批编号为"' + ids + '"的数据项?')
+        .then(function () {
+          return delFile(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
-<style lang="scss" scoped>
-
-</style>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1001 - 12
ruoyi-ui/src/views/crmSystem/customerInformation/add.vue


+ 250 - 13
ruoyi-ui/src/views/crmSystem/customerInformation/index.vue

@@ -1,22 +1,259 @@
 <template>
-    <div>333</div>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="客户编号" prop="customerCode">
+        <el-input
+          v-model="queryParams.customerCode"
+          placeholder="请输入客户编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          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, index) in statusOptions"
+            :key="index"
+            :label="item.dictname"
+            :value="item.dictvalue"
+            :disabled="item.disabled"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="登记日期" prop="createdDate">
+        <el-input
+          v-model="queryParams.createdDate"
+          placeholder="请输入登记日期"
+          clearable
+          @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="handleUserPopAdd"
+          >新增客户</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleApprovePopAdd"
+          >指定审批人员</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-table
+      :header-cell-style="{ background: '#f8f8f9' }"
+      v-loading="loading"
+      :data="myTaskList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column fixed type="selection" width="55" align="center" />
+      <el-table-column
+        fixed
+        label="申请公司"
+        align="center"
+        prop="dhrmCompanyName"
+      />
+      <el-table-column fixed label="申请部门" align="center" prop="deptName" />
+      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="客户编码" align="center" prop="customerCode" />
+      <el-table-column label="企业性质" align="center" prop="customerNature" />
+      <el-table-column label="行业" align="center" prop="trade" />
+      <el-table-column label="客户状态" align="center" prop="statusName" />
+      <el-table-column label="成立日期" align="center" prop="registDate" />
+      <el-table-column label="公司地址" align="center" prop="companyAddress" />
+      <el-table-column label="申请人" align="center" prop="userName" />
+      <el-table-column label="申请时间" align="center" prop="createdDate" />
+      <el-table-column label="联系人" align="center" prop="contactsName" />
+      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="登记日期" align="center" prop="createdDate" />
+      <el-table-column label="登记人" align="center" prop="userName" />
+      <el-table-column label="审核状态" align="center" prop="state" />
+      <el-table-column label="是否启用" align="center" prop="isOpen" />
+      <el-table-column label="数据来源" align="center" prop="dateFrom" />
+      <el-table-column
+        fixed="right"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:file:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:file:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 添加指定审批人员批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="财务部" prop="financeDept">
+          <el-select
+            v-model="form.financeDept"
+            multiple
+            placeholder="请选择"
+            :style="{ width: '100%' }"
+          >
+            <el-option
+              v-for="item in financeDeptOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="法务部" prop="lawDept">
+          <el-select
+            v-model="form.lawDept"
+            multiple
+            placeholder="请选择"
+            :style="{ width: '100%' }"
+          >
+            <el-option
+              v-for="item in lawDeptOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 <script>
 export default {
-    data(){
-        return{
-
-        }
+  data() {
+    return {
+      title: "",
+      open: false,
+      loading: false,
+      form: {
+        financeDept: null,
+        lawDept: null,
+      },
+      // 显示搜索条件
+      showSearch: true,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        customerCode: null,
+        customerName: null,
+        status: null,
+        createdDate: null,
+      },
+      statusOptions: [],
+      myTaskList: [],
+      financeDeptOptions: [],
+      lawDeptOptions: [],
+      rules: {},
+    };
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    submitForm() {},
+    cancel() {},
+    handleUserPopAdd() {
+      this.$router.push({ name: "customerInformationAdd" });
     },
-    created(){
-
+    handleApprovePopAdd() {
+      this.reset();
+      this.title = "指定审批人员";
+      this.open = true;
     },
-    mounted(){
-
-    }
-
-}
+    // 表单重置
+    reset() {
+      this.form = {
+        financeDept: null,
+        lawDept: null,
+      };
+      this.resetForm("form");
+    },
+    /** 查询DGT请假流程审批列表 */
+    getList() {
+      this.loading = true;
+      listFile(this.queryParams1).then((response) => {
+        this.myTaskList = response.rows;
+        this.total1 = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      // this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-
 </style>

+ 341 - 5
ruoyi-ui/src/views/crmSystem/myTask/index.vue

@@ -1,16 +1,352 @@
 <template>
-  <div>111</div>
+  <div class="app-container">
+    <el-form
+      :model="queryParams1"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="客户编号" prop="customerCode">
+        <el-input
+          v-model="queryParams1.customerCode"
+          placeholder="请输入客户编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input
+          v-model="queryParams1.customerName"
+          placeholder="请输入客户名称"
+          clearable
+          @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-tabs @tab-click="handleClick">
+      <el-tab-pane label="我的代办任务">
+        <el-table
+          :header-cell-style="{ background: '#f8f8f9' }"
+          v-loading="loading1"
+          :data="myTaskList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column
+            label="客户编号"
+            align="center"
+            prop="customerCode"
+          />
+          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column label="申请人" align="center" prop="userId" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <!-- <el-table-column label="员工状态" align="center" prop="staffStatus" /> -->
+          <!-- <el-table-column label="职位" align="center" prop="postName" /> -->
+          <el-table-column label="申请时间" align="center" prop="applyTime" />
+          <!-- <el-table-column
+            label="流程实例定义id"
+            align="center"
+            prop="processDefinitionId"
+          /> -->
+          <!-- <el-table-column
+            label="流程实例id"
+            align="center"
+            prop="processInstanceId"
+          /> -->
+          <el-table-column label="当前节点" align="center" prop="taskName" />
+          <!-- <el-table-column
+            label="当前节点key"
+            align="center"
+            prop="taskDefinitionKey"
+          /> -->
+
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:file:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:file:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total1 > 0"
+          :total="total1"
+          :page.sync="queryParams1.pageNum"
+          :limit.sync="queryParams1.pageSize"
+          @pagination="getList1"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="我的单据">
+        <el-table
+          :header-cell-style="{ background: '#f8f8f9' }"
+          v-loading="loading2"
+          :data="myList"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column
+            label="客户编号"
+            align="center"
+            prop="customerCode"
+          />
+          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column label="申请人" align="center" prop="userId" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <!-- <el-table-column label="员工状态" align="center" prop="staffStatus" /> -->
+          <!-- <el-table-column label="职位" align="center" prop="postName" /> -->
+          <el-table-column label="申请时间" align="center" prop="applyTime" />
+          <!-- <el-table-column
+            label="审批时间"
+            align="center"
+            prop="taskCreateTiem"
+          /> -->
+          <el-table-column label="状态" align="center" prop="state" />
+          <!-- <el-table-column
+            label="流程实例定义id"
+            align="center"
+            prop="processDefinitionId"
+          /> -->
+          <!-- <el-table-column
+            label="流程实例id"
+            align="center"
+            prop="processInstanceId"
+          /> -->
+          <el-table-column label="当前节点" align="center" prop="taskName" />
+          <el-table-column
+            label="当前处理人"
+            align="center"
+            prop="taskUserId"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:file:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:file:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total2 > 0"
+          :total="total2"
+          :page.sync="queryParams2.pageNum"
+          :limit.sync="queryParams2.pageSize"
+          @pagination="getList2"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- 添加或修改DGT请假流程审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="原文件名" prop="fileName">
+          <el-input v-model="form.fileName" placeholder="请输入原文件名" />
+        </el-form-item>
+        <el-form-item label="文件路径" prop="filePath">
+          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
+        </el-form-item>
+        <el-form-item label="新文件名" prop="newFileName">
+          <el-input v-model="form.newFileName" placeholder="请输入新文件名" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
+
 <script>
+// import { listFile, getFile, delFile, addFile, updateFile } from "@/api/system/file";
+
 export default {
   name: "myTaskIndex",
   data() {
-    return {};
+    return {
+      // 遮罩层
+      loading1: false,
+      loading2: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total1: 0,
+      total2: 0,
+      // DGT请假流程审批表格数据
+      myTaskList: [],
+      myList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        customerCode: null,
+        customerName: null,
+      },
+      // 查询参数
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 10,
+        customerCode: null,
+        customerName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        leaveAuditId: [
+          { required: true, message: "$comment不能为空", trigger: "blur" },
+        ],
+      },
+    };
   },
   created() {
+    // this.getList();
+  },
+  methods: {
+    submitForm() {},
+    /** 查询DGT请假流程审批列表 */
+    getList1() {
+      this.loading1 = true;
+      listFile(this.queryParams1).then((response) => {
+        this.myTaskList = response.rows;
+        this.total1 = response.total;
+        this.loading1 = false;
+      });
+    },
+    getList2() {
+      this.loading2 = true;
+      listFile(this.queryParams2).then((response) => {
+        this.myList = response.rows;
+        this.total2 = response.total;
+        this.loading2 = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        leaveAuditId: null,
+        fileName: null,
+        filePath: null,
+        fileType: null,
+        newFileName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams1.pageNum = 1;
+      this.queryParams2.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加DGT请假流程审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getFile(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改DGT请假流程审批";
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除DGT请假流程审批编号为"' + ids + '"的数据项?')
+        .then(function () {
+          return delFile(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
   },
-  mounted() {},
 };
 </script>
-<style lang="scss" scoped>
-</style>

+ 2 - 1
ruoyi-ui/src/views/flowable/task/record/index.vue

@@ -11,7 +11,8 @@
           <div>
             <parser :key="new Date().getTime()" :form-conf="variablesData" />
           </div>
-          <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;" v-if="finished === 'true'">
+          <!-- v-if="finished === 'true'" -->
+          <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;" > 
             <el-button  icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete">审批</el-button>
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>-->
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->