Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/screen/src/router/index.js

@@ -193,7 +193,7 @@ const routes = [
     }
   },
   {
-    path: '/projectAdd/:data?',
+    path: '/projectAdd/:data?/:mode?',
     name: 'projectAdd',
     component: () => import('../views/ProjectManagement_Rebuild/district/projectAddPage.vue'),
     meta: {

packages/screen/src/views/ProjectManagement_Rebuild/business/index.vue

@@ -7,6 +7,7 @@
                 placeholder="路线编码" :suffix-icon="Search" />
         </div>
         <div class="event-box">
+            
             <el-button type="primary" color="#952DE6" @click="">导出</el-button>
         </div>
         <DynamicTable :dataSource="script.tableData.value" :columns="script.columns" :autoHeight="true"

packages/screen/src/views/ProjectManagement_Rebuild/district/index.js

@@ -372,6 +372,16 @@ export default () => {
         getTableData();
     })
 
+// 新增填报
+const newAdd = () => {
+  router.push({
+    name: 'projectAdd',
+    params: {
+      mode: 'add'
+    }
+  })
+}
+
 
     watch(filterData, (val) => {
         getTableData(filterData);
@@ -395,5 +405,7 @@ export default () => {
         model2,
         modelVisible2,
         dialogRef2,
+
+        newAdd,
     }
 }

packages/screen/src/views/ProjectManagement_Rebuild/district/index.vue

@@ -7,6 +7,7 @@
                 placeholder="路线编码" :suffix-icon="Search" />
         </div>
         <div class="event-box">
+            <el-button type="primary" @click="script.newAdd">新增填报</el-button>
             <el-button type="primary" color="#952DE6" @click="">导出</el-button>
         </div>
         <DynamicTable :dataSource="script.tableData.value" :columns="script.columns" :autoHeight="true"

packages/screen/src/views/ProjectManagement_Rebuild/district/projectAddPage.vue

@@ -9,19 +9,19 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="区县名称" prop="区县名称">
-                            <el-input disabled v-model="form.districtName"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.districtName"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="路线编码" prop="路线编码">
-                            <el-input disabled v-model="form.routeNo"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.routeNo"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="实施里程" prop="实施里程">
-                            <el-input-number disabled v-model="form.implementMileage" :controls="false">
+                            <el-input-number :disabled="!isAddMode" v-model="form.implementMileage" :controls="false">
                                 <template #suffix>
                                     <span>公里</span>
                                 </template>
@@ -30,7 +30,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="塌方及损失" prop="塌方及损失">
-                            <el-input-number disabled v-model="form.earthworkLoss" :controls="false">
+                            <el-input-number :disabled="!isAddMode" v-model="form.earthworkLoss" :controls="false">
                                 <template #suffix>
                                     <span>方/万元</span>
                                 </template>
@@ -41,36 +41,36 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="起点桩号" prop="起点桩号">
-                            <el-input disabled v-model="form.startStakeNo"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.startStakeNo"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="止点桩号" prop="止点桩号">
-                            <el-input disabled v-model="form.endStakeNo"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.endStakeNo"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="路况位置" prop="路况位置">
-                            <el-input disabled v-model="form.roadLocation"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.roadLocation"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="阻断点小地名" prop="阻断点小地名">
-                            <el-input disabled v-model="form.blockedPointName"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.blockedPointName"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="灾害类型" prop="灾害类型">
-                            <el-input disabled v-model="form.disasterType"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.disasterType"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="预估费用" prop="预估费用">
-                            <el-input-number disabled v-model="form.estimatedCost" :controls="false">
+                            <el-input-number :disabled="!isAddMode" v-model="form.estimatedCost" :controls="false">
                                 <template #suffix>
                                     <span>万元</span>
                                 </template>
@@ -81,7 +81,7 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="技术等级" prop="技术等级">
-                            <el-select disabled v-model="form.technicalGrade">
+                            <el-select :disabled="!isAddMode" v-model="form.technicalGrade">
                                 <el-option
                                     v-for="item in [{ value: '三级', label: '三级' }, { value: '二级', label: '二级' }, { value: '一级', label: '一级' }]"
                                     :key="item.value" :label="item.label" :value="item.value" />
@@ -90,26 +90,28 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="资金来源" prop="资金来源">
-                            <el-input disabled v-model="form.fundingSource"></el-input>
+                            <el-input :disabled="!isAddMode" v-model="form.fundingSource"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="处置灾毁处数" prop="处置灾毁处数">
-                            <el-input-number disabled v-model="form.disposalCount" :controls="false"></el-input-number>
+                            <el-input-number :disabled="!isAddMode" v-model="form.disposalCount"
+                                :controls="false"></el-input-number>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="已完工处数" prop="已完工处数">
-                            <el-input-number disabled v-model="form.completedCount" :controls="false"></el-input-number>
+                            <el-input-number :disabled="!isAddMode" v-model="form.completedCount"
+                                :controls="false"></el-input-number>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="总投资" prop="总投资">
-                            <el-input-number disabled v-model="form.totalInvestment" :controls="false">
+                            <el-input-number :disabled="!isAddMode" v-model="form.totalInvestment" :controls="false">
                                 <template #suffix>
                                     <span>万元</span>
                                 </template>
@@ -118,7 +120,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="项目费用类型" prop="项目费用类型">
-                            <el-radio-group disabled v-model="form.projectExpenseType">
+                            <el-radio-group :disabled="!isAddMode" v-model="form.projectExpenseType">
                                 <el-radio value="自费重修">自费重修</el-radio>
                                 <el-radio value="申报重修">申报重修</el-radio>
                             </el-radio-group>
@@ -350,6 +352,7 @@ const router = useRouter()
 const route = useRoute()
 const form = ref({})
 const formRef = ref(null)
+const isAddMode = ref(false) // 是否为新增模式
 
 // 附件分类: 1-现场图片/视频 2-施工图设计批复文件 3-施工合同 4-交竣工证书 5-完工项目上传图片 6-其他佐证文件
 const designApprovalFiles = ref([]) // 施工图设计批复文件
@@ -369,7 +372,53 @@ const otherFiles = ref([]) // 其他佐证文件
 // }, { deep: true })
 
 onMounted(() => {
-    if (route.params.data) {
+    // 判断是否为新增模式
+    if (route.params.mode === 'add') {
+        isAddMode.value = true
+        // 初始化空的表单数据
+        form.value = {
+            districtName: '',
+            routeNo: '',
+            implementMileage: null,
+            earthworkLoss: null,
+            startStakeNo: '',
+            endStakeNo: '',
+            roadLocation: '',
+            blockedPointName: '',
+            disasterType: '',
+            estimatedCost: null,
+            technicalGrade: '',
+            fundingSource: '',
+            disposalCount: null,
+            completedCount: null,
+            totalInvestment: null,
+            projectExpenseType: '自费重修',
+            mainConstructionContent: '',
+            startTime: '',
+            endTime: '',
+            isReportedToMinistry: '0',
+            reportedInvestment: null,
+            projectProgress: '',
+            constructionUnit: '',
+            constructionUnitContact: '',
+            constructionUnitPhone: '',
+            executionUnit: '',
+            executionUnitContact: '',
+            executionUnitPhone: '',
+            designUnit: '',
+            designUnitContact: '',
+            designUnitPhone: '',
+            supervisionUnit: '',
+            supervisionUnitContact: '',
+            supervisionUnitPhone: '',
+            designApprovalTime: '',
+            contractTime: '',
+            contractAmount: null,
+            completedInvestment: null,
+            acceptanceTime: ''
+        }
+    } else if (route.params.data) {
+        // 编辑模式
         const data = JSON.parse(decodeURIComponent(route.params.data));
 
         if (data.projectExpenseType === '申报重修') {
@@ -404,11 +453,22 @@ const submit = async () => {
                 text: '操作中',
                 background: 'rgba(0, 0, 0, 0.7)',
             })
-            const res = await request({
-                url: '/snow-ops-platform/recovery/report',
-                method: 'POST',
-                data: data,
-            })
+            let res = null;
+            if (route.params.mode === 'add') {
+                // 如果是新增填报 则调用新增接口
+                res = await request({
+                    url: '/snow-ops-platform/recovery/add',
+                    method: 'POST',
+                    data: data,
+                })
+            } else {
+                // 如果是区县项目申报 调用申报接口
+                res = await request({
+                    url: '/snow-ops-platform/recovery/report',
+                    method: 'POST',
+                    data: data,
+                })
+            }
             loading.close();
             if (res.code === '00000') {
                 router.push({