From 982453bfc7f4055264b883d3573524be37d70dcd Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 25 Jul 2024 14:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                |  3 ---
 pages/management/alloc-maintenance.vue | 10 +++++-----
 pages/management/in-storage.vue        |  8 ++++----
 pages/management/receive-confirm.vue   | 16 ++++++++--------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 6ea5f52..108a35a 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -574,7 +574,4 @@ uni-toast .uni-toast {
 }
 .uni-select__selector-item:hover {
 	background-color: #3F6ACA !important;
-}
-.uni-input-placeholder {
-	color: #fff;
 }
\ No newline at end of file
diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue
index 45dbef7..c6bc71f 100644
--- a/pages/management/alloc-maintenance.vue
+++ b/pages/management/alloc-maintenance.vue
@@ -4,7 +4,7 @@
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-7"><search-box v-model="val1" /></view>
+					<view class="zd-col-7"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
 					<view class="zd-col-8 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="请选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
@@ -55,8 +55,8 @@
 									<tr>
 										<th>序号</th>
 										<th v-if="pkObj.djzt !== '审核后'">选择</th>
-										<th><text class="fontcol1">物料编码</text></th>
 										<th>物料名称</th>
+										<th>物料编码</th>
 										<th>计里单位</th>
 										<th>库存类型</th>
 										<th>库存状态</th>
@@ -81,8 +81,8 @@
 												<view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view>
 											</view>
 										</td>
-										<td><view class="fontcol1">{{el.wlbm}}</view></td>
 										<td>{{el.wlmc}}</td>
+										<td>{{el.wlbm}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.kclx}}</td>
 										<td>{{el.kczt}}</td>
@@ -137,8 +137,8 @@
 								<tbody v-else>
 									<tr v-for="(el, j) in dataList2" :key="el.id">
 										<td>{{j+1}}</td>
-										<td>{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
+										<td>{{el.wlbm}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.kclx}}</td>
 										<td>{{el.kczt}}</td>
@@ -565,7 +565,7 @@
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-		color #fff
+		color grey
 	/deep/ .uni-select__selector
 		background-color #071F3E
 		border-color #0c3162
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index c8f3a20..3a0c4d3 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -4,7 +4,7 @@
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-8"><search-box v-model="val1" /></view>
+					<view class="zd-col-8"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
 					<view class="zd-col-8 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
@@ -63,8 +63,8 @@
 										<th>序号</th>
 										<th>选择</th>
 										<th>仓库名称</th>
-										<th>物料编号</th>
 										<th>物料名称</th>
+										<th>物料编号</th>
 										<th>单位</th>
 										<th>库位</th>
 										<th>数量</th>
@@ -88,8 +88,8 @@
 											</view>
 										</td>
 										<td>{{el.ckmc}}</td>
-										<td>{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
+										<td>{{el.wlbm}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.kwbm}}</td>
 										<td>{{el.sl}}</td>
@@ -644,7 +644,7 @@
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-		color #fff
+		color grey
 	/deep/ .uni-select__selector
 		background-color #071F3E
 		border-color #0c3162
diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue
index c052599..8984450 100644
--- a/pages/management/receive-confirm.vue
+++ b/pages/management/receive-confirm.vue
@@ -4,7 +4,7 @@
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
 				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-7"><search-box v-model="val1" /></view>
+					<view class="zd-col-7"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
 					<view class="zd-col-8 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="请选择收货组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
@@ -67,19 +67,19 @@
 											</view>
 										</th>
 										<th><text class="fontcol1">采购订单号</text></th>
-										<th>物料编码</th>
 										<th>物料名称</th>
+										<th>物料编码</th>
 										<th>单位</th>
 										<th>订单量</th>
 										<th>总数</th>
 										<th>本次送货数量</th>
 										<th>收货组织</th>
-										<th>件数</th>
 										<th>是否质检</th>
 										<th>收货数量</th>
 										<th>收货仓库编码</th>
 										<th>收货仓库名称</th>
 										<th>收货库位名称</th>
+										<th>件数</th>
 										<th>更多</th>
 									</tr>
 								</thead>
@@ -92,14 +92,13 @@
 											</view>
 										</td>
 										<td><view class="fontcol1">{{el.cgbh}}</view></td>
-										<td>{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
+										<td>{{el.wlbm}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.ddsl}}</td>
 										<td>{{el.wlzs}}</td>
 										<td>{{el.bcshsl}}</td>
 										<td>{{el.zzmc}}</td>
-										<td>{{el.num}}</td>
 										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
 										<td><input class="td_input" type="number" v-model="el.shsl"  @blur="updateNumkw(el)" /></td>
 										<td @tap.stop="checkWarehouse(1, '修改收货仓库', el)">
@@ -114,6 +113,7 @@
 												<scan-input v-model="el.kwmc" @handleChange="updateNumkw(el)" />
 											</view>
 										</td>
+										<td>{{el.num}}</td>
 										<td @tap.stop="getDetails(4,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
 									</tr>
 								</tbody>
@@ -121,19 +121,19 @@
 									<tr v-for="(el, j) in dataList2" :key="el.id">
 										<td>{{j+1}}</td>
 										<td>{{el.cgbh}}</td>
-										<td>{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
+										<td>{{el.wlbm}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.ddsl}}</td>
 										<td>{{el.wlzs}}</td>
 										<td>{{el.bcshsl}}</td>
 										<td>{{el.zzmc}}</td>
-										<td>{{el.num}}</td>
 										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
 										<td>{{el.shsl}}</td>
 										<td>{{el.ckbm}}</td>
 										<td>{{el.ckmc}}</td>
 										<td>{{el.kwmc}}</td>
+										<td>{{el.num}}</td>
 										<td @tap.stop="getDetails(4,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
 									</tr>
 								</tbody>
@@ -509,7 +509,7 @@
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-		color #fff
+		color grey
 	/deep/ .uni-select__selector
 		background-color #071F3E
 		border-color #0c3162