收货确认需求修改

common/style/layout.css

@@ -40,6 +40,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	border: 1px solid #00a3dd;
 	box-shadow: rgba(4, 136, 203, 0.2) -3px 6px 6px 1px, rgba(4, 136, 203, 0.2) 3px -3px 6px 1px;
 }
+.search-confirm-wrap_2 {
+	width: calc(100% - 20px);
+	margin: 0 auto;
+}
 .search-label{
 	height: 35px;
 	font-size: 16px;
@@ -137,6 +141,9 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	padding: 15px 0 10px 0;
 	overflow-y: auto;
 }
+.table-wrap_1 {
+	width: calc(100% - 20px);
+}
 .grid-table {
 	min-width: 100%;
 	border-spacing: 0;
@@ -558,3 +565,6 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 .uni-select__selector-item:hover {
 	background-color: #3F6ACA !important;
 }
+.uni-input-placeholder {
+	color: #fff;
+}

components/SearchBox.vue

@@ -13,7 +13,7 @@
 		@input="handleChange($event)">
 		<view class="iconfont icon-del" @tap="toDel">&#xe6dc;</view>
 		<!-- <view class="iconfont icon_scan" @tap="checkMpaasScan">&#xe6e2;</view> -->
-		<view class="iconfont icon_scan" @tap="toScan">&#xe6e2;</view>
+		<view v-show="scanShow" class="iconfont icon_scan" @tap="toScan">&#xe6e2;</view>
 	</view>
 </template>
 
@@ -36,6 +36,10 @@
 			seaShow: {
 			  type: Boolean,
 			  default: false
+			},
+			scanShow: {
+			  type: Boolean,
+			  default: true
 			}
 		},
 		methods: {

pages/management/in-storage.vue

@@ -245,8 +245,6 @@
 			this.id = options.id
 			this.title = options.name
 			this.crType = options.type
-		},
-		onLoad () {
 			this._getWarehouseInfo()
 			this._getUserInfo()
 		},

pages/management/receive-confirm.vue

@@ -45,13 +45,26 @@
 						</view>
 					</view>
 					<!-- 二级表格start -->
-					<view v-if="pkId === e.djid" class="zd-sec-wraper pd0">
+					<view v-if="pkId === e.djid" class="zd-sec-wraper">
-						<view class="table-wrap">
+						<view class="search-confirm-wrap_2">
+							<view class="zd-row">
+								<view class="zd-col-24 zd-row jcflexstart">
+									<view class="zd-col-7"><search-box v-model="val2" :scanShow="false" /></view>
+								</view>
+								<button class="confirm-button" @tap="toSearch2">查询</button>
+								<button v-if="pkObj.djzt !== '审核后'" class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</button>
+							</view>
+						</view>
+						<view class="table-wrap table-wrap_1">
 							<table class="grid-table">
 								<thead>
 									<tr>
 										<th>序号</th>
-										<th v-if="pkObj.djzt !== '审核后'">选择</th>
+										<th v-if="pkObj.djzt !== '审核后'">
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
+											</view>
+										</th>
 										<th><text class="fontcol1">采购订单号</text></th>
 										<th>物料编码</th>
 										<th>物料名称</th>
@@ -119,17 +132,6 @@
 								</tbody>
 							</table>
 						</view>
-						<view v-if="pkObj.djzt !== '审核后'" class="zd-row jcflexstart mgt10 mgb20">
-							<view class="zd-col-1 zd-row jcenter mgl52">
-								<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-							</view>
-							<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</button>
-							<view class="zd-col-10">
-								<!-- <view class="zd-col-12 zd-row jcflexend">
-									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
-								</view> -->
-							</view>
-						</view>
 					</view>
 					<!-- 二级表格end -->
 				</view>
@@ -202,7 +204,8 @@
 				modalObj: {},
 				disabled: false,
 				value1: '',
-				range1: []
+				range1: [],
+				val2: ''
 			};
 		},
 		onLoad () {
@@ -262,7 +265,7 @@
 			},
 			// 二级表格接口
 			async _receiptBillPage () {
-				let res = await receiptBillPage(this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
+				let res = await receiptBillPage(this.val2, this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
 				if (res.code === 1) {
 					res.result.map(el => {
 						this.$set(el, 'checked', true)
@@ -298,6 +301,7 @@
 			toCollapse (e) {
 				this.pkId = this.pkId === e.djid ? '' : e.djid
 				this.pkObj = this.pkId === e.djid ? e : {}
+				this.val2 = ''
 				this.dataList2 = []
 				if (this.pkId === e.djid) {
 					this.queryParams2 = {
@@ -308,6 +312,15 @@
 					this._receiptBillPage()
 				}
 			},
+			// 二级表格查询
+			toSearch2 () {
+				this.queryParams2 = {
+					pageSize: 200,
+					pageNum: 1
+				}
+				this.currentPage2 = 1
+				this._receiptBillPage()
+			},
 			// 二级表格多选
 			toCheck2 (e) {
 				e.checked = !e.checked

utils/getData2.js

@@ -144,9 +144,10 @@ export const receiptPage = (fuzzy, kczzbm, page, size) => request({
 	}
 })
 // 2.收货单明细分页查询
-export const receiptBillPage = (djid, page, size) => request({
+export const receiptBillPage = (fuzzy, djid, page, size) => request({
 	url:'api/receiptBill/page',
 	data: {
+		fuzzy: fuzzy,
 		djid: djid,
 		page: page,
 		size: size

utils/mork2.js

@@ -1378,7 +1378,7 @@ export const receiptPage = () => {
 				"djid": "1777232450742624257",
 				"djbh": "DH2024040815101039",
 				"ywrq": "2024-04-08",
-				"djzt": "1",
+				"djzt": "审核后",
 				"tjsj": "2024-04-08 15:10:13",
 				"cgbh": "POORD06240400001",
 				"cggs": "诺力智能装备股份有限公司",