From 1d3ca63f270569ed4dafa275d46ab9de42a01766 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Wed, 2 Jul 2025 14:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E6=A3=80=E6=8A=A5=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=81=E6=8A=A5=E6=A3=80=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/odsRawOrderInBJ/index.vue | 130 +++++++++---------------
 1 file changed, 48 insertions(+), 82 deletions(-)

diff --git a/src/views/wms/odsRawOrderInBJ/index.vue b/src/views/wms/odsRawOrderInBJ/index.vue
index 0127257..57aaefe 100644
--- a/src/views/wms/odsRawOrderInBJ/index.vue
+++ b/src/views/wms/odsRawOrderInBJ/index.vue
@@ -1,5 +1,6 @@
 <template>
 	<div class="app-container">
+    <div ref="pageHeaderRef">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="送货单号" prop="userDefined5">
         <el-input
@@ -45,92 +46,42 @@
 <!--				/>-->
 <!--			</el-form-item>-->
 
-			<el-form-item>
+      <el-form-item label="报检日期" prop="checkTimeArray">
+        <el-date-picker
+          v-model="queryParams.checkTimeArray"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+
+
+      <el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 			</el-form-item>
 		</el-form>
 
-<!--		<el-row :gutter="10" class="mb8">-->
-<!--&lt;!&ndash;			<el-col :span="1.5">&ndash;&gt;-->
-<!--&lt;!&ndash;				<el-button&ndash;&gt;-->
-<!--&lt;!&ndash;					type="primary"&ndash;&gt;-->
-<!--&lt;!&ndash;					plain&ndash;&gt;-->
-<!--&lt;!&ndash;					icon="el-icon-plus"&ndash;&gt;-->
-<!--&lt;!&ndash;					size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;					@click="handleAdd"&ndash;&gt;-->
-<!--&lt;!&ndash;					v-hasPermi="['wms:odsRawOrderIn:add']"&ndash;&gt;-->
-<!--&lt;!&ndash;				>新增</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;			</el-col>&ndash;&gt;-->
-<!--&lt;!&ndash;			<el-col :span="1.5">&ndash;&gt;-->
-<!--&lt;!&ndash;				<el-button&ndash;&gt;-->
-<!--&lt;!&ndash;					type="success"&ndash;&gt;-->
-<!--&lt;!&ndash;					plain&ndash;&gt;-->
-<!--&lt;!&ndash;					icon="el-icon-edit"&ndash;&gt;-->
-<!--&lt;!&ndash;					size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;					:disabled="single"&ndash;&gt;-->
-<!--&lt;!&ndash;					@click="handleUpdateSAP"&ndash;&gt;-->
-<!--&lt;!&ndash;					v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
-<!--&lt;!&ndash;				>105过账</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;			</el-col>&ndash;&gt;-->
-<!--&lt;!&ndash;      <el-col :span="1.5">&ndash;&gt;-->
-<!--&lt;!&ndash;        <el-button&ndash;&gt;-->
-<!--&lt;!&ndash;          type="success"&ndash;&gt;-->
-<!--&lt;!&ndash;          plain&ndash;&gt;-->
-<!--&lt;!&ndash;          icon="el-icon-edit"&ndash;&gt;-->
-<!--&lt;!&ndash;          size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;          :disabled="single"&ndash;&gt;-->
-<!--&lt;!&ndash;          @click="handleUpdateSAP103"&ndash;&gt;-->
-<!--&lt;!&ndash;          v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
-<!--&lt;!&ndash;        >104冲销</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;      </el-col>&ndash;&gt;-->
-<!--&lt;!&ndash;      <el-col :span="1.5">&ndash;&gt;-->
-<!--&lt;!&ndash;        <el-button&ndash;&gt;-->
-<!--&lt;!&ndash;          type="success"&ndash;&gt;-->
-<!--&lt;!&ndash;          plain&ndash;&gt;-->
-<!--&lt;!&ndash;          icon="el-icon-edit"&ndash;&gt;-->
-<!--&lt;!&ndash;          size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;          :disabled="single"&ndash;&gt;-->
-<!--&lt;!&ndash;          @click="handleUpdateSAP105"&ndash;&gt;-->
-<!--&lt;!&ndash;          v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
-<!--&lt;!&ndash;        >106冲销</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;      </el-col>&ndash;&gt;-->
-<!--&lt;!&ndash;			<el-col :span="1.5">&ndash;&gt;-->
-<!--&lt;!&ndash;				<el-button&ndash;&gt;-->
-<!--&lt;!&ndash;					type="danger"&ndash;&gt;-->
-<!--&lt;!&ndash;					plain&ndash;&gt;-->
-<!--&lt;!&ndash;					icon="el-icon-delete"&ndash;&gt;-->
-<!--&lt;!&ndash;					size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;					:disabled="multiple"&ndash;&gt;-->
-<!--&lt;!&ndash;					@click="handleDelete"&ndash;&gt;-->
-<!--&lt;!&ndash;					v-hasPermi="['wms:odsRawOrderIn:remove']"&ndash;&gt;-->
-<!--&lt;!&ndash;				>删除</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;			</el-col>&ndash;&gt;-->
-<!--&lt;!&ndash;     <el-col :span="1.5">&ndash;&gt;-->
-<!--&lt;!&ndash;        <el-button&ndash;&gt;-->
-<!--&lt;!&ndash;          type="success"&ndash;&gt;-->
-<!--&lt;!&ndash;          plain&ndash;&gt;-->
-<!--&lt;!&ndash;          icon="el-icon-edit"&ndash;&gt;-->
-<!--&lt;!&ndash;          size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;          :disabled="single"&ndash;&gt;-->
-<!--&lt;!&ndash;          @click="handleUpdate"&ndash;&gt;-->
-<!--&lt;!&ndash;          v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
-<!--&lt;!&ndash;        >修改</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;      </el-col>&ndash;&gt;-->
-<!--&lt;!&ndash;			<el-col :span="1.5">&ndash;&gt;-->
-<!--&lt;!&ndash;				<el-button&ndash;&gt;-->
-<!--&lt;!&ndash;					type="warning"&ndash;&gt;-->
-<!--&lt;!&ndash;					plain&ndash;&gt;-->
-<!--&lt;!&ndash;					icon="el-icon-download"&ndash;&gt;-->
-<!--&lt;!&ndash;					size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;					@click="handleExport"&ndash;&gt;-->
-<!--&lt;!&ndash;					v-hasPermi="['wms:odsRawOrderIn:export']"&ndash;&gt;-->
-<!--&lt;!&ndash;				>导出</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;			</el-col>&ndash;&gt;-->
-<!--			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--		</el-row>-->
+    <el-row :gutter="10" class="mb8">
 
