fix

src/views/promotion/components/PreviewPromotionalInvoiceDetailDialog.vue

@@ -41,8 +41,8 @@
           />
           <el-table-column prop="serviceName" label="结算状态">
             <template #default="{ row }">
-              <div :class="statusList[row.status - 1]?.color">
-                {{ statusList[row.status - 1]?.label }}
+              <div :class="settlementStatusList[row.status - 1]?.color">
+                {{ settlementStatusList[row.status - 1]?.label }}
               </div>
             </template>
           </el-table-column>
@@ -93,8 +93,8 @@
             </el-table-column>
             <el-table-column prop="status" :formatter="v => v.order.promotionGoods?.memberCardName" label="订单状态">
               <template #default="{ row }">
-                <div :class="orderStatusList[row.order.status - 1]?.color">
-                  {{ orderStatusList[row.order.status - 1]?.label }}
+                <div :class="statusList[row.order.status - 1]?.color">
+                  {{ statusList[row.order.status - 1]?.label }}
                 </div>
               </template>
             </el-table-column>
@@ -148,8 +148,7 @@
 <script setup>
 import { handleDownloadFile } from "@/utils";
 import { ref, computed, defineProps, defineEmits, reactive } from "vue";
-import { statusList } from "../constant.ts";
-import { statusList as orderStatusList } from "../constant.ts";
+import { statusList, settlementStatusList } from "../constant.ts";
 import { ElMessage } from "element-plus";
 import { Document } from "@element-plus/icons-vue";
 import request from "@/api";

src/views/promotion/constant.ts

@@ -20,3 +20,20 @@ export const accountTypes = {
   2: "身份证号",
   3: "特殊编号"
 };
+export const settlementStatusList = [
+  {
+    label: "无需结算",
+    value: 1,
+    color: "text-blue-500"
+  },
+  {
+    label: "待结算",
+    value: 2,
+    color: "text-red-500"
+  },
+  {
+    label: "已结算",
+    value: 3,
+    color: "text-green-500"
+  }
+];

src/views/promotion/invoice.vue

@@ -24,7 +24,7 @@
                   clearable
                   class="w-[180px]"
                 >
-                  <el-option v-for="item in statusList" :label="item.label" :value="item.value" :key="item.value" />
+                  <el-option v-for="item in settlementStatusList" :label="item.label" :value="item.value" :key="item.value" />
                 </el-select>
                 <el-button class="ml-2" type="primary" @click="onSearch">筛选</el-button>
                 <el-button type="primary" plain @click="onReset">重置</el-button>
@@ -83,14 +83,14 @@
         />
         <el-table-column prop="serviceName" label="结算状态">
           <template #default="{ row }">
-            <div :class="statusList[row.status - 1].color">
-              {{ statusList[row.status - 1]?.label }}
+            <div :class="settlementStatusList[row.status - 1].color">
+              {{ settlementStatusList[row.status - 1]?.label }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="mechanismRemark" label="备注">
+        <el-table-column prop="agencyRemark" label="备注">
           <template #default="{ row }">
-            <div v-html="row.mechanismRemark" />
+            <div v-html="row.agencyRemark" />
           </template>
         </el-table-column>
         <el-table-column prop="serviceName" label="操作">
@@ -124,7 +124,7 @@
     </div>
     <el-dialog title="账单备注" v-model="state.visibleEeditRemark">
       <div>
-        <Editor placeholder="请输入账单备注" v-model:value="state.rowData.remark" />
+        <Editor placeholder="请输入账单备注" v-model:value="state.rowData.agencyRemark" />
       </div>
       <template #footer>
         <el-button @click="state.visibleEeditRemark = false">取 消</el-button>
@@ -137,7 +137,7 @@
 <script setup>
 import { ref, reactive } from "vue";
 
-import { statusList } from "./constant.ts";
+import { settlementStatusList } from "./constant.ts";
 import request from "@/api";
 
 import PreviewPromotionalInvoiceDetailDialog from "./components/PreviewPromotionalInvoiceDetailDialog.vue";

src/views/promotion/order.vue

@@ -165,7 +165,7 @@
             </div>
             <div>
               <div v-for="(item, index) in row.archives?.accounts" :key="index" class="space-x-4">
-                <span class="inline-block whitespace-nowrap w-[4em]">{{ accountTypes[item.type] }}</span>
+                <!-- <span class="inline-block whitespace-nowrap w-[4em]">{{ accountTypes[item.type] }}</span> -->
                 <span>【{{ item.account }}】</span>
               </div>
             </div>