Commit 361871c79c5ae6758a569f94698b7192670bb83a
1 parent
1388fe70
12
Showing
3 changed files
with
19 additions
and
7 deletions
src/views/Login.vue
| @@ -56,8 +56,8 @@ export default { | @@ -56,8 +56,8 @@ export default { | ||
| 56 | data() { | 56 | data() { |
| 57 | return { | 57 | return { |
| 58 | form: { | 58 | form: { |
| 59 | - account: "", // cdoffice, xin | ||
| 60 | - password: "", // 123456 | 59 | + account: "cdwxsd07", // cdoffice, xin |
| 60 | + password: "WxB@2024!User", // WxB@2024!User | ||
| 61 | }, | 61 | }, |
| 62 | rules: { | 62 | rules: { |
| 63 | account: { required: true, message: "用户名不能为空", trigger: "blur" }, | 63 | account: { required: true, message: "用户名不能为空", trigger: "blur" }, |
src/views/baseSystemInfo/index.vue
| @@ -35,6 +35,13 @@ | @@ -35,6 +35,13 @@ | ||
| 35 | </el-col> | 35 | </el-col> |
| 36 | <el-col :span="3"> | 36 | <el-col :span="3"> |
| 37 | <el-form-item label=""> | 37 | <el-form-item label=""> |
| 38 | + <el-select v-model="query.specialRecordType" placeholder="请选择特殊备案类型" clearable> | ||
| 39 | + <el-option v-for="item in specialRecordTypeOption" :key="item.id" :label="item.fullName" :value="item.id"/> | ||
| 40 | + </el-select> | ||
| 41 | + </el-form-item> | ||
| 42 | + </el-col> | ||
| 43 | + <!-- <el-col :span="3"> | ||
| 44 | + <el-form-item label=""> | ||
| 38 | <el-input v-model="query.principalName" placeholder="请输入联系人" clearable/> | 45 | <el-input v-model="query.principalName" placeholder="请输入联系人" clearable/> |
| 39 | </el-form-item> | 46 | </el-form-item> |
| 40 | </el-col> | 47 | </el-col> |
| @@ -42,7 +49,7 @@ | @@ -42,7 +49,7 @@ | ||
| 42 | <el-form-item label=""> | 49 | <el-form-item label=""> |
| 43 | <el-input v-model="query.principalPhone" placeholder="请输入联系电话" clearable/> | 50 | <el-input v-model="query.principalPhone" placeholder="请输入联系电话" clearable/> |
| 44 | </el-form-item> | 51 | </el-form-item> |
| 45 | - </el-col> | 52 | + </el-col> --> |
| 46 | <el-col :span="3"> | 53 | <el-col :span="3"> |
| 47 | <el-form-item> | 54 | <el-form-item> |
| 48 | <el-button type="primary" icon="el-icon-search" @click="search()" >搜索</el-button> | 55 | <el-button type="primary" icon="el-icon-search" @click="search()" >搜索</el-button> |
| @@ -69,6 +76,9 @@ | @@ -69,6 +76,9 @@ | ||
| 69 | <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip> | 76 | <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip> |
| 70 | <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template> | 77 | <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template> |
| 71 | </el-table-column> | 78 | </el-table-column> |
| 79 | + <el-table-column label="特殊备案类型" prop="specialRecordType" align="left" show-overflow-tooltip> | ||
| 80 | + <template slot-scope="scope">{{ scope.row.specialRecordType | dynamicText(specialRecordTypeOption) }}</template> | ||
| 81 | + </el-table-column> | ||
| 72 | <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip> | 82 | <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip> |
| 73 | <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> --> | 83 | <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> --> |
| 74 | </el-table-column> | 84 | </el-table-column> |
| @@ -193,10 +203,12 @@ export default { | @@ -193,10 +203,12 @@ export default { | ||
| 193 | { prop: "principalPhone", label: "联系电话" }, | 203 | { prop: "principalPhone", label: "联系电话" }, |
| 194 | { prop: "areaId", label: "所属区域" }, | 204 | { prop: "areaId", label: "所属区域" }, |
| 195 | ], | 205 | ], |
| 206 | + specialRecordTypeOption: [], | ||
| 196 | }; | 207 | }; |
| 197 | }, | 208 | }, |
| 198 | 209 | ||
| 199 | created() { | 210 | created() { |
| 211 | + this.initSpecialRecordTypeOption(); | ||
| 200 | this.initSystemTypeList(); | 212 | this.initSystemTypeList(); |
| 201 | this.initAreaTypeList(); | 213 | this.initAreaTypeList(); |
| 202 | this.initList(); | 214 | this.initList(); |
src/views/homePage/HomePage.vue
| @@ -67,14 +67,14 @@ export default { | @@ -67,14 +67,14 @@ export default { | ||
| 67 | computed: {}, | 67 | computed: {}, |
| 68 | methods: { | 68 | methods: { |
| 69 | toSearchInfoList() { | 69 | toSearchInfoList() { |
| 70 | - if(this.$route.path == '/baseSystemInfo/index.vue') { | ||
| 71 | - this.$refs.info.search(); | ||
| 72 | - } else { | 70 | + // if(this.$route.path == '/baseSystemInfo/index.vue') { |
| 71 | + // this.$refs.info.search(); | ||
| 72 | + // } else { | ||
| 73 | this.$router.push({ | 73 | this.$router.push({ |
| 74 | path: "/baseSystemInfo/index.vue", | 74 | path: "/baseSystemInfo/index.vue", |
| 75 | query: { keyword: this.searchKeyword }, | 75 | query: { keyword: this.searchKeyword }, |
| 76 | }); | 76 | }); |
| 77 | - } | 77 | + // } |
| 78 | }, | 78 | }, |
| 79 | }, | 79 | }, |
| 80 | }; | 80 | }; |