上传

src/views/IncidentManagementReport/index.tsx

@@ -41,36 +41,54 @@ export default defineComponent({
 
     const showCreateByPicker = ref(false);
 
+    const showCreateTypeByPicker = ref(false);
+
     const route = useRoute();
     const router = useRouter();
 
     const handleSaveReport = () => {
       const { id } = route.query;
+      console.log(1111111111);
+      console.log(form);
 
       const saveFn = id ? store.putIncidentItem : store.postIncidentItem;
+      // console.log(formRef);
 
-      formRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-          if (!form.value.locations) {
-            Notify({
-              type: 'danger',
-              message: '需要点击确认按钮确认是否正确',
-            });
-            return;
-          }
-          const result = await saveFn({
-            ...form.value,
-            level: Number(form.value.level) ?? null,
-            type: Number(form.value.type) ?? null,
-            status: route.params.status as unknown as number,
-          });
-          if (result) {
-            router.replace(
-              `/incident-management/status/${route.params.status}`,
-            );
-          }
-        }
+      const result = saveFn({
+        ...form.value,
+        level: Number(form.value.level) ?? null,
+        type: Number(form.value.type) ?? null,
+        // status: route.params.status as unknown as number,
       });
+
+      // if (result) {
+      //   // router.push(`/status/${route.params.status}/report`)
+      //   router.replace(
+      //     `/incident-management/status/${route.params.status}`,
+      //   );
+      // }
+      // formRef.value.validate(async (valid: boolean) => {
+      //   if (valid) {
+      //     if (!form.value.locations) {
+      //       Notify({
+      //         type: 'danger',
+      //         message: '需要点击确认按钮确认是否正确',
+      //       });
+      //       return;
+      //     }
+      //     const result = await saveFn({
+      //       ...form.value,
+      //       level: Number(form.value.level) ?? null,
+      //       type: Number(form.value.type) ?? null,
+      //       status: route.params.status as unknown as number,
+      //     });
+      //     if (result) {
+      //       router.replace(
+      //         `/incident-management/status/${route.params.status}`,
+      //       );
+      //     }
+      //   }
+      // });
     };
 
     onMounted(async () => {
@@ -130,7 +148,7 @@ export default defineComponent({
               rules={[{ required: true, message: '上报单位必填' }]}
             />
             <Field
-              v-model={form.value.type}
+              v-model={form.value.typeText}
               is-link
               readonly
               name="事件类型"
@@ -138,26 +156,27 @@ export default defineComponent({
               placeholder="请选择"
               required
               rules={[{ required: true, message: '事件类型必填' }]}
-              onClick={() => (showCreateByPicker.value = true)}
+              onClick={() => (showCreateTypeByPicker.value = true)}
             />
-            <Popup v-model:show={showCreateByPicker.value} position="bottom">
+            <Popup v-model:show={showCreateTypeByPicker.value} position="bottom">
               <Picker
                 columns={commonStore.globalDict['zhdd_incident_type']?.map(
                   (i) => ({ text: i.dictLabel, value: i.dictValue }),
                 )}
                 onConfirm={(value) => {
-                  form.value.type = value.text;
+                  form.value.typeText = value.text; 
+                  form.value.type = value.value; 
                   console.log(value, '---');
 
-                  showCreateByPicker.value = false;
+                  showCreateTypeByPicker.value = false;
                 }}
                 onCancel={() => {
-                  showCreateByPicker.value = false;
+                  showCreateTypeByPicker.value = false;
                 }}
               />
             </Popup>
             <Field
-              v-model={form.value.level}
+              v-model={form.value.levelText}
               is-link
               readonly
               name="事件等级"
@@ -173,7 +192,8 @@ export default defineComponent({
                   (i) => ({ text: i.dictLabel, value: i.dictValue }),
                 )}
                 onConfirm={(value) => {
-                  form.value.type = value.text;
+                  form.value.levelText = value.text;
+                  form.value.level = value.value;
                   console.log(value, '---');
 
                   showCreateByPicker.value = false;