From 92aaad5551c363ca9ab643a834517c4d6ffd40f9 Mon Sep 17 00:00:00 2001
From: zx <zhouxinxin0724@163.com>
Date: Wed, 21 Jan 2026 18:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8D=95=E6=8D=AE=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wisdom/bill.js                |   8 +
 src/views/information/print/index.vue |   1 +
 src/views/wisdom/bill/index.vue       | 946 +++++++-------------------
 3 files changed, 249 insertions(+), 706 deletions(-)

diff --git a/src/api/wisdom/bill.js b/src/api/wisdom/bill.js
index 6dee07c..0bfc599 100644
--- a/src/api/wisdom/bill.js
+++ b/src/api/wisdom/bill.js
@@ -70,6 +70,14 @@ export function backoutRecord(data) {
     data: data
   })
 }
+// 一键入库
+export function recordFinish(data) {
+  return request({
+    url: '/wisdom/record/finish',
+    method: 'post',
+    data: data
+  })
+}
 
 
 
diff --git a/src/views/information/print/index.vue b/src/views/information/print/index.vue
index 2f9e1ec..bc76fe9 100644
--- a/src/views/information/print/index.vue
+++ b/src/views/information/print/index.vue
@@ -54,6 +54,7 @@
 	  <el-table v-loading="loading" :data="pcdedetailList" @selection-change="handleSelectionChange">
 		<el-table-column type="selection" width="55" align="center" />
 		<el-table-column label="库位编号" align="center" prop="pcode" />
+		<el-table-column label="RFID" align="center" width="250" prop="encodedId" />
 		<el-table-column label="所属场景" align="center" prop="sceneName" />
 		<el-table-column label="所属大库" align="center" prop="parentWarehouseName" />
 		<el-table-column label="所属小库" align="center" prop="warehouseName" />
diff --git a/src/views/wisdom/bill/index.vue b/src/views/wisdom/bill/index.vue
index 0a29f28..690af91 100644
--- a/src/views/wisdom/bill/index.vue
+++ b/src/views/wisdom/bill/index.vue
@@ -2,69 +2,35 @@
   <div class="app-container">
     <el-splitter>
       <el-splitter-panel size="40%">
-        <el-form
-          :model="queryParams"
-          ref="queryRef"
-          v-show="showSearch"
-          label-width="90"
-        >
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="90">
           <el-row>
             <el-col :span="12">
               <el-form-item label="入库时间" prop="operationTime">
-                <el-date-picker
-                  v-model="operationTime"
-                  type="datetimerange"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  format="YYYY/MM/DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                  @keyup.enter="handleQuery"
-                />
+                <el-date-picker v-model="operationTime" type="datetimerange" start-placeholder="开始时间"
+                  end-placeholder="结束时间" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+                  @keyup.enter="handleQuery" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
               <el-form-item label="单据号" prop="billNo">
-                <el-input
-                  v-model="queryParams.billNo"
-                  placeholder="请输入单据号"
-                  clearable
-                  @keyup.enter="handleQuery"
-                />
+                <el-input v-model="queryParams.billNo" placeholder="请输入单据号" clearable @keyup.enter="handleQuery" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="入库类型" prop="operationType">
-                <el-select
-                  v-model="queryParams.operationType"
-                  placeholder="请选择入库类型"
-                  clearable
-                  @keyup.enter="handleQuery"
-                >
-                  <el-option
-                    v-for="dict in storeTypeList"
-                    :key="dict.id"
-                    :label="dict.typeName"
-                    :value="dict.typeCode"
-                  />
+                <el-select v-model="queryParams.operationType" placeholder="请选择入库类型" clearable
+                  @keyup.enter="handleQuery">
+                  <el-option v-for="dict in storeTypeList" :key="dict.id" :label="dict.typeName"
+                    :value="dict.typeCode" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="10">
               <el-form-item label="库存状态" prop="execStatus">
-                <el-select
-                  v-model="queryParams.execStatus"
-                  placeholder="请选择库存状态"
-                  clearable
-                  @keyup.enter="handleQuery"
-                >
-                  <el-option
-                    v-for="dict in execStatusMenu"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
+                <el-select v-model="queryParams.execStatus" placeholder="请选择库存状态" clearable @keyup.enter="handleQuery">
+                  <el-option v-for="dict in execStatusMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -72,52 +38,26 @@
         </el-form>
         <el-row class="mb8">
           <el-col :span="4">
-            <el-button
-              type="primary"
-              plain
-              @click="handleAdd(false)"
-              v-hasPermi="['wisdom:bill:add']"
-              >新增入库</el-button
-            >
+            <el-button type="primary" plain @click="handleAdd(false)" v-hasPermi="['wisdom:bill:add']">新增入库</el-button>
           </el-col>
           <el-col :span="4">
