fix 图片大小不超过2MB

.env.development

@@ -1,4 +1,4 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
@@ -11,7 +11,7 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 # zhangyong
 #  VITE_API_BASE='http://192.168.3.83:8081/'
 # 本地
-# VITE_API_BASE='http://localhost:8081/'
+VITE_API_BASE='http://localhost:8081/'
 # sunjiabei
 # VITE_API_BASE='http://192.168.1.70:8081/'
 

src/components/workspace/CashManagement.vue

@@ -100,7 +100,6 @@ const startDate = `${currentYear}-01-01 00:00:00`;
 const endDate = `${currentYear}-12-31 23:59:59`;
 // 获取接口数据
 const fetchCashData = async () => {
-  getAdminData()
   try {
     const res = await request({
       url: '/workbench/getTotalRevenue',
@@ -227,9 +226,9 @@ const renderChart = () => {
   chartInstance.setOption(option)
 }
 
-onMounted(() => {
-  // getAdminData()
-  fetchCashData()
+onMounted( async() => {
+   await getAdminData()
+   await fetchCashData()
 })
 </script>
 

src/views/moneyManage/executor/executor.vue

@@ -301,6 +301,7 @@ const getRefund = async function () {
         })
 
         tableData.value = result.data.list || []
+        pagination.value.total = result.data.total || 0
     } catch (error) {
         ElMessage.error(error.message || '查询失败')
     }

src/views/moneyManage/receiveDetail/receiveDetail.vue

@@ -48,7 +48,7 @@
                     </div>
                     <div class="rowItem">
                         <el-text style="width: 4vw;">产品名称</el-text>
-                        <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;" />
+                        <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;" clearable/>
                     </div>
                     <div class="rowItem" style="width: 30vw">
                         <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
@@ -184,7 +184,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="auditTime" label="驳回时间" v-if="activeTab == 'reject' && !kefu"
-                            width="150px" show-overflow-tooltip></el-table-column>
+                            width="180px" show-overflow-tooltip></el-table-column>
                         <el-table-column prop="rejectReason" label="驳回理由" v-if="activeTab == 'reject' && !kefu"
                             width="150px">
                             <template #default="scope">
@@ -687,11 +687,13 @@ const search = () => {
 const reset = () => {
     searchData.value = {}
     getTime.value = []
+    getlist()
 }
 //获得表格数据接口
 const getlist = async () => {
     try {
         let payCurrencySelect = ''
+        let goodsName = ''
         if (getTime.value && getTime.value.length === 2) {
             searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss')
             searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss')
@@ -702,7 +704,7 @@ const getlist = async () => {
         }
 
         if (searchData.value.goodsName) {
-            searchData.value.goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1]
+            goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1]
         }
         if (searchData.value.paymentCurrency) {
             payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency)
@@ -739,7 +741,9 @@ const getlist = async () => {
                     receivedMarket: MarketNameForId(receivedMarket),
                     cashRoleId: cashRoleId,
                     paymentCurrency: payCurrencySelect,
-                    submitterMarket: receivedMarket
+                    submitterMarket: receivedMarket,
+                    goodsName:goodsName,
+                    market:MarketNameForId(searchData.value.market)
                 }
             }
         })

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -507,6 +507,8 @@ const handleReject = async function () {
             ElMessage.success('审核驳回')
             showAudit.value = false
             getRefund()
+            addForm.value.remark = ''
+            showReject.value = false
         }
     } catch (error) {
         ElMessage.error(error.message || '审核失败')

src/views/moneyManage/refundDetail/refundService.vue

@@ -59,7 +59,7 @@
             <el-table-column type="index" label="序号" width="60" fixed="left" />
             <el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
             <el-table-column prop="name" label="姓名" width="120" fixed="left" show-overflow-tooltip />
-            <el-table-column prop="market" label="所属地区" width="120" />
+            <el-table-column prop="marketName" label="所属地区" width="120" />
             <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
             <el-table-column prop="goodsName" label="产品名称" width="130" show-overflow-tooltip />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
@@ -247,8 +247,12 @@ const showError = ref(false)
 const isKF = adminData.value.adminName.includes('客服')
 const statusList = ref([
     {
-        value: 'waiting',
-        label: '待审核',
+        value:'submitted',
+        label:'已提交',
+    },
+    {
+        value: 'back',
+        label: '已撤回',
     },
     {
         value: 'pending',
@@ -256,7 +260,11 @@ const statusList = ref([
     },
     {
         value: 'completed',
-        label: '退款完成'
+        label: '已退款'
+    },
+    {
+        value:'rejected',
+        label:'已驳回'
     }
 ])
 // 查全部
@@ -266,12 +274,16 @@ const getRefund = async function () {
         return
     }
     try {
-        if (searchForm.value.statuses === 'completed') {
-            searchForm.value.statuses = [41]
-        } else if (searchForm.value.statuses === 'pending') {
-            searchForm.value.statuses = [20, 30, 40]
-        } else if (searchForm.value.statuses === 'waiting') {
+        if (searchForm.value.statuses === 'submitted') {
             searchForm.value.statuses = [10]
+        } else if (searchForm.value.statuses === 'back') {
+            searchForm.value.statuses = [11]
+        } else if (searchForm.value.statuses === 'pending') {
+            searchForm.value.statuses = [20,30,40]
+        } else if(searchForm.value.statuses === 'completed') {
+            searchForm.value.statuses = [41]
+        } else if(searchForm.value.statuses === 'rejected') {
+            searchForm.value.statuses = [12,22,32]
         }
         const params = {
             pageNum: pagination.value.pageNum,
@@ -279,7 +291,7 @@ const getRefund = async function () {
             cashRecordDone: {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
-                markets: searchForm.value.market,//地区
+                market: searchForm.value.market,//地区
                 goodsNames: searchForm.value.goodsName,//商品名
                 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；