Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

src/plant/base/base-edit/index.vue

@@ -620,14 +620,14 @@ const options = ref([
 ]);
 const rules = reactive({
     'baseInfo.baseName': [{ required: true, message: '请输入基地名称' }],
-    'baseInfo.baseCode': [{ required: true, message: '请输入基地编号' }],
+    // 'baseInfo.baseCode': [{ required: true, message: '请输入基地编号' }],
     // 'baseInfo.buildDate': [{ required: true, message: '请选择建设时间' }],
     'baseInfo.orgType': [{ required: true, message: '请选择基地组织方式' }],
     // 'baseInfo.contactId': [{ required: true, message: '请选择基地负责人' }],
     'baseInfo.contactTel': [{ required: true, message: '请输入基地联系电话' }],
     'baseInfo.gapInfo.adcode': [{ required: true, message: '请选择基地具体地址' }],
     'baseInfo.gapFlag': [{ required: true, message: '请选择是否为Gap基地' }],
-    'baseInfo.gapInfo.basePic': [{ required: true, message: '请绘制基地范围' }],
+    // 'baseInfo.gapInfo.basePic': [{ required: true, message: '请绘制基地范围' }],
     'baseInfo.gapInfo.area': [{ required: true, message: '请输入基地面积' }],
     // 'baseInfo.gapInfo.lng': [{ required: true, message: '请输入基地经纬度' }],
     // 'baseInfo.gapInfo.lat': [{ required: true, message: '请输入基地经纬度' }],
@@ -853,6 +853,7 @@ const addPlot = (rowItem: any, title = '添加地块') => {
 const submitFormPlotAdd = (data: any) => {
     form.value.landInfoList.push({
         ...data,
+        baseId: did.value || undefined,
     });
 };
 const mapUnitByBaseType: any = {