李志伟 преди 3 години
родител
ревизия
482a07ad87
променени са 3 файла, в които са добавени 16 реда и са изтрити 18 реда
  1. 1
    1
      index.html
  2. 14
    16
      src/pages/resumeWorkForm/index.vue
  3. 1
    1
      vite.config.js

+ 1
- 1
index.html Целия файл

@@ -4,7 +4,7 @@
4 4
     <meta charset="UTF-8" />
5 5
     <link rel="icon" href="/favicon.ico" />
6 6
     <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no" />
7
-    <title>复工复产申报</title>
7
+    <title>疫情检测结果表</title>
8 8
   </head>
9 9
   <body>
10 10
     <div id="app"></div>

+ 14
- 16
src/pages/resumeWorkForm/index.vue Целия файл

@@ -14,14 +14,16 @@
14 14
           :rules="[{ required: true, message: '请选择企业' }]"
15 15
           @click="showPicker = true"
16 16
         />
17
-        <Popup v-model:show="showPicker" position="left" :style="{ height: '100%', width: '80%' }" >
18
-          <!-- <Picker
17
+        <!-- <Popup v-model:show="showPicker" position="left" :style="{ height: '100%', width: '80%' }" >
18
+          <org-picker v-model="formData.orgId" @change="onConfirm" />
19
+        </Popup> -->
20
+        <Popup v-model:show="showPicker" position="bottom"  >
21
+          <Picker
19 22
             :columns="orgList"
20 23
             :columns-field-names="customFieldName"
21 24
             @confirm="onConfirm"
22 25
             @cancel="showPicker = false"
23
-          /> -->
24
-          <org-picker v-model="formData.orgId" @change="onConfirm" />
26
+          />
25 27
         </Popup>
26 28
         <Field
27 29
           v-model="formData.userName"
@@ -38,8 +40,6 @@
38 40
           name="antigenImage"
39 41
           label="截图"
40 42
           input-align="right"
41
-          required
42
-          :rules="[{ required: true, message: '请选择抗原截图' }]"
43 43
         >
44 44
           <template #input>
45 45
             <up-single-img v-model="formData.antigenImage" :preview-size="40" />
@@ -48,9 +48,7 @@
48 48
         <Field
49 49
           name="antigenIsNormal"
50 50
           label="是否正常"
51
-          required
52 51
           input-align="right"
53
-          :rules="[{ required: true, message: '请选择是否正常' }]"
54 52
         >
55 53
           <template #input>
56 54
             <RadioGroup v-model="formData.antigenIsNormal" direction="horizontal">
@@ -115,7 +113,7 @@ import { upload } from '@/services/oss'
115 113
 import headImg from '@/assets/banner-1.jpg'
116 114
 
117 115
 const today = ref(dayjs().format('YYYY.MM.DD'));
118
-const title = computed(() => `复工申请单(${today.value})`)
116
+const title = computed(() => `疫情检测结果表(${today.value})`)
119 117
 
120 118
 const formData = reactive({
121 119
   orgId: null,
@@ -139,13 +137,13 @@ const customFieldName = {
139 137
 }
140 138
 
141 139
 onMounted(() => {
142
-  // getOrgList({ pageSize: 500 }).then((res) => {
143
-  //   orgList.value = res.records;
144
-  //   columns.value = res.records.map(item => item.orgName);
145
-  // }).catch(e => {
146
-  //   Toast('系统错误请刷新重试');
147
-  //   console.log(e);
148
-  // })
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
+  })
149 147
 });
150 148
 
151 149
 const onConfirm = (value) => {

+ 1
- 1
vite.config.js Целия файл

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