物料流转，老库存出库无法出库BUG

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/LineSideCabinServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zkqy.business.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -76,6 +77,7 @@ public class LineSideCabinServiceImpl implements ILineSideCabinService
         lineSideCabin.setStandby1(pz.toString());//赋值皮重
         lineSideCabin.setCreateTime(DateUtils.getNowDate());//新增时间
         lineSideCabin.setCreateBy(SecurityUtils.getUsername());//创建人
+        lineSideCabin.setStatus("1");//状态为1
         /** 新增流转日志 */
         OperationLog operationLog = new OperationLog();
         BeanUtils.copyProperties(lineSideCabin, operationLog);
@@ -96,6 +98,43 @@ public class LineSideCabinServiceImpl implements ILineSideCabinService
     @Override
     public int updateLineSideCabin(LineSideCabin lineSideCabin)
     {
+        // 获取当前日期和时间
+        Date now = DateUtils.getNowDate();
+        // 创建 SimpleDateFormat 实例并指定格式
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        // 格式化日期
+        String formattedDate = sdf.format(now);
+        lineSideCabin.setCollectTime(formattedDate);
+        int zt = Integer.parseInt(lineSideCabin.getStatus());
+        if( zt < 3){
+            lineSideCabin.setRecipient(SecurityUtils.getUsername());//领料人
+            /** 新增流转日志 */
+            OperationLog operationLog = new OperationLog();
+            BeanUtils.copyProperties(lineSideCabin, operationLog);
+            operationLog.setId(null);
+            operationLog.setStatus("2");//状态为出库
+            operationLog.setJt(lineSideCabin.getMachineTool());//机台
+            operationLog.setProductType(lineSideCabin.getProductId());//货品编号
+            operationLog.setBatchNumber(lineSideCabin.getBatchNumber());//领料人
+            operationLog.setRecipient(SecurityUtils.getUsername());//领料人
+            operationLog.setCollectTime(formattedDate);//领料时间
+            operationLogService.insertOperationLog(operationLog);
+        }else{
+            lineSideCabin.setConfirmTime(formattedDate);//确认时间
+            lineSideCabin.setConfirm(SecurityUtils.getUsername());//确认人
+            /** 新增流转日志 */
+            OperationLog operationLog = new OperationLog();
+            BeanUtils.copyProperties(lineSideCabin, operationLog);
+            operationLog.setId(null);
+            operationLog.setStatus(lineSideCabin.getStatus());//状态为确认出库
+            operationLog.setJt(lineSideCabin.getMachineTool());//机台
+            operationLog.setProductType(lineSideCabin.getProductId());//货品编号
+            operationLog.setBatchNumber(lineSideCabin.getBatchNumber());//批号
+            operationLog.setConfirm(SecurityUtils.getUsername());//确认人
+            operationLog.setConfirmTime(formattedDate);//确认时间
+            operationLogService.insertOperationLog(operationLog);
+        }
+
         return lineSideCabinMapper.updateLineSideCabin(lineSideCabin);
     }
 

zkqy-custom-business/src/main/resources/mapper/business/LineSideCabinMapper.xml

@@ -57,12 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             {DBNAME}.lineSideCabin as a
         LEFT JOIN {DBNAME}.silkcart b ON a.scid = b.id
-        LEFT JOIN {DBNAME}.production_line c ON a.machineTool = c.id
+        LEFT JOIN {DBNAME}.production_line c ON a.machineTool = c.id AND c.del_flag =0
     </sql>
 
     <select id="selectLineSideCabinList" parameterType="com.zkqy.business.domain.LineSideCabin" resultMap="LineSideCabinResult">
         <include refid="selectLineSideCabinVo"/>
-        <where>  
+        where a.status != 3
             <if test="productNo != null "> and product_no = #{productNo}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="productSpecifications != null  and productSpecifications != ''"> and product_specifications = #{productSpecifications}</if>
@@ -82,7 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirm != null  and confirm != ''"> and confirm = #{confirm}</if>
             <if test="confirmTime != null  and confirmTime != ''"> and confirmTime = #{confirmTime}</if>
             <if test="createTime != null  and createTime != ''"> and createTime = #{createTime}</if>
-        </where>
     </select>
     
     <select id="selectLineSideCabinById" parameterType="Long" resultMap="LineSideCabinResult">
