fix

src/views/promotion/components/PreviewPromotionalInvoiceDetailDialog.vue

@@ -136,7 +136,7 @@ import { handleDownloadFile } from "@/utils";
 import { ref, computed, defineProps, defineEmits, reactive } from "vue";
 import { statusList, settlementStatusList } from "../constant.ts";
 import { ElMessage } from "element-plus";
-import { Document } from "@element-plus/icons-vue";
+import { Document, ElMessageBox } from "@element-plus/icons-vue";
 import request from "@/api";
 
 const props = defineProps({
@@ -169,10 +169,16 @@ const dialogVisible = computed({
   }
 });
 const handleSettle = () => {
-  request.post(`archivesService/agency/orderBill/settle?id=${detail.value.id}`).then(resp => {
-    ElMessage.success(resp.message);
-    emits("success");
-    initData(detail.value.id);
+  ElMessageBox.confirm("确定该笔账单已经进行了实际的资金结算吗？确定后该状态不可撤回", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    request.post(`archivesService/agency/orderBill/settle?id=${detail.value.id}`).then(resp => {
+      ElMessage.success(resp.message);
+      emits("success");
+      initData(detail.value.id);
+    });
   });
 };
 const initData = id => {

src/views/promotion/invoice.vue

@@ -90,7 +90,8 @@
         </el-table-column>
         <el-table-column prop="agencyRemark" label="备注">
           <template #default="{ row }">
-            <div v-html="row.agencyRemark" />
+            <div v-if="!row.agencyRemark" class="text-gray-400">未填写</div>
+            <div v-else>已填写</div>
           </template>
         </el-table-column>
         <el-table-column prop="serviceName" label="操作">
@@ -204,7 +205,7 @@ const handleSaveRemark = () => {
   request
     .post("/archivesService/agency/orderBill/updateRemark", {
       id: state.rowData.id,
-      remark: state.rowData.remark
+      remark: state.rowData.agencyRemark
     })
     .then(resp => {
       ElMessage.success(resp.message);