Merge pull request 'tag061201' (#3) from shenhong into dev

Reviewed-on: #3

main/.env.development

@@ -18,4 +18,4 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # 内网接口地址
 VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
-VITE_APP_VIST_URL = 'http://192.168.18.99'
+# VITE_APP_VIST_URL = 'http://192.168.18.99'

sub-government-affairs-service/src/views/inputSuppliesManage/material/annualPlan/index.vue

@@ -99,7 +99,13 @@
       <template #default>
         <el-form ref="planForm" :model="formData" :rules="formRules" label-width="120px" class="common-dialog">
           <el-form-item label="" label-width="0px">
-            <AreaCascader v-model:value="areaFormData" split-rows label="所属行政区域-网格" :width="500" />
+            <AreaCascader
+              v-model:region-code="formData.regionCode"
+              v-model:grid-id="formData.gridId"
+              split-rows
+              label="所属行政区域-网格"
+              :width="500"
+            />
           </el-form-item>
           <!-- <AreaCascader v-model:value="areaFormData" split-rows label="所属行政区域-网格" :width="500" /> -->
           <el-form-item label="计划名称">
@@ -215,6 +221,7 @@ const fetchDetailData = async (id) => {
     const res = await getAnnualDetail(id);
     if (res.code === 200) {
       currentDetailRow.value = res.data;
+      formData.value = res.data;
     } else {
       app.$message.error(res.msg || '获取详情数据失败');
     }
@@ -332,8 +339,8 @@ const state = reactive({
           currentAction.value = 'reCreate';
           formData.value = { ...row };
           if (isGridMember.value) {
-            formData.value.regionName = row.regionName;
+            formData.value.regionCode = row.regionCode;
-            formData.value.gridName = row.gridName;
+            formData.value.gridId = row.gridId;
           }
           formData.value.growthCycleUnit = row.growthCycleUnit || '1';
           commonDialogVisible.value = true;
@@ -349,6 +356,7 @@ const state = reactive({
             formData.value.regionName = row.regionName;
             formData.value.gridName = row.gridName;
           }
+          formData.value.plantingArea = row.plantingAreaActual;
           formData.value.growthCycleUnit = row.growthCycleUnit || '1';
           commonDialogVisible.value = true;
         },
@@ -399,6 +407,7 @@ const submitForm = async () => {
       app.$message.success('重新制定计划成功');
     } else if (currentAction.value === 'fillActual') {
       // 填写实际种植信息的提交逻辑
+      formData.value.planId = formData.value.id;
       await saveActualProgress(formData.value);
       app.$message.success('填写实际种植信息成功');
     } else if (currentAction.value === 'add') {

sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue

@@ -81,14 +81,7 @@
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="土地产权信息" name="property">
-          <el-form
+          <el-form ref="propertyFormRef" :model="formDataProperty" :rules="propertyRules" label-width="120px" class="form-container">
-            ref="propertyFormRef"
-            :model="formDataProperty"
-            :rules="propertyRules"
-            :disabled="disabledProperty"
-            label-width="120px"
-            class="form-container"
-          >
             <el-form-item label="地块名称">
               <el-input v-model="formDataProperty.landName" disabled />
             </el-form-item>
@@ -120,7 +113,7 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="handleAddSubmit('basic')">提交</el-button>
+          <el-button v-if="activeTab === 'basic'" type="primary" @click="handleAddSubmit('basic')">提交</el-button>
           <el-button v-if="activeTab === 'basic'" :disabled="disabledProperty" @click="activeTab = 'property'">下一步</el-button>
           <el-button v-else @click="activeTab = 'basic'">上一步</el-button>
           <el-button v-if="activeTab === 'property'" type="primary" @click="handleAddSubmit('property')"> 提交 </el-button>
@@ -395,7 +388,7 @@ const option = reactive({
   column: [
     { label: '地块名称', prop: 'landName' },
     { label: '所属网格', prop: 'gridName' },
-    { label: '面积', prop: 'area' },
+    { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${cellValue} 亩` },
     { label: '土地类型', prop: 'landTypeName' },
     { label: '所属行政区域', prop: 'fullRegionName' },
     { label: '具体位置', prop: 'address' },

sub-government-affairs-service/src/views/resource/grid/AddGrid.vue

@@ -81,6 +81,7 @@ const state = reactive({
       {
         label: '网格编号',
         prop: 'id',
+        addDisplay: false,
       },
       {
         label: '网格名称',
@@ -301,6 +302,7 @@ const setCity = (row) => {
 // 新增
 const rowSave = (row, done, loading) => {
   setCity(row);
+  row.gridAreaCode = row.cities;
   AddEntity(row)
     .then((res) => {
       if (res.code === 200) {

sub-government-affairs-service/src/views/resource/grid/GridMember.vue

@@ -67,7 +67,7 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="submitAddForm">确定</el-button>
+          <el-button type="primary" @click="submitForm">确定</el-button>
         </span>
       </template>
     </el-dialog>