From 69150eaa18574e2d9b5c5d94bf1b79a73a1335a2 Mon Sep 17 00:00:00 2001
From: hdka <823267011@qq.com>
Date: Wed, 6 Nov 2024 16:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/oa/oaOutWarehouse.js         |   2 +-
 .../src/views/oa/oaOutWarehouse/index.vue     | 194 +++++++++++-------
 2 files changed, 125 insertions(+), 71 deletions(-)

diff --git a/ruoyi-ui/src/api/oa/oaOutWarehouse.js b/ruoyi-ui/src/api/oa/oaOutWarehouse.js
index 60c2fbf..46afb0b 100644
--- a/ruoyi-ui/src/api/oa/oaOutWarehouse.js
+++ b/ruoyi-ui/src/api/oa/oaOutWarehouse.js
@@ -37,7 +37,7 @@ export function queryOutWarehouseByProjectId(id) {
 // 新增仓库出库
 export function addOaOutWarehouse(data) {
   return request({
-    url: '/oa/oaOutWarehouse',
+    url: '/oa/oaOutWarehouse/insertOutBatch',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/views/oa/oaOutWarehouse/index.vue b/ruoyi-ui/src/views/oa/oaOutWarehouse/index.vue
index a242809..8e9294f 100644
--- a/ruoyi-ui/src/views/oa/oaOutWarehouse/index.vue
+++ b/ruoyi-ui/src/views/oa/oaOutWarehouse/index.vue
@@ -1,16 +1,16 @@
 <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="projectId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.projectId"-->
-<!--          placeholder="请输入项目名"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="项目名" prop="projectId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.projectId"-->
+      <!--          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 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>
@@ -24,7 +24,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['oa:oaOutWarehouse:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -35,7 +36,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['oa:oaOutWarehouse:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -45,16 +47,17 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['oa:oaOutWarehouse:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="projectList" @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="projectName" />
-      <el-table-column label="创建时间" align="center" prop="createtime" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" type="index"/>
+      <el-table-column label="项目名" align="center" prop="projectName"/>
+      <el-table-column label="创建时间" align="center" prop="createtime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 
@@ -64,7 +67,8 @@
             icon="el-icon-search"
             @click="handleSearch(scope.row)"
             v-hasPermi="['oa:oaOutWarehouse:remove']"
-          >查看详情</el-button>
+          >查看详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -97,32 +101,45 @@
         <el-form-item
           v-for="(item, index) in form.outWareHouseList"
           :label="'出库物料' + index"
-          :key="item.key"
+          :key="item.warehouseId"
           :prop="'outWareHouseList.' + index + '.warehouseId'"
         >
           <el-row>
             <el-col :span="8">物料名</el-col>
+            <el-col :span="4">当前库存</el-col>
             <el-col :span="8">出库数量</el-col>
-            <el-col :span="8">操作</el-col>
+            <el-col :span="4">操作</el-col>
           </el-row>
           <el-row>
 
             <el-col :span="8">
-            <el-autocomplete
-              class="inline-input"
-              v-model="item.warehouseName"
-              :fetch-suggestions="querySearch"
-              placeholder="请输入物料名"
-              :trigger-on-focus="false"
-              @select="handleSelect(item,index)"
-            ></el-autocomplete>
+              <el-select
+                v-model="item.warehouseId"
+                filterable
+                remote
+                reserve-keyword
+                @change="(e)=>handleGetInventory(e,index)"
+                placeholder="请输入关键词"
+                :remote-method="remoteMethod"
+                :loading="loading">
+                <el-option
+                  v-for="item in oaWarehouseList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-tag type="info" v-if="item.inventory===undefined">请选择物料</el-tag>
+              <el-tag type="info" v-else>{{item.inventory}}</el-tag>
             </el-col>
             <el-col :span="8">
-            <el-input-number v-model="item.amount" :min="1" :max="item.inventory" ></el-input-number>
+              <el-input-number v-model="item.amount" :min="1" :max="item.inventory"></el-input-number>
             </el-col>
             <el-col :span="4">
               <el-button @click.prevent="removeDomain(item)">删除</el-button>
-          </el-col>
+            </el-col>
           </el-row>
         </el-form-item>
         <el-form-item>
@@ -141,38 +158,39 @@
       title="我是标题"
       :visible.sync="drawer"
       :with-header="false">
-<!--      <el-form :model="query" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
-<!--        <el-form-item label="项目名" prop="projectId">-->
-<!--          <el-input-->
-<!--            v-model="query.name"-->
-<!--            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-form :model="query" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
+      <!--        <el-form-item label="项目名" prop="projectId">-->
+      <!--          <el-input-->
+      <!--            v-model="query.name"-->
+      <!--            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-button
-            style="margin: 25px"
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['oa:oaOutWarehouse:add']"
-          >新增</el-button>
+      <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="oaOutWarehouseList" @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 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
@@ -181,7 +199,8 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['oa:oaOutWarehouse:remove']"
-            >删除</el-button>
+            >删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -192,15 +211,24 @@
 </template>
 
 <script>
-import { listOaOutWarehouse, getOaOutWarehouse, delOaOutWarehouse, addOaOutWarehouse, updateOaOutWarehouse, outWareList,queryOutWarehouseByProjectId} from "@/api/oa/oaOutWarehouse";
+import {
+  listOaOutWarehouse,
+  getOaOutWarehouse,
+  delOaOutWarehouse,
+  addOaOutWarehouse,
+  updateOaOutWarehouse,
+  outWareList,
+  queryOutWarehouseByProjectId
+} from "@/api/oa/oaOutWarehouse";
 import {listProject} from "@/api/oa/project";
+import {listOaWarehouse} from "../../../api/oa/oaWarehouse";
 
 export default {
   name: "OaOutWarehouse",
   data() {
     return {
       // 抽屉
-      drawer:false,
+      drawer: false,
 
       // 按钮loading
       buttonLoading: false,
@@ -219,13 +247,20 @@ export default {
       // 仓库出库表格数据
       oaOutWarehouseList: [],
       // 项目列表
-      projectList:[],
+      projectList: [],
+      // 库存数据
+      oaWarehouseList: [],
       // 弹出层标题
       title: "",
       // 选择对象
-      searchItem:{},
+      searchItem: {},
       // 是否显示弹出层
       open: false,
+      // 库存查询参数
+      warehouseParams: {
+        pageSize: 999,
+        pageNum: 1
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -237,10 +272,10 @@ export default {
       // 表单校验
       rules: {
         amount: [
-          { required: true, message: "出库数量不能为空", trigger: "blur" }
+          {required: true, message: "出库数量不能为空", trigger: "blur"}
         ],
         warehouseId: [
-          { required: true, message: "出库对象id不能为空", trigger: "blur" }
+          {required: true, message: "出库对象id不能为空", trigger: "blur"}
         ],
       }
     };
@@ -257,6 +292,7 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+
     },
     // 取消按钮
     cancel() {
@@ -276,7 +312,8 @@ export default {
         updateTime: undefined,
         updateBy: undefined,
         delFlag: undefined,
-        outWareHouseList:[]
+        selectLoading: false,
+        outWareHouseList: []
       };
       this.resetForm("form");
     },
@@ -293,7 +330,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -373,25 +410,42 @@ export default {
       }
     },
 
+    handleGetInventory(e,index){
+     this.form.outWareHouseList[index].inventory = this.oaWarehouseList[this.oaWarehouseList.findIndex(item=>item.id===e)].inventory
+      console.log(this.form.outWareHouseList[index])
+    },
+
 
     querySearch(queryString, cb) {
       var oaWarehouseList = this.oaWarehouseList;
       var results = queryString ? oaWarehouseList.filter(this.createFilter(queryString)) : oaWarehouseList;
       // 调用 callback 返回建议列表的数据
+      sys_oa_contract
       cb(results);
     },
     createFilter(queryString) {
       return (restaurant) => {
+        // console.log(restaurant)
+
+        // console.log(restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()))
         return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
       };
     },
 
-    handleSelect(item,index) {
-      this.form.oaOutWarehouseList[index] = item
+    remoteMethod(query) {
+      this.warehouseParams.name = query
+      this.selectLoading = true;
+      listOaWarehouse(this.warehouseParams).then(res => {
+        this.oaWarehouseList = res.rows.filter(item => {
+          return item.name.toLowerCase()
+            .indexOf(query.toLowerCase()) > -1;
+        });
+        this.selectLoading = false;
+      })
     },
 
     // 查看出库详情
-    handleSearch(item){
+    handleSearch(item) {
       this.loading = true
       this.searchItem = item;
       this.form.projectId = item.projectId