hi преди 4 дни
родител
ревизия
d827459f0c
променени са 6 файла, в които са добавени 7 реда и са изтрити 9 реда
  1. 1 1
      env.js
  2. 1 1
      pages/index/components/notice-item.vue
  3. 1 1
      pages/index/components/use-pop.vue
  4. 2 2
      pages/picking-task/delivery.vue
  5. 0 1
      pages/purchase/detail.vue
  6. 2 3
      pages/purchase/put-storage.vue

+ 1 - 1
env.js

@@ -1,7 +1,7 @@
 /**
  *  全局配置文件
  */
-export const BASE_URL = process.env.NODE_ENV === "development" ? 'http://192.168.2.112:8080' : 'https://erp.xianglitech.com.cn/prod-api'
+export const BASE_URL = process.env.NODE_ENV === "development" ? 'https://erp.xianglitech.com.cn/prod-api' : 'https://erp.xianglitech.com.cn/prod-api'
 // https://erp.xianglitech.com.cn/prod-api
 // https://test-erp.xianglitech.com.cn/stage-api
 

+ 1 - 1
pages/index/components/notice-item.vue

@@ -16,7 +16,7 @@
 			您有1条新的拣货任务(单号:{{item.sn}}),请点击查看并及时处理!
 		</view>
 		<view class="item-footer">
-			<view>查看</view>
+			<view>查看详情</view>
 			<u-icon name="arrow-right" color="#7E838D"></u-icon>
 		</view>
 	</view>

+ 1 - 1
pages/index/components/use-pop.vue

@@ -21,7 +21,7 @@
 						<view>角色</view>
 						<view class="line-value">
 							<view>{{userInfo.position}}</view>
-							<u-icon name="arrow-right" color="#7E838D"></u-icon>
+							<!-- <u-icon name="arrow-right" color="#7E838D"></u-icon> -->
 						</view>
 					</view>
 				</view>

+ 2 - 2
pages/picking-task/delivery.vue

@@ -211,9 +211,9 @@
 		},
 		onShow() {
 			uni.$on('scanFinish',(data)=>{
-				if(this.goodsList.length == 0)return
+				if(this.goodsList.length == 0)return uni.$u.toast("该货物不属于该任务")
 				let index = this.goodsList.findIndex(item=>item.barCode == data)
-				if(index == -1) return
+				if(index == -1) return uni.$u.toast("该货物不属于该任务");
 				this.scanIndex = index
 				this.scanNum = 1
 				this.scanedShow = true

+ 0 - 1
pages/purchase/detail.vue

@@ -173,7 +173,6 @@
 				
 			},
 			confirm() {
-				console.log('确定')
 				this.errorShow = false
 			},
 			backClick() {

+ 2 - 3
pages/purchase/put-storage.vue

@@ -179,9 +179,9 @@
 		},
 		onShow() {
 			uni.$on('scanFinish',(data)=>{
-				if(this.goodsList.length == 0)return
+				if(this.goodsList.length == 0) return uni.$u.toast("该货物不属于该任务");
 				let index = this.goodsList.findIndex(item=>item.barCode == data)
-				if(index == -1) return
+				if(index == -1) return uni.$u.toast("该货物不属于该任务");
 				this.scanIndex = index
 				this.scanNum = 1
 				this.scanedShow = true
@@ -244,7 +244,6 @@
 				this.calendarShow = false
 			},
 			calendarClick(item) {
-				console.log(item.productionDate,'item.productionDate')
 				this.chooseGoodsInfo = item
 				if(item.productionDate) {
 					this.value1 = Number(new Date(item.productionDate))