lilei hace 1 año
padre
commit
f36eb10dd4

+ 3 - 3
pages.json

@@ -84,7 +84,7 @@
 						},
 						"buttons": [ //原生标题栏按钮配置,
 							{
-								"text": "盘点记录",
+								"text": "全部盘点",
 								"fontSize": "12px",
 								"width": "82px",
 								"color": "#00aaff"
@@ -107,7 +107,7 @@
 						},
 						"buttons": [ //原生标题栏按钮配置,
 							{
-								"text": "盘点记录",
+								"text": "全部盘点",
 								"fontSize": "12px",
 								"width": "82px",
 								"color": "#00aaff"
@@ -188,7 +188,7 @@
             "path" : "pages/stockPan/list",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "盘点记录",
+                "navigationBarTitleText": "全部盘点",
                 "enablePullDownRefresh": false
             }
         }

+ 2 - 12
pages/stock/index.vue

@@ -1,16 +1,5 @@
 <template>
 	<view class="stock-wrap">
-		<!-- 统计 -->
-		<view class="panel-box" v-if="totalData&&$hasPermissions('M_stockTj_mobile')">
-			<view class="item-box">
-				<view>库存总数量(个)</view>
-				<u-count-to :end-val="totalData&&totalData.totalCurrentStockQty ? totalData.totalCurrentStockQty : 0" separator=","></u-count-to>
-			</view>
-			<view class="item-box" v-if="$hasPermissions('M_showCostPrice_mobile')">
-				<view>库存总成本(¥)</view>
-				<u-count-to :end-val="totalData&&totalData.totalCurrentStockCost ? totalData.totalCurrentStockCost : 0" separator="," :decimals="2"></u-count-to>
-			</view>
-		</view>
 		<!-- 库存查询 -->
 		<view class="stock-con" v-if="$hasPermissions('M_stockQuery_mobile')">
 			<view class="stock-tit flex align_center">
@@ -18,8 +7,8 @@
 				库存查询
 			</view>
 			<u-form :model="form" ref="uForm" label-width="100">
-				<u-form-item label="产品编码"><u-input v-model.trim="form.productCode" border="bottom" placeholder="请输入产品编码" input-align="right" /></u-form-item>
 				<u-form-item label="条形码"><u-input v-model.trim="form.qrCode" border="bottom" placeholder="请输入条形码" input-align="right" /></u-form-item>
+				<u-form-item label="产品编码"><u-input v-model.trim="form.productCode" border="bottom" placeholder="请输入产品编码" input-align="right" /></u-form-item>
 				<u-form-item label="原厂编码"><u-input v-model.trim="form.productOrigCode" border="bottom" placeholder="请输入原厂编码" input-align="right" /></u-form-item>
 				<u-form-item label="产品名称"><u-input v-model.trim="form.productName" border="bottom" placeholder="请输入产品名称" input-align="right" /></u-form-item>
 				<u-form-item label="产品品牌" @click="brandModal=true"><u-input v-model="brandName" border="bottom" readonly placeholder="请选择产品品牌" input-align="right" /></u-form-item>
@@ -102,6 +91,7 @@
 			uni.$on('scancodedate', function(content) {
 			  console.log("扫描到的内容为:", content)
 			  _this.form.qrCode = content||''
+			  _this.handleSearch()
 			})
 		},
 		onUnload() {

+ 18 - 15
pages/stockOut/salesOut/index.vue

@@ -17,6 +17,14 @@
 					v-model="code">
 				</view>
 			</view>
+			<view style="justify-content: flex-start;flex-wrap: wrap;">
+				<view>总款数:123</view>
+				<view>已检款数: 50</view>
+			</view>
+			<view style="justify-content: flex-start;flex-wrap: wrap;">
+				<view>总数量: 150</view>
+				<view>已检数量: 70</view>
+			</view>
 		</view>
 		<view class="p-body">
 			<uni-table style="width: 100%;" border emptyText="暂无数据" :loading="loading" >
@@ -24,23 +32,26 @@
 				<uni-tr>
 					<uni-td align="center">产品编码</uni-td>
 					<uni-td align="center">产品分类</uni-td>
-					<uni-td align="center">数</uni-td>
-					<uni-td align="center">扫码检货</uni-td>
+					<uni-td align="center">已检/总数</uni-td>
+					<uni-td align="center">检货</uni-td>
 				</uni-tr>
 				<!-- 表格数据行 -->
 				<uni-tr v-for="item in detailList" :key="item.id" :checkedRow="curProduct&&curProduct.qrCode == item.qrCode">
 					<uni-td width="30%" align="center">{{item.dealerProductEntity.code}}</uni-td>
 					<uni-td width="30%" align="center">{{item.dealerProductEntity.productTypeName2}}</uni-td>
-					<uni-td width="20%" align="center">{{item.qty}}/{{item.qty}}</uni-td>
-					<uni-td width="20%" align="center">
-						<text :style="{color:item.pickFlag==1?'green':'red'}">{{item.pickFlag==1?'已检货':'未检货'}}</text>
+					<uni-td width="25%" align="center"><text style="color: red;">{{item.qty}}</text>/{{item.qty}}</uni-td>
+					<uni-td width="15%" align="center">
+						<!-- <text :style="{color:item.pickFlag==1?'green':'red'}">{{item.pickFlag==1?'已检货':'未检货'}}</text> -->
+						<view style="display: flex;justify-content: center;">
+							<u-icon v-if="item.pickFlag==0" name="close-circle-fill" color="red" size="22"></u-icon>
+							<u-icon v-if="item.pickFlag==1" name="checkmark-circle-fill" color="green" size="22"></u-icon>
+						</view>
 					</uni-td>
 				</uni-tr>
 			</uni-table>
 		</view>
 		<view class="p-footer">
-			<button :disabled="loading" size="mini" type="default" @click="toNoOut"> 未检货出库 <text class="iconfont icon-icon-test43"></text></button>
-			<button :disabled="loading" size="mini" type="primary" @click="toOut"> 检货出库 <text class="iconfont icon-icon-test43"></text></button>
+			<button :disabled="loading" size="mini" type="primary" @click="toOut"> 出库 <text class="iconfont icon-icon-test43"></text></button>
 		</view>
 		<scanCode></scanCode>
 	</view>
@@ -130,18 +141,10 @@
 					content: '确定未检货出库?',
 					success: function (res) {
 						if (res.confirm) {
-							 _this.salesWriteNoStockOut()
 						}
 					}
 				});
 			},
-			async salesWriteNoStockOut(){
-				const ret = await salesWriteNoStockOut({salesBillSn: this.salesBillSn})
-				if(ret.status == 200){
-					this.$store.state.vuex_isRefash = true
-					uni.navigateBack()
-				}
-			},
 			// 出库
 			async toOut(){
 				const ret = await salesWriteStockOut({salesBillSn: this.salesBillSn})

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 56 - 59
unpackage/dist/dev/app-plus/app-service.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 130 - 180
unpackage/dist/dev/app-plus/app-view.js


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio