初步完成入库和入库列表

src/api/wisdom/bill.js

@@ -0,0 +1,93 @@
+import request from '@/utils/request'
+
+// 查询库存单据列表
+export function listBill(query) {
+  return request({
+    url: '/wisdom/bill/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询库存单据详细
+export function getBill(id) {
+  return request({
+    url: '/wisdom/bill/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存单据
+export function addBill(data) {
+  return request({
+    url: '/wisdom/bill/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存单据
+export function updateBill(data) {
+  return request({
+    url: '/wisdom/bill',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存单据
+export function delBill(id) {
+  return request({
+    url: '/wisdom/bill/' + id,
+    method: 'delete'
+  })
+}
+
+
+
+
+
+
+
+
+// 查询库存单据明细列表
+export function listStock(id) {
+  return request({
+    url: '/wisdom/record/listByBillNo/' + id,
+    method: 'get'
+  })
+}
+
+// 查询库存单据明细详细
+export function getStock(id) {
+  return request({
+    url: '/wisdom/stock/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存单据明细
+export function addStock(data) {
+  return request({
+    url: '/wisdom/stock',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存单据明细
+export function updateStock(data) {
+  return request({
+    url: '/wisdom/stock',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存单据明细
+export function delStock(id) {
+  return request({
+    url: '/wisdom/stock/' + id,
+    method: 'delete'
+  })
+}

src/views/wisdom/bill/index.vue

@@ -32,8 +32,8 @@
             </el-row>
             <el-row >
               <el-col :span="12">
-                <el-form-item label="入库类型" prop="rkType">
+                <el-form-item label="入库类型" prop="operationType">
-                  <el-select v-model="queryParams.rkType" placeholder="请选择入库类型" clearable @keyup.enter="handleQuery">
+                  <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>
@@ -48,13 +48,13 @@
                   />
                 </el-form-item>
               </el-col> -->
-              <el-col :span="10">
+              <!-- <el-col :span="10">
                 <el-form-item label="库存状态" prop="isChuku">
                   <el-select v-model="queryParams.isChuku" placeholder="请选择" clearable @change="changeStore" @keyup.enter="handleQuery">
                       <el-option v-for="dict in storeStatusList" :key="dict.id" :label="dict.statusName" :value="dict.id" />
                   </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               
             </el-row>
           </el-form>
@@ -65,7 +65,7 @@
                 plain
    
                 @click="handleAdd(false)"
-                v-hasPermi="['wisdom:stock:add']"
+                v-hasPermi="['wisdom:bill:add']"
               >新增入库</el-button>
             </el-col>
             <el-col :span="4">
@@ -74,7 +74,7 @@
                 plain
            
                 @click="handleExport"
-                v-hasPermi="['wisdom:stock:export']"
+                v-hasPermi="['wisdom:bill:export']"
               >导出</el-button>
             </el-col>
             <el-col :span="4">
@@ -102,41 +102,35 @@
             <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
           </el-row> 
           <!-- @selection-change="printSelectionChange" -->
-        <el-table v-loading="loading" highlight-current-row  :data="billList"   @row-dblclick="billClick" @current-change="uploadSelectionChange">
+        <el-table v-loading="loading" highlight-current-row  :data="billList" :row-class-name="tableBillRowClassName"  @row-dblclick="billClick" @current-change="uploadSelectionChange">
-          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <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" />
-            <template #default="scope">
-              <span>{{ billFun(scope.row)  }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="库存状态" align="center" >
             <template #default="scope">
-              <dict-tag :options="dictTagData()" :value="scope.row.isChuku" />
+              <dict-tag :options="dictTagData()" :value="scope.row.bizType" />
             </template>
           </el-table-column>
-          <el-table-column label="理货员" align="center"  width="100" >
+          <el-table-column label="理货员" align="center" prop="operatorName" width="100" />
-            <template #default="scope">
+          <el-table-column label="入库类型" align="center" prop="operationTypeName" width="120"/>
-              <span>{{ lhyFun(scope.row)  }}</span>
+          <el-table-column label="所属大库" align="center" prop="parentWarehouseName" width="120"/>
-            </template>
+          <el-table-column label="所属小库" align="center" prop="warehouseName" width="120"/>
-          </el-table-column>
+          <el-table-column label="物资类型" align="center" prop="wlTypeName" width="100">
-          <el-table-column label="入库类型" align="center" prop="rkTypeName" width="120"/>
-          <el-table-column label="物资类型" align="center" prop="wlType" width="100">
             <template #default="scope">
               <span>{{ wzTypeFun(scope.row.wlType)  }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="出/入库时间" align="center" prop="rkTime" width="170">
+          <el-table-column label="入库时间" align="center" prop="operationTime" width="170">
             <template #default="scope">
-              <span>{{ parseTime(scope.row.rkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+              <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="施工队" align="center" prop="teamName" width="160" />
+          <!-- <el-table-column label="施工队" align="center" prop="teamName" width="160" /> -->
           <el-table-column label="操作" align="center"  width="280">
             <template #default="scope">
               <el-button link type="primary"  @click="picDetailFun(scope.row.billNo,0,1)">入库图片</el-button>
               <el-button link type="primary"  @click="picDetailFun(scope.row.billNoCk,1,1)">出库图片</el-button>
-              <el-button link type="primary" v-show="scope.row.isChuku == 0 || scope.row.isChuku == 5"  @click="billClick(scope.row, 'bill', 'rk')">入库单</el-button>
+              <el-button link type="primary" @click="billClick(scope.row, 'bill', 'rk')">入库单</el-button>
-              <el-button link type="primary" v-show="scope.row.isChuku == 1 || scope.row.isChuku == 3"  @click="billClick(scope.row, 'bill', 'ck')">出库单</el-button>
+              <!-- <el-button link type="primary" v-show="scope.row.isChuku == 1 || scope.row.isChuku == 3"  @click="billClick(scope.row, 'bill', 'ck')">出库单</el-button> -->
             </template>
           </el-table-column>
           <!-- <el-table-column label="所属仓库" align="center" prop="cangkuName" /> -->
@@ -174,7 +168,7 @@
                 icon="Printer"
                 @click="handlePrint"
                 v-print="printViewInfo"
-                v-hasPermi="['wisdom:stock:print']"
+                v-hasPermi="['wisdom:bill:print']"
               >打印单据</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -198,7 +192,7 @@
                 plain
                 icon="Switch"
                 @click="handleSwitch"
-                v-hasPermi="['wisdom:stock:move']"
+                v-hasPermi="['wisdom:bill:move']"
               >移库</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -222,11 +216,11 @@
         <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" width="100">
+          <!-- <el-table-column label="库存状态" align="center" width="100">
             <template #default="scope">
               <dict-tag :options="dictTagData()" :value="scope.row.isChuku" />
             </template>
-          </el-table-column>
+          </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"/>
@@ -244,22 +238,22 @@
           <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="rkTypeName" width="150"/>
+          <!-- <el-table-column label="入库类型" align="center" prop="rkTypeName" width="150"/> -->
-          <el-table-column label="物资类型" align="center" prop="wlTypeName" width="100"/>
+          <!-- <el-table-column label="物资类型" align="center" prop="wlTypeName" width="100"/> -->
           <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="rkTime" width="200">
+          <!-- <el-table-column label="入库时间" align="center" prop="rkTime" width="200">
             <template #default="scope">
               <span>{{ parseTime(scope.row.rkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
-          <el-table-column label="还料时间" align="center" prop="returnTime" width="200">
+          <!-- <el-table-column label="还料时间" align="center" prop="returnTime" width="200">
             <template #default="scope">
               <span>{{ parseTime(scope.row.returnTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="库龄" align="center" prop="stockAge" />
-          <el-table-column label="理货员" align="center" prop="lihuoYName" />
+          <!-- <el-table-column label="理货员" align="center" prop="lihuoYName" /> -->
           <el-table-column label="现场图片" align="center"  v-if="isExamine==1">
             <template #default="scope">
               <el-image  :src="scope.row.scenePhotoUrl" style="width:50px;height: 50px;" 
@@ -276,28 +270,20 @@
           <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"/>
-          <!-- fixed="right" -->
           <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:stock:edit']" v-show="scope.row.isChuku!=1 && scope.row.isChuku!=3">修改</el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wisdom:bill:edit']" v-show="scope.row.isChuku!=1 && scope.row.isChuku!=3">修改</el-button>
-              <el-button
+              <!-- <el-button
               link
               type="primary"
               icon="Delete"
               @click="handleStockDelete(scope.row)"
-              v-hasPermi="['wisdom:stock:delete']"
+              v-hasPermi="['wisdom:bill:delete']"
               v-show="scope.row.isChuku==0|| scope.row.isChuku==1"
-            >撤销</el-button>
+            >撤销</el-button> -->
             </template>
           </el-table-column>
         </el-table>
-        <!-- <pagination
-          v-show="detailTotal>0"
-          :total="detailTotal"
-          v-model:page="detailQueryParams.pageNum"
-          v-model:limit="detailQueryParams.pageSize"
-          @pagination="getDetailList"
-        /> -->
       </el-splitter-panel>
     </el-splitter>
 
@@ -313,7 +299,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="入库类型" >
-              <el-select v-model="billData.rkType" placeholder="请选择入库类型" clearable >
+              <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>
@@ -354,7 +340,7 @@
     <!-- append-to-body -->
     <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">
+        <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" />
@@ -364,10 +350,10 @@
             <el-button type="primary" @click="searchPlan" :disabled="idEdit!=0" >从供应计划中添加</el-button>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" v-if="idEdit==0">
           <el-col :span="6">
-            <el-form-item label="入库类型" prop="rkType">
+            <el-form-item label="入库类型" prop="operationType">
-              <el-select v-model="storeData.rkType" placeholder="请选择入库类型" clearable >
+              <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>
@@ -395,19 +381,28 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" v-if="idEdit==0">
           <el-col :span="6">
             <el-form-item label="入库时间" prop="rkTime">
               <!-- type="date" -->
               <el-date-picker
                 v-model="storeData.rkTime"
+                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="12">
+          <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="扩展描述" >
               <el-input v-model="kzms" placeholder="请输入扩展描述" :disabled="idEdit!=0" />
             </el-form-item>
@@ -459,6 +454,7 @@
             <template #default="scope" >
               <el-select
                 v-model="scope.row.pcode"
+                :disabled="idEdit!=0"
                 clearable
                 filterable
                 placeholder="请选择库位"
@@ -466,6 +462,7 @@
                 <el-option
                   v-for="item in kwOptions"
                   :key="item.id"
+                   
                   :label="item.pcode"
                   :value="item.pcode"
                 />
@@ -743,9 +740,10 @@
   </div>
 </template>
 
-<script setup name="Stock">
+<script setup name="Bill">
 // wisdomDelStock
-import {uploadContract, listBill,listStock, getStock, delStock, addStock, updateStock, getPlan,moveHouse, getAudit,wisdomDelStock,ckDelStock,wlSearch,picDetail,printTag,delPicF,editBill,addOneStock,getEditInfo} from "@/api/wisdom/stock";
+import { listBill, addBill, listStock } from "@/api/wisdom/bill";
+import {uploadContract, getStock, delStock, addStock, updateStock, getPlan,moveHouse, getAudit,wisdomDelStock,ckDelStock,wlSearch,picDetail,printTag,delPicF,editBill,addOneStock,getEditInfo} from "@/api/wisdom/stock";
 import {generateDispatch} from "@/api/wisdom/outbound";
 import { getToken } from "@/utils/auth";
 import {warehousingDict} from "@/api/information/warehousingtype";  //入库类型
@@ -763,26 +761,19 @@ const headers = ref({
 });
 const { proxy } = getCurrentInstance();
 
-const billList = ref([]);   //单据列表
 const stockList = ref([]);  //明细列表
 const open = ref(false);
 const openSwitch = ref(false);  //移库
-const loading = ref(true);
 const detailLoading = ref(false);  //加载列表详情
 const showSearch = ref(true);
 const idEdit = ref(0);
 const single = ref(true);
 const multiple = ref(true);
-const total = ref(0);       //单据
-const detailTotal = ref(0); //明细
 const title = ref("");
 const planLoading = ref(true);
 const planList = ref([]); //从供应计划中添加列表
 const checkPlanList = ref([]);  //已选中的要入库的数据
-const storeTypeList = ref([]);  //入库类型下拉数据
+
-const wzTypeList = ref([]);   //物资类型下拉数据
-const warehouseList = ref([]);  //所属仓库下拉数据
-const personList = ref([]);   //理货员下拉数据
 const orderNum = ref("")    //搜索条件：订单号
 const kwOptions = ref([]);  //库位下拉
 const showContent = ref(false); // 控制打印内容是否显示
@@ -801,7 +792,6 @@ const printNumList = ref([
 const printNum = ref(0)     //打印机编号
 const moveReason = ref("")  //移库原因
 const rkTime = ref([])
-const isExamine = ref(0) //是否需要开启审核 1开启；0不开启
 const actionUrl = import.meta.env.VITE_APP_BASE_API+"/wisdom/signature/upload"
 // const actionUrla = import.meta.env.VITE_APP_BASE_API+"/photo/upload/batch"
 const dialogImageUrl = ref('')
@@ -835,31 +825,18 @@ const dispatchOpen = ref(false) //调度任务弹窗
 const data = reactive({
   fileList:[],
   form: {},
-  storeData:{},   //入库数据
+  storeData:{
+    rkTime: ''
+  },   //入库数据
   switchData:[],  //移库数据
   queryParams: {
     keyword:"",
     pageNum: 1,
     pageSize: 10,
-    // billNo:null,  //入库单据号
-    // billNoCk:null,  //出库单据号
-    isChuku:null,
-    isChukuList:[0,1,3],
-    // rkTime: [],
     startTime:null,
     endTime:null,
-    xmNo: null,
+    operationType:"",
-    sapNo: null,
-    xmMs:"",
-    wlNo:"",
-    gysNo:"",
-    pcode:"",
-    rkType:"",
-    gysMc:"",
     wlType:"",  //物资类型
-    cangku:"",
-    wlMs:"",
-    ids:[]
   },
   detailQueryParams:{
     pageNum: 1,
@@ -868,10 +845,11 @@ const data = reactive({
     billNoCk:null
   },
   rules: {
-    rkType: [{ required: true, message: "入库类型不能为空", trigger: "change" }],
+    operationType: [{ required: true, message: "入库类型不能为空", trigger: "change" }],
     wlType: [{ required: true, message: "物资类型不能为空", trigger: "change" }],
     warehouseCode: [{ required: true, type:"array", message: "所属仓库不能为空", trigger: "change" }],
     lihuoY: [{ required: true, message: "理货员不能为空", trigger: "change" }],
+    execStatus: [{ required: true, message: "是否预入库不能为空", trigger: "change" }],
     rkTime: [{ required: true, message: "入库时间不能为空", trigger: "change" }]
   },
   switchRules:{
@@ -895,15 +873,95 @@ const data = reactive({
 
 const { fileList,queryParams,detailQueryParams, storeData, rules,form,printViewInfo,switchData,switchRules } = toRefs(data);
 
+const warehouseList = ref([]);  //所属仓库下拉数据
+//所属仓库
+function warehouseFun(){
+  //所属仓库下拉数据
+  warehouseAll().then(response=>{
+    warehouseList.value = response.data
+  })
+}
+//所属仓库
+warehouseFun()
+
+const wzTypeList = ref([]);   //物资类型下拉数据
+//物资类型
+function materialFun(){
+  //获取物资类型下拉数据
+  materialtypeDict().then(response=>{
+    wzTypeList.value = response.data
+  })
+}
+//物资类型
+materialFun()
+
+const storeTypeList = ref([]);  //入库类型下拉数据
+function rklxList(){
+  //获取入库类型下拉数据
+  warehousingDict().then(response=>{
+    storeTypeList.value = response.data
+  })
+}
+//入库类型下拉数据
+rklxList()
+
+const personList = ref([]);   //理货员下拉数据
+function lhyList(){
+  //理货员下拉数据
+  personListDict().then(response=>{
+    personList.value = response.data
+  })
+}
+//理货员下拉数据
+lhyList()
+
+// 是否预入库
+const execStatusList = ref([
+  {id:0, name:"是"},
+  {id:1, name:"否"}
+])
+
+const loading = ref(true);
+const billList = ref([{execStatus:0}]);   //单据列表
+const total = ref(0);       //单据
+/** 查询库存单据主列表 */
+function getList() {
+  loading.value = true;
+  listBill(queryParams.value).then(response => {
+    billList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+//数据列表
+getList();
+
+// 显示预出库的状态
+const tableBillRowClassName = ({ row, rowIndex }) => {
+  if (rowIndex == 0) {
+    return 'success-row'
+  }
+  return ''
+}
+
+// 左侧显示库存状态
+const bizTypeList = ref([
+  { value: 0, label: '已入库', elTagType: "success", elTagClass: null },
+  { value: 1, label: '已出库', elTagType: "warning", elTagClass: null },
+  { value: 2, label: '借料出库', elTagType: "danger", elTagClass: null },
+  { value: 3, label: '还料入库', elTagType: "primary", elTagClass: null },
+])
+const dictTagData = () => {
+  return bizTypeList.value.map(item => ({
+    ...item,
+    value: String(item.value)
+  }));
+}
+
+
+
 
-// function handleChange(file,filename){
-//   // console.log(333)
-//   // console.log(file.raw)
-//   // console.log(filename.raw)
-//   fileList.value.push(file)
-// }
 function handleDispatch(){
-
   if(dispatchList.value.length==0){
     proxy.$modal.msgError("请勾选数据");
     return
@@ -1034,53 +1092,19 @@ function picDetailFun(billId,type,isOpen){
   
 }
 
+const billNo = ref('')
 //双击单据，查询明细
 function billClick(row, type, status){
-  billStatus.value = status
   if (type != 'bill') {
     detailLoading.value = true;
   }
-  // console.log(row)
+  billNo.value = row.billNo
-  if(row.billNo){
+  detailList();
-    if(row.isChuku==0 || row.isChuku==5){
-      detailQueryParams.value.billNo = row.billNo
-      detailQueryParams.value.billNoCk = null
-      billStatus.value = "rk"
-    }else{
-      detailQueryParams.value.billNoCk = row.billNoCk
-      detailQueryParams.value.billNo = null
-      billStatus.value = "ck"
-    }
-    
-      // listStock(detailQueryParams.value).then(response => {
-      //   stockList.value = response.rows;
-      //   detailTotal.value = response.total;
-      //   detailLoading.value = false;
-      // });
-      detailList(type)
-  }
-  
 }
 //查询明细列表数据方法
-function detailList(type){
+function detailList(){
-  detailQueryParams.value.isChukuList = billStatus.value == 'rk' ? [0, 1, 3, 5] : [1, 3]
+  listStock(billNo.value).then(response => {
-  listStock(detailQueryParams.value).then(response => {
+    stockList.value = response.data;
-    if (type == 'bill') {
-      // const response = {
-      //   rows: [
-      //     { id: 1, isChuku: 0, name: "货物A" },
-      //     { id: 2, isChuku: 1, name: "货物B" },
-      //     { id: 3, isChuku: 2, name: "货物C" },
-      //     { id: 4, isChuku: 5, name: "货物D" },
-      //     { id: 5, isChuku: 3, name: "货物E" }
-      //   ]
-      // };
-      billAllObj.value = response.rows.filter(item=>item.isChuku == 0 || item.isChuku == 2 || item.isChuku == 5 || item.isChuku == 1 || item.isChuku == 3)
-      dialogBill.value = true
-      return
-    }
-    stockList.value = response.rows;
-    detailTotal.value = response.total;
     detailLoading.value = false;
   });
 }
@@ -1280,16 +1304,7 @@ function tableRowClassName({row, rowIndex}) {
     // }
 	return '';
 }
-/** 查询库存单据主列表 */
+
-function getList() {
-  loading.value = true;
-  listBill(queryParams.value).then(response => {
-    billList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
-  
-}
 function getDetailList(){
   
       listStock(detailQueryParams.value).then(response => {
@@ -1298,15 +1313,7 @@ function getDetailList(){
         detailLoading.value = false;
       });
 }
-//判断是否需要开启审核功能
+
-function isAudit(){
-  // {configKey:"stock.audit.enabled"}
-  getAudit().then(response=>{
-    // console.log(2222222)
-    // console.log(response.msg)
-    isExamine.value = response.msg
-  })
-}
 //库位字典
 function pcodeList(value){
   console.log(value)
@@ -1314,20 +1321,9 @@ function pcodeList(value){
     kwOptions.value = response.data
   })
 }
-//所属仓库
+
-function warehouseFun(){
+
-  //所属仓库下拉数据
+
-  warehouseAll().then(response=>{
-    warehouseList.value = response.data
-  })
-}
-//物资类型
-function materialFun(){
-  //获取物资类型下拉数据
-  materialtypeDict().then(response=>{
-    wzTypeList.value = response.data
-  })
-}
 
 // 取消按钮
 function cancel() {
@@ -1418,7 +1414,7 @@ function printSelectionChange(selection){
 }
 //修改主单据
 function editData(){
-  if(billData.value && billData.value.isChuku == 0){
+  // if(billData.value && billData.value.isChuku == 0){
     //查询修改信息
     // console.log(billData.value)
     getEditInfo(billData.value.billNo).then(response=>{
@@ -1427,10 +1423,10 @@ function editData(){
       // console.log(billData.value)
       openBill.value = true
     })
-  }else{
+  // }else{
-    proxy.$modal.msgWarning("仅支持修改入库单据");
+  //   proxy.$modal.msgWarning("仅支持修改入库单据");
-      return
+  //     return
-  }
+  // }
   
 
 }
@@ -1455,7 +1451,7 @@ function addOne(){
   handleAdd(true)
   
   if(stockList.value.length>0){
-    storeData.value.rkType = stockList.value[0].rkType
+    storeData.value.operationType = stockList.value[0].operationType
     storeData.value.wlType = stockList.value[0].wlType
     // storeData.value.cangku = stockList.value[0].cangku
     storeData.value.lihuoY =  Number(stockList.value[0].lihuoY)
@@ -1481,38 +1477,19 @@ function handleAdd(single) {
     personList.value = response.data
   })
 }
-function lhyList(){
+
-  //理货员下拉数据
+
-  personListDict().then(response=>{
+
-    personList.value = response.data
+
-  })
+
-}
+// 新增入库的列表状态
-function rklxList(){
-  //获取入库类型下拉数据
-  warehousingDict().then(response=>{
-    storeTypeList.value = response.data
-  })
-}
-function handleEnter(e){
-  console.log(e)
-}
-const isChukuList = ref([
-  { value: 0, label: '已入库', elTagType: "success", elTagClass: null },
-  { value: 1, label: '已出库', elTagType: "warning", elTagClass: null },
-  { value: 3, label: '借料出库', elTagType: "danger", elTagClass: null },
-  { value: 5, label: '出库撤销', elTagType: "primary", elTagClass: null },
-])
-const dictTagData = () => {
-  return isChukuList.value.map(item => ({
-    ...item,
-    value: String(item.value)
-  }));
-}
 const statusList = ref([
   { value: 0, label: "未到货"},
   { value: 1, label: "已入库"},
   { value: 2, label: "部分入库"}
 ])
+
+
 //从供应计划中添加 搜索
 function searchPlan(){
   if(!orderNum.value){
@@ -1572,7 +1549,7 @@ function handleUpdate(row) {
   getStock(row.id).then(response => {
     let dataInfo = response.data
     dataInfo.isnew = true
-    storeData.value.rkType = dataInfo.rkType
+    storeData.value.operationType = dataInfo.operationType
     storeData.value.wlType = dataInfo.wlType
     storeData.value.rkTime = dataInfo.rkTime
     storeData.value.warehouseCode = [dataInfo.parentWarehouseCode ,dataInfo.warehouseCode]
@@ -1651,7 +1628,7 @@ function submitForm() {
       //   return
       // }
       //发现场入库类型可以不用选库位
-      if(storeData.value.rkType!="RK025" && iscfwz){
+      if(storeData.value.operationType!="RK025" && iscfwz){
         proxy.$modal.msgError("请选择库位");
         return
       }
@@ -1665,17 +1642,22 @@ function submitForm() {
       
       // console.log(submitData)
       // return
+      checkPlanList.value.forEach(item=>{
+        item.bizType = 0
+      })
       let arr = JSON.parse(JSON.stringify(checkPlanList.value[0]))
       delete arr.warehouseCode
       // console.log(arr)
       if(idEdit.value!=0){  //修改
         let submitData = {
-          warehouseCode:storeData.value.warehouseCode[storeData.value.warehouseCode.length-1],    //所属仓库
+          cangku:storeData.value.warehouseCode[storeData.value.warehouseCode.length-1],    //所属仓库
-          lihuoY:storeData.value.lihuoY,    //理货员
+          operator:storeData.value.lihuoY,    //理货员
-          rkType:storeData.value.rkType,    //入库类型
+          operationType:storeData.value.operationType,    //入库类型
           wlType:storeData.value.wlType,    //物资类型
           approverId:storeData.value.approverId,  //审批人
-          rkTime:storeData.value.rkTime,    //入库时间
+          operationTime:storeData.value.rkTime,    //入库时间
+          execStatus:storeData.value.execStatus,    //是否预入库
+          bizType: 0,
           id:idEdit.value,
           // rkList:planList.value
           ...arr
@@ -1689,16 +1671,20 @@ function submitForm() {
       }else{  //新增
         console.log(storeData.value)
         let submitData = {
-          warehouseCode:storeData.value.warehouseCode[storeData.value.warehouseCode.length-1],    //所属仓库
+          rkBill: {
-          lihuoY:storeData.value.lihuoY,    //理货员
+            cangku:storeData.value.warehouseCode[storeData.value.warehouseCode.length-1],    //所属仓库
-          rkType:storeData.value.rkType,    //入库类型
+            operator:storeData.value.lihuoY,    //理货员
-          wlType:storeData.value.wlType,    //物资类型
+            operationType:storeData.value.operationType,    //入库类型
-          approverId:storeData.value.approverId,  //审批人
+            wlType:storeData.value.wlType,    //物资类型
-          rkTime:storeData.value.rkTime,    //入库时间
+            approverId:storeData.value.approverId,  //审批人
-          id:idEdit.value,
+            operationTime:storeData.value.rkTime,    //入库时间
-          billNo:storeData.value.billNo && isSingle.value ? storeData.value.billNo : null,
+            execStatus:storeData.value.execStatus,    //是否预入库
+            id:idEdit.value,
+            bizType: 0,
+            billNo:storeData.value.billNo && isSingle.value ? storeData.value.billNo : null,
+          },
           // rkList:planList.value
-          rkList:checkPlanList.value
+          rkInfoList:checkPlanList.value
         }
         console.log(submitData)
         // return
@@ -1709,7 +1695,7 @@ function submitForm() {
               detailList()
           });
         }else{  //多条添加
-            addStock(submitData).then(response => {
+          addBill(submitData).then(response => {
               proxy.$modal.msgSuccess("新增成功");
               open.value = false;
               getList();
@@ -1964,20 +1950,19 @@ function handlePrintTag(){
     }
   })
 }
-//数据列表
+
-getList();
+const isExamine = ref(0) //是否需要开启审核 1开启；0不开启
-//库位下拉数据
+//判断是否需要开启审核功能
-// pcodeList()
+function isAudit(){
-//所属仓库
+  // {configKey:"stock.audit.enabled"}
-warehouseFun()
+  getAudit().then(response=>{
-//物资类型
+    // console.log(2222222)
-materialFun()
+    // console.log(response.msg)
+    isExamine.value = response.msg
+  })
+}
 //是否开启审核
 isAudit()
-//入库类型下拉数据
-rklxList()
-//理货员下拉数据
-lhyList()
 
 
 
@@ -1986,12 +1971,20 @@ const billAllObj = ref([])
 const billStatus = ref('')
 
 </script>
-<style scoped lang="scss">
+<style>
 .el-table .warning-row {
-  --el-table-tr-bg-color: var(--el-color-warning-light-9);
+  --el-table-tr-background-color: var(--el-color-warning-lighter) !important;
 }
 .el-table .success-row {
-  --el-table-tr-bg-color: var(--el-color-success-light-9);
+  --el-table-tr-background-color: var(--el-color-success-lighter) !important;
+}
+</style>
+<style scoped lang="scss">
+:deep(.el-table .warning-row) {
+  background-color: var(--el-color-warning-lighter) !important;
+}
+:deep(.el-table .success-row) {
+  background-color: var(--el-color-success-lighter) !important;
 }
 .titleBox{
   text-align: center;