-            <el-button
-              type="warning"
-              plain
-              @click="handleExport"
-              v-hasPermi="['wisdom:bill:export']"
-              >导出</el-button
-            >
+            <el-button type="warning" plain @click="handleExport" v-hasPermi="['wisdom:bill:export']">导出</el-button>
           </el-col>
           <el-col :span="4">
-            <el-button type="primary" plain @click="rkUpload"
-              >图片上传</el-button
-            >
+            <el-button type="primary" plain @click="rkUpload">图片上传</el-button>
           </el-col>
 
           <el-col :span="8">
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery"
-                >搜索</el-button
-              >
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-table
-          v-loading="loading"
-          :data="billList"
-          :row-class-name="tableBillRowClassName"
-          @row-dblclick="billClick"
-          @current-change="uploadSelectionChange"
-        >
+        <el-table v-loading="loading" :data="billList" :row-class-name="tableBillRowClassName" @row-dblclick="billClick"
+          @current-change="uploadSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column
-            label="单据号"
-            align="center"
-            prop="billNo"
-            width="180"
-          />
+          <el-table-column label="单据号" align="center" prop="billNo" width="180" />
           <el-table-column label="库存状态" align="center">
             <template #default="scope">
               <span>{{ scope.row.execStatus == 1 ? "已入库" : "预入库" }}</span>
@@ -128,101 +68,41 @@
               <dict-tag :options="dictTagData()" :value="scope.row.bizType" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="理货员"