@@ -151,8 +150,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productId != null">product_id = #{productId},</if>
             <if test="batchNumber != null">batchNumber = #{batchNumber},</if>
             <if test="colours != null">colours = #{colours},</if>
-            <if test="machineTool != null">machineTool = #{machineTool},</if>
-            <if test="js != null">js = #{js},</if>
             <if test="status != null">status = #{status},</if>
             <if test="standby != null">standby = #{standby},</if>
             <if test="standby1 != null">standby1 = #{standby1},</if>
@@ -163,9 +160,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="collectTime != null">collectTime = #{collectTime},</if>
             <if test="confirm != null">confirm = #{confirm},</if>
             <if test="confirmTime != null">confirmTime = #{confirmTime},</if>
-            <if test="scid != null">scid = #{scid},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="createBy != null">createBy = #{createBy},</if>
         </trim>
         where id = #{id}
     </update>

zkqy-ui/src/views/orderMange/lineSideCabin/InboundManagement.vue

@@ -2,6 +2,59 @@
   <el-card shadow="always" :body-style="{ padding: '10px' }">
     <div class="app-container">
       <div class="main-wrap">
+        <div class="left">
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
+            <el-form-item prop="machineTool" label="机台" style="width: 500px">
+              <el-select
+                v-model="form.machineTool"
+                filterable
+                @change="machineToolChange"
+              >
+                <el-option
+                  v-for="(item, index) in lineOptions"
+                  :key="index"
+                  :label="item.productionLineName"
+                  :value="item.id"
+                >
+                  <span class="discribe" style="float: left">{{item.productionLineName }}</span>
+                  <span
+                    style="float: right; color: #8492a6; font-size: 13px"
+                  >{{ item.productionLineDepartment }}</span
+                  >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="scid" label="丝车">
+              <el-select
+                v-model="form.scid"
+                filterable
+              >
+                <el-option
+                  v-for="(item, index) in silkcartList"
+                  :key="index"
+                  :label="item.scname"
+                  :value="item.id"
+                >
+                  <span class="discribe" style="float: left">{{item.scname }}</span>
+                  <span
+                    style="float: right; color: #8492a6; font-size: 13px"
+                  >{{ item.scWeight }}</span
+                  >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="卷数" prop="js" style="width: 278px">
+              <el-input v-model="form.js" placeholder="请输入卷数"/>
+            </el-form-item>
+            <el-form-item label="毛重" prop="standby" style="width: 278px">
+              <el-input v-model="form.standby" 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>
+        </div>
         <div class="right">
           <div class="table-wrap">
             <el-table
@@ -31,69 +84,17 @@
         </div>
       </div>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item prop="machineTool" label="机台">
-          <el-select
-            v-model="form.machineTool"
-            filterable
-            size="mini"
-            @change="machineToolChange"
-          >
-            <el-option
-              v-for="(item, index) in lineOptions"
-              :key="index"
-              :label="item.productionLineName"
-              :value="item.id"
-            >
-              <span class="discribe" style="float: left">{{item.productionLineName }}</span>
-              <span
-                style="float: right; color: #8492a6; font-size: 13px"
-              >{{ item.productionLineDepartment }}</span
-              >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="scid" label="丝车">
-          <el-select
-            v-model="form.scid"
-            filterable
-            size="mini"
-          >
-            <el-option
-              v-for="(item, index) in silkcartList"
-              :key="index"
-              :label="item.scname"
-              :value="item.id"
-            >
-              <span class="discribe" style="float: left">{{item.scname }}</span>
-              <span
-                style="float: right; color: #8492a6; font-size: 13px"
-              >{{ item.scWeight }}</span
-              >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="卷数" prop="js">
-          <el-input v-model="form.js" placeholder="请输入卷数" />
-        </el-form-item>
-        <el-form-item label="毛重" prop="standby">
-          <el-input v-model="form.standby" 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>
 
 
 
-      <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"-->
+<!--      />-->
 
       <!-- 添加或修改线边舱库存对话框 -->
 
