From 876fe18935de43ff1bdd5f59841dfb1e952a9ce5 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Mon, 18 Mar 2024 18:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js          |  2 +-
 common/http.api.js        | 13 +++++++++++++
 pages/inventory/index.vue |  9 ++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/common/config.js b/common/config.js
index 2053abc..001bf6e 100644
--- a/common/config.js
+++ b/common/config.js
@@ -12,7 +12,7 @@ const config = {
 // config.baseUrl = 'http://120.77.94.227:8030'
 config.baseUrl = 'http://127.0.0.1:8030';
 // config.baseUrl = 'http://192.168.7.24:8030';
-// config.baseUrl = 'http://192.168.229.120:8030';
+// config.baseUrl = 'http://192.168.229.120:8030';0 
 // config.baseUrl = 'http://120.77.94.227:8030';
 //现场
 // config.baseUrl = 'http://192.168.1.199:8030';
diff --git a/common/http.api.js b/common/http.api.js
index 23b046e..fb493e0 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -126,6 +126,17 @@ const install = (Vue, vm) => {
       //提报异常
       billingToAdnormal: (params = {}) => vm.$u.post('/wms/shelf/pda/shelfToAdnormal', params),
     },
+	//盘点接口
+	invPlan:{
+		//待盘点列表
+		queryInvLocation:(params={})=>vm.$u.get('/wms/stock/inv/queryInvLocation',params), 	
+		//盘点执行列表
+		pdaInvByContainerCode:(params={})=>vm.$u.get('/wms/stock/inv/pdaInvByContainerCode',params), 	
+		//修改接口 确认
+		entrySave:(params={})=>vm.$u.post('/wms/stock/inv/entrySave',params), 	
+		//确认无误
+		confirm:(params={})=>vm.$u.post('/wms/stock/inv/confirm',params), 
+	},
 
     // 外复核界面管理
     reviewManage: {
@@ -185,6 +196,8 @@ const install = (Vue, vm) => {
 	cache:{
 		updCacheWallShelf:(params={})=>vm.$u.post(`/wms/billing/pda/updCacheWallShelf`, params),
 	},
+	//批次接口
+	getLockstockBatch:(params = {}) => vm.$u.get('/wms/lock/getLockstockBatch'),
     // 验收界面
     acceptance: {
       // 分页查询带收货明细汇总
diff --git a/pages/inventory/index.vue b/pages/inventory/index.vue
index 523b1ad..7698dbd 100644
--- a/pages/inventory/index.vue
+++ b/pages/inventory/index.vue
@@ -8,14 +8,14 @@
 				</u-form-item> -->
         <u-form-item  prop="barCode">
 			
-          <u-input v-model="dataForm.containerCode" border height="70" style="background-color: #ffffff;" placeholder="请扫描托盘编号"
+          <u-input v-model="dataForm.containerCode" class="global-font" border height="70" style="background-color: #ffffff;" placeholder="请扫描托盘编号"
             @confirm="inputQuery()" :focus="firstFocus"></u-input>
         </u-form-item>
       </u-form>
  
     </view>
 	<view class='recommend'>
-	  <text class='recommend-title'>待盘点物料信息</text>
+	  <text class='recommend-title global-font'>待盘点物料信息</text>
 	</view>
     <!-- {{dataList}} -->
 	<view class="all-card">
@@ -81,7 +81,6 @@
 		  		</view>
 		  	<view style="width: 100%; display: flex;margin-top: 40px;font-size: 14px;">
 		  			    <button style="width: 30%; font-size: 16px;line-height: 44px;" class="btn1" type="default" @click="noEnter()">取消</button>
-		  			    <button  style="width: 30%;font-size: 16px;line-height: 44px;;" type="default"  @click="enterUp(item)">确认</button>
 		  		    </view>
 		  
 		  	</u-popup>
@@ -95,8 +94,8 @@
     </view> -->
     <!-- <button @click="open">测试</button> -->
 
-	<view class="bottom">
-		<button @click="pickUp()" >确认无误</button>
+	<view class="bottom global-font">
+		<button  @click="pickUp()" >确认无误</button>
 		<!-- <p class="foot" style="width: 100%; text-align: center;margin-top: 8px;color: gray;">盘点完成后当前托盘自动回库</p> -->
 	</view>