供应计划页面修改

src/api/wisdom/bill.js

@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 
 // 查询库存单据列表
-export function listBill(query) {
+export function listBill(data) {
   return request({
     url: '/wisdom/bill/list',
-    method: 'get',
+    method: 'POST',
-    params: query
+    data: data
   })
 }
 
@@ -70,6 +70,14 @@ export function backoutRecord(data) {
     data: data
   })
 }
+// 一键入库
+export function recordFinish(data) {
+  return request({
+    url: '/wisdom/record/finish',
+    method: 'post',
+    data: data
+  })
+}
 
 
 

src/api/wisdom/stock.js

@@ -12,8 +12,8 @@ export function listBill(data) {
 export function listStock(data) {
   return request({
     url: '/wisdom/stock/list',
-    method: 'post',
+    method: 'get',
-    data: data
+    params: data
   })
 }
 

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" />

src/views/plan/jh/index.vue

@@ -530,6 +530,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
+  importTime.value=''
   handleQuery();
 }
 

src/views/wisdom/record/index.vue

@@ -4,32 +4,17 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="项目号" prop="xmNo">
-			  <el-input
+            <el-input v-model="queryParams.xmNo" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.xmNo"
-				placeholder="请输入项目号"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="订单编号" prop="sapNo">
-			  <el-input
+            <el-input v-model="queryParams.sapNo" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.sapNo"
-				placeholder="请输入订单编号"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="单据号" prop="billNo">
-			  <el-input
+            <el-input v-model="queryParams.billNo" placeholder="请输入单据号" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.billNo"
-				placeholder="请输入单据号"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -43,38 +28,24 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="物料号" prop="wlNo">
-			  <el-input
+            <el-input v-model="queryParams.wlNo" placeholder="请输入物料号" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.wlNo"
-				placeholder="请输入物料号"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="项目描述" prop="xmMs">
-			  <el-input
+            <el-input v-model="queryParams.xmMs" placeholder="请输入项目描述" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.xmMs"
-				placeholder="请输入项目描述"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="存放位置" prop="pcode">
-			  <el-input
+            <el-input v-model="queryParams.pcode" placeholder="请输入存放位置" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.pcode"
-				placeholder="请输入存放位置"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
 
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="入库类型" prop="operationTypeRK">
-			  <el-select v-model="operationTypeRK" placeholder="请选择入库类型" clearable  @change="changeOperationType($event,'operationTypeRK')" >
+            <el-select v-model="operationTypeRK" placeholder="请选择入库类型" clearable
+              @change="changeOperationType($event, 'operationTypeRK')">
               <el-option v-for="dict in storeTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
             </el-select>
           </el-form-item>
@@ -83,38 +54,24 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="所属仓库" prop="warehouseCode">
-			  <el-cascader
+            <el-cascader v-model="warehouseCode" :options="warehouseOptions" placeholder="请选择所属仓库" style="width: 100%;"
-      			v-model="warehouseCode"
+              :props="{ children: 'children', label: 'warehouseName', value: 'warehouseCode' }" />
-      			:options="warehouseOptions"
-				placeholder="请选择所属仓库"
-				style="width: 100%;"
-      			:props="{children: 'children', label: 'warehouseName', value: 'warehouseCode'}"
-    		/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="物料描述" prop="wlMs">
-			  <el-input
+            <el-input v-model="queryParams.wlMs" placeholder="请输入物料描述" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.wlMs"
-				placeholder="请输入物料描述"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="供应商名称" prop="gysMc">
-			  <el-input
+            <el-input v-model="queryParams.gysMc" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
-				v-model="queryParams.gysMc"
-				placeholder="请输入供应商名称"
-				clearable
-				@keyup.enter="handleQuery"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="出库类型" prop="operationTypeCK">
-			  <el-select v-model="operationTypeCK" placeholder="请选择出库类型" @change="changeOperationType($event,'operationTypeCK')" clearable >
+            <el-select v-model="operationTypeCK" placeholder="请选择出库类型"
+              @change="changeOperationType($event, 'operationTypeCK')" clearable>
               <el-option v-for="dict in ckTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
             </el-select>
           </el-form-item>
@@ -123,15 +80,9 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-			<el-form-item label="操作时间" prop="rkTime">
+          <el-form-item label="操作时间" prop="optionTime">
-			  <el-date-picker
+            <el-date-picker v-model="optionTime" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间"
-				v-model="optionTime"
+              format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
-				type="datetimerange"
-				start-placeholder="开始时间"
-				end-placeholder="结束时间"
-				format="YYYY/MM/DD HH:mm:ss"
-				value-format="YYYY-MM-DD HH:mm:ss"
-			  />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="searchBtn">
@@ -144,18 +95,13 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-		  <el-button
+        <el-button type="primary" plain icon="Download" @click="handleExport"
-			type="primary"
+          v-hasPermi="['wisdom:stock:export']">导出</el-button>
-			plain
-			icon="Download"
-			@click="handleExport"
-			v-hasPermi="['wisdom:stock:export']"
-		  >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-	<el-table v-loading="loading"  :data="stockList" show-overflow-tooltip border >
+    <el-table v-loading="loading" :data="stockList" show-overflow-tooltip border :row-class-name="tableBillRowClassName">
       <el-table-column label="序号" align="center" type="index" width="70" />
       <el-table-column label="操作类型" align="center" prop="bizType" width="100">
         <template #default="scope">
@@ -179,13 +125,8 @@
       <el-table-column label="操作时间" align="center" prop="operationTime" width="200" />
     </el-table>
 
-	  <pagination
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-		v-show="total>0"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
-		:total="total"
-		v-model:page="queryParams.pageNum"
-		v-model:limit="queryParams.pageSize"
-		@pagination="getList" 
-	   />
 
     <!-- 图片预览 -->
     <el-dialog v-model="dialogVisible">
@@ -246,8 +187,6 @@
     cangku: "",
     wlMs: "",
     ids: [],
-	  parentWarehouseCode:"",
-	  warehouseCode:"",
   },
 });
 
@@ -328,6 +267,7 @@
 //搜索按钮操作 
 function handleQuery() {
   //所属仓库
+  console.log(warehouseCode.value, optionTime, '====');
   if (warehouseCode.value) {
     queryParams.value.cangku = warehouseCode.value[1]
   }
@@ -354,8 +294,6 @@
   operationTypeCK.value = ''
   operationTypeRK.value = ''
   warehouseCode.value = ''
-	queryParams.value.parentWarehouseCode = null
-	queryParams.value.warehouseCode = null
   queryParams.value.operationType = ''
   queryParams.value.cangku = ''
   handleQuery();
@@ -370,6 +308,15 @@
 //出、入库类型下拉数据
 rklxList()
 
+// 显示预出库的状态
+const tableBillRowClassName = ({ row, rowIndex }) => {
+  console.log('row===>',row);
+  
+  if (row.execStatus == 0) {
+    return 'success-row'
+  }
+  return ''
+}
 
 const dictTagData = () => {
   return isChukuList.value.map(item => ({
@@ -380,9 +327,18 @@ const dictTagData = () => {
 </script>
 
 <style scoped>
+:deep(.el-table .success-row) {
+  background-color: #f8fdf5 !important;
+}
+.el-table {
+  /* 核心：把 hover 背景色设为和默认行背景色一致 */
+  --el-table-row-hover-bg-color: transparent; 
+  /* 或设为和表格背景色相同（比如白色），更通用 */
+  /* --el-table-row-hover-bg-color: #ffffff; */
+}
+
 .searchBtn {
   display: flex;
   justify-content: flex-end;
 }
 </style>
-