Merge branch 'dev' into 'master'

fix: 问题修改

See merge request !22

components.d.ts

@@ -32,6 +32,7 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -50,6 +51,7 @@ declare module 'vue' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']

src/views/order/podUs/index.vue

@@ -1081,7 +1081,11 @@
       <ElFormItem
         label="异常类型"
         prop="exceptionType"
-        :rules="{ required: true, message: '请选择异常类型' }"
+        :rules="
+          status === 'EXCEPTION_ORDER'
+            ? { required: true, message: '请选择异常类型' }
+            : {}
+        "
       >
         <ElSelect
           v-model="exceptionForm.exceptionType"
@@ -1097,7 +1101,15 @@
           />
         </ElSelect>
       </ElFormItem>
-      <ElFormItem label="异常原因" prop="exceptionReason">
+      <ElFormItem
+        label="异常原因"
+        prop="exceptionReason"
+        :rules="
+          status !== 'EXCEPTION_ORDER'
+            ? { required: true, message: '请输入异常原因' }
+            : {}
+        "
+      >
         <ElInput
           v-model="exceptionForm.exceptionReason"
           style="width: 100%"