Merge branch 'dev_intercept_refund' into 'dev'

Dev intercept refund

See merge request !235

src/api/factoryOrderNew.ts

@@ -537,10 +537,14 @@ export function completeDeliveryApi(ids: (number | string)[]) {
 }
 
 // 生产扫码
-export function productionScanApi(id: number | string, status: string) {
+export function productionScanApi(
+  id: number | string,
+  status: string,
+  type: string,
+) {
   return axios.get<never, BaseRespData<never>>(
     'factory/podOrderOperation/scan-produce',
-    { params: { id, status } },
+    { params: { id, status, type } },
   )
 }
 
@@ -655,7 +659,7 @@ export function interceptUpdateApi(ids: (string | number)[]) {
 }
 
 export function interceptSuccessApi(
-  data: { factoryOrderNumber: string; suspendSussessType: number }[],
+  data: { factoryOrderNumber: string; blockSuccessType: number }[],
 ) {
   return axios.post<never, BaseRespData<ResultInfoDataItem[]>>(
     'factory/podOrder/factoryOrderBlockSuccess',

src/views/order/factoryOrderNew/component/CancelOrderDialog.vue

@@ -22,6 +22,9 @@
           />
         </ElSelect>
       </ElFormItem>
+      <div style="color: #f56c6c; margin-left: 100px; margin-top: -10px">
+        注意: 取消订单后金额将原路返回
+      </div>
     </ElForm>
     <template #footer>
       <div class="dialog-footer" style="text-align: center">

src/views/order/factoryOrderNew/index.vue

@@ -449,7 +449,7 @@
         <span
           v-if="
             status === 'PENDING_RECEIVE' ||
-            (status === 'SUSPEND' && suspendedSubTab !== 1)
+            (status === 'SUSPEND' && suspendedSubTab === 4)
           "
           class="item"
         >
@@ -654,12 +654,12 @@
           </span>
           <span v-if="suspendedSubTab === 1" class="item">
             <ElButton type="success" @click="() => handleInterceptionSuccess()"
-              >拦截成功</ElButton
+              >处理拦截</ElButton
             >
           </span>
           <span v-if="suspendedSubTab === 1" class="item">
             <ElButton type="danger" @click="() => handleInterceptionFail()"
-              >拦截失败</ElButton
+              >取消拦截</ElButton
             >
           </span>
           <span class="item">
@@ -896,7 +896,7 @@
                         size="small"
                         @click.stop="handleInterceptionSuccess(row)"
                       >
-                        拦截成功
+                        处理拦截
                       </ElButton>
                     </span>
                     <span
@@ -909,7 +909,7 @@
                         size="small"
                         @click.stop="handleInterceptionFail(row)"
                       >
-                        拦截失败
+                        取消拦截
                       </ElButton>
                     </span>
                   </div>
@@ -1115,24 +1115,24 @@
     />
     <ElDialog
       v-model="interceptSuccessDialogVisible"
-      title="拦截成功"
+      title="处理拦截"
       width="480px"
       :close-on-click-modal="false"
     >
       <ElForm ref="interceptSuccessFormRef" :model="interceptSuccessForm">
         <ElFormItem
-          label="拦截成功类型"
-          prop="suspendSussessType"
+          label="处理拦截类型"
+          prop="blockSuccessType"
           :rules="[
             {
               required: true,
-              message: '请选择拦截成功类型',
+              message: '请选择处理拦截类型',
               trigger: 'change',
             },
           ]"
         >
           <ElSelect
-            v-model="interceptSuccessForm.suspendSussessType"
+            v-model="interceptSuccessForm.blockSuccessType"
             placeholder="请选择"
             style="width: 100%"
             clearable
@@ -1307,8 +1307,8 @@ const interceptSuccessTypeOptions = [
   { label: '生产拦截成功', value: 1 },
   { label: '发货拦截成功', value: 2 },
 ]
-const interceptSuccessForm = ref<{ suspendSussessType: number | undefined }>({
-  suspendSussessType: undefined,
+const interceptSuccessForm = ref<{ blockSuccessType: number | undefined }>({
+  blockSuccessType: undefined,
 })
 const interceptSuccessRows = ref<FactoryOrderNewListData[]>([])
 const sizes = ['FS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL', '4XL', '5XL']
@@ -3006,7 +3006,7 @@ const completeOperationById = (
 ) => {
   if (trigger === 'auto') {
     const detailStatus = String(detailData?.status ?? '')
-    return productionScanApi(ids[0], detailStatus)
+    return productionScanApi(ids[0], detailStatus, 'web')
   }
   return completeDeliveryApi(ids)
 }
@@ -3110,7 +3110,7 @@ const handleInterceptionSuccess = (row?: FactoryOrderNewListData) => {
     if (!ensureSelection()) return
     interceptSuccessRows.value = [...selectedRows.value]
   }
-  interceptSuccessForm.value.suspendSussessType = undefined
+  interceptSuccessForm.value.blockSuccessType = undefined
   interceptSuccessDialogVisible.value = true
   nextTick(() => interceptSuccessFormRef.value?.clearValidate())
 }
@@ -3123,8 +3123,8 @@ const submitInterceptSuccess = async () => {
   } catch {
     return
   }
-  const suspendSussessType = interceptSuccessForm.value.suspendSussessType
-  if (suspendSussessType === undefined) return
+  const blockSuccessType = interceptSuccessForm.value.blockSuccessType
+  if (blockSuccessType === undefined) return
 
   const loading = ElLoading.service({
     fullscreen: true,
@@ -3135,9 +3135,9 @@ const submitInterceptSuccess = async () => {
   const data = rows.map((item: FactoryOrderNewListData) => {
     return {
       factoryOrderNumber: item.factoryOrderNumber as string,
-      suspendSussessType,
+      blockSuccessType,
     }
-  }) as { factoryOrderNumber: string; suspendSussessType: number }[]
+  }) as { factoryOrderNumber: string; blockSuccessType: number }[]
   try {
     const res = await interceptSuccessApi(data)
     if (res.code !== 200) return
@@ -3163,7 +3163,7 @@ const handleInterceptionFail = async (row?: FactoryOrderNewListData) => {
               item.factoryOrderNumber as string,
           ),
     api: (ids) => interceptUpdateApi(ids as string[]),
-    confirmText: '拦截失败,订单会恢复到拦截前的状态，确认是否拒绝拦截申请?',
+    confirmText: '取消拦截,订单会恢复到拦截前的状态，确认是否拒绝拦截申请?',
     onSuccess: (res) => {
       const data = Array.isArray(res.data)
         ? (res.data as ResultInfoDataItem[])