lilei 1 ano atrás
pai
commit
6854893b69

+ 3 - 3
config/request.js

@@ -4,9 +4,9 @@ module.exports = (vm) => {
     // 初始化请求配置
     uni.$u.http.setConfig((config) => {
         /* config 为默认全局配置*/
-        // config.baseURL = 'http://192.168.2.117/qpls-md'; /* 开发 */
+        config.baseURL = 'http://192.168.2.117/qpls-md'; /* 开发 */
 		// config.baseURL = 'https://iscm.360arrow.com/qpls-md'; /* 生产 */
-		config.baseURL = 'https://p.iscm.360arrow.com/qpls-md'; /* 预发布 */
+		// config.baseURL = 'https://p.iscm.360arrow.com/qpls-md'; /* 预发布 */
 		config.custom.auth = true
         return config
     })
@@ -20,7 +20,7 @@ module.exports = (vm) => {
 			// 可以在此通过vm引用vuex中的变量,具体值在vm.$store.state中
 			config.header['access-token'] = vm.$store.state.vuex_token
 		}
-		config.header['hand-device-no'] = vm.$store.state.vuex_deviceId
+		// config.header['hand-device-no'] = vm.$store.state.vuex_deviceId
 	    return config 
 	}, config => { // 可使用async await 做异步操作
 	    return Promise.reject(config)

+ 1 - 0
pages/login/index.vue

@@ -101,6 +101,7 @@
 				}
 				if(formdata.username && formdata.password){
 					const res = await login(formdata)
+					console.log(res)
 					if(res.status == 200){
 						this.$store.state.vuex_userData = this.fiterAuthCode(res.data.auth_user)
 						this.$store.state.vuex_token = res.data.access_token

+ 11 - 12
pages/purchasing/index.vue

@@ -45,27 +45,24 @@
 					<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.dealerProductEntity.qrCode == item.dealerProductEntity.qrCode"
+				:checkedRow="curProduct&&curProduct.dealerProductEntity.code == item.dealerProductEntity.code"
+				 @click="editRow(item)"
 				>
 					<uni-td width="30%" align="center">
-						<view @click="copyText(item.dealerProductEntity.code)">{{item.dealerProductEntity.code}}</view>
+						<view>{{item.dealerProductEntity.code}}</view>
 					</uni-td>
 					<uni-td width="30%" align="center">
-						<view @click="editRow(item)">
+						<view>
 							<view>{{item.warehouseEntity&&item.warehouseEntity.name||defWarehouseName[0]}}/</view>
 							<view>{{item.warehouseLocationEntity&&item.warehouseLocationEntity.name||defWarehouseName[1]}}</view>
 						</view>
 					</uni-td>
-					<uni-td width="20%" align="center"><text style="color: red;">{{item.realPutQty}}</text>/{{item.putQty}}</uni-td>
-					<uni-td width="20%" align="center">
-						 {{item.realPutAmount}}
-					</uni-td>
+					<uni-td width="40%" align="center"><text style="color: red;">{{item.realPutQty}}</text>/{{item.putQty}}</uni-td>
 				</uni-tr>
 			</uni-table>
 		</view>
@@ -75,7 +72,7 @@
 		</view>
 		<scanCode @onKeyDown="keyDown"></scanCode>
 		 <!-- 选择仓库 -->
-		<chooseWarehouse ref="chooseWarehouse" :openPick="showPick" :value="defWarehouse" @close="showPick=false" @change="confirmWarehouse"></chooseWarehouse>
+		<chooseWarehouse ref="chooseWarehouse" :openPick="showPick" :value="warehouseVal" @close="showPick=false" @change="confirmWarehouse"></chooseWarehouse>
 		<!-- 左键扫描,修改包装数 -->
 		<uni-popup ref="popup" :mask-click="false" type="dialog">
 			<view style="background-color: #fff;padding: 30rpx 50rpx;border-radius: 30rpx;width: 75%;margin: 0 auto;">
@@ -130,7 +127,8 @@
 				toThousands,
 				defWarehouse: [],
 				defWarehouseName:[],
-				keyName: ''
+				keyName: '',
+				warehouseVal: []
 			};
 		},
 		onLoad(opts) {
@@ -199,6 +197,7 @@
 			},
 			// 修改仓库
 			editRow(item){
+				this.warehouseVal = item.warehouseSn ? [item.warehouseSn,item.warehouseLocationSn] : this.defWarehouse
 				this.showPick = true
 				this.curProduct = item
 			},
@@ -295,8 +294,8 @@
 					this.showModal = true
 					this.msg = {
 						title: '提示',
-						content: '有产品入库数量与发货数量不一致',
-						confirmText: '确定入库'
+						content: '有产品入库数量与发货数量不一致,确定入库?',
+						confirmText: '确定'
 					}
 				}
 			},

