update

src/packages/pc/components/base/table-details/index.less

@@ -15,6 +15,14 @@
             color: #606266;
             font-weight: normal;
             vertical-align: top;
+
+            span.required {
+                &::before {
+                    content: "*";
+                    color: var(--el-color-danger);
+                    margin-right: 4px;
+                }
+            }
         }
 
         td {

src/packages/pc/components/base/table-details/index.vue

@@ -11,7 +11,9 @@
                     <template v-for="(item, n) in items" :key="n">
                         <th :style="labelStyle">
                             <slot :name="item.prop + 'Label'">
-                                {{ t(item.formatLabel ? item.formatLabel(data[item.prop]) : item.label ?? '') }}
+                                <span :class="{ required: item.required }">
+                                    {{ t(item.formatLabel ? item.formatLabel(data[item.prop]) : item.label ?? '') }}
+                                </span>
                             </slot>
                         </th>
                         <td :colspan="(items.length - 1) === n ? (column * 2 - items.length * 2) + 1 : 1"

src/packages/pc/components/base/table-details/types.ts

@@ -4,6 +4,7 @@ export interface CellProp {
     decimal?: number; // 保留小数点位数
     entireRow?: boolean; // 是否整行显示
     show?: boolean; // 是否显示
+    required?: boolean; // 是否必填
     formatLabel?: (value: any) => string
     formatValue?: (value: any) => any
 }

src/packages/pc/views/query/order/accountsumm/index.vue → src/packages/pc/views/query/internal/accountsumm/index.vue

@@ -40,7 +40,7 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_accountsumm_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_accountsumm_export'])"
                     @click="openComponentOnClick" />
             </template>
             <template #footer>

src/packages/pc/views/query/order/deliveryorder/index.vue → src/packages/pc/views/query/internal/deliveryorder/index.vue

@@ -16,12 +16,12 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_deliveryorder_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_deliveryorder_export'])"
                     @click="(code: string) => openComponent(code)" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-operation size="small" :data-list="getActionButtons(['query_order_deliveryorder_details'])"
+                <app-operation size="small" :data-list="getActionButtons(['query_internal_deliveryorder_details'])"
                     @click="(code: string) => openComponent(code, row)" circle />
             </template>
             <template #footer>

src/packages/pc/views/query/order/deliverytrade/index.vue → src/packages/pc/views/query/internal/deliverytrade/index.vue

@@ -19,12 +19,12 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_deliverytrade_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_deliverytrade_export'])"
                     @click="(code: string) => openComponent(code)" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-operation size="small" :data-list="getActionButtons(['query_order_deliverytrade_details'])"
+                <app-operation size="small" :data-list="getActionButtons(['query_internal_deliverytrade_details'])"
                     @click="(code: string) => openComponent(code, row)" circle />
             </template>
             <template #footer>

src/packages/pc/views/query/order/goodssumm/index.vue → src/packages/pc/views/query/internal/goodssumm/index.vue

@@ -33,7 +33,7 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_goodssumm_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_goodssumm_export'])"
                     @click="openComponentOnClick" />
             </template>
             <template #footer>

src/packages/pc/views/query/order/institutionsumm/index.vue → src/packages/pc/views/query/internal/institutionsumm/index.vue

@@ -27,7 +27,7 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_institutionsumm_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_institutionsumm_export'])"
                     @click="openComponentOnClick" />
             </template>
             <template #footer>

src/packages/pc/views/query/order/liquidation/index.vue → src/packages/pc/views/query/internal/liquidation/index.vue

@@ -6,12 +6,12 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_liquidation_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_liquidation_export'])"
                     @click="(code: string) => openComponent(code)" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-operation size="small" :data-list="getActionButtons(['query_order_liquidation_details'])"
+                <app-operation size="small" :data-list="getActionButtons(['query_internal_liquidation_details'])"
                     @click="(code: string) => openComponent(code, row)" circle />
             </template>
             <template #footer>

src/packages/pc/views/query/internal/offlinedelivery/components/close/index.vue

@@ -0,0 +1,95 @@
+<!-- 查询管理-内部订单查询-线下交收单查询-失败 -->
+<template>
+    <app-drawer title="详细" width="960" v-model:show="show">
+        <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2">
+            <template #auditremark>
+                <el-input ref="inputRef" type="textarea" :rows="3" placeholder="必填" v-model="formData.auditremark" />
+            </template>
+        </app-table-details>
+        <template #footer>
+            <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
+            <el-button type="primary" @click="onSubmit">交收失败</el-button>
+        </template>
+    </app-drawer>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef, reactive, PropType } from 'vue'
+import { ElMessage, InputInstance } from 'element-plus'
+import { formatDate } from '@/filters'
+import { getBuyOrSellName } from '@/constants/order'
+import { useRequest } from '@/hooks/request'
+import { queryOfflineDetail, offlineFail } from '@/services/api/order'
+import { CellProp } from '@pc/components/base/table-details/types'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
+
+const props = defineProps({
+    record: {
+        type: Object as PropType<Model.OfflineRsp>,
+        required: true
+    }
+})
+
+const { t } = i18n.global
+const show = shallowRef(true)
+const refresh = shallowRef(false)
+const loading = shallowRef(false)
+const inputRef = shallowRef<InputInstance>()
+
+const formData = reactive<Model.offlineFailReq>({
+    auditremark: '',
+    deliveryorderid: props.record.deliveryorderid,
+    marketid: props.record.marketid
+})
+
+const { data } = useRequest(queryOfflineDetail, {
+    params: {
+        deliveryorderid: props.record.deliveryorderid
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const detailProps1: CellProp[] = [
+    { prop: 'deliveryorderid', label: '交收单号：' },
+    { prop: 'username', label: '申请人：' },
+    { prop: 'goodsdisplay', label: '交收商品：' },
+    { prop: 'buyorsell', label: '方向：', formatValue: (val) => getBuyOrSellName(val) },
+    { prop: 'deliveryqty', label: '交收数量：' },
+    { prop: 'deliveryprice', label: '交收价格：' },
+    { prop: 'deliveryamount', label: '交收货款：' },
+    { prop: 'matchname', label: '对手方：' },
+    { prop: 'deliveryinfo', label: '交收信息：' },
+    { prop: 'reqtime', label: '申请时间：', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: '交收状态：' },
+    { prop: 'auditremark', label: '备注：', required: true }
+]
+
+const onCancel = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onSubmit = () => {
+    if (formData.auditremark) {
+        loading.value = true
+        offlineFail({
+            data: formData
+        }).then(() => {
+            ElMessage.success('提交成功')
+            onCancel(true)
+        }).catch((err) => {
+            ElMessage.error('提交失败：' + err)
+            onCancel()
+        }).finally(() => {
+            loading.value = false
+        })
+    } else {
+        inputRef.value?.focus()
+        ElMessage.warning('请输入备注')
+    }
+}
+</script>

src/packages/pc/views/query/internal/offlinedelivery/components/confirm/index.vue

@@ -0,0 +1,81 @@
+<!-- 查询管理-内部订单查询-线下交收单查询-确认 -->
+<template>
+    <app-drawer title="详细" width="960" v-model:show="show">
+        <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2" />
+        <template #footer>
+            <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
+            <el-button type="primary" @click="onSubmit">确认交收</el-button>
+        </template>
+    </app-drawer>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef, PropType } from 'vue'
+import { ElMessage } from 'element-plus'
+import { formatDate } from '@/filters'
+import { getBuyOrSellName } from '@/constants/order'
+import { useRequest } from '@/hooks/request'
+import { queryOfflineDetail, offlineClose } from '@/services/api/order'
+import { CellProp } from '@pc/components/base/table-details/types'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
+
+const props = defineProps({
+    record: {
+        type: Object as PropType<Model.OfflineRsp>,
+        required: true
+    }
+})
+
+const { t } = i18n.global
+const show = shallowRef(true)
+const refresh = shallowRef(false)
+const loading = shallowRef(false)
+
+const { data } = useRequest(queryOfflineDetail, {
+    params: {
+        deliveryorderid: props.record.deliveryorderid
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const detailProps1: CellProp[] = [
+    { prop: 'deliveryorderid', label: '交收单号：' },
+    { prop: 'username', label: '申请人：' },
+    { prop: 'goodsdisplay', label: '交收商品：' },
+    { prop: 'buyorsell', label: '方向：', formatValue: (val) => getBuyOrSellName(val) },
+    { prop: 'deliveryqty', label: '交收数量：' },
+    { prop: 'deliveryprice', label: '交收价格：' },
+    { prop: 'deliveryamount', label: '交收货款：' },
+    { prop: 'matchname', label: '对手方：' },
+    { prop: 'deliveryinfo', label: '交收信息：' },
+    { prop: 'reqtime', label: '申请时间：', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: '交收状态：' }
+]
+
+const onCancel = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onSubmit = () => {
+    loading.value = true
+    offlineClose({
+        data: {
+            deliveryorderid: props.record.deliveryorderid,
+            marketid: props.record.marketid
+        }
+    }).then(() => {
+        ElMessage.success('提交成功')
+        onCancel(true)
+    }).catch((err) => {
+        ElMessage.error('提交失败：' + err)
+        onCancel()
+    }).finally(() => {
+        loading.value = false
+    })
+}
+</script>

src/packages/pc/views/query/order/offlinedelivery/components/details/index.vue → src/packages/pc/views/query/internal/offlinedelivery/components/details/index.vue

@@ -55,7 +55,7 @@ const detailProps1: CellProp[] = [
     { prop: 'orderstatusdisplay', label: '交收状态：' },
     { prop: 'remark', label: '备注：' },
     { prop: 'deliverycharge', label: '交收手续费：' },
-    { prop: 'closetime', label: '完成时间：' },
+    { prop: 'closetime', label: '完成时间：', formatValue: (val) => formatDate(val) },
 ]
 
 const onCancel = () => {

src/packages/pc/views/query/internal/offlinedelivery/components/pay/index.vue

@@ -0,0 +1,51 @@
+<!-- 查询管理-内部订单查询-线下交收单查询-支付 -->
+<template>
+    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+        <div class="g-text-message">确认交收服务商向卖方支付货款？</div>
+        <template #footer>
+            <el-button @click="onCancel(false)">取消</el-button>
+            <el-button type="primary" @click="onSubmit">确认</el-button>
+        </template>
+    </app-drawer>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef, PropType } from 'vue'
+import { ElMessage } from 'element-plus'
+import { sellGoods } from '@/services/api/order'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+
+const props = defineProps({
+    record: {
+        type: Object as PropType<Model.OfflineRsp>,
+        required: true
+    }
+})
+
+const show = shallowRef(true)
+const refresh = shallowRef(false)
+const loading = shallowRef(false)
+
+const onCancel = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onSubmit = () => {
+    loading.value = true
+    sellGoods({
+        data: {
+            deliveryorderid: props.record.deliveryorderid,
+            marketid: props.record.marketid
+        }
+    }).then(() => {
+        ElMessage.success('提交成功')
+        onCancel(true)
+    }).catch((err) => {
+        ElMessage.error('提交失败：' + err)
+        onCancel()
+    }).finally(() => {
+        loading.value = false
+    })
+}
+</script>

src/packages/pc/views/query/order/offlinedelivery/index.vue → src/packages/pc/views/query/internal/offlinedelivery/index.vue

@@ -12,12 +12,12 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_offlinedelivery_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_offlinedelivery_export'])"
                     @click="(code: string) => openComponent(code)" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-operation size="small" :data-list="getActionButtons(['query_order_offlinedelivery_details'])"
+                <app-operation size="small" :data-list="handleOperateButtons(row)"
                     @click="(code: string) => openComponent(code, row)" circle />
             </template>
             <template #footer>
@@ -33,7 +33,7 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { ElMessage } from 'element-plus'
-import { getBuyOrSellList } from '@/constants/order'
+import { BuyOrSell, getBuyOrSellList } from '@/constants/order'
 import { useDataFilter } from '@/hooks/datatable-v2'
 import { useRequest } from '@/hooks/request'
 import { useOperation } from '@/hooks/operation'
@@ -69,7 +69,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'matchname', label: '对手方' },
     { field: 'reqtime', label: '申请时间' },
     { field: 'orderstatusdisplay', label: '交收状态' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: '操作', width: 180, fixed: 'right' }
 ])
 
 const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OfflineReq>({
@@ -103,6 +103,22 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     ]
 })
 
+// 处理操作按钮
+const handleOperateButtons = (row: Model.OfflineRsp) => {
+    const buttons = ['query_internal_offlinedelivery_details']
+
+    if (row.orderstatus === 2) {
+        buttons.push('query_internal_offlinedelivery_confirm', 'query_internal_offlinedelivery_close')
+        if (row.buyorsell === BuyOrSell.Sell) {
+            buttons.push('query_internal_offlinedelivery_pay')
+        }
+    } else if (row.orderstatus === 9) {
+        buttons.push('query_internal_offlinedelivery_pay')
+    }
+
+    return getActionButtons(buttons)
+}
+
 const onSearch = () => {
     const qs = getQueryParams()
     run(qs)

src/packages/pc/views/query/order/order/index.vue → src/packages/pc/views/query/internal/order/index.vue

@@ -56,12 +56,12 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_order_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_order_export'])"
                     @click="openComponentOnClick" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-operation size="small" :data-list="getActionButtons(['query_order_order_details'])"
+                <app-operation size="small" :data-list="getActionButtons(['query_internal_order_details'])"
                     @click="(code: string) => openComponent(code, row)" circle />
             </template>
             <template #footer>

src/packages/pc/views/query/order/position/index.vue → src/packages/pc/views/query/internal/position/index.vue

@@ -55,12 +55,12 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_position_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_position_export'])"
                     @click="openComponentOnClick" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-operation size="small" :data-list="getActionButtons(['query_order_position_details'])"
+                <app-operation size="small" :data-list="getActionButtons(['query_internal_position_details'])"
                     @click="(code: string) => openComponent(code, row)" circle />
             </template>
             <template #footer>

src/packages/pc/views/query/order/positionsumm/index.vue → src/packages/pc/views/query/internal/positionsumm/index.vue

@@ -32,7 +32,7 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_positionsumm_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_positionsumm_export'])"
                     @click="openComponentOnClick" />
             </template>
             <template #footer>

src/packages/pc/views/query/order/trade/index.vue → src/packages/pc/views/query/internal/trade/index.vue

@@ -72,12 +72,12 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_trade_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_trade_export'])"
                     @click="openComponentOnClick" />
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-operation size="small" :data-list="getActionButtons(['query_order_trade_details'])"
+                <app-operation size="small" :data-list="getActionButtons(['query_internal_trade_details'])"
                     @click="(code: string) => openComponent(code, row)" circle />
             </template>
             <template #footer>

src/packages/pc/views/query/order/tradesumm/index.vue → src/packages/pc/views/query/internal/tradesumm/index.vue

@@ -12,7 +12,7 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_tradesumm_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_tradesumm_export'])"
                     @click="(code: string) => openComponent(code)" />
             </template>
             <template #footer>

src/packages/pc/views/report/profitshare/index.vue

@@ -30,7 +30,7 @@
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
-                <app-operation :data-list="getActionButtons(['query_order_profitshare_export'])"
+                <app-operation :data-list="getActionButtons(['query_internal_profitshare_export'])"
                     @click="(code: string) => openComponent(code)" />
             </template>
             <template #footer>

src/services/api/order/index.ts

@@ -270,4 +270,11 @@ export function offlineClose(options: CommonFetchOptions<{ request: Model.offlin
  */
 export function offlineFail(options: CommonFetchOptions<{ request: Model.offlineFailReq; }>) {
     return httpClient.commonRequest('/query/offlinefail', 'get', options)
+}
+
+/**
+ * 内部订单查询--> 线下交收单查询 --> 交收付款
+ */
+export function sellGoods(options: CommonFetchOptions<{ request: Model.sellGoodsReq; }>) {
+    return httpClient.commonRequest('/query/sellGoods', 'get', options)
 }

src/types/model/order.d.ts

@@ -1478,6 +1478,7 @@ declare namespace Model {
 
     /** 内部订单查询--> 线下交收单查询 --> 获取列表 响应 */
     interface OfflineRsp {
+        buyorsell: number;
         buyorselldisplay: string; // 方向
         deliveryamount: string; // 交收货款
         deliveryorderid: string; // 交收单号
@@ -1531,4 +1532,10 @@ declare namespace Model {
         deliveryorderid: string;
         marketid: number;
     }
+
+    /** 内部订单查询--> 线下交收单查询 --> 交收付款 请求 */
+    interface sellGoodsReq {
+        deliveryorderid: string;
+        marketid: number;
+    }
 }