From 39a08593390b2f57918b7a1226d1618d604a7484 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Thu, 18 Aug 2022 14:23:05 +0800
Subject: [PATCH] 2022.8.18 log

---
 src/api/system/log.js              |   9 +
 src/views/contract/seeContract.vue |  35 +--
 src/views/dashboard/index.vue      |  17 +-
 src/views/system/department.vue    | 470 +++++++++++++++--------------
 src/views/system/log.vue           |  75 +++++
 5 files changed, 340 insertions(+), 266 deletions(-)
 create mode 100644 src/api/system/log.js
 create mode 100644 src/views/system/log.vue

diff --git a/src/api/system/log.js b/src/api/system/log.js
new file mode 100644
index 0000000..c3033aa
--- /dev/null
+++ b/src/api/system/log.js
@@ -0,0 +1,9 @@
+import request from "@/utils/request";
+
+export function index(data){
+  return request({
+    method:'post',
+    url:'/api/admin/operate-log/index',
+    data
+  })
+}
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 25fb2c7..e484b2f 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -777,43 +777,10 @@ export default {
         }
       })
     },
-    //提交新建
-    submit(){
-      addContrant({
-        type:this.form.type,
-        is_plan:this.form.isBudget ? 1 : 0,
-        purchase_type_id:this.form.methods,
-        purchase_way_id:this.form.modality,
-        money_way_id:`${this.form.fundingChannels.toString()}`,
-        plan_price:this.form.price,
-        name:this.form.name,
-        contract_plan_links:this.form.plan.map(item=>{
-          return item.value
-        })
-      }).then(res=>{
-        this.isShowAdd = false
-        Message({
-          type:'success',
-          message:'操作成功'
-        })
-        this.$refs['addContract'].reset()
-        this.$refs['planTable'].clearSelection()
-        this.getContracts()
-      })
-    },
 
