Browse Source

1.增加数据字典

psj0001 1 day ago
parent
commit
46e8c8c861
2 changed files with 19 additions and 8 deletions
  1. 4 2
      src/views/cstj/suggestedMain/index.vue
  2. 15 6
      src/views/cstj/updateProject/index.vue

+ 4 - 2
src/views/cstj/suggestedMain/index.vue

@@ -114,7 +114,9 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="整治建议类型" prop="type">
-                  <el-input v-model="form.type" :disabled="!dialog.editable" placeholder="请输入整治建议类型" />
+                  <el-select v-model="form.type" :disabled="!dialog.editable" placeholder="整治建议类型" clearable>
+                    <el-option v-for="dict in suggest_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -247,7 +249,7 @@ import { selectProblemsMainList } from '@/api/cstj/problemsMain';
 import { getInfo as getUserInfo } from '@/api/login';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { cstj_filling_state, problems_type } = toRefs<any>(proxy?.useDict('cstj_filling_state', 'problems_type'));
+const { cstj_filling_state, problems_type, suggest_type } = toRefs<any>(proxy?.useDict('cstj_filling_state', 'problems_type', 'suggest_type'));
 
 const suggestedMainList = ref<SuggestedMainVO[]>([]);
 const buttonLoading = ref(false);

+ 15 - 6
src/views/cstj/updateProject/index.vue

@@ -96,17 +96,26 @@
             <el-form-item label="项目编号" prop="code">
               <el-input v-model="form.code" placeholder="请输入项目编号" />
             </el-form-item>
+            <el-form-item label="项目名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入项目名称" />
+            </el-form-item>
             <el-form-item label="更新类型" prop="type">
-              <el-input v-model="form.type" placeholder="请输入更新类型" />
+              <el-select v-model="form.type" :disabled="!dialog.editable" placeholder="更新类型" clearable>
+                <el-option v-for="dict in update_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="年度" prop="yearly">
-              <el-select v-model="form.yearly" :disabled="!dialog.editable" placeholder="请选择年度" clearable filterable @change="getSuggestedMainList(form.yearly)">
+              <el-select
+                v-model="form.yearly"
+                :disabled="!dialog.editable"
+                placeholder="请选择年度"
+                clearable
+                filterable
+                @change="getSuggestedMainList(form.yearly)"
+              >
                 <el-option v-for="dict in yearList" :key="dict.yearly" :label="dict.yearly" :value="dict.yearly" />
               </el-select>
             </el-form-item>
-            <el-form-item label="项目名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入项目名称" />
-            </el-form-item>
             <el-form-item label="项目区域" prop="geojson">
               <el-input v-model="form.geojson" disabled placeholder="请输入项目区域" style="flex: 1" />
               <el-button type="primary" style="height: 33px">绘制</el-button>
@@ -190,7 +199,7 @@ import { getSuggestedMain, selectSuggestedMainList } from '@/api/cstj/suggestedM
 import { SuggestedMainVO } from '@/api/cstj/suggestedMain/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { cstj_filling_state } = toRefs<any>(proxy?.useDict('cstj_filling_state'));
+const { cstj_filling_state, update_type } = toRefs<any>(proxy?.useDict('cstj_filling_state', 'update_type'));
 
 const updateProjectList = ref<UpdateProjectVO[]>([]);
 const buttonLoading = ref(false);