Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/api/business/spd/bo/power.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询医院竞争对手用户查看权限列表
+export function listPower(query) {
+  return request({
+    url: '/mk/bo/power/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询医院竞争对手用户查看权限详细
+export function getPower(id) {
+  return request({
+    url: '/mk/bo/power/' + id,
+    method: 'get'
+  })
+}
+
+// 新增医院竞争对手用户查看权限
+export function addPower(data) {
+  return request({
+    url: '/mk/bo/power',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改医院竞争对手用户查看权限
+export function updatePower(data) {
+  return request({
+    url: '/mk/bo/power',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除医院竞争对手用户查看权限
+export function delPower(ids) {
+  return request({
+    url: '/mk/bo/power/delete',
+    method: 'post',
+    data: ids
+  })
+}

src/views/business/spd/bo/gather/index.vue

@@ -367,9 +367,16 @@
           console.log('res', res);
           if (res.code == '200') {
             this.resetQuery();
+            if (res.msg.indexOf('导入失败') >= 0) {
+            this.$message({
+              duration: 5000,
+              message: res.msg
+            });
+            } else {
             this.$message.success(res.msg);
+            }
           } else {
-            this.$message.success(res.msg);
+            this.$message.error(res.msg);
           }
           this.loading = false;
         }).catch((e) => {
@@ -427,7 +434,7 @@
           this.ids.push(row.id);
         }
         const ids = this.ids;
-        this.$modal.confirm('是否确认删除竞争产品信息收集编号为"' + ids + '"的数据项？').then(function () {
+        this.$modal.confirm('是否确认删除？').then(function () {
           return delGather(ids);
         }).then(() => {
           this.getList();

src/views/business/spd/bo/power/index.vue

@@ -0,0 +1,247 @@
+<template>
+  <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="code">
+        <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="人员" prop="person">
+        <el-input v-model="queryParams.person" placeholder="请输入人员" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="人员姓名" prop="personName">
+        <el-input v-model="queryParams.personName" placeholder="请输入人员姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contactInformation">
+        <el-input v-model="queryParams.contactInformation" placeholder="请输入联系方式" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="描述" prop="description">
+        <el-input v-model="queryParams.description" 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="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="powerList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编码" align="center" prop="code" />
+      <el-table-column label="人员" align="center" prop="person" />
+      <el-table-column label="人员姓名" align="center" prop="personName" />
+      <el-table-column label="联系方式" align="center" prop="contactInformation" />
+      <el-table-column label="描述" align="center" prop="description" />
+      <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)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @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" />
+
+    <!-- 添加或修改医院竞争对手用户查看权限对话框 -->
+    <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="code">
+          <el-input v-model="form.code" placeholder="请输入编码" />
+        </el-form-item>
+        <el-form-item label="人员" prop="person">
+          <el-input v-model="form.person" placeholder="请输入人员" />
+        </el-form-item>
+        <el-form-item label="人员姓名" prop="personName">
+          <el-input v-model="form.personName" placeholder="请输入人员姓名" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactInformation">
+          <el-input v-model="form.contactInformation" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="描述" prop="description">
+          <el-input type="textarea" autosize v-model="form.description" 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 {
+    listPower,
+    getPower,
+    delPower,
+    addPower,
+    updatePower
+  } from "@/api/business/spd/bo/power";
+
+  export default {
+    name: "Power",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 医院竞争对手用户查看权限表格数据
+        powerList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          person: null,
+          personName: null,
+          contactInformation: null,
+          description: null,
+          tenantId: null,
+          revision: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {}
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询医院竞争对手用户查看权限列表 */
+      getList() {
+        this.loading = true;
+        listPower(this.queryParams).then(response => {
+          this.powerList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          code: null,
+          person: null,
+          personName: null,
+          contactInformation: null,
+          description: null,
+          tenantId: null,
+          revision: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          delFlag: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      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
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加医院竞争对手用户查看权限";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getPower(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改医院竞争对手用户查看权限";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updatePower(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addPower(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        if (row.id != undefined) {
+          this.ids.push(row.id);
+        }
+        const ids = this.ids;
+        this.$modal.confirm('是否确认删除？').then(function () {
+          return delPower(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('bo/power/export', {
+          ...this.queryParams
+        }, `power_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+
+</script>