更新

common/request/apis/purchase.js

@@ -12,3 +12,6 @@ export const materialDetail = (urlparams, config = {custom: { auth: true }}) =>
 export const materialDepotDetail = (urlparams,data, config = {custom: { auth: true }}) => uni.$u.http.get(`/pda/materialDepotDetail/${urlparams.type}/${urlparams.materialId}`, {data,config})
 // 商品入库
 export const orderSubmit = (params, config = {custom: { auth: true }}) => uni.$u.http.post(`/pda/orderSubmit`, params, config)
+// 仓库下拉框
+export const depotSpinnerList = (urlparams,data, config = {custom: { auth: true }}) => uni.$u.http.get(`/pda/depotSpinnerList`, {data,config})
+	

env.js

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

pages/goods/detail.vue

@@ -101,8 +101,8 @@
 						<view class="crk-item-title">{{item.materialName}}</view>
 						<!-- <view class="crk-item-line">出库仓库：我的仓库-暂无</view> -->
 						<view class="crk-item-line">货物规格：{{item.materialStandard}}</view>
-						<view class="crk-item-line">{{currentCrkId == 'out' ?'出库':'入库'}}时间：{{item.operTime || '-'}}</view>
-						<view class="crk-item-line">{{currentCrkId == 'out' ?'出库':'入库'}}数量：{{item.actualQuantityInStorage || 0}}{{item.materialUnit || '-'}}</view>
+						<view class="crk-item-line">{{currentCrkId == 'out' ?'出库':'入库'}}时间：{{item.warehousingTime || '-'}}</view>
+						<view class="crk-item-line">{{currentCrkId == 'out' ?'出库':'入库'}}数量：{{item.actualQuantityInStorage || 0}}{{item.commodityUnit || ''}}</view>
 						<view class="img-box">
 							<u-image v-if="currentCrkId == 0" src="@/static/image/yck-img.png" width="132rpx" height="132rpx"></u-image>
 							<u-image v-if="currentCrkId == 1" src="@/static/image/yrk-img.png" width="132rpx" height="132rpx"></u-image>

pages/picking-task/index.vue

@@ -37,9 +37,9 @@
 			</view>
 		</view>
 		<!-- 中心仓弹窗 -->
-		<u-picker :show="stashShow" :defaultIndex="defaultIndex" :columns="stashColumns" @confirm="pickerConfirm" @cancel="stashShow= false"></u-picker>
+		<u-picker :show="stashShow" keyName="label" :defaultIndex="defaultIndex" :columns="stashColumns" @confirm="pickerConfirm" @cancel="stashShow= false"></u-picker>
 		<!-- 状态 -->
-		<u-picker :show="statusShow" keyName="name" :defaultIndex="defaultIndex2" :columns="statusColumns" @confirm="statusConfirm" @cancel="statusShow= false"></u-picker>
+		<u-picker :show="statusShow" keyName="label" :defaultIndex="defaultIndex2" :columns="statusColumns" @confirm="statusConfirm" @cancel="statusShow= false"></u-picker>
 		<!-- 月份 -->
 		<u-picker :show="dateShow" :defaultIndex="defaultIndex3" :columns="dateColumns" @confirm="dateConfirm" @cancel="dateShow= false"></u-picker>
 		
@@ -51,7 +51,7 @@
 	var _codeQueryTag = false;
 	import taskItem from '@/components/task-item/task-item.vue'
 	import {saleOrder} from '@/common/request/apis/picking'
