gjy 3 anni fa
parent
commit
fdc1249a09

+ 8 - 2
pages/erp/exWarehousing/exWarehousing.vue

@@ -121,9 +121,9 @@
 			</view>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
 				<view class="left">车厢号</view>
-				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom"
+				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 					placeholder="请输入车厢号"></input>
-				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom"
+				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 					placeholder="请输入车厢号"></input>
 			</view>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
@@ -441,6 +441,12 @@
 				this.detailData.outType = this.multiSelector[e].name
 				this.detailData.outType = this.multiSelector[e].name
 				console.log(e)
 				console.log(e)
 			},
 			},
+			toUpperCase2(val) {
+				this.detailData.wingNumber = val.detail.value.toUpperCase()
+			},
+			toUpperCase3(val) {
+				this.detailData.wingNumberOther = val.detail.value.toUpperCase()
+			},
 			outWarehouse() {
 			outWarehouse() {
 				this.$api.doRequest('get', '/commonSysParameter/getInfo', {
 				this.$api.doRequest('get', '/commonSysParameter/getInfo', {
 					constId: 'CON6'
 					constId: 'CON6'

+ 2 - 2
pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -29,8 +29,8 @@
 					<view v-if='item.boxNoOther'>箱号2:{{item.boxNoOther}}</view>
 					<view v-if='item.boxNoOther'>箱号2:{{item.boxNoOther}}</view>
 				</view>
 				</view>
 				<view v-if="item.outType=='火运'" style='color:#878C9C;font-size:14px;' class="row">
 				<view v-if="item.outType=='火运'" style='color:#878C9C;font-size:14px;' class="row">
-					<view v-if='item.boxNo' class="left">车厢号:{{item.boxNo}}</view>
-					<view v-if='item.boxNoOther'>车厢号2:{{item.boxNoOther}}</view>
+					<view v-if='item.wingNumber' class="left">车厢号:{{item.wingNumber}}</view>
+					<view v-if='item.wingNumberOther'>车厢号2:{{item.wingNumberOther}}</view>
 				</view>
 				</view>
 				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
 				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
 					<view v-if='item.binNo' class="left">仓位号:{{item.binNo}}</view>
 					<view v-if='item.binNo' class="left">仓位号:{{item.binNo}}</view>

+ 8 - 3
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -117,9 +117,9 @@
 			</view>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
 				<view class="left">车厢号</view>
-				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom"
+				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 					placeholder="请输入车厢号"></input>
-				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom"
+				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 					placeholder="请输入车厢号"></input>
 			</view>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
@@ -180,7 +180,6 @@
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
-
 <script>
 <script>
 	import upload from '@/components/upload.vue';
 	import upload from '@/components/upload.vue';
 	import helper from '@/common/helper.js';
 	import helper from '@/common/helper.js';
@@ -365,6 +364,12 @@
 			toUpperCase1(val) {
 			toUpperCase1(val) {
 				this.detailData.boxNoOther = val.detail.value.toUpperCase()
 				this.detailData.boxNoOther = val.detail.value.toUpperCase()
 			},
 			},
+			toUpperCase2(val) {
+				this.detailData.wingNumber = val.detail.value.toUpperCase()
+			},
+			toUpperCase3(val) {
+				this.detailData.wingNumberOther = val.detail.value.toUpperCase()
+			},
 			outtypeChange(e) {
 			outtypeChange(e) {
 				this.detailData.outType = this.multiSelector[e].name
 				this.detailData.outType = this.multiSelector[e].name
 				console.log(e)
 				console.log(e)

+ 2 - 2
pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -45,8 +45,8 @@
 					<view v-if='item.boxNoOther'>箱号2:{{item.boxNoOther}}</view>
 					<view v-if='item.boxNoOther'>箱号2:{{item.boxNoOther}}</view>
 				</view>
 				</view>
 				<view v-if="item.outType=='火运'" style='color:#878C9C;font-size:14px;' class="row">
 				<view v-if="item.outType=='火运'" style='color:#878C9C;font-size:14px;' class="row">
-					<view v-if='item.boxNo' class="left">车厢号:{{item.boxNo}}</view>
-					<view v-if='item.boxNoOther'>车厢号2:{{item.boxNoOther}}</view>
+					<view v-if='item.wingNumber' class="left">车厢号:{{item.wingNumber}}</view>
+					<view v-if='item.wingNumberOther'>车厢号2:{{item.wingNumberOther}}</view>
 				</view>
 				</view>
 				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
 				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
 					<view v-if='item.binNo' class="left">仓位号:{{item.binNo}}</view>
 					<view v-if='item.binNo' class="left">仓位号:{{item.binNo}}</view>

+ 8 - 2
pages/erp/warehousing/warehousing.vue

@@ -131,9 +131,9 @@
 			</view>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
 				<view class="left">车厢号</view>
-				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom"
+				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 					placeholder="请输入车厢号"></input>
-				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom"
+				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 					placeholder="请输入车厢号"></input>
 			</view>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
@@ -472,6 +472,12 @@
 			toUpperCase(val) {
 			toUpperCase(val) {
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 			},
 			},
+			toUpperCase2(val) {
+				this.detailData.wingNumber = val.detail.value.toUpperCase()
+			},
+			toUpperCase3(val) {
+				this.detailData.wingNumberOther = val.detail.value.toUpperCase()
+			},
 			toUpperCase1(val) {
 			toUpperCase1(val) {
 				this.detailData.boxNoOther = val.detail.value.toUpperCase()
 				this.detailData.boxNoOther = val.detail.value.toUpperCase()
 			},
 			},