Переглянути джерело

修改路有异常签收驳回的状态码

Alex 9 місяців тому
батько
коміт
2d7982cb6b

+ 3 - 4
src/components/CommonPage/SimpleFormModal.vue

@@ -69,7 +69,7 @@
     idKey: { type: String, default: 'id' },
     fallbackData: { type: Function, default: (data) => data } //回填数据
   });
-  const emit = defineEmits(['success']);
+  const emit = defineEmits(['success', 'refresh']);
   /** 弹窗是否打开 */
   const visible = defineModel({ type: Boolean });
 
@@ -128,8 +128,6 @@
 
   const formRef = ref();
   const handleSumbit = () => {
-    console.log(props.formatData, '格式化数据');
-
     formRef.value?.submitForm().then((data) => {
       console.log(data, '格式化数据data');
 
@@ -141,7 +139,8 @@
         if (res.data.code !== 200) return EleMessage.error(res.data.msg);
         visible.value = false;
         emit('success', data);
-        EleMessage.success(format[props.idKey] ? '编辑成功' : '操作成功');
+        EleMessage.success('操作成功');
+        // EleMessage.success(format[props.idKey] ? '操作成功' : '操作成功');
       });
     });
   };

+ 7 - 6
src/views/recycleLogistics/abnormalSign/index.vue

@@ -53,9 +53,9 @@
         </template>
 
         <component :is="orderLog" ref="orderLogRef" />
-        <component :is="orderDetail" ref="orderDetailRef" @refresh="pageRef.value?.reload()" />
+        <component :is="orderDetail" ref="orderDetailRef" @refresh="handleStatusChange" />
         <userBindTag ref="userTagRef" />
-        <reject-modal ref="rejectModalRef" @success="pageRef.value?.reload()" />
+        <reject-modal ref="rejectModalRef" @refresh="handleStatusChange" />
     </order-page>
 </template>
 
@@ -127,12 +127,13 @@ function handleAgree(row) {
 
 // 驳回异常签收
 function handleReject(row) {
-    rejectModalRef.value?.handleOpen(row.orderId);
+    let id = row.exceptOrderCheckInfo.id;
+    rejectModalRef.value?.handleOpen(id);
 }
 
-const { 
-    handleCancelOrder, 
-    applyForInterception, 
+const {
+    handleCancelOrder,
+    applyForInterception,
     fallbackOrder,
     toOrderDetail,
     openOrderLog,

+ 43 - 32
src/views/recycleLogistics/components/reject-modal.vue

@@ -1,52 +1,63 @@
 <!-- 驳回弹窗 -->
 <template>
-    <simple-form-modal title="驳回提示" :items="formItems" ref="editRef" :baseUrl="baseUrl" :formatData="formatData"
-        @success="(data) => emit('success', data)"></simple-form-modal>
+  <simple-form-modal
+    title="驳回提示"
+    :items="formItems"
+    ref="editRef"
+    :baseUrl="baseUrl"
+    :formatData="formatData"
+    @success="handleSuccess"
+  ></simple-form-modal>
 </template>
 
 <script setup>
-import { reactive, ref, defineEmits, computed } from 'vue';
-import SimpleFormModal from '@/components/CommonPage/SimpleFormModal.vue';
+  import { reactive, ref, defineEmits, computed } from 'vue';
+  import SimpleFormModal from '@/components/CommonPage/SimpleFormModal.vue';
 
-const emit = defineEmits(['success']);
+  const emit = defineEmits(['refresh']);
 
-const formItems = computed(() => {
+  const formItems = computed(() => {
     return [
-        {
-            type: 'dictSelect',
-            label: '驳回原因',
-            prop: 'refusalReson',
-            props: { code: 'audit_reject_reason', class: 'custom-select' },
-        }
+      {
+        type: 'dictSelect',
+        label: '驳回原因',
+        prop: 'refusalReson',
+        props: { code: 'audit_reject_reason', class: 'custom-select' }
+      }
     ];
-});
+  });
 
-//默认值
-const baseUrl = reactive({
+  //默认值
+  const baseUrl = reactive({
     add: '/order/orderInfo/exceptcheck',
     update: '/order/orderInfo/exceptcheck'
-});
+  });
 
-const formData = ref({
+  const formData = ref({
     id: '',
     checkStatus: 3
-});
+  });
 
-const formatData = (data) => {
+  const formatData = (data) => {
     return {
-        id: formData.value.id,
-        checkStatus: formData.value.checkStatus,
-        refusalReson: data.refusalReson,
-        refusalResonCode: data.refusalReson
-    }
-}
-
-const editRef = ref(null);
-
-function handleOpen(id) {
+      id: formData.value.id,
+      checkStatus: formData.value.checkStatus,
+      refusalReson: data.refusalReson,
+      refusalResonCode: data.refusalReson
+    };
+  };
+  //成功之后的回调
+  const handleSuccess = (data) => {
+    console.log(data, 'data---------');
+    emit('refresh', data);
+  };
+
+  const editRef = ref(null);
+
+  function handleOpen(id) {
     formData.value.id = id;
     editRef.value?.handleOpen(formData.value);
-}
+  }
 
-defineExpose({ handleOpen });
-</script>
+  defineExpose({ handleOpen });
+</script>