chenjj преди 3 месеца
родител
ревизия
8471ef7cc8

+ 12 - 1
src/views/components/DialogForm/index.vue

@@ -70,7 +70,18 @@
                 <el-form-item :label="item.label" v-if="item.type === 'img'" :prop="item.prop">
                     <el-space wrap>
                         <div v-for="(imgItem, imgIndex) in getImages(item.prop)" :key="imgIndex">
-                            <img :src="imgItem" alt="" srcset="" style="width: 100px;" />
+                            <!-- <img :src="imgItem" alt="" srcset="" style="width: 100px;" /> -->
+                            <el-image
+                                style="width: 100px;"
+                                :src="imgItem"
+                                :zoom-rate="1.2"
+                                :max-scale="7"
+                                :min-scale="0.2"
+                                :preview-src-list="getImages(item.prop)"
+                                show-progress
+                                :initial-index="4"
+                                fit="cover"
+                                />
                         </div>
                     </el-space>
                 </el-form-item>

+ 1 - 1
src/views/finance/withdrawal/index.vue

@@ -2,7 +2,7 @@
     <div>
         <ListPage :column="tabkey !== '4' ? talkeColumn : paymentColumn" :tableApi="getList" :isSelect="true"
             :scopeBtns="scopeBtns" :searchBtns="searchBtns" ref="userTableRef" tableKey="volunteerTakeRecordId"
-            :tabList="tabList" tabsearchKey="tabkeys" defaultTab="1" />
+            :tabList="tabList" tabsearchKey="tabkeys" defaultTab="" />
         <DialogForm ref="dialogFormRef" :title="dialogData.title" :column="dialogData.column" @submit="submitForm"
             labelWidth="120px" />
 

+ 14 - 13
src/views/finance/withdrawal/useData.js

@@ -92,7 +92,7 @@ export default ({ proxy, jlzj_area_type }) => {
             delete parmasData.tabkeys;
         }
         tabkey.value = data.tabkeys;
-        return data.tabkeys === '4' ? paymentList(parmasData):takeList({ ...parmasData, appStatus: data.tabkeys });
+        return data.tabkeys === '4' ? paymentList(parmasData):takeList({ ...parmasData });
     }
 
     const paymentSubmit = async (ids) => {
@@ -221,17 +221,17 @@ export default ({ proxy, jlzj_area_type }) => {
         verifyCancel,
         getCode,
         tabList: [
-            {
-                title: '支付宝提现审核',
-                name: '1'
-            },
-            {
-                title: '审核驳回',
-                name: '3'
-            },
+            // {
+            //     title: '支付宝提现审核',
+            //     name: '1'
+            // },
+            // {
+            //     title: '审核驳回',
+            //     name: '3'
+            // },
             {
                 title: '支付宝提现申请单',
-                name: '2'
+                name: ''
             },
             {
                 title: '打款单记录',
@@ -281,6 +281,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 prop: 'appStatus',
                 type: 'dict',
                 dict: volunteer_app_status,
+                isSearch: true,
             }
         ]),
         paymentColumn: ref([
@@ -432,7 +433,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 key: 'applicant',
                 type: 'primary',
                 show: (row) => {
-                    return tabkey.value === '2'
+                    return tabkey.value !== '4'
                 }
             },
         ],
@@ -447,7 +448,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 },
                 show: (row) => {
                     
-                    return tabkey.value === '1' && row.appStatus === '1'
+                    return row.appStatus === '1'
                 }
             },
             {
@@ -485,7 +486,7 @@ export default ({ proxy, jlzj_area_type }) => {
                     paymentSubmit([row.volunteerTakeRecordId])
                 },
                 show: (row) => {
-                    return tabkey.value === '2' && row.appStatus === '2'
+                    return tabkey.value === '' && row.appStatus === '2'
                 }
             },
             {

+ 7 - 1
src/views/staff/volunteer/manage/index.vue

@@ -68,7 +68,7 @@ const listPageData = reactive({
             prop: 'address',
         },
         {
-            label: '个人头像',
+            label: '服务图片',
             prop: 'volunteerPicture',
             type: 'img',
         },
@@ -192,6 +192,11 @@ const dialogData = reactive({
             type: 'text',
             dese: '元'
         },
+        {
+            label: '服务图片',
+            prop: 'volunteerPicture',
+            type: 'img',
+        },
         {
             label: '身份证件',
             prop: ['idCardPictureFront','idCardPictureBack'],
@@ -207,6 +212,7 @@ const dialogData = reactive({
             prop: 'skillDescribe',
             type: 'text',
         },
+       
         {
             label: '审核状态',
             prop: 'appStatus',