-            align="center"
-            prop="operatorName"
-            width="100"
-          />
-          <el-table-column
-            label="入库类型"
-            align="center"
-            prop="operationTypeName"
-            width="120"
-          />
-          <el-table-column
-            label="物资类型"
-            align="center"
-            prop="wlTypeName"
-            width="100"
-          />
-          <el-table-column
-            label="入库时间"
-            align="center"
-            prop="operationTime"
-            width="170"
-          >
+          <el-table-column label="理货员" align="center" prop="operatorName" width="100" />
+          <el-table-column label="入库类型" align="center" prop="operationTypeName" width="120" />
+          <el-table-column label="物资类型" align="center" prop="wlTypeName" width="100" />
+          <el-table-column label="入库时间" align="center" prop="operationTime" width="170">
             <template #default="scope">
               <span>{{
                 parseTime(scope.row.operationTime, "{y}-{m}-{d} {h}:{i}:{s}")
               }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            fixed="right"
-            width="220"
-          >
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="scope">
-              <el-button
-                link
-                type="primary"
-                @click="picDetailFun(scope.row.billNo, 0, 1)"
-                >入库图片</el-button
-              >
-              <el-button
-                link
-                type="primary"
-                @click="billClick(scope.row, 'bill', 'rk')"
-                >入库单</el-button
-              >
-              <el-button link type="primary" @click="editData(scope.row)"
-                >修改</el-button
-              >
+              <el-button link type="primary" @click="picDetailFun(scope.row.billNo, 0, 1)">入库图片</el-button>
+              <el-button link type="primary" @click="billClick(scope.row, 'bill', 'rk')">入库单</el-button>
+              <el-button link type="primary" @click="editData(scope.row)">修改</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize" @pagination="getList" />
         <!-- <el-pagination background layout="prev, pager, next" :total="total" v-model:page="queryParams.pageNum" @pagination="getList"/> -->
       </el-splitter-panel>
       <el-splitter-panel :min="200">
         <el-row :gutter="10" class="mb8" v-show="stockList.length > 0">
           <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="Printer"
-              @click="handlePrint"
-              v-print="printViewInfo"
-              v-hasPermi="['wisdom:bill:print']"
-              >打印单据</el-button
-            >
+            <el-button type="success" plain icon="Printer" @click="handlePrint" v-print="printViewInfo"
+              v-hasPermi="['wisdom:bill:print']">打印单据</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="Printer"
-              @click="handlePrintTag"
-              >打印标签</el-button
-            >
+            <el-button type="primary" plain icon="Printer" @click="handlePrintTag">打印标签</el-button>
           </el-col>
           <el-col :span="4">
             <el-form-item label="打印机编号" prop="printNum">
               <el-select v-model="printNum" clearable>
-                <el-option
-                  v-for="dict in printNumList"
-                  :key="dict.id"
-                  :label="dict.statusName"
-                  :value="dict.id"
-                />
+                <el-option v-for="dict in printNumList" :key="dict.id" :label="dict.statusName" :value="dict.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -236,172 +116,63 @@
               >移库</el-button>
             </el-col> -->
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="addOne()"
-              >添加单条物料</el-button
-            >
+            <el-button type="primary" plain icon="Plus" @click="addOne()">添加单条物料</el-button>
           </el-col>
-          <el-col :span="5">
-            <el-button type="primary" plain icon="Plus" @click="handleDispatch"
-              >生成调度任务</el-button
-            >
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleDispatch">生成调度任务</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleOneClickWarehousing">一键入库</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleOneClickStockDelete">一键撤销</el-button>
           </el-col>
         </el-row>
-        <el-table
-          v-loading="detailLoading"
-          show-overflow-tooltip
-          border
-          :data="stockList"
-          @selection-change="printSelectionChange"
-        >
+        <el-table v-loading="detailLoading" show-overflow-tooltip border :data="stockList"
+          @selection-change="printSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column
-            label="序号"
-            align="center"
-            type="index"
-            width="70"
-          />
+          <el-table-column label="序号" align="center" type="index" width="70" />
           <el-table-column label="库存状态" align="center">
             <template #default="scope">
               <span>{{ scope.row.execStatus == 1 ? "已入库" : "预入库" }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="项目号"
-            align="center"
-            prop="xmNo"
-            width="150"
-          />
-          <el-table-column
-            label="项目描述"
-            align="center"
-            prop="xmMs"
-            width="250"
-          />
-          <el-table-column
-            label="物料号"
-            align="center"
-            prop="wlNo"
-            width="100"
-          />
-          <el-table-column
-            label="物料描述"
-            align="center"
-            prop="wlMs"
-            width="250"
-          />
-          <el-table-column
-            label="供应商名称"
-            align="center"
-            prop="gysMc"
-            width="200"
-          />
+          <el-table-column label="项目号" align="center" prop="xmNo" width="150" />
+          <el-table-column label="项目描述" align="center" prop="xmMs" width="250" />
+          <el-table-column label="物料号" align="center" prop="wlNo" width="100" />
+          <el-table-column label="物料描述" align="center" prop="wlMs" width="250" />
+          <el-table-column label="供应商名称" align="center" prop="gysMc" width="200" />
           <el-table-column label="合同单价" align="center" prop="htDj" />
-          <el-table-column
-            label="订单编号"
-            align="center"
-            prop="sapNo"
-            width="150"
-          />
+          <el-table-column label="订单编号" align="center" prop="sapNo" width="150" />
           <el-table-column label="计量单位" align="center" prop="dw" />
-          <el-table-column
-            label="实际入库数量"
-            align="center"
-            prop="realQty"
-            width="120"
-          />
+          <el-table-column label="实际入库数量" align="center" prop="realQty" width="120" />
           <el-table-column label="是否移库" align="center" prop="isMove">
             <template #default="scope">
               <span>{{ isMoveFun(scope.row.hasMoved) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="库位码"
-            align="center"
-            prop="pcode"
-            width="120"
-          />
+          <el-table-column label="库位码" align="center" prop="pcode" width="120" />
           <el-table-column label="托盘码" align="center" prop="trayCode" />
-          <el-table-column
-            label="身份码"
-            align="center"
-            prop="entityId"
-            width="200"
-          />
-          <el-table-column
-            label="所属大仓"
-            align="center"
-            prop="parentWarehouseName"
-            width="150"
-          />
-          <el-table-column
-            label="所属小仓"
-            align="center"
-            prop="warehouseName"
-            width="150"
-          />
+          <el-table-column label="身份码" align="center" prop="entityId" width="200" />
+          <el-table-column label="所属大仓" align="center" prop="parentWarehouseName" width="150" />
+          <el-table-column label="所属小仓" align="center" prop="warehouseName" width="150" />
           <el-table-column label="库龄" align="center" prop="stockAge" />
-          <el-table-column
-            label="现场图片"
-            align="center"
-            v-if="isExamine == 1"
-          >
+          <el-table-column label="现场图片" align="center" v-if="isExamine == 1">
             <template #default="scope">
-              <el-image
-                :src="scope.row.scenePhotoUrl"
-                style="width: 50px; height: 50px"
-                :zoom-rate="1.2"
-                :max-scale="7"
-                :min-scale="0.2"
-                :preview-src-list="srcList"
-                show-progress
-                :initial-index="4"
-                :preview-teleported="true"
-                @click="preview(scope.row.scenePhotoUrl)"
-              />
+              <el-image :src="scope.row.scenePhotoUrl" style="width: 50px; height: 50px" :zoom-rate="1.2" :max-scale="7"
+                :min-scale="0.2" :preview-src-list="srcList" show-progress :initial-index="4" :preview-teleported="true"
+                @click="preview(scope.row.scenePhotoUrl)" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="备注"
-            align="center"
-            prop="remark"
-            width="200"
-          />
-          <el-table-column
-            label="一次封样号"
-            align="center"
-            prop="fycde1"
-            width="150"
-          />
-          <el-table-column
-            label="二次封样号"
-            align="center"
-            prop="fycde2"
-            width="150"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            width="150"
-          >
+          <el-table-column label="备注" align="center" prop="remark" width="200" />
+          <el-table-column label="一次封样号" align="center" prop="fycde1" width="150" />
+          <el-table-column label="二次封样号" align="center" prop="fycde2" width="150" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
             <template #default="scope">
-              <el-button
-                link
-                type="primary"
-                icon="Edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['wisdom:bill:edit']"
-                >修改</el-button
-              >
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                v-show="scope.row.execStatus == 1"
-                @click="handleStockDelete(scope.row)"
-                v-hasPermi="['wisdom:bill:delete']"
-                >撤销</el-button
-              >
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['wisdom:bill:edit']">修改</el-button>
+              <el-button link type="primary" icon="Delete" v-show="scope.row.execStatus == 1"
+                @click="handleStockDelete(scope.row)" v-hasPermi="['wisdom:bill:delete']">撤销</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -413,44 +184,20 @@
       <printBill :billAllObj="stockList" />
     </div>
     <!-- 修改主单据，入库时间等字段 -->
-    <el-dialog
-      title="修改"
-      v-model="openBill"
-      @close="closeDialog"
-      append-to-body
-      width="40%"
-    >
+    <el-dialog title="修改" v-model="openBill" @close="closeDialog" append-to-body width="40%">
       <el-form :model="billData" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="入库类型" prop="operationType">
-              <el-select
-                v-model="billData.operationType"
-                placeholder="请选择入库类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in storeTypeList"
-                  :key="dict.id"
-                  :label="dict.typeName"
-                  :value="dict.typeCode"
-                />
+              <el-select v-model="billData.operationType" placeholder="请选择入库类型" clearable>
+                <el-option v-for="dict in storeTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="物资类型" prop="wlType">
-              <el-select
-                v-model="billData.wlType"
-                placeholder="请选择物资类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in wzTypeList"
-                  :key="dict.id"
-                  :label="dict.typeName"
-                  :value="dict.typeCode"
-                />
+              <el-select v-model="billData.wlType" placeholder="请选择物资类型" clearable>
+                <el-option v-for="dict in wzTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -458,46 +205,23 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="理货员" prop="operator">
-              <el-select
-                v-model="billData.operator"
-                placeholder="请选择理货员"
-                clearable
-              >
-                <el-option
-                  v-for="dict in personList"
-                  :key="dict.userId"
-                  :label="dict.userName"
-                  :value="dict.userId"
-                />
+              <el-select v-model="billData.operator" placeholder="请选择理货员" clearable>
+                <el-option v-for="dict in personList" :key="dict.userId" :label="dict.userName" :value="dict.userId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="入库时间" prop="operationTime">
-              <el-date-picker
-                style="width: 100%"
-                v-model="billData.operationTime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                type="datetime"
-              />
+              <el-date-picker style="width: 100%" v-model="billData.operationTime" value-format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD HH:mm:ss" type="datetime" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="库存状态" prop="execStatus">
-              <el-select
-                v-model="billData.execStatus"
-                placeholder="请选择库存状态"
-                clearable
-              >
-                <el-option
-                  v-for="dict in execStatusMenu"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
+              <el-select v-model="billData.execStatus" placeholder="请选择库存状态" clearable>
+                <el-option v-for="dict in execStatusMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -510,96 +234,47 @@
       </template>
     </el-dialog>
     <!-- 添加或修改库存单据主对话框 -->
-    <el-dialog
-      :title="title"
-      v-model="open"
-      @close="closeDialog"
-      width="75%"
-      :draggable="true"
-      :z-index="4"
-      :close-on-click-modal="false"
-    >
+    <el-dialog :title="title" v-model="open" @close="closeDialog" width="75%" :draggable="true" :z-index="4"
+      :close-on-click-modal="false">
       <el-form ref="stockRef" :model="storeData" :rules="rules">
         <el-row :gutter="20" v-if="idEdit == 0">
           <el-col :span="12">
             <el-form-item label="采购订单号">
-              <el-input
-                v-model="orderNum"
-                placeholder="请输入订单号"
-                :disabled="idEdit != 0"
-                @keydown.enter="searchPlan"
-              />
+              <el-input v-model="orderNum" placeholder="请输入订单号" :disabled="idEdit != 0" @keydown.enter="searchPlan" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-button
-              type="primary"
-              @click="searchPlan"
-              :disabled="idEdit != 0"
-              >从供应计划中添加</el-button
-            >
+            <el-button type="primary" @click="searchPlan" :disabled="idEdit != 0">从供应计划中添加</el-button>
           </el-col>
         </el-row>
         <el-row :gutter="20" v-if="idEdit == 0">
           <el-col :span="6">
             <el-form-item label="入库类型" prop="operationType">
-              <el-select
-                v-model="storeData.operationType"
-                placeholder="请选择入库类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in storeTypeList"
-                  :key="dict.id"
-                  :label="dict.typeName"
-                  :value="dict.typeCode"
-                />
+              <el-select v-model="storeData.operationType" placeholder="请选择入库类型" clearable>
+                <el-option v-for="dict in storeTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="物资类型" prop="wlType">
-              <el-select
-                v-model="storeData.wlType"
-                placeholder="请选择物资类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in wzTypeList"
-                  :key="dict.id"
-                  :label="dict.typeName"
-                  :value="dict.typeCode"
-                />
+              <el-select v-model="storeData.wlType" placeholder="请选择物资类型" clearable>
+                <el-option v-for="dict in wzTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属仓库" prop="warehouseCode">
-              <el-cascader
-                :options="warehouseList"
-                @change="pcodeList"
-                v-model="storeData.warehouseCode"
-                :props="{
-                  children: 'children',
-                  label: 'warehouseName',
-                  value: 'warehouseCode',
-                }"
-              />
+              <el-cascader :options="warehouseList" @change="pcodeList" v-model="storeData.warehouseCode" :props="{
+                children: 'children',
+                label: 'warehouseName',
+                value: 'warehouseCode',
+              }" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="理货员" prop="operator">
-              <el-select
-                v-model="storeData.operator"
-                placeholder="请选择理货员"
-                clearable
-              >
-                <el-option
-                  v-for="dict in personList"
-                  :key="dict.userId"
-                  :label="dict.userName"
-                  :value="dict.userId"
-                />
+              <el-select v-model="storeData.operator" placeholder="请选择理货员" clearable>
+                <el-option v-for="dict in personList" :key="dict.userId" :label="dict.userName" :value="dict.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -608,164 +283,79 @@
           <el-col :span="6">
             <el-form-item label="入库时间" prop="operationTime">
               <!-- type="date" -->
-              <el-date-picker
-                v-model="storeData.operationTime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                type="datetime"
-                placeholder="请选择入库时间"
-                style="width: 100%"
-              />
+              <el-date-picker v-model="storeData.operationTime" value-format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择入库时间" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="是否预入库" prop="execStatus">
-              <el-select
-                v-model="storeData.execStatus"
-                placeholder="请选择"
-                clearable
-              >
-                <el-option
-                  v-for="dict in execStatusList"
-                  :key="dict.id"
-                  :label="dict.name"
-                  :value="dict.id"
-                />
+              <el-select v-model="storeData.execStatus" placeholder="请选择" clearable>
+                <el-option v-for="dict in execStatusList" :key="dict.id" :label="dict.name" :value="dict.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="扩展描述">
-              <el-input
-                v-model="kzms"
-                placeholder="请输入扩展描述"
-                :disabled="idEdit != 0"
-              />
+              <el-input v-model="kzms" placeholder="请输入扩展描述" :disabled="idEdit != 0" />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-checkbox
-              v-model="autoFill"
-              label="自动填充"
-              size="large"
-              @change="autoFillFun"
-              :disabled="idEdit != 0"
-            />
+            <el-checkbox v-model="autoFill" label="自动填充" size="large" @change="autoFillFun" :disabled="idEdit != 0" />
           </el-col>
           <el-col :span="2">
-            <el-button
-              type="primary"
-              @click="addLineFun"
-              :disabled="idEdit != 0"
-              >添加</el-button
-            >
+            <el-button type="primary" @click="addLineFun" :disabled="idEdit != 0">添加</el-button>
           </el-col>
         </el-row>
-        <el-table
-          :data="planList"
-          height="400"
-          style="width: 100%"
-          show-overflow-tooltip
-          :row-class-name="tableRowClassName"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table :data="planList" height="400" style="width: 100%" show-overflow-tooltip
+          :row-class-name="tableRowClassName" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="30" align="center" />
-          <el-table-column
-            label="序号"
-            align="center"
-            type="index"
-            width="50"
-          />
-          <el-table-column
-            label="状态"
-            align="center"
-            prop="status"
-            width="100"
-          >
+          <el-table-column label="序号" align="center" type="index" width="50" />
+          <el-table-column label="状态" align="center" prop="status" width="100">
             <template #default="scoped">
-              <el-tag
-                :type="
-                  scoped.row.status == 1
-                    ? 'success'
-                    : scoped.row.status == 0
-                    ? 'danger'
-                    : 'warning'
-                "
-                >{{
+              <el-tag :type="scoped.row.status == 1
+                ? 'success'
+                : scoped.row.status == 0
+                  ? 'danger'
+                  : 'warning'
+                ">{{
                   statusList.filter(
                     (item) => item.value == scoped.row.status
                   )[0].label
-                }}</el-tag
-              >
+                }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column width="40" align="center">
             <template #default="scope">
-              <el-icon :size="22" @click="delLineFun(scope.$index)"
-                ><RemoveFilled
-              /></el-icon>
+              <el-icon :size="22" @click="delLineFun(scope.$index)">
+                <RemoveFilled />
+              </el-icon>
             </template>
           </el-table-column>
-          <el-table-column
-            label="物料号"
-            align="center"
-            prop="wlNo"
-            width="150"
-          >
+          <el-table-column label="物料号" align="center" prop="wlNo" width="150">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.wlNo"
-                placeholder="请输入物料号"
-                @change="searchInfo(scope.row.wlNo, scope.$index)"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.wlNo" placeholder="请输入物料号"
+                @change="searchInfo(scope.row.wlNo, scope.$index)"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            label="物料描述"
-            align="center"
-            prop="wlMs"
-            width="200"
-          >
+          <el-table-column label="物料描述" align="center" prop="wlMs" width="200">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.wlMs"
-                placeholder="请输入物料描述"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.wlMs" placeholder="请输入物料描述"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="单价" align="center" prop="htDj" width="80">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.htDj"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.htDj"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="单位" align="center" prop="dw" width="80">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.dw"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.dw"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="库位" align="center" width="150">
             <template #default="scope">
-              <el-select
-                v-model="scope.row.pcode"
-                :disabled="idEdit != 0"
-                clearable
-                filterable
-                placeholder="请选择库位"
-              >
-                <el-option
-                  v-for="item in kwOptions"
-                  :key="item.id"
-                  :label="item.pcode"
-                  :value="item.pcode"
-                />
+              <el-select v-model="scope.row.pcode" :disabled="idEdit != 0" clearable filterable placeholder="请选择库位">
+                <el-option v-for="item in kwOptions" :key="item.id" :label="item.pcode" :value="item.pcode" />
               </el-select>
             </template>
           </el-table-column>
@@ -780,139 +370,69 @@
           </el-table-column>
           <el-table-column label="备注" align="center" width="200">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.remark"
-                placeholder="请输入备注"
-              ></el-input>
+              <el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="容器码" align="center" width="150">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.trayCode"
-                placeholder="请输入容器码"
-              ></el-input>
+              <el-input v-model="scope.row.trayCode" placeholder="请输入容器码"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="身份码" align="center" width="200">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.entityId"
-                placeholder="请输入身份码"
-              ></el-input>
+              <el-input v-model="scope.row.entityId" placeholder="请输入身份码"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            label="采购订单号"
-            align="center"
-            prop="sapNo"
-            width="130"
-          >
+          <el-table-column label="采购订单号" align="center" prop="sapNo" width="130">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.sapNo"
-                placeholder="请输入订单号"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.sapNo" placeholder="请输入订单号"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            label="项目定义号"
-            align="center"
-            prop="xmNo"
-            width="150"
-          >
+          <el-table-column label="项目定义号" align="center" prop="xmNo" width="150">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.xmNo"
-                placeholder="项目定义号"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.xmNo" placeholder="项目定义号"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            label="项目名称"
-            align="center"
-            prop="xmMs"
-            width="300"
-          >
+          <el-table-column label="项目名称" align="center" prop="xmMs" width="300">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.xmMs"
-                placeholder="项目名称"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.xmMs" placeholder="项目名称"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            label="供应商"
-            align="center"
-            prop="gysMc"
-            width="200"
-          >
+          <el-table-column label="供应商" align="center" prop="gysMc" width="200">
             <template #default="scope">
-              <el-input
-                v-if="scope.row.isnew"
-                v-model="scope.row.gysMc"
-                placeholder="供应商"
-              ></el-input>
+              <el-input v-if="scope.row.isnew" v-model="scope.row.gysMc" placeholder="供应商"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="一次封样号" align="center" width="200">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.fycde1"
-                placeholder="请输入一次封样号"
-              ></el-input>
+              <el-input v-model="scope.row.fycde1" placeholder="请输入一次封样号"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="二次封样号" align="center" width="200">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.fycde2"
-                placeholder="请输入二次封样号"
-              ></el-input>
+              <el-input v-model="scope.row.fycde2" placeholder="请输入二次封样号"></el-input>
             </template>
           </el-table-column>
 
-          <el-table-column
-            label="上传"
-            align="center"
-            width="150"
-            v-if="isExamine == 1"
-          >
+          <el-table-column label="上传" align="center" width="150" v-if="isExamine == 1">
             <template #default="scope">
-              <el-upload
-                class="upload-demo"
-                :action="actionUrl"
-                :multiple="false"
-                :headers="headers"
-                :on-preview="handlePreview"
-                :on-remove="
-                  function (response) {
-                    return handleRemove(
-                      response,
-                      scope.row.id,
-                      scope.row.pcode
-                    );
-                  }
-                "
-                :on-success="
-                  function (response) {
+              <el-upload class="upload-demo" :action="actionUrl" :multiple="false" :headers="headers"
+                :on-preview="handlePreview" :on-remove="function (response) {
+                  return handleRemove(
+                    response,
+                    scope.row.id,
+                    scope.row.pcode
+                  );
+                }
+                  " :on-success="function (response) {
                     return handleAvatarSuccess(
                       response,
                       scope.row.id,
                       scope.row.pcode
                     );
                   }
-                "
-              >
-                <el-button
-                  type="primary"
-                  size="small"
-                  v-show="!scope.row.photoUrl && scope.row.pcode"
-                  >选择图片</el-button
-                >
+                    ">
+                <el-button type="primary" size="small" v-show="!scope.row.photoUrl && scope.row.pcode">选择图片</el-button>
               </el-upload>
             </template>
           </el-table-column>
@@ -922,18 +442,9 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="审批人">
-                <el-select
-                  v-model="storeData.approverId"
-                  clearable
-                  filterable
-                  placeholder="请选择审批人"
-                >
-                  <el-option
-                    v-for="dict in personList"
-                    :key="dict.userId"
-                    :label="dict.userName"
-                    :value="dict.userId"
-                  />
+                <el-select v-model="storeData.approverId" clearable filterable placeholder="请选择审批人">
+                  <el-option v-for="dict in personList" :key="dict.userId" :label="dict.userName"
+                    :value="dict.userId" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -988,41 +499,23 @@
           </el-table-column>
           <el-table-column label="存放位置" align="center">
             <template #default="scope">
-              <el-select
-                v-model="scope.row.toPcode"
-                clearable
-                filterable
-                placeholder="请选择库位"
-              >
-                <el-option
-                  v-for="item in kwOptions"
-                  :key="item.id"
-                  :label="item.pcode"
-                  :value="item.pcode"
-                />
+              <el-select v-model="scope.row.toPcode" clearable filterable placeholder="请选择库位">
+                <el-option v-for="item in kwOptions" :key="item.id" :label="item.pcode" :value="item.pcode" />
               </el-select>
             </template>
           </el-table-column>
           <el-table-column label="容器码" align="center">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.toTrayCode"
-                placeholder="请输入容器码"
-              ></el-input>
+              <el-input v-model="scope.row.toTrayCode" placeholder="请输入容器码"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="仓库" align="center">
             <template #default="scope">
-              <el-cascader
-                :options="warehouseList"
-                v-model="scope.row.toCangku"
-                @change="pcodeList"
-                :props="{
-                  children: 'children',
-                  label: 'warehouseName',
-                  value: 'warehouseCode',
-                }"
-              />
+              <el-cascader :options="warehouseList" v-model="scope.row.toCangku" @change="pcodeList" :props="{
+                children: 'children',
+                label: 'warehouseName',
+                value: 'warehouseCode',
+              }" />
             </template>
           </el-table-column>
         </el-table>
