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

config/index.js

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

pageD/identity/companyIdentityEdit.vue

@@ -143,18 +143,6 @@
 						<input placeholder="请填写开户行" name="input" v-model="deptList.bankDeposit"></input>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">开户支行</text>
-					<view class="con-list">
-						<input placeholder="请填写开户支行" name="input" v-model="deptList.bankDepositBranch"></input>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">供应商姓名</text>
-					<view class="con-list">
-						<input placeholder="请填写供应商姓名" name="input" v-model="deptList.supplier"></input>
-					</view>
-				</view>
 				<view class="c-row">
 					<text class="tit">供应商电话</text>
 					<view class="con-list">
@@ -167,13 +155,24 @@
 						<input  type='number' placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
 					</view>
 				</view>
-				<view class="c-row ">
+				<view class="c-row b-b">
 					<text class="tit">联系地址</text>
 					<view class="con-list">
 						<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
 					</view>
 				</view>
-
+				<view class="c-row b-b">
+					<text class="tit">开户支行</text>
+					<view class="con-list">
+						<input placeholder="请填写开户支行" name="input" v-model="deptList.bankDepositBranch"></input>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">供应商姓名</text>
+					<view class="con-list">
+						<input placeholder="请填写供应商姓名" name="input" v-model="deptList.supplier"></input>
+					</view>
+				</view>
 			</view>
 		</view>
 		<button class="btn btns" @click="commitEdit">修改</button>

pageD/identity/companyIdentityLook.vue

@@ -79,18 +79,6 @@
 					{{deptList.bankDepositBranch}}
 				</view>
 			</view>
-			<view class="c-row b-b">
-				<text class="tit">供应商姓名</text>
-				<view class="con-list">
-					{{deptList.supplier}}
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">供应商电话</text>
-				<view class="con-list">
-						{{deptList.supplierPhone}}
-				</view>
-			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
@@ -103,12 +91,24 @@
 					{{deptList.compAddress}}
 				</view>
 			</view>
-			<view class="c-row" v-if="deptList.customerTypeFlag == 1">
+			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
 					{{deptList.compAddress}}
 				</view>
 			</view>
+			<view class="c-row b-b">
+				<text class="tit">供应商姓名</text>
+				<view class="con-list">
+					{{deptList.supplier}}
+				</view>
+			</view>
+			<view class="c-row ">
+				<text class="tit">供应商电话</text>
+				<view class="con-list">
+						{{deptList.supplierPhone}}
+				</view>
+			</view>
 			</view>
 	</view>
 </template>

pages/erpbusiness/acquisitionInformation.vue

@@ -123,17 +123,20 @@
 		methods: {
 			init() {
 				let _obj = {
-					commonId: this.sgId
+					commonId: this.sgId,
+					warehouseName:uni.getStorageSync("depotAcquisition_warehouseName")
 				}
 				this.$api.doRequest('get', '/acquisitionInfo/getInfo', _obj).then(res => {
 					if (res.data.code == 200) {
 						if (res.data.data) {
 							this.isEdit = true
 							this.value = res.data.data.checkFlag == '0' ? false : true
+							console.log(this.value)
 							this.warehouseName = res.data.data.warehouseName
 							this.textareaValue = res.data.data.acquisitionInformation
 							this.id = res.data.data.id
 						} else {
+							this.textareaValue = ''
 							this.isEdit = false
 							this.value = false
 						}
@@ -173,6 +176,8 @@
 				this.warehouseName = this.warehouseList[e[0]].warehouseName
 				this.warehouseId = this.warehouseList[e[0]].id
 				uni.setStorageSync("depotAcquisition_warehouseName", this.warehouseName)
+				this.init()
+				
 			},
 			/**
 			 * 统一跳转接口,拦截未登录路由
@@ -197,6 +202,7 @@
 					mask: true
 				})
 				let _flag = ''
+				console.log(this.value)
 				if (this.value) {
 					_flag = 1
 				} else {
@@ -225,13 +231,13 @@
 				this.isShowAlert = false
 			},
 			checkBoxChange(e) {
-				// console.log("e-----", e)
-				this.value = !this.value
+				this.value = e
+				// this.alertBtn1()
 				// console.log("value----", this.value)
 			},
 			submit() {
 				this.isShowAlert1 = true
-
+				
 				// this.$api.msg('提交成功')
 				// this.$api.msg('提交失败')
 			}