From 96440f3dd32d67d93b9e48472c0d96b801df899a Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 11 May 2024 10:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=95=B0=E9=87=8F=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/GridDetail.vue       |  4 ++++
 pages/management/in-storage.vue | 35 ++++++++++++++++++++++-----------
 utils/getData2.js               |  3 ++-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/components/GridDetail.vue b/components/GridDetail.vue
index bd4ab4b..ea7605c 100644
--- a/components/GridDetail.vue
+++ b/components/GridDetail.vue
@@ -4,6 +4,10 @@
 		<view class="allwidth">
 			<view v-if="data.type === 1" class="allwidth font1">{{data.data.djbh}}</view>
 			<table v-if="data.type === 1" class="detail_table">
+				<tr>
+					<td>单据ID</td>
+					<td>{{data.data.djid}}</td>
+				</tr>
 				<tr>
 					<td>来源部门</td>
 					<td>{{data.data.bmmc}}</td>
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index 54a642a..3092458 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -3,20 +3,26 @@
 		<nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
-				<view class="zd-col-18 zd-row">
-					<view class="zd-col-10"><search-box v-model="val1" /></view>
-					<view class="zd-col-10 select_wraper">
+				<view class="zd-col-24 zd-row">
+					<view class="zd-col-8"><search-box v-model="val1" /></view>
+					<view class="zd-col-7 select_wraper">
 						<uni-data-select
+						placeholder="请选择状态"
 						 v-model="value"
 						 :localdata="range"
 						></uni-data-select>
 					</view>
-					<button class="confirm-button" @tap="toSearch">查询</button>
-				</view>
-				<view class="zd-col-6 zd-row jcflexend">
-					<!-- <button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0 || btnActive1}" :disabled="disabled1" @tap="toSure">单据审核</button> -->
-					<button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0}" :disabled="disabled1" @tap="toSure">单据审核</button>
+					<view class="zd-col-8 select_wraper">
+						<uni-data-select
+						placeholder="请选择仓库名称"
+						 v-model="value1"
+						 :localdata="range1"
+						></uni-data-select>
+					</view>
 				</view>
+				<button class="confirm-button mgr30" @tap="toSearch">查询</button>
+				<!-- <button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0 || btnActive1}" :disabled="disabled1" @tap="toSure">单据审核</button> -->
+				<button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0}" :disabled="disabled1" @tap="toSure">单据审核</button>
 			</view>
 		</view>
 		<view class="zd-row jcflexstart table-title_wraper">{{title}}</view>
@@ -125,9 +131,12 @@
 						v-model="ele.kwbm"
 						/>
 					</view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td">
+					<!-- <view class="zd-col-4 zd-sec-td zd-pop-td">
 						<input v-show="!ele.checked" type="number" class="pop-input" v-model="ele.sysl" @blur="handleBlur(ele)">
 						<text v-show="ele.checked">{{ele.sysl}}</text>
+					</view> -->
+					<view class="zd-col-4 zd-sec-td zd-pop-td">
+						<input type="number" class="pop-input" v-model="ele.sysl">
 					</view>
 					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
 				</view>
@@ -205,7 +214,9 @@
 				delShow: false,
 				detailObj: {},
 				value: '',
-				range:[{value: 1, text: '提交'}, {value: 2, text: '审核'}]
+				range:[{value: 1, text: '提交'}, {value: 2, text: '审核'}],
+				value1: '',
+				range1: [{value: '3.03.013', text: '三期原材料库'}]
 			};
 		},
 		onShow() {
@@ -236,7 +247,7 @@
 				this._easOutInBillPage()
 			},
 			async _easOutInBillPage () {
-				let res = await easOutInBillPage(this.val1, this.id, this.value, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				let res = await easOutInBillPage(this.val1, this.id, this.value, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
 				if (res.code === 1) {
 					this.checkArr1 = []
 					res.result.map(el => {
@@ -473,6 +484,8 @@
 
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
+.mgr30
+	margin-right 30rpx
 .select_wraper
 	/deep/ .uni-select__selector
 		z-index 11
diff --git a/utils/getData2.js b/utils/getData2.js
index 73b913b..2f08077 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -21,12 +21,13 @@ export const getBillsCount = (area) => request({
 })
 
 // 1.2分页查询出入库单据
-export const easOutInBillPage = (fuzzy, djlx, djzt, page, size) => request({
+export const easOutInBillPage = (fuzzy, djlx, djzt, ckbm, page, size) => request({
 	url:'api/easOutInBill/page',
 	data: {
 		fuzzy: fuzzy,
 		djlx: djlx,
 		djzt: djzt,
+		ckbm: ckbm,
 		page: page,
 		size: size
 	}