From ff915a54f2ab4f33d70ce07a3ae1fb5a93d2128c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 11 Mar 2022 10:39:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=A7=94=E5=91=98=E4=BC=9A=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/pages/mechanismManage/index.vue    |   5 +
 .../pages/mechanismManage/pages/committee.vue | 401 ++++++++++++++++++
 2 files changed, 406 insertions(+)
 create mode 100644 src/pages/config/pages/mechanismManage/pages/committee.vue

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index e062b815e..b5d8d4287 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -9,6 +9,9 @@
         <el-tab-pane label="工作组" name="workgroup">
           <workgroup></workgroup>
         </el-tab-pane>
+        <el-tab-pane label="技术委员会" name="committee">
+          <committee></committee>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -16,11 +19,13 @@
 <script>
 import workgroup from "@/pages/config/pages/mechanismManage/pages/workgroup";
 import mechanism from "@/pages/config/pages/mechanismManage/pages/mechanism";
+import committee from "@/pages/config/pages/mechanismManage/pages/committee"
 export default {
   name: 'MechanismManage',
   components: {
     workgroup,
     mechanism,
+    committee
   },
   data () {
     return {
diff --git a/src/pages/config/pages/mechanismManage/pages/committee.vue b/src/pages/config/pages/mechanismManage/pages/committee.vue
new file mode 100644
index 000000000..338213066
--- /dev/null
+++ b/src/pages/config/pages/mechanismManage/pages/committee.vue
@@ -0,0 +1,401 @@
+<template>
+  <div id="committee">
+    <div class="committee-content">
+      <div class="search-area">
+        <el-form :model="committeeSearch" inline class="label-input-form">
+          <el-form-item label="委员会名称" class="search-item">
+            <el-input v-model="committeeSearch.committeeName"
+                      placeholder="请输入委员会名称"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-primary" type="primary" size="mini" @click="search"
+                       v-btn-permission="">查询
+            </el-button>
+          </el-form-item>
+          <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-default" @click="resetSelect" size="mini"
+                       v-btn-permission="">清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="table-content">
+        <div class="table-button">
+          <el-button type="primary" size="mini"
+                     class="common-button-primary" @click="committeeAdd">
+            新增
+          </el-button>
+          <el-button type="primary" size="mini"
+                     class="common-button-primary" @click="committeeEdit">
+            编辑
+          </el-button>
+          <el-button type="primary" size="mini"
+                     class="common-button-primary" @click="committeeDel">
+            批量删除
+          </el-button>
+        </div>
+        <el-table
+          ref="committee"
+          tooltip-effect="dark"
+          style="width: 100%; flex: auto;"
+          :data="committeeData"
+          @selection-change="committeeChange"
+          border
+          class="drag-table"
+
+          height="100%"
+          :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+          />
+          <el-table-column
+            prop="committeeName"
+            align="center"
+            label="委员会名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="committeeDirectorName"
+            label="主任"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="committeeSecretaryName"
+            align="center"
+            label="秘书长">
+          </el-table-column>
+          <el-table-column
+            prop="committor"
+            align="center"
+            label="委员">
+          </el-table-column>
+        </el-table>
+        <loading :loading="Loading">加载中...</loading>
+        <pagination :page="page" :total="total" :pageSize="pageSize" @pageChange="pageChange"
+                    @pageSizeChange="pageSizeChange"></pagination>
+      </div>
+      <el-dialog
+        :title="dialogTitle"
+        :visible.sync="addModel"
+        :wrapperClosable="false"
+        @close="cancelModel"
+        width="800px"
+      >
+        <div class="myDialog">
+          <el-form
+            ref="addForm"
+            :model="addForm"
+            :rules="addFormRules"
+            class="label-input-form"
+
+          >
+            <el-form-item label="委员会名称" prop="committeeName" label-width="100px" class="add-form-item">
+              <el-input v-model="addForm.committeeName"
+                        placeholder="请输入委员会名称"
+                        clearable></el-input>
+            </el-form-item>
+            <el-form-item label="主任" prop="committeeDirector" label-width="100px" class="add-form-item">
+              <el-input
+                v-model="addForm.committeeDirectorName"
+                placeholder="请选择主任"
+                @click.native="choiceZRR('committeeDirector', '选择主任', addForm.committeeDirector)"
+              />
+            </el-form-item>
+            <el-form-item label="秘书长" prop="committeeSecretary" label-width="100px" class="add-form-item">
+              <el-input v-model="addForm.committeeSecretaryName"
+                        placeholder="请选择秘书长"
+                        @click.native="choiceZRR('committeeSecretary', '选择秘书长', addForm.committeeSecretary)"
+                        clearable></el-input>
+            </el-form-item>
+            <el-form-item label="委员" prop="committor" label-width="100px" class="add-form-item">
+              <el-input v-model="addForm.committor"
+                        placeholder="请选择委员"
+                        @click.native="choiceZRRS"
+                        clearable></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div slot="footer">
+          <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelModel">取消</el-button>
+          <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="addOk">确定
+          </el-button>
+        </div>
+      </el-dialog>
+      <!--    单选人-->
+      <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="modalshowflag"
+        @checkedRole="drawerCheck"
+        :nodeList="nodeList"
+      ></Role-tree>
+      <!--    多选择人-->
+      <Role-tree
+        is-title="选择委员"
+        :is-visible.sync="modalshowflag2"
+        @checkedRole="drawerCheck2"
+        :nodeList="nodeList2"
+      ></Role-tree>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "committee",
+  data() {
+    return {
+      nodeList: [],
+      nodeList2: [],
+      drawerTitle: "",
+      modalshowflag: false,
+      modalshowflag2: false,
+      Loading: false, //加载loading
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      committeeSearch: {
+        committeeName: "", //委员会名称
+      },
+      addForm: {
+        committeeName: "", //委员会名称
+        committeeDirector: "", //主任
+        committeeDirectorName: "", //主任
+        committeeSecretary: "", //秘书长
+        committeeSecretaryName: "", //秘书长
+        committor: "", //委员
+        committeeIds: "" //委员
+      },
+      addFormRules: {
+        committeeName: [
+          { required: true, message: "请输入委员会名称", trigger: "blur" }
+        ],
+        committeeDirectorName: [
+          { required: true, message: "请填写主任", trigger: "blur" }
+        ],
+        committeeSecretaryName: [
+          { required: true, message: "请填写秘书长", trigger: "blur" }
+        ],
+        committor: [
+          { required: true, message: "请填写委员", trigger: "blur" }
+        ]
+
+      },
+      committeeData: [],
+      dialogTitle: "", //新增/编辑框的title
+      addModel: false,
+      committeeChangeList: []
+    };
+  },
+  mounted() {
+    //获取委员会数据
+    this.getCommittee();
+  },
+  methods: {
+    getCommittee() {
+      this.$http.get("wgCommittee/wg-committee/page", {
+        ...this.committeeSearch,
+        page: this.page,
+        pageSize: this.pageSize
+      }, {
+        _this: this
+      }, res => {
+        this.committeeData = res.data.records;
+        this.total = res.data.total;
+      });
+
+    },
+    //查询
+    search() {
+      this.page = 1
+      this.getCommittee();
+    },
+    //清空
+    resetSelect() {
+      this.committeeSearch = {
+        committeeName: "", //委员会名称
+      };
+      this.getCommittee();
+    },
+    //新增
+    committeeAdd() {
+      this.dialogTitle = "新增";
+      this.addModel = true;
+    },
+    //编辑
+    committeeEdit() {
+      if (!this.committeeChangeList.length) {
+        this.$message.warning("请至少选择一条数据进行编辑");
+      } else if (this.committeeChangeList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行编辑");
+      } else {
+        this.dialogTitle = "编辑";
+        this.addModel = true;
+        this.addForm.id = this.committeeChangeList[0].id;
+        this.addForm.committeeName = this.committeeChangeList[0].committeeName;
+        this.addForm.committor = this.committeeChangeList[0].committor;
+        this.addForm.committeeIds = this.committeeChangeList[0].committorId;
+        this.addForm.committeeDirector = this.committeeChangeList[0].committeeDirector;
+        this.addForm.committeeDirectorName = this.committeeChangeList[0].committeeDirectorName;
+        this.addForm.committeeSecretary = this.committeeChangeList[0].committeeSecretary;
+        this.addForm.committeeSecretaryName = this.committeeChangeList[0].committeeSecretaryName;
+      }
+    },
+    //批量删除
+    committeeDel() {
+      if (this.committeeChangeList.length) {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          if(this.committeeChangeList.length === 1){
+            let ids =  this.committeeChangeList[0].id
+            this.$http.delete('wgCommittee/wg-committee/deleteBatch',{
+              id: ids,
+            }, {
+              _this: this
+            }, res => {
+              if(res.ok){
+                this.$message.success('删除成功')
+                this.getCommittee()
+              }
+              this.$refs.committee.clearSelection()
+            })
+          }else{
+            let ids = ''
+            this.committeeChangeList.forEach(item => {
+              ids += item.id
+              ids += ','
+            })
+            this.$http.delete('wgCommittee/wg-committee/deleteBatch',{
+              id: ids,
+            }, {
+              _this: this
+            }, res => {
+              if(res.ok){
+                this.$message.success('删除成功')
+                this.getCommittee()
+              }
+              this.$refs.committee.clearSelection()
+            })
+          }
+        }).catch(() => {
+        });
+      } else {
+        this.$message.warning("请至少选择一条数据进行删除");
+      }
+    },
+    //取消新增
+    cancelModel() {
+      this.addModel = false;
+    },
+    //确定新增
+    addOk() {
+      this.$refs["addForm"].validate((valid) => {
+        if (valid) {
+          if (this.dialogTitle === "新增") {
+            this.$http.post("wgCommittee/wg-committee/insert", {
+              ...this.addForm
+            }, {
+              _this: this
+            }, res => {
+              this.getCommittee();
+              this.addModel = false;
+            });
+          } else {
+            this.$http.put("wgCommittee/wg-committee/update", {
+              ...this.addForm
+            }, { _this: this },
+              res => {
+              console.log(res);
+            });
+
+          }
+        } else {
+          this.$message.warning("请填写完整信息");
+        }
+      });
+
+    },
+    //表格数据勾选变化
+    committeeChange(data) {
+      this.committeeChangeList = data;
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getCommittee();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getCommittee();
+    },
+    /** 单选人员选择 */
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    /**单选人员选择确定 **/
+    drawerCheck(data) {
+      if (this.type === "committeeDirector") {
+        this.addForm.committeeDirector = data[0].id;
+        this.addForm.committeeDirectorName = data[0].name;
+      } else if (this.type === "committeeSecretary") {
+        this.addForm.committeeSecretary = data[0].id;
+        this.addForm.committeeSecretaryName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    //多选人员
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.addForm.committeeIds.length > 0) {
+        this.nodeList2 = this.addForm.committeeIds.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
+    drawerCheck2(data) {
+      let idList = "", nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.addForm.committeeIds = idList;
+      this.addForm.committor = nameList;
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+#committee {
+  height: 100%;
+  width: 100%;
+
+  .committee-content {
+    .table-content {
+      width: 100%;
+      height: 68.5vh;
+
+      .table-button {
+        margin: 10px;
+      }
+    }
+  }
+}
+
+</style>

From 2d26ed101fdc6b2876978de2c2afc14a001109f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 11 Mar 2022 14:02:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=A7=94=E5=91=98?=
 =?UTF-8?q?=E4=BC=9A=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/pages/mechanismManage/pages/committee.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/pages/committee.vue b/src/pages/config/pages/mechanismManage/pages/committee.vue
index 338213066..d2f7278cd 100644
--- a/src/pages/config/pages/mechanismManage/pages/committee.vue
+++ b/src/pages/config/pages/mechanismManage/pages/committee.vue
@@ -238,6 +238,7 @@ export default {
         this.dialogTitle = "编辑";
         this.addModel = true;
         this.addForm.id = this.committeeChangeList[0].id;
+        this.addForm.committeer = this.committeeChangeList[0].committeer;
         this.addForm.committeeName = this.committeeChangeList[0].committeeName;
         this.addForm.committor = this.committeeChangeList[0].committor;
         this.addForm.committeeIds = this.committeeChangeList[0].committorId;
@@ -307,15 +308,20 @@ export default {
             }, {
               _this: this
             }, res => {
-              this.getCommittee();
-              this.addModel = false;
+              if(res.ok){
+                this.getCommittee();
+                this.addModel = false;
+              }
             });
           } else {
             this.$http.put("wgCommittee/wg-committee/update", {
               ...this.addForm
             }, { _this: this },
               res => {
-              console.log(res);
+              if(res.ok){
+                this.getCommittee();
+                this.addModel = false;
+              }
             });
 
           }

From a2c0aea60c8a95b175531c2674159af2c8c6ab8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 11 Mar 2022 15:06:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=B4=A6=E5=8F=B7=E5=8F=8A=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/operationLog/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue
index 88a0a3959..f8a6f1c2f 100644
--- a/src/pages/config/pages/operationLog/index.vue
+++ b/src/pages/config/pages/operationLog/index.vue
@@ -167,8 +167,11 @@
                     loading: 'dataLoading'
                 }, res => {
                     if (res.ok) {
-                        this.total = res.data.total
-                        this.data = res.data.records
+                      this.total = res.data.total;
+                      res.data.records.forEach(item => {
+                        item.account = "(" + item.account + ")" + item.accountName;
+                      });
+                      this.data = res.data.records;
                     }
                 })
             },