修改供应商发货记录

mycomponents/recommend/recommend.vue

@@ -13,7 +13,7 @@
 			<view>
 				<!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
-					:isShowStdPack="false"></recommend-qty>
+					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
@@ -69,6 +69,10 @@
 				type: Boolean,
 				default: false
 			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
 
 			locationTitle: {
 				type: String,

pages.json

@@ -14,7 +14,14 @@
 			"path": "pages/message/index",
 			"style": {
 				"navigationBarTitleText": "消息",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+				
+				
+					]
+				}
 			}
 		},
 
@@ -35,17 +42,12 @@
 				"navigationBarTitleText": "登录",
 				"titleNView": {
 					// "autoBackButton": "true",
-					// "buttons": [
+					"buttons": [
-					// 	// 右边按钮
+				
-					// 	{
-					// 		"float": "right",
-					// 		"fontSize": "52rpx", //按钮上文字的大小
-					// 		"text": "\ue706",
-					// 		"fontSrc": "/static/ali_icon/iconfont.ttf"
-					// 	}
 				
-					// ]
+					]
 				}
+				
 			}
 		},
 		{
@@ -1704,7 +1706,14 @@
 			"path": "pages/setter/index",
 			"style": {
 				"navigationBarTitleText": "设置",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+				
+				
+					]
+				}
 			}
 		},
 		{

pages/login/index.vue

@@ -67,7 +67,7 @@
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
 						<view class="uni-input-wrapper">
-							<input class="" style="height: 80rpx; background-color: #EEEEEE;margin-right: 20rpx;"
+							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
 						<view class="display: flex; align-items: center; text-center">
@@ -143,6 +143,7 @@
 					url:"/pages/config/config"
 				})
 			} 
+			
 		},
 		onLoad() {
 			getCaptchaImage().then(res => {

pages/setter/index.vue

@@ -20,10 +20,10 @@
 					thumb="/static/icon_personal_password.png"></uni-list-item>
 				<uni-list-item title="" clickable rightText="清除缓存" thumb="/static/icon_personal_name.png"
 					@click="clear"></uni-list-item>
-				<uni-list-item title="修改密码" link to="/pages/setter/passwordpage"
+				<uni-list-item rightText="修改密码" link to="/pages/setter/passwordpage"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item title="服务器地址" 
 					thumb="/static/icon_personal_password.png"></uni-list-item>
+				<!-- <uni-list-item title="服务器地址" 
+					thumb="/static/icon_personal_password.png"></uni-list-item> -->
 				<!-- 	<uni-list-item title="参数设置" link to="/pages/setter/setterDetail"
 					thumb="/static/icon_personal_setting.png"></uni-list-item> -->
 			</uni-list>

pages/supplierDeliver/coms/comRecordDetailCard.vue

@@ -10,7 +10,11 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="detailOptions">
-							<recommend :detail="item"  :isShowFromLocation="false"></recommend>
+							<recommend :detail="item"  :isShowToLocation="true" 
+							:isShowFromLocation="false" 
+							:isShowStatus="false"
+							:isShowPack="false"
+							></recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<u-line color="#D8D8D8"></u-line>

pages/supplierDeliver/record/supplierDeliverRecordDetail.vue

@@ -5,20 +5,19 @@
 				<view class=""
 					style="padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
 					<view class="" style="font-size: 35rpx;">
-						发货单号 :
+						发货单号 :{{dataContent.asnNumber}}
 					</view>
 					<view class="" style="font-size: 35rpx;">
-						<text>供应商 : </text>
+						供应商代码 :{{dataContent.supplierCode}}
 					</view>
 				</view>
 				<u-line />
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comRecordDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+						<comRecordDetailCard :dataContent="item" :index="index"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail">
 						</comRecordDetailCard>
 					</view>
-					<u-line />
 				</view>
 			</scroll-view>
 		</view>
@@ -80,9 +79,8 @@
 				id: '',
 				receiptJob: {},
 				received: false,
-
 				scanCount: 0,
-				jobContent: {}, //任务内容
+				dataContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				locationTypeList: [],
@@ -121,7 +119,7 @@
 						that.showMessage('未获取到详情');
 					} else {
 						if (res.data.subList.length > 0) {
-							that.jobContent = res.data;
+							that.dataContent = res.data;
 							that.subList = res.data.subList;
 							that.subList.forEach(res => {
 								res.packingNumber = res.toPackingNumber
@@ -181,18 +179,6 @@
 				calcHandleQty(this.detailSource);
 			},
 
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-			},
-
-
 			showMessage(message) {
 				setTimeout(r => {
 					this.$refs.comMessage.showMessage(message, res => {

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.180:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",