update

src/packages/pc/views/notice/manage/components/finish/index.vue

@@ -0,0 +1,52 @@
+<!-- 通知公告-公告通知管理-提前失效 -->
+<template>
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
+        <div class="g-text-message">确定提前失效此条消息吗？</div>
+        <template #footer>
+            <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
+        </template>
+    </app-drawer>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef, PropType } from 'vue'
+import { ElMessage } from 'element-plus'
+import { invalid } from '@/services/api/notice'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+import { i18n } from '@/stores'
+
+const props = defineProps({
+    record: {
+        type: Object as PropType<Notice.QueryRsp>,
+        required: true
+    }
+})
+
+const { global: { t } } = i18n
+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
+    invalid({
+        data: {
+            auditid: props.record.autoid,
+        }
+    }).then(() => {
+        ElMessage.success(t('common.tips5'))
+        onCancel(true)
+    }).catch((err) => {
+        ElMessage.error(t('common.tips6') + err)
+        onCancel()
+    }).finally(() => {
+        loading.value = false
+    })
+}
+</script>

src/packages/pc/views/notice/newscolumn/index.vue

@@ -2,13 +2,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-filter :option="filterOption">
-                <template #userid="{ item }">
-                    <el-form-item :label="item.label">
-                        <app-select-investor v-model="item.value" />
-                    </el-form-item>
-                </template>
-            </app-filter>
+            <app-filter :option="filterOption" />
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>

src/packages/pc/views/notice/newssource/index.vue

@@ -2,13 +2,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-filter :option="filterOption">
-                <template #userid="{ item }">
-                    <el-form-item :label="item.label">
-                        <app-select-investor v-model="item.value" />
-                    </el-form-item>
-                </template>
-            </app-filter>
+            <app-filter :option="filterOption" />
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>

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

@@ -1,7 +1,23 @@
 <!-- 查询管理-内部订单查询-线下交收单查询-详情 -->
 <template>
     <app-drawer :title="t('query.internal.offlinedelivery.details.title')" width="960" v-model:show="show">
-        <app-table-details :data="data" :label-width="160" :cell-props="detailProps" :column="2" />
+        <app-table-details :data="data" :label-width="160" :cell-props="detailProps" :column="2">
+            <!-- 申请交收数量 -->
+            <template #deliveryqty v-if="data">
+                <span>{{ data.deliveryqty }}</span>
+                <span>{{ goodsunitEnum.getEnumTypeName(data.goodunitid) }}</span>
+            </template>
+            <!-- 实际交收数量 -->
+            <template #sucdeliveryqty v-if="data">
+                <span>{{ data.sucdeliveryqty }}</span>
+                <span>{{ goodsunitEnum.getEnumTypeName(data.goodunitid) }}</span>
+            </template>
+            <!-- 撤销交收数量 -->
+            <template #cancledeliveryqty v-if="data">
+                <span>{{ data.cancledeliveryqty }}</span>
+                <span>{{ goodsunitEnum.getEnumTypeName(data.goodunitid) }}</span>
+            </template>
+        </app-table-details>
         <template #footer>
             <el-button @click="onCancel">{{ t('operation.close') }}</el-button>
         </template>
@@ -12,6 +28,7 @@
 import { shallowRef, PropType, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 import { formatDate } from '@/filters'
+import { useEnum } from '@/hooks/enum'
 import { getBuyOrSellName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryOfflineDetail } from '@/services/api/order'
@@ -28,6 +45,7 @@ const props = defineProps({
 })
 
 const { t } = i18n.global
+const goodsunitEnum = useEnum('goodsunit')
 const show = shallowRef(true)
 
 const { data } = useRequest(queryOfflineDetail, {

src/services/api/notice/index.ts

@@ -51,6 +51,13 @@ export function noticeDelete(options: CommonFetchOptions<{ request: Notice.Notic
 }
 
 /**
+ * 通知公告-->公告通知管理-->提前失效
+ */
+export function invalid(options: CommonFetchOptions<{ request: Notice.InvalidReq; }>) {
+    return httpClient.commonRequest('/notice/invalid', 'get', options)
+}
+
+/**
  * 通知公告-->资讯栏目-->获取列表
  */
 export function columnquery(options: CommonFetchOptions<{ request: Notice.ColumnQueryReq; response: Notice.ColumnQueryRsp[]; }>) {

src/types/model/notice.d.ts

@@ -86,6 +86,11 @@ declare namespace Notice {
         auditid: number;
     }
 
+    /** 通知公告-->公告通知管理-->提前失效 请求 */
+    interface InvalidReq {
+        auditid: number;
+    }
+
     /** 通知公告-->资讯栏目-->获取列表 请求 */
     interface ColumnQueryReq {
         columnname?: string; // 栏目名称

src/types/model/order.d.ts

@@ -1511,7 +1511,7 @@ declare namespace Model {
         deliveryprice: number; // 交收价格
         deliveryqty: number; // 申请交收数量
         goodsdisplay: string; // 交收商品
-        goodunitid: string;
+        goodunitid: number;
         matchname: string; // 对手方
         orderstatusdisplay: number; // 交收状态
         remark: string; // 备注