From 143185864d85f85403b5722a7dc8f88841439606 Mon Sep 17 00:00:00 2001
From: yujiacong <1016029365@qq.com>
Date: Mon, 28 Jul 2025 16:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B8=81=E9=92=BB=E7=9F=B3=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=20-=20=E7=B1=BB=E5=9E=8B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E8=96=AA=E8=B5=84=EF=BC=8C=E4=B8=BB?=
 =?UTF-8?q?=E6=92=AD=E8=96=AA=E8=B5=84=E6=93=8D=E4=BD=9C=20-=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=98=E6=96=B9=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anchorSalaryOperate.vue                   | 42 ++++++++++++++++++-
 src/views/record/OfficicalGoldView.vue        | 24 ++++++++++-
 .../refund/goldDiamondOperationRecord.vue     | 24 +++++------
 3 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/src/views/guildOperationManagement/anchorSalaryOperate.vue b/src/views/guildOperationManagement/anchorSalaryOperate.vue
index 9c99c6e..a054e2c 100644
--- a/src/views/guildOperationManagement/anchorSalaryOperate.vue
+++ b/src/views/guildOperationManagement/anchorSalaryOperate.vue
@@ -142,6 +142,16 @@
               </el-button>
             </template>
           </el-table-column>
+          <el-table-column align="center"
+                           prop="platformOperationUsb"
+                           label="官方操作">
+            <template v-slot="scope">
+              <el-button type="text"
+                         @click="handleOpen(9, scope.row)">
+                {{ scope.row.platformOperationUsb + "us" }}
+              </el-button>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="usb"
                            label="剩余薪资">
@@ -251,11 +261,11 @@
           </template>
         </el-table-column>
         <!-- 薪资转增公会长3 -->
-        <el-table-column v-if="dialogType == 3 || dialogType == 4"
+        <el-table-column v-if="dialogType == 3 || dialogType == 4 || dialogType == 9"
                          prop="receiveNick"
                          label="公会长昵称"
                          align="center"></el-table-column>
-        <el-table-column v-if="dialogType == 3 || dialogType == 4"
+        <el-table-column v-if="dialogType == 3 || dialogType == 4 || dialogType == 9"
                          prop="receiveErbano"
                          label="公会长ID"
                          align="center"></el-table-column>
@@ -277,6 +287,30 @@
           </template>
         </el-table-column>
 
+        <el-table-column v-if="dialogType == 9"
+                         align="center"
+                         prop="type"
+                         label="赠送方式">
+          <template v-slot="scope">
+            {{ scope.row.type == '9'?'官方增加薪资':'官方减少薪资' }}
+          </template>
+        </el-table-column>
+
+        <el-table-column v-if="dialogType == 9"
+                         align="center"
+                         prop="tradeUsb"
+                         label="操作数量">
+                    <template v-slot="scope">
+                      {{ scope.row.tradeUsb + "us" }}
+                    </template>
+          </el-table-column>
+
+          <el-table-column v-if="dialogType == 9"
+                         align="center"
+                         prop="remark"
+                         label="备注">
+          </el-table-column>
+
         <el-table-column align="center"
                          prop="afterUsb"
                          label="剩余薪资">
@@ -440,6 +474,10 @@ export default {
           this.dialogTitle = "薪资兑换金币";
           this.dialogType = 6;
           break;
+          case 9:
+          this.dialogTitle = "官方操作";
+          this.dialogType = 9;
+          break;
         default:
           break;
       }
