张延森 3 лет назад
Родитель
Сommit
a1aa20c19b
4 измененных файлов: 44 добавлений и 23 удалений
  1. 7
    7
      src/pages/result/index.vue
  2. 22
    12
      src/pages/resumeWorkForm/index.vue
  3. 12
    1
      src/services/org.js
  4. 3
    3
      vite.config.js

+ 7
- 7
src/pages/result/index.vue Просмотреть файл

@@ -12,13 +12,13 @@
12 12
 </template>
13 13
 <script setup>
14 14
 import { Icon, Button } from 'vant';
15
-import { useRouter } from 'vue-router'
16
-const router = useRouter()
17
-const goForm = () => {
18
-  router.replace({
19
-    path: '/resume-work-form'
20
-  })
21
-}
15
+// import { useRouter } from 'vue-router'
16
+// const router = useRouter()
17
+// const goForm = () => {
18
+//   router.replace({
19
+//     path: '/resume-work-form'
20
+//   })
21
+// }
22 22
 </script>
23 23
 <style lang="less" scoped>
24 24
 #body {

+ 22
- 12
src/pages/resumeWorkForm/index.vue Просмотреть файл

@@ -6,6 +6,7 @@
6 6
       <CellGroup inset>
7 7
         <Field
8 8
           v-model="formData.orgName"
9
+          :disabled="disableOrg"
9 10
           readonly
10 11
           required
11 12
           name="orgName"
@@ -103,11 +104,11 @@
103 104
 </template>
104 105
 
105 106
 <script setup>
106
-import { onMounted, reactive, ref, computed } from 'vue';
107
+import { onMounted, reactive, ref, computed, watch } from 'vue';
107 108
 import { useRouter } from 'vue-router'
108 109
 import dayjs from 'dayjs'
109 110
 import { Button, Form, Field, CellGroup, Image, Uploader, RadioGroup, Radio, Switch, Popup, Picker, Loading, Toast } from 'vant';
110
-import { getOrgList } from '@/services/org'
111
+import { getOrgList, getOrg } from '@/services/org'
111 112
 import { addResume } from '@/services/resume'
112 113
 import { upload } from '@/services/oss'
113 114
 import headImg from '@/assets/banner-1.jpg'
@@ -125,27 +126,36 @@ const formData = reactive({
125 126
   nucleicIsNormal: null,
126 127
 })
127 128
 
129
+const disableOrg = ref(false);
128 130
 const showPicker = ref(false);
129 131
 let columns = ref([]);
130 132
 let orgList = ref([]);
131 133
 let loading = ref(false);
132 134
 
133 135
 const router = useRouter()
136
+watch(router.currentRoute, (currentRoute) => {
137
+  const orgId = currentRoute.query.org
138
+  console.log('------orgId------->', orgId, disableOrg.value)
139
+  if (!orgId) {
140
+    disableOrg.value = false
141
+    return;
142
+  }
143
+
144
+  //
145
+  getOrg(orgId).then((org) => {
146
+    disableOrg.value = true
147
+    formData.orgId = org.orgId
148
+    formData.orgName = org.orgName
149
+  })
150
+}, {
151
+  immediate: true,
152
+  deep: true,
153
+})
134 154
 
135 155
 const customFieldName = {
136 156
   text: 'orgName',
137 157
 }
138 158
 
139
-onMounted(() => {
140
-  // getOrgList({ pageSize: 500 }).then((res) => {
141
-  //   orgList.value = res.records;
142
-  //   columns.value = res.records.map(item => item.orgName);
143
-  // }).catch(e => {
144
-  //   Toast('系统错误请刷新重试');
145
-  //   console.log(e);
146
-  // })
147
-});
148
-
149 159
 const onConfirm = (value) => {
150 160
   formData.orgId = value.orgId
151 161
   formData.orgName = value.orgName

+ 12
- 1
src/services/org.js Просмотреть файл

@@ -2,10 +2,21 @@ import request,{ baseURL } from "../utils/request";
2 2
 
3 3
 /**
4 4
  * 获取企业列表
5
- * @param {*} person 
5
+ * @param {*} params 
6
+ * @param {*} loading 
6 7
  * @returns 
7 8
  */
8 9
  export function getOrgList(params, loading) {
9 10
   const url = `${baseURL}/org`
10 11
   return request(url, { params, loading })
12
+}
13
+
14
+/**
15
+ * 获取企业信息
16
+ * @param {*} person 
17
+ * @returns 
18
+ */
19
+ export function getOrg(id) {
20
+  const url = `${baseURL}/org/${id}`
21
+  return request(url)
11 22
 }

+ 3
- 3
vite.config.js Просмотреть файл

@@ -9,11 +9,11 @@ export default defineConfig({
9 9
   server: {
10 10
     proxy: {
11 11
       '/api': {
12
-        target: 'http://192.168.89.147:9000',
12
+        target: 'http://192.168.89.147:9001',
13 13
         changeOrigin: true,//允许跨域允许的是host 不是全部的路径 path前面不一样就是跨域
14 14
         headers: {
15
-          'origin': 'http://192.168.89.147:9000',
16
-          'referer': 'http://192.168.89.147:9000'
15
+          'origin': 'http://192.168.89.147:9001',
16
+          'referer': 'http://192.168.89.147:9001'
17 17
         }
18 18
       }
19 19
     }