Merge branch 'master' of gitlab.gavelinfo.com:lisu/xgdlapp

pages/dl_cmaterial/index.vue

@@ -156,7 +156,7 @@
 		},
 		methods: {
 			backWarehouse(){
-				backWarehouse({id:this.gwinfor[this.gwSelcetdIndex].id}).then(e=>{
+				backWarehouse({gwid:this.gwinfor[this.gwSelcetdIndex].id}).then(e=>{
 					if(e){
 						this.f5Gw()
 						this.$tip.toast("回库成功")

pages/dl_cmaterial/xzwl.vue

@@ -12,12 +12,12 @@
 		</view>
 		<view class="bg-white">
 			<cu-custom bgColor="bg-gradual-blue" :isBack="true">
-				<block slot="content">选择物料</block>
+				<block slot="content">选择生产订单</block>
 			</cu-custom>
 		</view>
 		<view class="cu-bar bg-white solid-bottom">
 			<view class="action">
-				<text class="cuIcon-title text-orange "></text> 物料列表
+				<text class="cuIcon-title text-orange "></text>订单列表
 			</view>
 		</view>
 		<InfoCard :keyWidth="'cardKeyFull'" :itemWidth="'infoBodyItemFull'" :info="item" :title="'序号:#'+(index+1)" v-for="(item,index) in wlinfor" :key="index"