-    //删除合同
-    deleteContract(id){
-      delContract({id}).then(res=>{
-        Message({
-          type:'success',
-          message:'操作成功'
-        })
-        this.getContracts()
-      })
-    },
   },
   mounted() {
+
     this.window.width = screen.availWidth * 0.95
     this.window.height = screen.availHeight * 0.95
     this.window.top = (window.screen.height - 30 - this.window.height)/2
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 3862281..1c70436 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -16,22 +16,30 @@
         <el-table-column prop="type" width="100" label="类型" align="center" :formatter="typeFormatter"/>
         <el-table-column prop="content" label="内容" align="left" />
         <el-table-column prop="created_at" width="200" label="下发时间" align="center" :formatter="timeFormatter"/>
-        <el-table-column fixed="right" width="100" label="状态" align="center" prop="read_count">
+        <el-table-column width="100" label="状态" align="center" prop="read_count">
           <template slot-scope="{row, $index}">
             <el-link v-if="row.read_count" type="success" :underline="false">已读</el-link>
             <Button v-else type="error" size="small" style="margin-left: 10px;" ghost @click="readIt(row, $index)">未读</Button>
           </template>
         </el-table-column>
+        <el-table-column width="90" header-align="center" label="操作" align="center">
+          <template slot-scope="{row, $index}">
+            <Button type="primary" size="small" style="margin-left: 10px;" ghost @click="toContract(row)">查看</Button>
+          </template>
+        </el-table-column>
       </el-table>
 
       <div style="display: flex;justify-content: flex-end;">
         <Page :total="total" show-elevator @on-change="pageChange"/>
       </div>
     </div>
+
+    <detailContract ref="detailContract"></detailContract>
   </div>
 </template>
 
 <script>
+import detailContract from "@/views/contract/components/detailContract"
 import LxHeader from '@/components/LxHeader/index.vue'
 import Pagination from '@/components/Pagination'
 import { adminDepartmentList } from '../../api/system/department.js'
@@ -42,7 +50,7 @@ import {Message} from "element-ui";
 export default {
   name: 'Manage',
   components: {
-    LxHeader, Pagination
+    LxHeader, Pagination,detailContract
   },
   data() {
     return {
@@ -75,6 +83,11 @@ export default {
     }).catch(error => {})
   },
   methods: {
+    toContract(row){
+      this.$refs['detailContract'].getDetail(row.contract_id)
+      this.$refs['detailContract'].isShowDetail = true
+    },
+
     pageChange(e){
       this.pageIndex = e
       this.getNotices()
diff --git a/src/views/system/department.vue b/src/views/system/department.vue
index 7e931ad..593f38f 100644
--- a/src/views/system/department.vue
+++ b/src/views/system/department.vue
@@ -1,231 +1,241 @@
-<template>
-  <div class="container">
-    <!-- 查询配置 -->
-    <div style="padding: 0px 20px">
-      <div ref="lxHeader">
-        <LxHeader icon="md-apps" text="部门管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-          <div slot="content"></div>
-          <slot>
-            <div>
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
-              <Button type="primary" @click="edit()" style="margin-left: 10px">新增部门</Button>
-            </div>
-          </slot>
-        </LxHeader>
-      </div>
-      <div class="table-tree">
-        <el-table :data="tableData" :height="tableHeight" class="v-table" style="width: 100%;margin-bottom: 20px;"
-          row-key="id" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-          <el-table-column type="index" align="center">
-          </el-table-column>
-          <el-table-column prop="name" label="部门名称" sortable>
-          </el-table-column>
-          <el-table-column  prop="manger" label="部门负责人" sortable  width="180">
-            <template slot-scope="scope">
-              <el-tag type="primary" disable-transitions>{{scope.row.manager?scope.row.manager.name:"无"}}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="leader" label="部门分管人" sortable width="180">
-            <template slot-scope="scope">
-              <el-tag type="success" disable-transitions>{{scope.row.leader?scope.row.leader.name:"无"}}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="sortnumber" align="center" label="排序" sortable width="80">
-          </el-table-column>
-          <el-table-column fixed="right" label="操作" width="300">
-            <template slot-scope="scope">
-              <Button type="primary" @click="addchildren(scope.row)" size="small" style="margin-left: 10px;"
-                ghost>下级部门</Button>
-              <Button type="error" @click="del(scope.row)" size="small" style="margin-left: 10px;" ghost>删除</Button>
-              <Button type="primary" @click="edit(scope.row)" size="small" style="margin-left: 10px;" ghost>编辑</Button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-
-    <el-dialog title="部门编辑" :visible.sync="dialogFormVisible" width="30%">
-      <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
-        <el-form-item label="上级部门">
-          <el-input v-model="form.pname" disabled autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="部门名称" prop="name">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="部门负责人" prop="manager">
-          <el-autocomplete class="inline-input" v-model="form.manager" :fetch-suggestions="querySearch"
-            placeholder="请输入部门负责人" :trigger-on-focus="false" @select="handleSelectManager"></el-autocomplete>
-        </el-form-item>
-        <el-form-item label="部门分管人" prop="leader">
-          <el-autocomplete class="inline-input" v-model="form.leader" :fetch-suggestions="querySearch"
-            placeholder="请输入部门分管人" :trigger-on-focus="false" @select="handleSelectLeader"></el-autocomplete>
-        </el-form-item>
-        <el-form-item label="排序">
-          <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="resetForm('form')">取 消</el-button>
-        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-<script>
-  import LxHeader from "@/components/LxHeader/index.vue";
-  import {
-    listdept,
-    save,
-    del
-  } from "../../api/system/department.js";
-  import {
-    listuser
-  } from "../../api/system/user.js";
-
-  export default {
-    components: {
-      LxHeader
-    },
-    created() {
-      this.initLoad();
-      this.load();
-    },
-    mounted() {},
-    data() {
-      return {
-        dialogFormVisible: false,
-        formLabelWidth: "120px",
-        form: {
-          name: "",
-          id: "",
-          pid: "0",
-          manager_id: "",
-          leader_id: "",
-          manager: "",
-          leader: "",
-          sortnumber: 0,
-          icon: "",
-          pname: "上级部门"
-        },
-        rules: {
-          name: [{
-            required: true,
-            message: '请输入部门名称',
-            trigger: 'blur'
-          }]
-        },
-        tableHeight: 0,
-        //查询条件字段
-        searchFields: {
-          KeyWord: ""
-        },
-        tableData: []
-      }
-    },
-    methods: {
-      querySearch(queryString, cb) {
-        listuser().then(response => {
-          var data = response.data;
-          for (var m of data) {
-            m.value = m.name;
-          }
-          cb(data)
-        }).catch(error => {
-          //reject(error)
-        })
-      },
-      handleSelectManager(item) {
-        this.form.manager_id = item.id;
-      },
-      handleSelectLeader(item) {
-        this.form.leader_id = item.id;
-      },
-      initLoad() {
-        var that = this;
-        var clientHeight = document.documentElement.clientHeight
-        var lxHeader_height = 96.5; //查询 头部
-        var paginationHeight = 37; //分页的高度
-        var topHeight = 50; //页面 头部
-        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
-        that.tableHeight = tableHeight;
-      },
-      load() {
-        var that = this;
-        listdept().then(response => {
-          that.tableData = response;
-        }).catch(error => {
-          //reject(error)
-        })
-
-      },
-      edit(obj) {
-        this.form = this.$options.data().form
-        if (obj) {
-          var result = Object.assign(this.form, obj);
-          if (obj.leader)
-            result.leader = obj.leader.name
-          if (obj.manager)
-            result.manager = obj.manager.name
-          this.form = result;
-        }
-        this.dialogFormVisible = true;
-      },
-      addchildren(obj) {
-        this.form = this.$options.data().form
-        if (obj) {
-          this.form.pname = obj.name;
-          this.form.pid = obj.id;
-          this.dialogFormVisible = true;
-        }
-      },
-      submitForm(formName) {
-        var that = this;
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            save(that.form).then(response => {
-              console.log(response)
-              this.$Message.success('操作成功');
-              that.dialogFormVisible = false;
-              that.load();
-            }).catch(error => {
-              reject(error)
-            })
-          } else {
-            this.$Message.error('数据校验失败');
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        var that = this;
-        this.$refs[formName].resetFields();
-        that.dialogFormVisible = false;
-      },
-      del(obj) {
-        var that = this;
-        if (obj) {
-          this.$Modal.confirm({
-            title: '确认要删除数据？',
-            onOk: () => {
-              del({
-                id: obj.id
-              }).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-              }).catch(error => {
-                console.log(error)
-                reject(error)
-              })
-            },
-            onCancel: () => {
-              //this.$Message.info('Clicked cancel');
-            }
-          });
-        }
-      },
-    }
-  };
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+      <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="部门管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增部门</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div> <div ref="lxHeader">
+        <LxHeader icon="md-apps" text="部门管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增部门</Button>
+            </div>
+          </slot>
+        </LxHeader>
+      </div>
+      <div class="table-tree">
+        <el-table :data="tableData" :height="tableHeight" class="v-table" style="width: 100%;margin-bottom: 20px;"
+          row-key="id" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+          <el-table-column type="index" align="center">
+          </el-table-column>
+          <el-table-column prop="name" label="部门名称" sortable>
+          </el-table-column>
+          <el-table-column  prop="manger" label="部门负责人" sortable  width="180">
+            <template slot-scope="scope">
+              <el-tag type="primary" disable-transitions>{{scope.row.manager?scope.row.manager.name:"无"}}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="leader" label="部门分管人" sortable width="180">
+            <template slot-scope="scope">
+              <el-tag type="success" disable-transitions>{{scope.row.leader?scope.row.leader.name:"无"}}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="sortnumber" align="center" label="排序" sortable width="80">
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" width="300">
+            <template slot-scope="scope">
+              <Button type="primary" @click="addchildren(scope.row)" size="small" style="margin-left: 10px;"
+                ghost>下级部门</Button>
+              <Button type="error" @click="del(scope.row)" size="small" style="margin-left: 10px;" ghost>删除</Button>
+              <Button type="primary" @click="edit(scope.row)" size="small" style="margin-left: 10px;" ghost>编辑</Button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+    <el-dialog title="部门编辑" :visible.sync="dialogFormVisible" width="30%">
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+        <el-form-item label="上级部门">
+          <el-input v-model="form.pname" disabled autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="部门名称" prop="name">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="部门负责人" prop="manager">
+          <el-autocomplete class="inline-input" v-model="form.manager" :fetch-suggestions="querySearch"
+            placeholder="请输入部门负责人" :trigger-on-focus="false" @select="handleSelectManager"></el-autocomplete>
+        </el-form-item>
+        <el-form-item label="部门分管人" prop="leader">
+          <el-autocomplete class="inline-input" v-model="form.leader" :fetch-suggestions="querySearch"
+            placeholder="请输入部门分管人" :trigger-on-focus="false" @select="handleSelectLeader"></el-autocomplete>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="form.sortnumber" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import {
+    listdept,
+    save,
+    del
+  } from "../../api/system/department.js";
+  import {
+    listuser
+  } from "../../api/system/user.js";
+
+  export default {
+    components: {
+      LxHeader
+    },
+    created() {
+      this.initLoad();
+      this.load();
+    },
+    mounted() {},
+    data() {
+      return {
+        dialogFormVisible: false,
+        formLabelWidth: "120px",
+        form: {
+          name: "",
+          id: "",
+          pid: "0",
+          manager_id: "",
+          leader_id: "",
+          manager: "",
+          leader: "",
+          sortnumber: 0,
+          icon: "",
+          pname: "上级部门"
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请输入部门名称',
+            trigger: 'blur'
+          }]
+        },
+        tableHeight: 0,
+        //查询条件字段
+        searchFields: {
+          KeyWord: ""
+        },
+        tableData: []
+      }
+    },
+    methods: {
+      querySearch(queryString, cb) {
+        listuser().then(response => {
+          var data = response.data;
+          for (var m of data) {
+            m.value = m.name;
+          }
+          cb(data)
+        }).catch(error => {
+          //reject(error)
+        })
+      },
+      handleSelectManager(item) {
+        this.form.manager_id = item.id;
+      },
+      handleSelectLeader(item) {
+        this.form.leader_id = item.id;
+      },
+      initLoad() {
+        var that = this;
+        var clientHeight = document.documentElement.clientHeight
+        var lxHeader_height = 96.5; //查询 头部
+        var paginationHeight = 37; //分页的高度
+        var topHeight = 50; //页面 头部
+        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+        that.tableHeight = tableHeight;
+      },
+      load() {
+        var that = this;
+        listdept().then(response => {
+          that.tableData = response;
+        }).catch(error => {
+          //reject(error)
+        })
+
+      },
+      edit(obj) {
+        this.form = this.$options.data().form
+        if (obj) {
+          var result = Object.assign(this.form, obj);
+          if (obj.leader)
+            result.leader = obj.leader.name
+          if (obj.manager)
+            result.manager = obj.manager.name
+          this.form = result;
+        }
+        this.dialogFormVisible = true;
+      },
+      addchildren(obj) {
+        this.form = this.$options.data().form
+        if (obj) {
+          this.form.pname = obj.name;
+          this.form.pid = obj.id;
+          this.dialogFormVisible = true;
+        }
+      },
+      submitForm(formName) {
+        var that = this;
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            save(that.form).then(response => {
+              console.log(response)
+              this.$Message.success('操作成功');
+              that.dialogFormVisible = false;
+              that.load();
+            }).catch(error => {
+              reject(error)
+            })
+          } else {
+            this.$Message.error('数据校验失败');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        var that = this;
+        this.$refs[formName].resetFields();
+        that.dialogFormVisible = false;
+      },
+      del(obj) {
+        var that = this;
+        if (obj) {
+          this.$Modal.confirm({
+            title: '确认要删除数据？',
+            onOk: () => {
+              del({
+                id: obj.id
+              }).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
+      },
+    }
+  };
 </script>
diff --git a/src/views/system/log.vue b/src/views/system/log.vue
new file mode 100644
index 0000000..c89073f
--- /dev/null
+++ b/src/views/system/log.vue
@@ -0,0 +1,75 @@
+<template>
+  <div style="padding: 0 20px;">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="系统日志" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <div slot="content"></div>
+        <slot>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table :list="list" :table-item="table">
+      <template v-slot:btns><div></div></template>
+    </xy-table>
+
+    <div style="display: flex;justify-content: flex-end;">
+      <Page :total="total" show-elevator @on-change="pageChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import {index} from "@/api/system/log"
+export default {
+  data() {
+    return {
+      select:{
+        pageIndex:1,
+        pageSize:10,
+      },
+
+      table:[
+        {
+          prop:'name',
+          label:'内容'
+        },
+        {
+          prop:'admin.name',
+          label:'操作人'
+        },
+        {
+          prop:'department.name',
+          label:'部门'
+        },
+        {
+          prop:'created_at',
+          label:'日期'
+        }
+      ],
+      list:[],
+      total:0,
+    }
+  },
+  methods: {
+    async getLog(){
+      const res = await index({
+        page:this.select.pageIndex,
+        page_size:this.select.pageSize
+      })
+      this.list = res.data
+      this.total = res.total
+    },
+
+    pageChange(e){
+      this.select.pageIndex = e
+      this.getLog()
+    }
+  },
+  mounted() {
+    this.getLog()
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>