-	import {orderStartHandle} from '@/common/request/apis/purchase'
+	import {orderStartHandle, depotSpinnerList} from '@/common/request/apis/purchase'
 	export default{
 		components:{
 			taskItem
@@ -59,27 +59,25 @@
 		data() {
 			return {
 				offsetTop:0,
-				cangName:'鹏越中心仓',
+				cangName:'',
 				type1:'全部',
 				type2:'月份',
 				stashShow:false,
 				statusShow:false,
 				dateShow:false,
-				stashColumns:[
-					['鹏越中心仓','美团中心仓']
-				],
+				stashColumns:[],
 				statusColumns:[
 					[{
-						name:'全部',
+						label:'全部',
 						id:''
 					},{
-						name:'待拣货',
+						label:'待拣货',
 						id:'1'
 					},{
-						name:'拣货中',
+						label:'拣货中',
 						id:'4'
 					},{
-						name:'已拣货',
+						label:'已拣货',
 						id:'2'
 					}]
 				],
@@ -107,6 +105,7 @@
 			let statusBarHeight = systemInfo.statusBarHeight;
 			this.offsetTop = statusBarHeight + 40
 			this.init()
+			this.getDepotSpinnerList()
 		},
 		onHide() {
 			uni.$off('scanFinish')
@@ -131,6 +130,15 @@
 			}
 		},
 		methods:{
+			getDepotSpinnerList() {
+				depotSpinnerList()
+				.then(res=>{
+					if(res.code == 200) {
+						this.stashColumns = [res.data]
+						this.cangName = res.data[0].label
+					}
+				})
+			},
 			scanCode() {
 				this.$scan.scanCode()
 			},
@@ -176,11 +184,11 @@
 				this.stashShow = true
 			},
 			pickerConfirm(val) {
-				this.cangName = val.value[0]
+				this.cangName = val.value[0].label
 				this.stashShow = false
 			},
 			statusConfirm(val) {
-				this.type1 = val.value[0].name
+				this.type1 = val.value[0].label
 				this.params.status = val.value[0].id
 				this.statusShow = false
 				this.init()

pages/purchase/index.vue

@@ -37,9 +37,9 @@
 			</view>
 		</view>
 		<!-- 中心仓弹窗 -->
-		<u-picker :show="stashShow" :defaultIndex="defaultIndex" :columns="stashColumns" @confirm="pickerConfirm" @cancel="stashShow= false"></u-picker>
+		<u-picker :show="stashShow" keyName="label" :defaultIndex="defaultIndex" :columns="stashColumns" @confirm="pickerConfirm" @cancel="stashShow= false"></u-picker>
 		<!-- 状态 -->
-		<u-picker :show="statusShow" keyName="name" :defaultIndex="defaultIndex2" :columns="statusColumns" @confirm="statusConfirm" @cancel="statusShow= false"></u-picker>
+		<u-picker :show="statusShow" keyName="label" :defaultIndex="defaultIndex2" :columns="statusColumns" @confirm="statusConfirm" @cancel="statusShow= false"></u-picker>
 		<!-- 月份 -->
 		<u-picker :show="dateShow" :defaultIndex="defaultIndex3" :columns="dateColumns" @confirm="dateConfirm" @cancel="dateShow= false"></u-picker>
 		
@@ -48,7 +48,7 @@
 
 <script>
 	import taskItem from '@/components/task-item/task-item.vue'
-	import {purchaseInventory, orderStartHandle} from '@/common/request/apis/purchase'
+	import {purchaseInventory, orderStartHandle, depotSpinnerList} from '@/common/request/apis/purchase'
 	export default{
 		components:{
 			taskItem
@@ -56,7 +56,7 @@
 		data() {
 			return {
 				offsetTop:0,
-				cangName:'鹏越中心仓',
+				cangName:'',
 				searchKey:'',
 				type1:'全部',
 				type2:'月份',
@@ -64,21 +64,19 @@
 				stashShow:false,
 				statusShow:false,
 				dateShow:false,
-				stashColumns:[
-					['鹏越中心仓','美团中心仓']
-				],
+				stashColumns:[],
 				statusColumns:[
 					[{
-						name:'全部',
+						label:'全部',
 						id:''
 					},{
-						name:'待入库',
+						label:'待入库',
 						id:'1'
 					},{
-						name:'入库中',
+						label:'入库中',
 						id:'4'
 					},{
-						name:'已入库',
+						label:'已入库',
 						id:'2'
 					}]
 				],
@@ -106,6 +104,7 @@
 			let statusBarHeight = systemInfo.statusBarHeight;
 			this.offsetTop = statusBarHeight + 40
 			this.init()
+			this.getDepotSpinnerList()
 		},
 		onShow() {
 			uni.$on('scanFinish',(data)=>{
@@ -130,6 +129,15 @@
 			}
 		},	
 		methods:{
+			getDepotSpinnerList() {
+				depotSpinnerList()
+				.then(res=>{
+					if(res.code == 200) {
+						this.stashColumns = [res.data]
+						this.cangName = res.data[0].label
+					}
+				})
+			},
 			scanCode() {
 				this.$scan.scanCode()
 			},
@@ -186,11 +194,11 @@
 				this.stashShow = true
 			},
 			pickerConfirm(val) {
-				this.cangName = val.value[0]
+				this.cangName = val.value[0].label
 				this.stashShow = false
 			},
 			statusConfirm(val) {
-				this.type1 = val.value[0].name
+				this.type1 = val.value[0].label
 				this.params.status = val.value[0].id
 				this.statusShow = false
 				this.init()