-		<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['wms:orderBJ:export']"
+        >导出</el-button>
+      </el-col>
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    </div>
+
+		<el-table :max-height="tableHeight" v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
       <el-table-column label="送货单号" align="center" prop="userDefined5" width="130"/>
       <el-table-column label="采购单" align="center" prop="procureCode" width="130"/>
@@ -142,6 +93,7 @@
       <el-table-column label="物料描述" align="center" prop="materialDesc" :min-width="180"/>
       <el-table-column label="数量" align="center" prop="operationNumber" width="130"/>
       <el-table-column label="报检时间" align="center" prop="createtime" width="150"/>
+      <el-table-column label="检验任务编号" align="center" prop="checkNo" width="150"/>
       <el-table-column label="报检人" align="center" prop="createBy" width="150"/>
       <el-table-column label="暂收时间" align="center" prop="gmtCreate" width="150"/>
       <el-table-column label="质检开始时间" align="center" prop="createtime" width="150"/>
@@ -340,10 +292,13 @@
 
 <script>
 import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn ,sap105temporarilyCollected,handleUpdateSAP103,handleUpdateSAP105,listZJ} from "@/api/wms/odsRawOrderIn";
+import moment from "moment";
+import useTableMaxHeight from "@/utils/useTableMaxHeight";
 
 export default {
 	name: "OdsRawOrderIn",
-	data() {
+  mixins: [useTableMaxHeight],
+  data() {
 		return {
 			// 遮罩层
 			loading: true,
@@ -365,6 +320,7 @@ export default {
 			open: false,
 			// 查询参数
 			queryParams: {
+        checkTimeArray:undefined,
 				pageNum: 1,
 				pageSize: 10,
 				factoryCode: null,
@@ -428,9 +384,18 @@ export default {
 	created() {
 		this.getList();
 	},
+  mounted() {
+    this.pageHeaderRef = this.$refs.pageHeaderRef
+  },
 	methods: {
 		/** 查询包材到货单列表 */
 		getList() {
+
+      if(this.queryParams.checkTimeArray!=null){
+        this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD');
+        this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD');
+      }
+
 			this.loading = true;
       listZJ(this.queryParams).then(response => {
 				this.odsRawOrderInList = response.rows;
@@ -509,6 +474,7 @@ export default {
 		/** 重置按钮操作 */
 		resetQuery() {
 			this.resetForm("queryForm");
+      this.queryParams.checkTimeArray = undefined;
 			this.handleQuery();
 		},
 		// 多选框选中数据
@@ -605,7 +571,7 @@ export default {
 		},
 		/** 导出按钮操作 */
 		handleExport() {
-			this.download('wms/odsRawOrderIn/export', {
+			this.download('wms/odsRawOrderIn/exportBJ', {
 				...this.queryParams
 			}, `odsRawOrderIn_${new Date().getTime()}.xlsx`)
 		}