Merge branch 'gaoqucodecheck' of...

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck

src/_shanghu_detail-edit.html

@@ -88,15 +88,15 @@
 					
 					<!-- 新增字段  -->
 					<div class="form-item">
-						<span class="form-label">所属社区</span>
+						<span class="form-label van-cell--required">所属社区</span>
 						<div class="form-input-wrap">
-							<select class="selector" v-model="formData.community"
+							<select class="selector" v-model="formData.deptId"
 							 :disabled="flag=='XQ'">
 								<option
 									v-for="(item, i) in dict4community"
 									:key="i"
 									:label="item.label"
-									:value="item.label"
+									:value="item.id"
 								></option>
 							</select>
 						</div>

src/_shanghu_detail-edit.js

@@ -203,6 +203,7 @@ window.addEventListener('load', function () {
 					page:1,
 					size: 9999,
 					sign: 22,
+					"merId": gemhoUtil.getParameter('merId'),
 				}
 			}, (res) => {
 				if (!res) { // 中台返回为undefined 重新请求
@@ -338,7 +339,7 @@ window.addEventListener('load', function () {
 			}
 			if(!reqParam.area){
 				vant.Toast({
-					message: '建筑不能为空',
+					message: '建筑面积不能为空',
 				})
 				return
 			}
@@ -348,13 +349,20 @@ window.addEventListener('load', function () {
 				})
 				return
 			}
-			if(!reqParam.deptId){
+			if(!reqParam.community){
 				vant.Toast({
 					message: '所属社区不能为空',
 				})
 				return
 			}
 			
+			if(!reqParam.industryType){
+				vant.Toast({
+					message: '行业类型不能为空',
+				})
+				return
+			}
+			
 			http3.put('/gq/merchant', reqParam).then((res) => {
 				console.log('添加结果', res)
 				vant.Toast({