Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/audit/depots/components/ruleForm.vue

@@ -38,9 +38,9 @@
 					<el-button type="primary" icon="el-icon-s-custom" @click="toCargoOwner">货主管理</el-button>
 				</el-col>
 			</el-form-item>
-			<el-form-item label="第三方货仓库：" prop="thirdStorehouseName" v-if="ruleForm.isThird">
+			<el-form-item label="第三方货仓库：" prop="thirdStorehouseCode" v-if="ruleForm.isThird">
 				<el-col :span="13">
-					<el-select v-model="ruleForm.thirdStorehouseName" placeholder="请选择第三方货仓库">
+					<el-select v-model="ruleForm.thirdStorehouseCode" placeholder="请选择第三方货仓库">
 						<el-option v-for="(item,index) in thirdStorehouseList" :key="index" :label="item" :value="item"></el-option>
 					</el-select>
 				</el-col>
@@ -76,7 +76,8 @@
 			thirdSysName: 'GEEKPLUS', //第三方系统名称
 			thirdPartnerId: null, //货主ID
 			thirdPartnerName: null, //货主名称
-			thirdStorehouseName: null, //云仓仓库名称
+			thirdPartnerCode: null, //云仓货主编号
+			thirdStorehouseCode: null, //云仓仓库编号
 			address: null, //详细地址
 			province: null, //仓库所在省
 			provinceCode: null, //省份编号
@@ -106,7 +107,7 @@
 			thirdPartnerId: [{
 				required: true, message: '请选择第三方货主', trigger: 'change'
 			}],
-			thirdStorehouseName: [{
+			thirdStorehouseCode: [{
 				required: true, message: '请选择第三方货仓库', trigger: 'change'
 			}],
 			address: [{
@@ -217,7 +218,7 @@
 			// 	data.thirdSysName = null;
 			// 	data.thirdPartnerId = null;
 			// 	data.thirdPartnerName = null;
-			// 	data.thirdStorehouseName = null;
+			// 	data.thirdStorehouseCode = null;
 			// }
 			
 			return (this as any).$lodash.cloneDeep(data);
@@ -230,7 +231,8 @@
 			for (var i = 0; i < (this as any).thirdPartnerList.length; i++) {
 				if((this as any).thirdPartnerList[i].id == e){
 					(this as any).ruleForm.thirdPartnerName = (this as any).thirdPartnerList[i].wmsMemberName;
-					(this as any).ruleForm.thirdStorehouseName = (this as any).thirdPartnerList[i].wmsWarehouseIdList;
+					(this as any).ruleForm.thirdPartnerCode = (this as any).thirdPartnerList[i].wmsMemberId;
+					(this as any).ruleForm.thirdStorehouseCode = (this as any).thirdPartnerList[i].wmsWarehouseIdList;
 					(this as any).thirdStorehouseList.push((this as any).thirdPartnerList[i].wmsWarehouseIdList);
 				}
 			}
@@ -256,8 +258,9 @@
 				isThird: 0, //是否绑定第三方仓库
 				thirdSysName: 'GEEKPLUS', //第三方系统名称
 				thirdPartnerId: null, //货主ID
+				thirdPartnerCode: null, //云仓货主编号
 				thirdPartnerName: null, //货主名称
-				thirdStorehouseName: null, //云仓仓库名称
+				thirdStorehouseCode: null, //云仓仓库名称
 				address: null, //详细地址
 				province: null, //仓库所在省
 				provinceCode: null, //省份编号

src/views/audit/depots/index.vue

@@ -513,8 +513,9 @@
 					if(query.isThird == 0 || query.isThird == null){
 						query.thirdSysName = '';
 						query.thirdPartnerId = '';
+						query.thirdPartnerCode = '',
 						query.thirdPartnerName = '';
-						query.thirdStorehouseName = '';
+						query.thirdStorehouseCode = '';
 					}
 					// console.log(query);
 					if (this.popTitle === '注册') {