@@ -1040,16 +533,11 @@
     </el-dialog>
     <!-- 上传图片 -->
     <el-dialog title="图片上传" v-model="dialogPicVisible">
-      <el-upload
-        v-model:file-list="fileList"
-        :multiple="true"
-        list-type="picture-card"
-        :on-change="handleChange"
-        :auto-upload="false"
-        :on-preview="handlePictureCardPreview"
-        :on-remove="handleScRemove"
-      >
-        <el-icon><Plus /></el-icon>
+      <el-upload v-model:file-list="fileList" :multiple="true" list-type="picture-card" :on-change="handleChange"
+        :auto-upload="false" :on-preview="handlePictureCardPreview" :on-remove="handleScRemove">
+        <el-icon>
+          <Plus />
+        </el-icon>
       </el-upload>
       <template #footer>
         <div class="dialog-footer">
@@ -1063,27 +551,18 @@
       <!-- <span class="demonstration">{{ fit }}</span> -->
       <div class="picBox">
         <div v-for="obj in picList" :key="obj.id" class="everyPicBox">
-          <el-icon class="closeBox" :size="23" @click="delPic(obj.id)"
-            ><CircleCloseFilled
-          /></el-icon>
-          <el-image
-            style="width: 100px; height: 100px; margin-right: 20px"
-            :src="obj.url"
-            :preview-src-list="urlList"
-          />
+          <el-icon class="closeBox" :size="23" @click="delPic(obj.id)">
+            <CircleCloseFilled />
+          </el-icon>
+          <el-image style="width: 100px; height: 100px; margin-right: 20px" :src="obj.url"
+            :preview-src-list="urlList" />
         </div>
       </div>
 
       <!-- </div> -->
     </el-dialog>
 
