oa初步完成

ruoyi-ui/src/views/oa/oaWarehouse/data.vue

@@ -0,0 +1,180 @@
+
+<template>
+  <div class="app-container">
+    <el-row :gutter="20"  class="mb8">
+
+      <el-col >
+        <el-card class="box-card">
+<!--          <div slot="header" class="clearfix">-->
+<!--            <span>卡片名称</span>-->
+<!--            <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>-->
+<!--          </div>-->
+          <div class="text item">
+            物料：<strong>{{warehouse.name}}</strong>
+            的出库详情
+          </div>
+        </el-card>
+
+      </el-col>
+    </el-row>
+    <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="['oa:oaOutWarehouse:add']"
+        >新增
+        </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="['oa:oaOutWarehouse: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="['oa:oaOutWarehouse:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="outWarehouseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type="index"/>
+      <el-table-column label="出库单" align="center" prop="id"/>
+      <el-table-column :label="'出库数量('+warehouse.unit+')'" align="center" prop="amount"/>
+      <el-table-column label="出库时间" align="center" prop="createTime"/>
+      <el-table-column label="关联项目" align="center" prop="projectName"/>
+      <el-table-column label="备注" align="center" prop="remark"/>
+      <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-search"
+            @click="handleSearch(scope.row)"
+            v-hasPermi="['oa:oaOutWarehouse:remove']"
+          >查看详情
+          </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-drawer
+      size="70%"
+      title="我是标题"
+      :visible.sync="drawer"
+      :with-header="false">
+      <el-button
+        style="margin: 25px"
+        type="primary"
+        plain
+        icon="el-icon-plus"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['oa:oaOutWarehouse:add']"
+      >新增
+      </el-button>
+
+      <el-table v-loading="loading" :data="outWarehouseList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="序号" align="center" type="index"/>
+        <el-table-column label="物料名" align="center" prop="warehouseName"/>
+        <el-table-column label="出库数量" align="center" prop="amount"/>
+        <el-table-column label="出库时间" align="center" prop="createTime"/>
+        <el-table-column label="备注" align="center" prop="remark"/>
+        <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-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['oa:oaOutWarehouse:remove']"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </el-drawer>
+
+  </div>
+</template>
+<script>
+import {listOaOutWarehouse} from "@/api/oa/oaOutWarehouse";
+import {getOaWarehouse} from "@/api/oa/oaWarehouse";
+
+export default {
+  name: "data",
+  data() {
+    return {
+      // 出库列表
+      outWarehouseList: [],
+
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        warehouseId: this.$route.params.warehouseId,
+      },
+
+      // 物料信息
+      warehouse:{},
+
+      // 加载
+      loading:false
+    }
+  },
+  created() {
+    this.getWarehouse();
+    this.getList();
+  },
+  methods: {
+
+    getWarehouse() {
+      getOaWarehouse(this.queryParams.warehouseId).then(res => {
+        this.warehouse = res.data;
+      })
+    },
+    // 获取列表
+    getList() {
+      this.loading = true;
+      listOaOutWarehouse(this.queryParams).then(res => {
+        this.outWarehouseList = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

ruoyi-ui/src/views/oa/oaWarehouse/index.vue

@@ -91,7 +91,16 @@
     <el-table v-loading="loading" :data="oaWarehouseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index"/>
-      <el-table-column label="物料名称" align="center" prop="name" />
+      <el-table-column label="物料" align="center" prop="name" :show-overflow-tooltip="true">
+
+          <template slot-scope="scope">
+            <router-link :to="'/oa/warehouse-data/index/' + scope.row.id" class="link-type">
+              <span>{{ scope.row.name }}</span>
+            </router-link>
+          </template>
+
+
+      </el-table-column>
       <el-table-column label="型号" align="center" prop="model" />
       <el-table-column label="库存数量" align="center" prop="inventory" />
       <el-table-column label="单位" align="center" prop="unit" />