+ 9 - 7
pages/stock/index.vue

@@ -16,16 +16,16 @@
 			<uni-table border emptyText="暂无数据" :loading="loading" >
 				<!-- 表头行 -->
 				<uni-tr>
-					<uni-td width="30%" align="center">产品编码</uni-td>
-					<uni-td width="30%" align="center">库存</uni-td>
-					<uni-td width="15%" align="center">冻结</uni-td>
+					<uni-td width="25%" align="center">产品编码</uni-td>
+					<uni-td width="25%" align="center">可用库存</uni-td>
+					<uni-td width="25%" align="center">冻结库存</uni-td>
 					<uni-td width="25%" align="center">仓库/仓位</uni-td>
 				</uni-tr>
 				<!-- 表格数据行 -->
 				<uni-tr v-for="item in listData" :key="item.productSn" @click="toDetail(item)">
-					<uni-td width="30%" align="center">{{item.productCode||'-'}}</uni-td>
-					<uni-td width="30%" align="center">{{item.currentQty}}</uni-td>
-					<uni-td width="15%" align="center">{{item.currentQty}}</uni-td>
+					<uni-td width="25%" align="center">{{item.productCode||'-'}}</uni-td>
+					<uni-td width="25%" align="center">{{item.currentQty}}</uni-td>
+					<uni-td width="25%" align="center">{{item.freezeQty}}</uni-td>
 					<uni-td width="25%" align="center">{{item.warehouseName}}/<view>{{item.warehouseLocationName}}</view></uni-td>
 				</uni-tr>
 			</uni-table>
@@ -153,7 +153,7 @@
 				border-bottom: 1px solid #eee;
 			}
 			.form-footer-btn{
-				margin: 30upx;
+				margin: 20upx 30upx;
 				display: flex;
 				justify-content: space-between;
 			}
@@ -168,6 +168,8 @@
 			padding: 10upx 20upx;
 			border-radius: 20upx;
 			margin-top: 20upx;
+			height: 60vh;
+			overflow: auto;
 		}
 	}
 </style>

+ 17 - 9
pages/stock/stockDetail.vue

@@ -4,35 +4,43 @@
 		<view class="stockDetail-info" v-if="productData">
 			<view class="info-item flex align_center justify_between">
 				<view class="info-name">产品编码</view>
-				<view>{{productData && productData.dealerProductEntity.code || '--'}} <copyText :text="productData.dealerProductEntity.code" label="产品编码"></copyText></view>
+				<view style="width:70%;">{{productData && productData.dealerProductEntity.code || '--'}} <copyText :text="productData.dealerProductEntity.code" label="产品编码"></copyText></view>
 			</view>
 			<view class="info-item flex align_center justify_between">
 				<view class="info-name">产品名称</view>
-				<view style="width: 50%;">{{productData && productData.dealerProductEntity.name || '--'}} <copyText :text="productData.dealerProductEntity.name" label="产品名称"></copyText></view>
+				<view style="width:70%;">{{productData && productData.dealerProductEntity.name || '--'}} <copyText :text="productData.dealerProductEntity.name" label="产品名称"></copyText></view>
+			</view>
+			<view class="info-item flex align_center justify_between">
+				<view class="info-name">原厂编码</view>
+				<view style="width:70%;">{{productData && productData.dealerProductEntity.origCode || '--'}} <copyText :text="productData.dealerProductEntity.origCode" label="原厂编码"></copyText></view>
 			</view>
 			<view class="info-item flex align_center justify_between">
 				<view class="info-name">条形码</view>
-				<view>{{productData && productData.dealerProductEntity.qrCode || '--'}} <copyText :text="productData.dealerProductEntity.qrCode" label="条形码"></copyText></view>
+				<view style="width:70%;">{{productData && productData.dealerProductEntity.qrCode || '--'}} <copyText :text="productData.dealerProductEntity.qrCode" label="条形码"></copyText></view>
+			</view>
+			<view class="info-item flex align_center justify_between">
+				<view class="info-name">可用库存</view>
+				<view style="width:70%;">{{productData.currentQty||0}}</view>
 			</view>
 			<view class="info-item flex align_center justify_between">
-				<view class="info-name">库存数量</view>
-				<view>{{toThousands(productData.currentQty||0)}}{{productData.dealerProductEntity.unit}}</view>
+				<view class="info-name">冻结库存</view>
+				<view style="width:70%;">{{productData.freezeQty||0}}</view>
 			</view>
 			<view class="info-item flex align_center justify_between">
 				<view class="info-name">仓库/仓位</view>