diff --git a/src/views/record/OfficicalGoldView.vue b/src/views/record/OfficicalGoldView.vue
index fa0adc6..5f2cd9a 100644
--- a/src/views/record/OfficicalGoldView.vue
+++ b/src/views/record/OfficicalGoldView.vue
@@ -418,7 +418,8 @@ function initUserInfoTable () {
       { field: 'nick', title: '昵称', align: 'center', width: '5%', valign: 'middle' },
       { field: 'goldNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' },
       { field: 'radishNum', title: '水晶', align: 'center', width: '5%', valign: 'middle' },
-      { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' }
+      { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' },
+      { field: 'guildUsdNum', title: '薪资', align: 'center', width: '5%', valign: 'middle' }
     ],
     cache: false,
     striped: true,
@@ -471,7 +472,26 @@ function initGoldRecordTable () {
       { field: 'erbanNo', title: '兔兔号', align: 'center', width: '5%', valign: 'middle' },
       { field: 'nick', title: '昵称', align: 'center', width: '5%', valign: 'middle' },
       { field: 'money', title: '余额', align: 'center', width: '5%', valign: 'middle' },
-      { field: 'goldNum', title: '赠送数量', align: 'center', width: '5%', valign: 'middle' },
+      { 
+        field: 'goldNum', 
+        title: '赠送数量', 
+        align: 'center', 
+        width: '5%', 
+        valign: 'middle',
+        formatter: function (val, row, index) {
+          // 根据条件判断显示哪个字段
+          // 示例：根据typeCn字段的值来决定显示什么
+          if (row.currencyType == 0 || row.currencyType == 4) {
+            if(row.currencyType == 0 && row.diamondNum  == null){
+            return row.goldNum 
+            }else{
+            return row.diamondNum 
+            }
+          }else if(row.currencyType == 1 || row.currencyType == 2){
+            return row.goldNum 
+          }
+        }
+      },
       { field: 'typeCn', title: '赠送类型', align: 'center', width: '5%', valign: 'middle' },
       { field: 'busName', title: '赠送分类', align: 'center', width: '5%', valign: 'middle' },
       { field: 'remark', title: '备注', align: 'center', width: '10%', valign: 'middle' },
diff --git a/src/views/refund/goldDiamondOperationRecord.vue b/src/views/refund/goldDiamondOperationRecord.vue
index 6a5628e..8c24ab1 100644
--- a/src/views/refund/goldDiamondOperationRecord.vue
+++ b/src/views/refund/goldDiamondOperationRecord.vue
@@ -79,6 +79,14 @@
       border
       style="width: 100%; margin-top: 25px"
     >
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="partitionDesc" align="center" label="区域" />
+      <el-table-column prop="operationNum" align="center" label="操作数量" />
+      <el-table-column prop="actualAmount" align="center" label="打款金额" />
+      <el-table-column prop="typeDesc" align="center" label="赠送类型" />
+      <el-table-column prop="currencyTypeDesc" align="center" label="赠送分类" />
+      <el-table-column prop="remark" align="center" label="备注" />
       <el-table-column prop="createTime" align="center" label="操作时间">
         <template v-slot="scope">
           {{
@@ -89,20 +97,6 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column prop="erbanNo" align="center" label="用户ID" />
-      <el-table-column prop="nick" align="center" label="用户昵称" />
-      <el-table-column prop="partitionDesc" align="center" label="区域" />
-      <el-table-column prop="money" align="center" label="实时金币余额" />
-      <el-table-column prop="goldNum" align="center" label="赠送金币数量" />
-      <el-table-column prop="diamondNum" align="center" label="赠送钻石数量" />
-      <el-table-column prop="typeDesc" align="center" label="赠送类型" />
-      <el-table-column
-        prop="currencyTypeDesc"
-        align="center"
-        label="赠送分类"
-      />
-      <el-table-column prop="actualAmount" align="center" label="打款金额" />
-      <el-table-column prop="remark" align="center" label="备注" />
       <el-table-column prop="operatorName" align="center" label="操作人" />
     </el-table>
     <!-- 分页 -->
@@ -153,6 +147,8 @@ export default {
           { desc: "官方金币消除", id: "OFFICAL_REDUCE_DIAMONDS" },
           { desc: "官方赠送钻石", id: "OFFICAL_GOLD" },
           { desc: "用户钻石清除", id: "CLEAR_USER_GOLD" },
+          { desc: "官方消除薪资", id: "OFFICAL_MINUS_GUILD_USD" },
+          { desc: "官方赠送薪资", id: "OFFICAL_PLUS_GUILD_USD" },
         ],
         time: "",
       },