活动类型、使用费用

src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js

@@ -140,6 +140,19 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                                             </el-form-item>
                                         </el-col>
 
+                                        <el-col :span="12" v-if="!formData.isEnrollSystem">
+                                            <el-form-item label="使用费用" prop="money">
+                                                <el-input-number
+                                                        :min="0"
+                                                        :precision="2"
+                                                        :step="0.01"
+                                                        placeholder="请填写使用费用"           
+                                                        style="width: 100%"
+                                                        v-model="formData.money">
+                                                </el-input-number>
+                                            </el-form-item>
+                                        </el-col>
+
                                         <el-col :span="12">
                                             <el-form-item label="参加人员范围" prop="groupId">
                                                 <div style="display: flex; justify-content: space-between">

src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js

@@ -44,6 +44,9 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = {
                 <el-descriptions-item label="活动地点">
                     {{ viewData.address }}
                 </el-descriptions-item>
+                <el-descriptions-item label="使用费用">
+                    {{ viewData.money || '暂无' }}
+                </el-descriptions-item>
                 <el-descriptions-item label="报名方式">
                     <span v-if="viewData.signUpMethod===1">个人报名</span>
                     <span v-else-if="viewData.signUpMethod===2">组队报名</span>

src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js

@@ -23,6 +23,23 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
                             <el-input clearable placeholder="请输入活动名称"
                                       v-model="pageForm.name"></el-input>
                         </search-item>
+                        
+                        <search-item label="活动类型">
+                            <el-select filterable placeholder="请选择活动类型" style="width: 100%"
+                                       v-model="pageForm.projectTypeCode" clearable>
+                                <el-option
+                                    :key="item.code"
+                                    :label="item.name+' ('+item.code+')'"
+                                    :value="item.code"
+                                    v-for="item in activityTypeList">
+                                </el-option>
+                            </el-select>
+                        </search-item>
+                        
+                        <search-item label="使用费用">
+                            <el-input clearable placeholder="请输入使用费用"
+                                      v-model="pageForm.money"></el-input>
+                        </search-item>
                     </search>
                 </el-card>
         
@@ -161,6 +178,7 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
     mixins: [initTableMixins],
     data() {
         return {
+            activityTypeList: [],
             codeDialogVisible: false,
             pageForm: {
                 year: new Date().getFullYear() + ""
@@ -264,7 +282,11 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
                 }
             })
             this.tableLoading = false
-        }
+        },
+        async getActivityTwoLevelType(code) {
+            const {data} = await this.$axios.post("/platform/activity/basic/settings/getActivityTwoLevelType", {code: code})
+            return data
+        },
     },
     async created() {
         // 根据 activity_type 动态添加流程相关列
@@ -274,6 +296,13 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
                 {prop: "instanceState", label: "流程状态"}
             );
         }
+        this.getActivityTwoLevelType("50000").then((data) => {
+            data.forEach((v) => {
+                if (v.code !== "50004") {
+                    this.activityTypeList.push(v)
+                }
+            })
+        })
         this.pageData()
     }
 }