-    <el-dialog
-      title="入库单"
-      v-model="dialogBill"
-      append-to-body
-      width="80%"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="入库单" v-model="dialogBill" append-to-body width="80%" :close-on-click-modal="false">
       <bill :billAllObj="billAllObj" billStatus="rk" />
       <template #footer>
         <div class="dialog-footer">
@@ -1091,12 +570,7 @@
         </div>
       </template>
     </el-dialog>
-    <el-dialog
-      title="调度任务"
-      v-model="dispatchOpen"
-      width="30%"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="调度任务" v-model="dispatchOpen" width="30%" :close-on-click-modal="false">
       <el-form>
         <el-row>
           <el-col>
@@ -1129,6 +603,7 @@ import {
   moveRecord,
   updateRecord,
   backoutRecord,
+  recordFinish
 } from "@/api/wisdom/bill";
 import {
   uploadContract,
@@ -1281,9 +756,9 @@ const data = reactive({
     beforeOpenCallback() {
       showContent.value = false;
     }, // 开始打印之前的callback
-    openCallback() {}, // 调用打印时的callback
-    closeCallback() {}, // 关闭打印的callback(无法区分确认or取消)
-    clickMounted() {},
+    openCallback() { }, // 调用打印时的callback
+    closeCallback() { }, // 关闭打印的callback(无法区分确认or取消)
+    clickMounted() { },
 
     standard: "",
     extarCss: "",
@@ -1391,8 +866,8 @@ function delLineFun(index) {
     .then(function () {
       return planList.value.splice(index, 1);
     })
-    .then(() => {})
-    .catch(() => {});
+    .then(() => { })
+    .catch(() => { });
 }
 // 新增入库的列表状态
 const statusList = ref([
@@ -1536,7 +1011,7 @@ function submitForm() {
           rkBill: {
             cangku:
               storeData.value.warehouseCode[
-                storeData.value.warehouseCode.length - 1
+              storeData.value.warehouseCode.length - 1
               ], //所属仓库
             operator: storeData.value.operator, //理货员
             operationType: storeData.value.operationType, //入库类型
@@ -1817,12 +1292,61 @@ const handleStockDelete = (row) => {
       detailList();
       proxy.$modal.msgSuccess("操作成功");
     })
-    .catch(() => {});
+    .catch(() => { });
+};
+// 一键撤销
+const handleOneClickStockDelete = (row) => {
+  if (checkStockList.value.length == 0) {
+    proxy.$modal.msgError("请勾选数据");
+    return;
+  }
+  const ids = []
+  for (let i = 0; i < checkStockList.value.length; i++) {
+    if (checkStockList.value[i].execStatus == 1) {
+      ids.push(checkStockList.value[i].id)
+    }
+  }
+  if (ids.length == 0) {
+    proxy.$modal.msgSuccess("勾选数据撤销完成");
+    return;
+  }
+  backoutRecord({ ids: ids }).then((response) => {
+    if (response.code == 200) {
+      proxy.$modal.msgSuccess("操作成功");
+      detailList();
+    } else {
+      proxy.$modal.msgError("操作失败");
+    }
+  });
 };
 
 
 
-
+//  一键入库
+function handleOneClickWarehousing() {
+  if (checkStockList.value.length == 0) {
+    proxy.$modal.msgError("请勾选数据");
+    return;
+  }
+  const ids = []
+  for (let i = 0; i < checkStockList.value.length; i++) {
+    if (checkStockList.value[i].execStatus == 0) {
+      ids.push(checkStockList.value[i].id)
+    }
+  }
+  if (ids.length == 0) {
+    proxy.$modal.msgSuccess("勾选数据入库完成");
+    return;
+  }
+  recordFinish({ ids: ids }).then((response) => {
+    if (response.code == 200) {
+      proxy.$modal.msgSuccess("操作成功");
+      detailList();
+    } else {
+      proxy.$modal.msgError("操作失败");
+    }
+  });
+}
 
 // **************************************************************************
 
@@ -2016,7 +1540,7 @@ function delPic(picId) {
       // getList();
       proxy.$modal.msgSuccess("操作成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 //预览图片
 function handlePreview(uploadFile) {
@@ -2157,6 +1681,7 @@ isAudit();
 :deep(.el-table .success-row) {
   background-color: #f8fdf5 !important;
 }
+
 .el-table {
   /* 核心：把 hover 背景色设为和默认行背景色一致 */
   // --el-table-row-hover-bg-color: transparent;
@@ -2169,21 +1694,26 @@ isAudit();
     line-height: 30px;
   }
 }
+
 .topBox {
   /* margin-bottom: 10px; */
   display: flex;
   flex-wrap: wrap;
 }
+
 .bottomBox {
   margin-top: 20px;
 }
+
 .oneLineBox {
   display: flex;
 }
+
 .everyBox {
   /* width: 30%; */
   width: 50%;
 }
+
 .examine {
   margin-top: 20px;
   height: 100px;
@@ -2191,6 +1721,7 @@ isAudit();
   padding: 20px 0 0 20px;
   border-radius: 10px;
 }
+
 /* .dialog_class{
   pointer-events: none;
 }
@@ -2203,12 +1734,15 @@ isAudit();
 ::v-deep .el-modal-dialog {
   z-index: 1;
 }
+
 .picBox {
   display: flex;
 }
+
 .everyPicBox {
   position: relative;
 }
+
 .closeBox {
   position: absolute;
   right: 5px;