Merge branch 'dev' of http://94.191.59.107:3000/wukai/lzga-doc into dev

src/api/doc/expand.js

@@ -34,6 +34,20 @@ export function updateExpand(data) {
     data: data
   })
 }
+// 修改扩容申请
+export function yesExpand(expandId) {
+  return request({
+    url: '/doc/expand/yes/'+expandId,
+    method: 'get',
+  })
+}
+// 修改扩容申请
+export function noExpand(expandId) {
+  return request({
+    url: '/doc/expand/no/'+expandId,
+    method: 'get',
+  })
+}
 
 // 删除扩容申请
 export function delExpand(expandId) {

src/views/doc/expand/index.vue

@@ -2,37 +2,12 @@
   <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="spaceName">
-        <el-input
-          v-model="queryParams.spaceName"
-          placeholder="请输入空间名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="当前容量" prop="currentCap">
-        <el-input
-          v-model="queryParams.currentCap"
-          placeholder="请输入当前容量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="扩充容量" prop="expandCap">
-        <el-input
-          v-model="queryParams.expandCap"
-          placeholder="请输入扩充容量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.spaceName" placeholder="请输入空间名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="扩容状态" prop="expandStatus">
         <el-select v-model="queryParams.expandStatus" placeholder="请选择扩容状态" clearable>
-          <el-option
-            v-for="dict in dict.type.expand_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.expand_status" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -43,100 +18,54 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['doc:expand:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['doc:expand:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['doc:expand:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['doc:expand:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['doc:expand:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['doc:expand:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['doc:expand:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['doc:expand:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="expandList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="容量信息ID" align="center" prop="expandId" />
+      <!-- <el-table-column label="容量信息ID" align="center" prop="expandId" /> -->
       <el-table-column label="空间名称" align="center" prop="spaceName" />
       <el-table-column label="当前容量" align="center" prop="currentCap" />
       <el-table-column label="扩充容量" align="center" prop="expandCap" />
+      <el-table-column label="申请理由" align="center" prop="remark" />
       <el-table-column label="扩容状态" align="center" prop="expandStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.expand_status" :value="scope.row.expandStatus"/>
+          <dict-tag :options="dict.type.expand_status" :value="scope.row.expandStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="申请人" align="center" prop="createBy" />
+      <el-table-column label="申请时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <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="['doc:expand:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['doc:expand:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-check" @click="handleYes(scope.row)"
+            v-hasPermi="['doc:expand:edit']">同意扩容</el-button>
+          <el-button size="mini" type="text" icon="el-icon-close" @click="handleNo(scope.row)"
+            v-hasPermi="['doc:expand:edit']">拒绝扩容</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"
-    />
+    <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>
@@ -155,11 +84,8 @@
         </el-form-item>
         <el-form-item label="扩容状态" prop="expandStatus">
           <el-radio-group v-model="form.expandStatus">
-            <el-radio
-              v-for="dict in dict.type.expand_status"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
+            <el-radio v-for="dict in dict.type.expand_status" :key="dict.value"
+              :label="dict.value">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -178,160 +104,194 @@
 </template>
 
 <script>
-import { listExpand, getExpand, delExpand, addExpand, updateExpand } from "@/api/doc/expand";
+  import {
+    listExpand,
+    getExpand,
+    delExpand,
+    addExpand,
+    yesExpand,
+    noExpand,
+    updateExpand
+  } from "@/api/doc/expand";
 
-export default {
-  name: "Expand",
-  dicts: ['expand_status'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 扩容申请表格数据
-      expandList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        spaceName: null,
-        currentCap: null,
-        expandCap: null,
-        expandStatus: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        spaceName: [
-          { required: true, message: "空间名称不能为空", trigger: "blur" }
-        ],
-        expandCap: [
-          { required: true, message: "扩充容量不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询扩容申请列表 */
-    getList() {
-      this.loading = true;
-      listExpand(this.queryParams).then(response => {
-        this.expandList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        expandId: null,
-        spaceId: null,
-        spaceName: null,
-        currentCap: null,
-        expandCap: null,
-        expandStatus: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null,
-        isDel: null
+  export default {
+    name: "Expand",
+    dicts: ['expand_status'],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 扩容申请表格数据
+        expandList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          spaceName: null,
+          currentCap: null,
+          expandCap: null,
+          expandStatus: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          spaceName: [{
+            required: true,
+            message: "空间名称不能为空",
+            trigger: "blur"
+          }],
+          expandCap: [{
+            required: true,
+            message: "扩充容量不能为空",
+            trigger: "blur"
+          }],
+          remark: [{
+            required: true,
+            message: "备注不能为空",
+            trigger: "blur"
+          }],
+        }
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
+      // console.log(dict.type.expand_status);
+      this.queryParams.expandStatus = "1";
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.expandId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加扩容申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const expandId = row.expandId || this.ids
-      getExpand(expandId).then(response => {
-        this.form = response.data;
+    methods: {
+      /** 查询扩容申请列表 */
+      getList() {
+        this.loading = true;
+        listExpand(this.queryParams).then(response => {
+          this.expandList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          expandId: null,
+          spaceId: null,
+          spaceName: null,
+          currentCap: null,
+          expandCap: null,
+          expandStatus: 1,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          remark: null,
+          isDel: 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.expandId)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
         this.open = true;
-        this.title = "修改扩容申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.expandId != null) {
-            updateExpand(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addExpand(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+        this.title = "添加扩容申请";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const expandId = row.expandId || this.ids
+        getExpand(expandId).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改扩容申请";
+        });
+      },
+      /** 同意按钮操作 */
+      handleYes(row) {
+        this.$modal.confirm('确认同意 ' + row.spaceName + ' 扩容申请"？').then(function() {
+          return yesExpand(row.expandId);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("同意扩容成功！");
+        }).catch(() => {});
+      },
+      /** 拒绝按钮操作 */
+      handleNo(row) {
+        this.$modal.confirm('确认拒绝 ' + row.spaceName + ' 扩容申请"？').then(function() {
+          return noExpand(row.expandId);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("拒绝扩容成功！");
+        }).catch(() => {});
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.expandId != null) {
+              updateExpand(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addExpand(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const expandIds = row.expandId || this.ids;
-      this.$modal.confirm('是否确认删除扩容申请编号为"' + expandIds + '"的数据项？').then(function() {
-        return delExpand(expandIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('doc/expand/export', {
-        ...this.queryParams
-      }, `expand_${new Date().getTime()}.xlsx`)
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const expandIds = row.expandId || this.ids;
+        this.$modal.confirm('是否确认删除扩容申请编号为"' + expandIds + '"的数据项？').then(function() {
+          return delExpand(expandIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('doc/expand/export', {
+          ...this.queryParams
+        }, `expand_${new Date().getTime()}.xlsx`)
+      }
     }
-  }
-};
-</script>
+  };
+</script>