@@ -398,7 +399,7 @@ export default {
   justify-content: space-between;
 
   .left {
-    width: 58%;
+    width: 30%;
 
     .top-area {
       display: flex;
@@ -431,7 +432,7 @@ export default {
   }
 
   .right {
-    width: 60%;
+    width: 70%;
     // flex: 1;
     .queryForm {
       width: 100%;

zkqy-ui/src/views/orderMange/lineSideCabin/index.vue

@@ -197,23 +197,32 @@
       <el-table-column label="皮重" align="center" prop="standby1" />
       <el-table-column label="净重" align="center" prop="standby2" />
       <el-table-column label="丝车号" align="center" prop="scid" />
+      <el-table-column label="入库时间" align="center" prop="createTime" />
+      <el-table-column label="操作人" align="center" prop="createBy" />
 <!--      <el-table-column label="任务号" align="center" prop="standby3" />-->
       <el-table-column label="领料车间" align="center" prop="workshop" />
       <el-table-column label="领料人" align="center" prop="recipient" />
       <el-table-column label="领料时间" align="center" prop="collectTime" />
       <el-table-column label="确认人" align="center" prop="confirm" />
       <el-table-column label="确认时间" align="center" prop="confirmTime" />
-      <el-table-column label="入库时间" align="center" prop="createTime" />
-      <el-table-column label="操作人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.status==1"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['lineSideCabin:lineSideCabin:edit']"
-          >修改</el-button>
+          >领料出库</el-button>
+          <el-button
+            v-if="scope.row.status==2"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdateConfirm(scope.row)"
+            v-hasPermi="['lineSideCabin:lineSideCabin:edit']"
+          >出库确认</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
 <!--            type="text"-->
@@ -236,58 +245,130 @@
     <!-- 添加或修改线边舱库存对话框 -->
     <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="productNo">
-          <el-input v-model="form.productNo" placeholder="请输入产品编号" />
-        </el-form-item>
-        <el-form-item label="品名" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入品名" />
+        <el-form-item label="产品:" prop="productNo">
+<!--          <el-input v-model="form.productNo" placeholder="请输入产品编号" />-->
+          <span>{{form.productName}}--{{form.productSpecifications}}</span>
         </el-form-item>
-        <el-form-item label="产品规格" prop="productSpecifications">
-          <el-input v-model="form.productSpecifications" placeholder="请输入产品规格" />
+        <el-form-item label="色泽:" prop="colours">
+<!--          <el-input v-model="form.colours" placeholder="请输入色泽" />-->
+          <span>{{form.colours}}</span>
         </el-form-item>
         <el-form-item label="批号" prop="batchNumber">
-          <el-input v-model="form.batchNumber" placeholder="请输入批号" />
-        </el-form-item>
-        <el-form-item label="色泽" prop="colours">
-          <el-input v-model="form.colours" placeholder="请输入色泽" />
+<!--          <el-input v-model="form.batchNumber" placeholder="请输入批号" />-->
+          <span>{{form.batchNumber}}</span>
         </el-form-item>
         <el-form-item label="机台" prop="machineTool">
-          <el-input v-model="form.machineTool" placeholder="请输入机台" />
+<!--          <el-input v-model="form.machineTool" placeholder="请输入机台" />-->
+          <span>{{form.machineTool}}</span>
         </el-form-item>
         <el-form-item label="卷数" prop="js">
-          <el-input v-model="form.js" placeholder="请输入卷数" />
+<!--          <el-input v-model="form.js" placeholder="请输入卷数" />-->
+          <span>{{form.js}}</span>
         </el-form-item>
         <el-form-item label="毛重" prop="standby">
-          <el-input v-model="form.standby" placeholder="请输入毛重" />
+<!--          <el-input v-model="form.standby" placeholder="请输入毛重" />-->
+          <span>{{form.standby}}</span>
         </el-form-item>
         <el-form-item label="皮重" prop="standby1">
-          <el-input v-model="form.standby1" placeholder="请输入皮重" />
+<!--          <el-input v-model="form.standby1" placeholder="请输入皮重" />-->
+          <span>{{form.standby1}}</span>
         </el-form-item>
         <el-form-item label="净重" prop="standby2">
-          <el-input v-model="form.standby2" placeholder="请输入净重" />
+<!--          <el-input v-model="form.standby2" placeholder="请输入净重" />-->
+          <span>{{form.standby2}}</span>
         </el-form-item>
-        <el-form-item label="任务号" prop="standby3">
-          <el-input v-model="form.standby3" placeholder="请输入任务号" />
+        <el-form-item label="丝车" prop="scid">
+          <!--          <el-input v-model="form.standby2" placeholder="请输入净重" />-->
+          <span>{{form.scid}}</span>
         </el-form-item>
         <el-form-item label="领料车间" prop="workshop">
-          <el-input v-model="form.workshop" placeholder="请输入领料车间" />
+          <el-select v-model="form.workshop" placeholder="请选择领料车间">
+            <el-option label="纺丝车间" value="纺丝车间"/>
+            <el-option label="加弹南车间" value="加弹南车间"/>
+            <el-option label="加弹北车间" value="加弹北车间"/>
+            <el-option label="调丝车间" value="调丝车间"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="领料人" prop="recipient">
-          <el-input v-model="form.recipient" placeholder="请输入领料人" />
+<!--        <el-form-item label="领料人" prop="recipient">-->
+<!--          <el-input v-model="form.recipient" placeholder="请输入领料人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="领料时间" prop="collectTime">-->
+<!--          <el-input v-model="form.collectTime" placeholder="请输入领料时间" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="确认人" prop="confirm">-->
+<!--          <el-input v-model="form.confirm" placeholder="请输入确认人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="确认时间" prop="confirmTime">-->
+<!--          <el-input v-model="form.confirmTime" 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>
+
+    <!-- 确认领料对话框 -->
+    <el-dialog :title="title" :visible.sync="opens" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="产品:" prop="productNo">
+          <!--          <el-input v-model="form.productNo" placeholder="请输入产品编号" />-->
+          <span>{{form.productName}}--{{form.productSpecifications}}</span>
+        </el-form-item>
+        <el-form-item label="色泽:" prop="colours">
+          <!--          <el-input v-model="form.colours" placeholder="请输入色泽" />-->
+          <span>{{form.colours}}</span>
         </el-form-item>
-        <el-form-item label="领料时间" prop="collectTime">
-          <el-input v-model="form.collectTime" placeholder="请输入领料时间" />
+        <el-form-item label="批号" prop="batchNumber">
+          <!--          <el-input v-model="form.batchNumber" placeholder="请输入批号" />-->
+          <span>{{form.batchNumber}}</span>
         </el-form-item>
-        <el-form-item label="确认人" prop="confirm">
-          <el-input v-model="form.confirm" placeholder="请输入确认人" />
+        <el-form-item label="机台" prop="machineTool">
+          <!--          <el-input v-model="form.machineTool" placeholder="请输入机台" />-->
+          <span>{{form.machineTool}}</span>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmTime">
-          <el-input v-model="form.confirmTime" placeholder="请输入确认时间" />
+        <el-form-item label="卷数" prop="js">
+          <!--          <el-input v-model="form.js" placeholder="请输入卷数" />-->
+          <span>{{form.js}}</span>
         </el-form-item>
+        <el-form-item label="毛重" prop="standby">
+          <!--          <el-input v-model="form.standby" placeholder="请输入毛重" />-->
+          <span>{{form.standby}}</span>
+        </el-form-item>
+        <el-form-item label="皮重" prop="standby1">
+          <!--          <el-input v-model="form.standby1" placeholder="请输入皮重" />-->
+          <span>{{form.standby1}}</span>
+        </el-form-item>
+        <el-form-item label="净重" prop="standby2">
+          <!--          <el-input v-model="form.standby2" placeholder="请输入净重" />-->
+          <span>{{form.standby2}}</span>
+        </el-form-item>
+        <el-form-item label="丝车" prop="scid">
+          <!--          <el-input v-model="form.standby2" placeholder="请输入净重" />-->
+          <span>{{form.scid}}</span>
+        </el-form-item>
+        <el-form-item label="领料车间" prop="workshop">
+          <span>{{form.workshop}}</span>
+        </el-form-item>
+        <!--        <el-form-item label="领料人" prop="recipient">-->
+        <!--          <el-input v-model="form.recipient" placeholder="请输入领料人" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="领料时间" prop="collectTime">-->
+        <!--          <el-input v-model="form.collectTime" placeholder="请输入领料时间" />-->
+        <!--        </el-form-item>-->
+                <el-form-item label="确认出库" prop="status">
+                  <label>
+                    <input type="radio"  value="3" >
+                  </label>
+                </el-form-item>
+
+        <!--        <el-form-item label="确认时间" prop="confirmTime">-->
+        <!--          <el-input v-model="form.confirmTime" 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>
+        <el-button type="primary" @click="submitFormqr">确 定</el-button>
+        <el-button @click="cancels">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -318,6 +399,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      opens:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -367,6 +449,12 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.opens = false;
+      this.reset();
+    },
+    // 取消按钮
+    cancels() {
+      this.opens = false;
       this.reset();
     },
     // 表单重置
@@ -426,7 +514,40 @@ export default {
       getLineSideCabin(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改线边舱库存";
+        this.form.status=2;//领料状态
+        this.title = "领料出库登记";
+      });
+    },
+    //出库确认弹窗
+    handleUpdateConfirm(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLineSideCabin(id).then(response => {
+        this.form = response.data;
+        this.opens = true;
+        this.title = "领料出库登记";
+      });
+    },
+    /** 确认出库提交按钮 */
+    submitFormqr() {
+      this.$refs["form"].validate(valid => {
+        this.form.status=3;
+        if (valid) {
+          if (this.form.id != null) {
+            updateLineSideCabin(this.form).then(response => {
+              this.$modal.msgSuccess("提交成功");
+              this.open = false;
+              this.getList();
+              this.cancels();
+            });
+          } else {
+            addLineSideCabin(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
       });
     },
     /** 提交按钮 */
@@ -435,7 +556,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateLineSideCabin(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("领取成功");
               this.open = false;
               this.getList();
             });

zkqy-ui/src/views/orderMange/oldOutStock/index.vue

@@ -239,7 +239,7 @@
           </el-table-column>
           <el-table-column align="center" :label="$t('oldOutStock.dialog.operation')">
             <template slot-scope="scope">
-              <el-button type="primary" @click="ckDo(scope.$index, scope.row)">{{ $t('oldOutStock.button.outStock') }}</el-button>
+              <el-button v-if="scope.row.deleted === 0" type="primary" @click="ckDo(scope.$index, scope.row)">{{ $t('oldOutStock.button.outStock') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -396,7 +396,7 @@ export default {
       return {
         oldActualWeight: [
           { required: true, message: this.$t('oldOutStock.validation.weight.required'), trigger: 'blur' },
-          { type: 'number', message: this.$t('oldOutStock.validation.weight.number'), trigger: 'blur' },
+          // { required: true, message: this.$t('oldOutStock.validation.weight.required'), trigger: 'blur' },
           {
             validator: (rule, value, callback) => {
               if(value==0){
@@ -421,7 +421,7 @@ export default {
       return {
         oldActualBoxNum: [
           { required: true, message: this.$t('oldOutStock.validation.boxCount.required'), trigger: 'blur' },
-          { type: 'number', message: this.$t('oldOutStock.validation.boxCount.number'), trigger: 'blur' },
+          // { type: 'number', message: this.$t('oldOutStock.validation.boxCount.number'), trigger: 'blur' },
           {
             validator: (rule, value, callback) => {
               if(value==0){
@@ -469,9 +469,11 @@ export default {
       //产品编码,产品名称,规格,颜色.
       //查询老库存列表信息
       let res1 = await queryTheOldInventoryDeliveryList(row);
+      res1.rows = res1.rows.map(item=>{return{...item,deleted:0}});//增加出库按钮是否显示标识，点击过出库后则不显示出库按钮
       //打开老库存列表弹窗
       this.cktotal=res1.total;
       this.tableData=res1.rows;
+      console.log("---------------------------",this.tableData)
       this.dckOpen=true;
       // 初始化表单引用数组
     },
@@ -536,6 +538,7 @@ export default {
         let resOut= await oldInventoryGoOut(payLoad)
         console.log(resOut)
         if(resOut.code==200){
+          this.tableData[index].deleted = 1;//出库成功后出库按钮隐藏
           this.$message.success(this.$t('oldOutStock.message.outStockSuccess'));
         }else {
           this.$message.error(this.$t('oldOutStock.message.outStockFailed'));

zkqy-ui/src/views/orderMange/operationLog/index.vue

@@ -41,7 +41,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="类型" prop="workshop">
+        <el-select v-model="queryParams.status" placeholder="请选择类型">
+          <el-option label="全部" value=""/>
+          <el-option label="已入库" value="1"/>
+          <el-option label="已领料" value="2"/>
+          <el-option label="已确认" value="3"/>
 
+        </el-select>
+      </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>