Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/recharge/addRecharge.vue

@@ -10,6 +10,8 @@ import { range, re } from "mathjs";
 import * as xlsx from 'xlsx';
 import _, { before } from 'lodash';
 import { th } from "element-plus/es/locales.mjs";
+import * as xlsx from "xlsx";
+import _ from "lodash";
 
 // 这是添加上传图片的接口
 const imageUrl = ref("");
@@ -382,15 +384,18 @@ const addLine = function () {
     paidGold: "0",
   });
 };
-const loading = ref(false);
+const loading = ref(true);
 // 添加多行
 const addLines = async function () {
+  loading.value = true;
   try {
     loading.value = true; // 操作开始前，将loading设为true，显示加载动画
     console.log(loading.value, "loading.value")
 
     await new Promise(resolve => setTimeout(resolve, 100)); // 人为创建一个小延迟
 
+    // 操作开始前，将loading设为true，显示加载动画
+    await nextTick(); // 等待视图更新，确保加载动画能及时显示出来
     for (let j = 0; j < addLineObj.value; j++) {
       batchData.value.unshift({
         line: ++i.value,
@@ -401,7 +406,15 @@ const addLines = async function () {
         rechargeGold: "0",
         paidGold: "0",
       });
+      batchData.value.unshift({
+        line: ++i.value,
+        showInput: true,
+      });
     }
+
+    // 所有数据添加操作完成后，准备关闭加载动画
+    await nextTick(); // 再次等待视图更新，确保数据添加操作引起的视图变化已完成
+    loading.value = false; // 将loading设为false，关闭加载动画
     ElMessage.success("添加成功");
     console.log(batchData.value, "batchData.value");
   } catch (error) {
@@ -715,6 +728,57 @@ const batchAdd = async function () {
       }
     }
     console.log("batchData::", batchData.value);
+  console.log("batchData===", batchData.value);
+  let msg = "";
+  if (batchData.value.length == 0) {
+    ElMessage({
+      type: "error",
+      message: "至少需要输入一条数据！",
+    });
+    return;
+  }
+  for (let i = 0; i < batchData.value.length; i++) {
+    batchData.value[i].adminId = adminData.value.adminId;
+    batchData.value[i].area = adminData.value.area;
+    batchData.value[i].rechargeWay = "客服充值";
+    if (batchData.value[i].jwcode == "" || batchData.value[i].jwcode == null) {
+      msg += `精网号不能为空！ <br/>`;
+    }
+    if (
+      batchData.value[i].activityId == "" ||
+      batchData.value[i].activityId == null
+    ) {
+      msg += `活动不能为空！ <br/>`;
+    }
+    if (
+      batchData.value[i].paidGold == "" ||
+      batchData.value[i].paidGold == null
+    ) {
+      msg += `充值金币不能为空！ <br/>`;
+    }
+    if (
+      batchData.value[i].rechargeGold == "" ||
+      batchData.value[i].rechargeGold == null
+    ) {
+      msg += `充值金额不能为空！ <br/>`;
+    }
+    if (batchData.value[i].payWay == "" || batchData.value[i].payWay == null) {
+      msg += `收款方式不能为空！ <br/>`;
+    }
+    if (
+      batchData.value[i].rechargeTime == "" ||
+      batchData.value[i].rechargeTime == null
+    ) {
+      msg += `交款时间不能为空！ <br/>`;
+    }
+    ElMessage({
+      dangerouslyUseHTMLString: true,
+      type: "error",
+      message: msg,
+    });
+    return;
+  }
+  console.log("batchData===", batchData.value);
 
     const result = await API.post(
       "http://192.168.8.93:10010/recharge/recharge/addmore",
@@ -867,14 +931,36 @@ onMounted(async function () {
     <el-button type="primary" plain @click="batchInit()">批量充值</el-button>
   </div>
 
-  <el-form :model="addRecharge" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px" class="add-form">
+  <el-form
+    :model="addRecharge"
+    ref="Ref"
+    :rules="rules"
+    label-width="auto"
+    style="max-width: 600px"
+    class="add-form"
+  >
     <el-form-item prop="jwcode" label="精网号">
       <el-input v-model="addRecharge.jwcode" style="width: 220px" />
-      <el-button type="primary" @click="getUser(addRecharge.jwcode)" style="margin-left: 20px">查询</el-button>
+      <el-button
+        type="primary"
+        @click="getUser(addRecharge.jwcode)"
+        style="margin-left: 20px"
+        >查询</el-button
+      >
     </el-form-item>
     <el-form-item prop="activityId" label="活动名称">
-      <el-select v-model="addRecharge.activityId" placeholder="请选择" style="width: 300px" @change="handleActivityChange">
-        <el-option v-for="item in activity" :key="item.value" :label="item.activityName" :value="item.activityId" />
+      <el-select
+        v-model="addRecharge.activityId"
+        placeholder="请选择"
+        style="width: 300px"
+        @change="handleActivityChange"
+      >
+        <el-option
+          v-for="item in activity"
+          :key="item.value"
+          :label="item.activityName"
+          :value="item.activityId"
+        />
       </el-select>
     </el-form-item>
     <el-form-item prop="paidGold" label="永久金币">
@@ -885,24 +971,66 @@ onMounted(async function () {
       <p>个</p>
     </el-form-item>
     <el-form-item prop="rechargeGold" label="充值金额">
-      <el-select prop="rechargeGold" v-model="Rate" placeholder="货币名称" style="width: 95px; margin-right: 5px">
-        <el-option v-for="item in currency" :key="item.value" :label="item.currency" :value="item.exchangeRate" />
+      <el-select
+        prop="rechargeGold"
+        v-model="Rate"
+        placeholder="货币名称"
+        style="width: 95px; margin-right: 5px"
+      >
+        <el-option
+          v-for="item in currency"
+          :key="item.value"
+          :label="item.currency"
+          :value="item.exchangeRate"
+        />
       </el-select>
       <el-input v-model="addRecharge.rechargeGold" style="width: 200px" />
     </el-form-item>
     <el-form-item prop="payWay" label="收款方式">
-      <el-select v-model="addRecharge.payWay" placeholder="请选择" style="width: 300px">
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      <el-select
+        v-model="addRecharge.payWay"
+        placeholder="请选择"
+        style="width: 300px"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
       </el-select>
     </el-form-item>
     <el-form-item prop="rechargeTime" label="交款时间">
-      <el-date-picker v-model="addRecharge.rechargeTime" type="date" style="width: 300px" />
+      <el-date-picker
+        v-model="addRecharge.rechargeTime"
+        type="date"
+        style="width: 300px"
+      />
     </el-form-item>
-    <el-form-item prop="rechargeVoucher" label="交款凭证" style="margin-bottom: 5px">
-      <el-upload action="http://192.168.8.93:10010/upload" class="avatar-uploader" :show-file-list="false"
-        :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload" style="width: 100px; height: 115px">
-        <img v-if="imageUrl" :src="imageUrl" class="avatar" style="width: 100px; height: 115px" />
-        <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px">
+    <el-form-item
+      prop="rechargeVoucher"
+      label="交款凭证"
+      style="margin-bottom: 5px"
+    >
+      <el-upload
+        action="http://192.168.8.93:10010/upload"
+        class="avatar-uploader"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess"
+        :before-upload="beforeAvatarUpload"
+        style="width: 100px; height: 115px"
+      >
+        <img
+          v-if="imageUrl"
+          :src="imageUrl"
+          class="avatar"
+          style="width: 100px; height: 115px"
+        />
+        <el-icon
+          v-else
+          class="avatar-uploader-icon"
+          style="width: 100px; height: 100px"
+        >
           <Plus />
         </el-icon>
       </el-upload>
@@ -911,19 +1039,41 @@ onMounted(async function () {
       </p>
     </el-form-item>
     <el-form-item prop="remark" label="备注">
-      <el-input v-model="addRecharge.remark" style="width: 300px" :rows="2" maxlength="100" show-word-limit
-        type="textarea" />
+      <el-input
+        v-model="addRecharge.remark"
+        style="width: 300px"
+        :rows="2"
+        maxlength="100"
+        show-word-limit
+        type="textarea"
+      />
     </el-form-item>
     <el-form-item prop="submitter" label="提交人">
-      <el-input style="width: 300px" :value="adminData.name" disabled placeholder="提交人姓名" />
+      <el-input
+        style="width: 300px"
+        :value="adminData.name"
+        disabled
+        placeholder="提交人姓名"
+      />
     </el-form-item>
-    <el-button @click="deleteRecharge" style="margin-left: 280px">重置</el-button>
+    <el-button @click="deleteRecharge" style="margin-left: 280px"
+      >重置</el-button
+    >
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
   </el-form>
 
   <!-- 客户信息栏 -->
-  <el-card style="width: 1200px; float: right" class="customer-info" width="3000px">
-    <el-form :model="user" label-width="auto" style="max-width: 1200px" label-position="left">
+  <el-card
+    style="width: 1200px; float: right"
+    class="customer-info"
+    width="3000px"
+  >
+    <el-form
+      :model="user"
+      label-width="auto"
+      style="max-width: 1200px"
+      label-position="left"
+    >
       <el-text size="large" style="margin-left: 20px">客户信息</el-text>
       <el-row style="margin-top: 20px">
         <el-col :span="10">
@@ -948,8 +1098,13 @@ onMounted(async function () {
             }}</span>
             <span style="display: inline; white-space: nowrap; color: #b1b1b1" v-if="user.buyJb">(永久金币:{{ user.buyJb
               }};免费金币:{{
+            <span
+              style="display: inline; white-space: nowrap; color: #b1b1b1"
+              v-if="user.buyJb"
+              >(充值金币:{{ user.buyJb }};免费金币:{{
                 user.free6 + user.free12
-              }};任务金币:{{ user.coreJb }})</span>
+              }};任务金币:{{ user.coreJb }})</span
+            >
           </el-form-item>
         </el-col>
         <el-col :span="10">
@@ -990,8 +1145,13 @@ onMounted(async function () {
     </el-form>
   </el-card>
 
-  <el-dialog v-model="batchRechargeVisible" title="批量充值" width="1800px" style="height: 700px"
-    :close-on-click-modal="false">
+  <el-dialog
+    v-model="batchRechargeVisible"
+    title="批量充值"
+    width="1800px"
+    style="height: 700px"
+    :close-on-click-modal="false"
+  >
     <el-row style="margin-bottom: 10px">
       <!-- <el-button type="primary" @click="addLine()" style="margin-right: 10px">新增一行</el-button> -->
       <div style="font-weight: bold; font-size: 20px">
@@ -999,17 +1159,38 @@ onMounted(async function () {
         <el-input-number min="1" style="width: 100px;" controls-position="right" v-model="addLineObj"></el-input-number>
         <span>行</span>
         <el-button type="primary" @click="throttledAddLines" style="margin-right: 10px">添加</el-button>
+        <el-button type="primary" @click="addLines()" style="margin-right: 10px"
+          >添加</el-button
+        >
       </div>
-      <el-button type="warning" @click="batchSettingInit()" style="margin-right: 10px">批量设置</el-button>
+      <el-button
+        type="warning"
+        @click="batchSettingInit()"
+        style="margin-right: 10px"
+        >批量设置</el-button
+      >
       <!-- <el-upload :ref="(el) => handleSetUploadRefMap(el)" action="" :http-request="httpExcelRequest" :limit="1" :show-file-list="false"
         class="uploadExcelContent" :data={} style="margin-right: auto">
         <el-button type="success" >导入jwcode</el-button>
       </el-upload> -->
-      <el-button type="danger" plain @click="batchDel()" style="margin-right: 10px; width: 130px">批量删除</el-button>
+      <el-button
+        type="danger"
+        plain
+        @click="batchDel()"
+        style="margin-right: 10px; width: 130px"
+        >批量删除</el-button
+      >
     </el-row>
     <el-row>
       <el-table id="batchTable" v-loading="loading" :data="batchData" border
         max-height="540px" style="height: 540px" @selection-change="handleSelectionChangebatch">
+      <el-table
+        :data="batchData"
+        border
+        max-height="540px"
+        style="height: 540px"
+        @selection-change="handleSelectionChangebatch"
+      >
         <el-table-column type="selection" width="50px" />
         <el-table-column property="index" label="序号" width="55px">
           <template #default="scope">
@@ -1026,16 +1207,35 @@ onMounted(async function () {
           <!-- <template #default="scope">
             <el-select-v2 v-if="scope.row.showInput" filterable clearable v-model="scope.row.jwcode"
               placeholder="请选择精网号" style="widows: 110px;" :options="jwcodeList">
+            <el-select-v2
+              v-if="scope.row.showInput"
+              filterable
+              clearable
+              v-model="scope.row.jwcode"
+              placeholder="请选择精网号"
+              style="widows: 110px"
+              :options="jwcodeList"
+            >
             </el-select-v2>
             <span v-else>{{ scope.row.jwcode }}</span>
           </template> -->
         </el-table-column>
         <el-table-column property="activityName" label="活动名称" width="150px">
           <template #default="scope">
-            <el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.activityId"
-              placeholder="请选择活动名称" @change="changeActivity(scope.row)">
-              <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
-                :value="item.activityId">
+            <el-select
+              v-if="scope.row.showInput"
+              filterable
+              clearable
+              v-model="scope.row.activityId"
+              placeholder="请选择活动名称"
+              @change="changeActivity(scope.row)"
+            >
+              <el-option
+                v-for="item in activity"
+                :key="item.activityId"
+                :label="item.activityName"
+                :value="item.activityId"
+              >
               </el-option>
             </el-select>
             <span v-else>{{ scope.row.activityName }}</span>
@@ -1043,8 +1243,12 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="paidGold" label="永久金币" width="110px">
           <template #default="scope">
-            <el-input v-if="scope.row.showInput" v-model="scope.row.paidGold" style="width: 70px"
-              @change="changePaidGold(scope.row)" />
+            <el-input
+              v-if="scope.row.showInput"
+              v-model="scope.row.paidGold"
+              style="width: 70px"
+              @change="changePaidGold(scope.row)"
+            />
             <span v-else>{{ scope.row.paidGold }}</span>
           </template>
         </el-table-column>
@@ -1052,14 +1256,30 @@ onMounted(async function () {
           <template #default="scope">
             <el-input v-if="scope.row.showInput" v-model="scope.row.freeGold" style="width: 70px" />
             <span v-else>{{ scope.row.freeGold }}</span>
+            <el-input
+              v-if="scope.row.showInput"
+              v-model="scope.row.freeGold"
+              style="width: 70px"
+            />
+            <span v-else>{{ scope.row.paidGold }}</span>
           </template>
         </el-table-column>
         <el-table-column property="rate" label="货币名称">
           <template #default="scope">
-            <el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.rate" placeholder="请选择币种"
-              @change="changeRate(scope.row)">
-              <el-option v-for="item in currency" :key="item.exchangeRate" :label="item.currency"
-                :value="item.exchangeRate">
+            <el-select
+              v-if="scope.row.showInput"
+              filterable
+              clearable
+              v-model="scope.row.rate"
+              placeholder="请选择币种"
+              @change="changeRate(scope.row)"
+            >
+              <el-option
+                v-for="item in currency"
+                :key="item.exchangeRate"
+                :label="item.currency"
+                :value="item.exchangeRate"
+              >
               </el-option>
             </el-select>
             <span v-else>{{ scope.row.rate }}</span>
@@ -1072,8 +1292,19 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="payWay" label="收款方式" width="130px">
           <template #default="scope">
-            <el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.payWay" placeholder="请选择收款方式">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-if="scope.row.showInput"
+              filterable
+              clearable
+              v-model="scope.row.payWay"
+              placeholder="请选择收款方式"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
             <span v-else>{{ scope.row.payWay }}</span>
@@ -1081,8 +1312,13 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="rechargeTime" label="交款时间" width="150px">
           <template #default="scope">
-            <el-date-picker v-if="scope.row.showInput" type="date" v-model="scope.row.rechargeTime" style="width: 120px"
-              placeholder="请选择交款时间">
+            <el-date-picker
+              v-if="scope.row.showInput"
+              type="date"
+              v-model="scope.row.rechargeTime"
+              style="width: 120px"
+              placeholder="请选择交款时间"
+            >
             </el-date-picker>
             <span v-else>{{
               moment(scope.row.rechargeTime).format("YYYY-MM-DD HH:mm:ss")
@@ -1091,9 +1327,19 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="rechargeVoucher" label="充值凭证">
           <template #default="scope">
-            <el-upload action="http://192.168.8.93:10010/upload" class="avatar-uploader" :show-file-list="false"
-              :on-success="handleBatchAvatarSuccess" v-if="scope.row.showInput" @change="changeVoucher(scope.row)">
-              <img v-if="scope.row.imageUrl" :src="scope.row.imageUrl" class="avatar" />
+            <el-upload
+              action="http://192.168.8.93:10010/upload"
+              class="avatar-uploader"
+              :show-file-list="false"
+              :on-success="handleBatchAvatarSuccess"
+              v-if="scope.row.showInput"
+              @change="changeVoucher(scope.row)"
+            >
+              <img
+                v-if="scope.row.imageUrl"
+                :src="scope.row.imageUrl"
+                class="avatar"
+              />
               <el-icon v-else class="avatar-uploader-icon">
                 <Plus />
               </el-icon>
@@ -1103,18 +1349,32 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="remark" label="备注" width="130px">
           <template #default="scope">
-            <el-input type="textarea" v-if="scope.row.showInput" v-model="scope.row.remark" style="max-width: 90px"
-              :rows="1" cols="12"></el-input>
+            <el-input
+              type="textarea"
+              v-if="scope.row.showInput"
+              v-model="scope.row.remark"
+              style="max-width: 90px"
+              :rows="1"
+              cols="12"
+            ></el-input>
             <span v-else>{{ scope.row.remark }}</span>
           </template>
         </el-table-column>
         <el-table-column property="submitter" label="提交人">
           <el-input :value="adminData.name" disabled />
         </el-table-column>
-        <el-table-column fixed="right" prop="operation" label="操作" width="150px">
+        <el-table-column
+          fixed="right"
+          prop="operation"
+          label="操作"
+          width="150px"
+        >
           <template #default="scope">
             <div style="display: flex">
-              <el-popconfirm title="确定将此条信息删除吗？" @confirm="delConfirm">
+              <el-popconfirm
+                title="确定将此条信息删除吗？"
+                @confirm="delConfirm"
+              >
                 <template #reference>
                   <el-button type="danger" text @click="del(scope.row)">
                     删除
@@ -1127,7 +1387,10 @@ onMounted(async function () {
                   </el-button>
                 </template>
               </el-popconfirm>
-              <el-popconfirm title="确定将此条信息重置吗？" @confirm="resetConfirm">
+              <el-popconfirm
+                title="确定将此条信息重置吗？"
+                @confirm="resetConfirm"
+              >
                 <template #reference>
                   <el-button type="primary" text @click="reset(scope.row)">
                     重置
@@ -1148,62 +1411,131 @@ onMounted(async function () {
     <el-row>
       <div class="batch-btn">
         <el-button @click="cancelBatch()"> 取消 </el-button>
-        <el-button type="primary" @click="throttledBatchAdd()"> 提交 </el-button>
+        <el-button type="primary" @click="throttledBatchAdd()">
+          提交
+        </el-button>
       </div>
     </el-row>
   </el-dialog>
 
-  <el-dialog v-model="batchSettingVisible" title="批量设置" :close-on-click-modal="false" style="width: 550px">
+  <el-dialog
+    v-model="batchSettingVisible"
+    title="批量设置"
+    :close-on-click-modal="false"
+    style="width: 550px"
+  >
     <el-form label-position="left" label-width="auto">
       <el-form-item label="活动名称">
-        <el-select v-model="batchSettingObj.activityId" placeholder="请选择活动名称" clearable>
-          <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
-            :value="item.activityId">
+        <el-select
+          v-model="batchSettingObj.activityId"
+          placeholder="请选择活动名称"
+          clearable
+        >
+          <el-option
+            v-for="item in activity"
+            :key="item.activityId"
+            :label="item.activityName"
+            :value="item.activityId"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="永久金币">
         <el-input v-model="batchSettingObj.paidGold" placeholder="请输入永久金币"></el-input>
+      <el-form-item label="充值金币">
+        <el-input
+          v-model="batchSettingObj.paidGold"
+          placeholder="请输入充值金币"
+        ></el-input>
       </el-form-item>
       <el-form-item label="免费金币">
         <el-input v-model="batchSettingObj.freeGold"></el-input>
       </el-form-item>
       <el-form-item label="充值金额">
         <div style="display: flex">
-          <el-select v-model="batchSettingObj.rate" placeholder="请选择币种" style="width: 120px; margin-right: 10px"
-            clearable>
-            <el-option v-for="item in currency" :key="item.exchangeRate" :label="item.currency"
-              :value="item.exchangeRate"></el-option>
+          <el-select
+            v-model="batchSettingObj.rate"
+            placeholder="请选择币种"
+            style="width: 120px; margin-right: 10px"
+            clearable
+          >
+            <el-option
+              v-for="item in currency"
+              :key="item.exchangeRate"
+              :label="item.currency"
+              :value="item.exchangeRate"
+            ></el-option>
           </el-select>
-          <el-input v-model="batchSettingObj.rechargeGold" placeholder="请输入充值金额"></el-input>
+          <el-input
+            v-model="batchSettingObj.rechargeGold"
+            placeholder="请输入充值金额"
+          ></el-input>
         </div>
       </el-form-item>
       <el-form-item prop="payWay" label="收款方式">
-        <el-select v-model="batchSettingObj.payWay" placeholder="请选择收款方式" clearable>
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        <el-select
+          v-model="batchSettingObj.payWay"
+          placeholder="请选择收款方式"
+          clearable
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="rechargeTime" label="交款时间">
-        <el-date-picker v-model="batchSettingObj.rechargeTime" type="date" placeholder="请选择交款时间"></el-date-picker>
+        <el-date-picker
+          v-model="batchSettingObj.rechargeTime"
+          type="date"
+          placeholder="请选择交款时间"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item prop="rechargeVoucher" label="交款凭证">
-        <el-upload action="http://192.168.8.93:10010/upload" class="avatar-uploader" :show-file-list="false"
-          :on-success="batchSettingHandleAvatarSuccess" :before-upload="beforeAvatarUpload"
-          style="width: 100px; height: 115px">
-          <img v-if="batchSettingObj.imageUrl" :src="batchSettingObj.imageUrl" class="avatar"
-            style="width: 100px; height: 115px" />
-          <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px">
+        <el-upload
+          action="http://192.168.8.93:10010/upload"
+          class="avatar-uploader"
+          :show-file-list="false"
+          :on-success="batchSettingHandleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          style="width: 100px; height: 115px"
+        >
+          <img
+            v-if="batchSettingObj.imageUrl"
+            :src="batchSettingObj.imageUrl"
+            class="avatar"
+            style="width: 100px; height: 115px"
+          />
+          <el-icon
+            v-else
+            class="avatar-uploader-icon"
+            style="width: 100px; height: 100px"
+          >
             <Plus />
           </el-icon>
         </el-upload>
       </el-form-item>
       <el-form-item prop="remark" label="备注">
-        <el-input type="textarea" v-model="batchSettingObj.remark" placeholder="请输入备注" />
+        <el-input
+          type="textarea"
+          v-model="batchSettingObj.remark"
+          placeholder="请输入备注"
+        />
       </el-form-item>
     </el-form>
-    <el-button @click="cancelBatchSetting()" style="margin-left: 370px">取消</el-button>
+    <el-button @click="cancelBatchSetting()" style="margin-left: 370px"
+      >取消</el-button
+    >
     <el-button type="primary" @click="batchSettingConfirm()"> 确认 </el-button>
   </el-dialog>
+  <el-loading
+    :fullscreen="true"
+    :lock="true"
+    :text="'加载中...'"
+    v-model="loading"
+  ></el-loading>
 </template>
 
 <style scoped>

vue/gold-system/src/views/usergold/index.vue

@@ -318,7 +318,18 @@ const area = [
     label: "越南HCM",
   },
 ];
+//选消费平台
+const platform = [
+  {
+    value: "金币系统",
+    label: "金币系统",
+  },
 
+  {
+    value: "ERP系统",
+    label: "ERP系统",
+  },
+];
 const TimeGet = ref("1");
 
 // 今天
@@ -465,53 +476,70 @@ const get30 = function () {
   <el-row>
     <el-col>
       <el-card style="margin-bottom: 20px">
-        <div class="head-card">
-          <div class="head-card-element">
-            <el-text class="mx-1" size="large">精网号：</el-text>
-            <el-input
-              v-model="detailY.jwcode"
-              style="width: 240px"
-              placeholder="请输入精网号"
-              clearable
-            />
-          </div>
-          <div class="head-card-element">
-            <el-text class="mx-1" size="large">更新类型：</el-text>
-            <el-select
-              v-model="detailY.updateType"
-              placeholder="请选择更新类型"
-              size="large"
-              style="width: 240px"
-              clearable
-            >
-              <el-option
-                v-for="item in updateType"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+        <el-row style="margin-bottom: 10px">
+          <el-col :span="8">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">精网号：</el-text>
+              <el-input
+                v-model="detailY.jwcode"
+                style="width: 240px"
+                placeholder="请输入精网号"
+                clearable
               />
-            </el-select>
-          </div>
-          <div class="head-card-element">
-            <el-text class="mx-1" size="large">更新时间：</el-text>
-            <el-date-picker
-              v-model="getTime"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="起始时间"
-              end-placeholder="结束时间"
-            />
-          </div>
-          <div class="head-card-btn">
-            <el-button
-              type="success"
-              style="margin-right: 40px"
-              @click="getPutEX = true"
-              >导出Excel表格</el-button
-            >
-            <el-button @click="reset()">重置</el-button>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </div>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">平台信息：</el-text>
+              <el-select
+                v-model="detailY.plateform"
+                placeholder="请选择平台信息"
+                style="width: 200px"
+                clearable
+              >
+                <el-option
+                  v-for="item in platform"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">更新类型：</el-text>
+              <el-select
+                v-model="detailY.updateType"
+                placeholder="请选择更新类型"
+                style="width: 200px"
+                clearable
+              >
+                <el-option
+                  v-for="item in updateType"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+          </el-col>
+        </el-row>
+        <div class="head-card-element">
+          <el-text class="mx-1" size="large">更新时间：</el-text>
+          <el-date-picker
+            v-model="getTime"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="起始时间"
+            end-placeholder="结束时间"
+            style="margin-right: 700px"
+          />
+          <el-button type="success" @click="getPutEX = true"
+            >导出Excel表格</el-button
+          >
+          <el-button @click="reset()">重置</el-button>
+          <el-button type="primary" @click="search()">查询</el-button>
         </div>
       </el-card>
     </el-col>
@@ -665,11 +693,11 @@ const get30 = function () {
   display: flex;
 }
 
-.head-card-element {
+/* .head-card-element {
   margin-right: 20px;
-}
+} */
 
-.head-card-btn {
+/* .head-card-btn {
   margin-left: auto;
-}
+} */
 </style>