-				<view style="width: 50%;">{{productData && productData.warehouseName || '--'}}>{{productData && productData.warehouseLocationName || '--'}}</view>
+				<view style="width:70%;">{{productData && productData.warehouseName || '--'}}>{{productData && productData.warehouseLocationName || '--'}}</view>
 			</view>
 			<view class="info-item flex align_center justify_between">
 				<view class="info-name">产品分类</view>
-				<view style="width: 50%;">{{productData.dealerProductEntity.productTypeName1 }} > {{productData.dealerProductEntity.productTypeName2 }} > {{productData.dealerProductEntity.productTypeName3 }} </view>
+				<view style="width:70%;">{{productData.dealerProductEntity.productTypeName1 }} > {{productData.dealerProductEntity.productTypeName2 }} > {{productData.dealerProductEntity.productTypeName3 }} </view>
 			</view>
 			<view class="info-item flex align_center justify_between">
 				<view class="info-name">单位</view>
-				<view>{{productData && productData.dealerProductEntity.unit || '--'}}</view>
+				<view style="width:70%;">{{productData && productData.dealerProductEntity.unit || '--'}}</view>
 			</view>
 			<view class="info-item flex align_center justify_between">
 				<view class="info-name">产品图片</view>
-				<view @click="viewImgs()">
+				<view style="width:70%;" @click="viewImgs()">
 					<u-image :src="productData.productMainImage?productData.productMainImage:`../../static/def_img@2x.png`" width="80" height="80" border-radius="10"></u-image>
 				</view>
 			</view>

+ 3 - 3
pages/stockOut/chainTransferOut/index.vue

@@ -11,7 +11,7 @@
 				</view>
 			</view>
 			 <view>
-			 	<text>条形码:</text>
+			 	<view>条形码:</view>
 			 	<view>
 			 		<input
 			 		@blur="addQty(true)"
@@ -23,7 +23,7 @@
 			 	</view>
 			 </view>
 			 <view>
-			 	<text>产品编码:</text>
+			 	<view>产品编码:</view>
 			 	<view>
 			 		<input
 			 		@blur="addQty(true)"
@@ -204,7 +204,7 @@
 					this.showModal = true
 					this.msg = {
 						title: '提示',
-						content: '拣货未完成,是否出库?',
+						content: '确定未完成拣货出库吗?',
 						confirmText: '确定出库'
 					}
 				}else{

+ 4 - 4
pages/stockOut/salesOut/index.vue

@@ -11,7 +11,7 @@
 				</view>
 			</view>
 			<view>
-				<text>条形码:</text>
+				<view>条形码:</view>
 				<view>
 					<input
 					@blur="addQty(true)"
@@ -23,7 +23,7 @@
 				</view>
 			</view>
 			<view>
-				<text>产品编码:</text>
+				<view>产品编码:</view>
 				<view>
 					<input
 					@blur="addQty(true)"
@@ -203,7 +203,7 @@
 					this.showModal = true
 					this.msg = {
 						title: '提示',
-						content: '拣货未完成,是否出库?',
+						content: '确定未完成拣货出库吗?',
 						confirmText: '确定出库'
 					}
 				}else{
@@ -252,7 +252,7 @@
 			height: 50%;
 		}
 		.p-footer{
-			padding:30upx;
+			padding: 20upx 30upx;
 			display: flex;
 			> button{
 				width: 40%;

+ 3 - 3
pages/stockOut/storeTransferOut/index.vue

@@ -11,7 +11,7 @@
 				</view>
 			</view>
 			<view>
-				<text>条形码:</text>
+				<view>条形码:</view>
 				<view>
 					<input
 					@blur="addQty(true)"
@@ -23,7 +23,7 @@
 				</view>
 			</view>
 			<view>
-				<text>产品编码:</text>
+				<view>产品编码:</view>
 				<view>
 					<input
 					@blur="addQty(true)"
@@ -204,7 +204,7 @@
 					this.showModal = true
 					this.msg = {
 						title: '提示',
-						content: '拣货未完成,是否出库?',
+						content: '确定未完成拣货出库吗?',
 						confirmText: '确定出库'
 					}
 				}else{

+ 1 - 0
pages/stockPan/index.vue

@@ -255,6 +255,7 @@
 			// 详情
 			getDetail(){
 				checkWarehouseDetailBySn({sn: this.checkWarehouseSn}).then(res => {
+					console.log(res,'详情')
 					if(res.status == 200){
 						this.baseData = res.data
 					}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 1
unpackage/dist/dev/app-plus/app-config-service.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 7 - 10
unpackage/dist/dev/app-plus/app-service.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 23 - 26
unpackage/dist/dev/app-plus/app-view.js


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff