Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	baseUrlNew: 'http://api1.eliangeyun.com/',
-	// baseUrlNew: 'http://192.168.1.113:8090/',
+	// baseUrlNew: 'http://192.168.1.119:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.27",
-    "versionCode" : 1127,
+    "versionName" : "1.1.29",
+    "versionCode" : 1129,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pageD/identity/companyIdentityEdit.vue

@@ -150,15 +150,15 @@
 					</view>
 				</view>
 				<view class="c-row b-b">
-					<text class="tit">收款人姓名</text>
+					<text class="tit">供应商姓名</text>
 					<view class="con-list">
-						<input placeholder="请填写收款人姓名" name="input" v-model="deptList.payeeName"></input>
+						<input placeholder="请填写供应商姓名" name="input" v-model="deptList.supplier"></input>
 					</view>
 				</view>
 				<view class="c-row">
-					<text class="tit">收款人身份证号</text>
+					<text class="tit">供应商电话</text>
 					<view class="con-list">
-						<input type='number' placeholder="请填写收款身份证号" name="input" v-model="deptList.payeeNumberCard"></input>
+						<input type='number' placeholder="请填写供应商电话" name="input" v-model="deptList.supplierPhone"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">

pageD/identity/companyIdentityLook.vue

@@ -79,16 +79,16 @@
 					{{deptList.bankDepositBranch}}
 				</view>
 			</view>
-			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
-				<text class="tit">收款人姓名</text>
+			<view class="c-row b-b">
+				<text class="tit">供应商姓名</text>
 				<view class="con-list">
-					{{deptList.payeeName}}
+					{{deptList.supplier}}
 				</view>
 			</view>
-			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
-				<text class="tit">收款人身份证号</text>
+			<view class="c-row b-b">
+				<text class="tit">供应商电话</text>
 				<view class="con-list">
-						{{deptList.payeeNumberCard}}
+						{{deptList.supplierPhone}}
 				</view>
 			</view>
 			<view class="c-row b-b">

pageD/identity/companyIdentityThree.vue

@@ -41,19 +41,6 @@
 			<button v-if="zhihangStatus" class='cu-btn bg-green shadow' @click="changeZhihang">填写</button>
 			<button v-else class='cu-btn bg-green shadow' @click="changeZhihang">识别</button>
 		</view>
-		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 1">
-			<text class="tit">收款人姓名</text>
-			<view class="con-list">
-				<input placeholder="请填写收款人姓名" name="input" v-model="identityAuthenticationInfo.payeeName"></input>
-			</view>
-		</view>
-		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 1">
-			<text class="tit">收款人身份证号</text>
-			<view class="con-list">
-				<input placeholder="请填写收款人身份证号" name="input"
-					v-model="identityAuthenticationInfo.payeeNumberCard"></input>
-			</view>
-		</view>
 		<view class="c-row b-b">
 			<text class="tit_red">*</text>
 			<text class="tit">手机号</text>
@@ -80,6 +67,19 @@
 				<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
 			</view>
 		</view>
+		<view class="c-row b-b" >
+			<text class="tit">供应商姓名</text>
+			<view class="con-list">
+				<input placeholder="请填写供应商姓名" name="input" v-model="identityAuthenticationInfo.supplier"></input>
+			</view>
+		</view>
+		<view class="c-row b-b" >
+			<text class="tit">供应商电话</text>
+			<view class="con-list">
+				<input placeholder="请填写供应商电话" name="input"
+					v-model="identityAuthenticationInfo.supplierPhone"></input>
+			</view>
+		</view>
 		</view>
 		
 		<button class="btns btn" @click="commit">提交</button>

pages/erp/exWarehousing/exWarehousing.vue

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

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -29,8 +29,8 @@
 					<view v-if='item.boxNoOther'>箱号2：{{item.boxNoOther}}</view>
 				</view>
 				<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 v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
 					<view v-if='item.binNo' class="left">仓位号：{{item.binNo}}</view>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

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

pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -45,8 +45,8 @@
 					<view v-if='item.boxNoOther'>箱号2：{{item.boxNoOther}}</view>
 				</view>
 				<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 v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
 					<view v-if='item.binNo' class="left">仓位号：{{item.binNo}}</view>

pages/erp/warehousing/warehousing.vue

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