Merge remote-tracking branch 'origin/master'

src/views/onlineBusinessHall/automobileSeroice/refundManagement/index.vue

@@ -88,7 +88,7 @@
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           @change="dateChangeHandle"
-          :clearable="false"
+          :clearable="true"
         />
       </template>
       <template #button2>
@@ -585,7 +585,7 @@ const field = ref({
       },
     },
     {
-      label: '金额',
+      label: '金额（元）',
       prop: 'amount',
       funRuleStarts: true,
       funRule: (val: any) => {

src/views/settlement/financeManagement/refundManagement/index.vue

@@ -149,13 +149,13 @@
 
         </el-descriptions>
         <el-descriptions title="实际退费信息" v-if="refundBtn || rowData.refundAmount" :column="3" border>
-          <el-descriptions-item label="实际退费金额(元)" label-align="right" align="center">
+          <el-descriptions-item label="实际退费金额（元）" label-align="right" align="center">
             {{ rowData.refundAmount }}
           </el-descriptions-item>
         </el-descriptions>
 
 
-        <el-descriptions title="付费银行账号信息" v-if="rowData.operateType === 'BANK'" :column="2" border>
+        <!-- <el-descriptions title="付费银行账号信息" v-if="rowData.operateType === 'BANK'" :column="2" border>
 
           <el-descriptions-item label="付费银行" label-align="right" align="center" v-if="refundBtn">
             <el-select clearable v-model="rowData.paymentBankType" :disabled="!refundBtn" class="m-2"
@@ -173,7 +173,7 @@
           <el-descriptions-item label="付费银行卡号" label-align="right" align="center" v-if="!refundBtn">
             {{ rowData.paymentBankCardId }}
           </el-descriptions-item>
-        </el-descriptions>
+        </el-descriptions> -->
       </template>
       <template #footer>
         <el-button type="primary" @click="refundSubmit(rowData.id, '退费确认')" v-if="refundBtn">退费确认</el-button>
@@ -235,10 +235,10 @@
   const VEHICLE_COLOR_TYPE = computed(() => {
   return $storeinitData.state.dictData['VEHICLE_COLOR_TYPE'] || []
 }) //车牌颜色
-  const refundNum = ref(0)
 
+  const refundNum = ref(0)
   const tableData = ref([] as any[]);
-  const rowData = ref({});
+  const rowData = ref<any>({})
   const initItem = {
     id: "",
   };
@@ -250,13 +250,13 @@
     border: true, //是否添加边框(默认false)
     dialogCustom: true, //自定义Dialog (默认false)
     dialogFooter: true, //隐藏弹窗页脚显示 (默认false)
-    dialogWidth: '60%', //dialog宽度 (默认40%)
+    dialogWidth: '80%', //dialog宽度 (默认40%)
     crudShow: true, //是否显示CURD操作栏 (默认true)
     crudChildShow: true, //是否显示CURD子操作栏 (默认true)
     paginStart: true, //是否显示分页查询 (默认false)
     isPageSizes: true,
     pageLayout: 'total, sizes, prev, pager, next',
-    titleDialog: "", //table 标题
+    titleDialog: '', //table 标题
     tableOperation: true,
     paging: {
       pageSize: 10,
@@ -285,7 +285,7 @@
       edit: false, //是否编辑(默认true)
       delete: false, //是否删除(默认true)
       announcement: false, // 公告
-      remark: true, // 详情
+      remark: IsPermission(route, 'VIEW_LIST'), // 详情
       forbidden: false, // 禁用
       enable: false, // 启用
       authorization: false, // 授权
@@ -303,10 +303,18 @@
       {
         label: '支付单号',
         prop: 'externalOrderNo',
+        //   form: {
+        //   width: '90%',
+        //   type: 'input'
+        // },
       },
       {
         label: '卡号',
         prop: 'cardId',
+        //   form: {
+        //   width: '90%',
+        //   type: 'input'
+        // },
       },
       {
         label: '车牌号',
@@ -320,51 +328,66 @@
           return getDictLabel(VEHICLE_COLOR_TYPE, val)
         },
     },
-      {
-        label: '金额(元)',
-        prop: 'amount',
-        unit: "元",
-        funRuleStarts: true,
-        funRule: (val: any) => {
-          var m = 0;
-          var s1 = val.toString();
-          var s2 = '0.01'.toString();
-          try {
-            m += s1.split(".")[1].length;
-          } catch (e) { }
-          try {
-            m += s2.split(".")[1].length;
-          } catch (e) { }
-
-          return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m);
-          // return val === null ? 0+"元" : val*0.01+"元"
-        },
+    {
+      label: '金额（元）',
+      prop: 'amount',
+      funRuleStarts: true,
+      funRule: (val: any) => {
+        var m = 0
+        var s1 = val.toString()
+        var s2 = '0.01'.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {}
+        try {
+          m += s2.split('.')[1].length
+        } catch (e) {}
+
+        return (
+          (Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) /
+            Math.pow(10, m) +
+          '元'
+        )
+        // return val === null ? 0+"元" : val*0.01+"元"
       },
-      {
-        label: '状态',
-        prop: 'status',
-        width: "170",
-        funRuleStarts: true,
-        funRule: (val: any) => {
-          return getDictLabel(statusList.value, val)
-        },
+    },
+    {
+      label: '状态',
+      prop: 'status',
+      width: "170",
+      funRuleStarts: true,
+      funRule: (val: any) => {
+        return getDictLabel(statusList.value, val)
       },
-      {
-        label: '业务端口',
-        prop: 'businessPort',
-        width: "170",
-        funRuleStarts: true,
-        funRule: (val: any) => {
-          return getDictLabel(portList.value, val)
-        },
+    },
+    {
+      label: '业务端口',
+      prop: 'businessPort',
+      width: "170",
+      funRuleStarts: true,
+      funRule: (val: any) => {
+        return getDictLabel(portList.value, val)
       },
-      {
-        label: '操作员',
-        prop: 'salesmanNickName',
+    },
+    {
+      label: '操作员',
+      prop: 'salesmanNickName',
+    },
+    {
+    prop: 'refundTime',
+    label: '退款时间',
+    width: '170px',
+    funRuleStarts: true,
+    funRule: (val: any) => {
+      if (val) {
+        return val.replaceAll('T', ' ')
+      }
+      return val
       },
-      {
-      prop: 'refundTime',
-      label: '退款时间',
+    },
+    {
+      prop: 'insertTime',
+      label: '创建时间',
       width: '170px',
       funRuleStarts: true,
       funRule: (val: any) => {
@@ -374,30 +397,18 @@
         return val
       },
     },
-      {
-        prop: 'insertTime',
-        label: '创建时间',
-        width: '170px',
-        funRuleStarts: true,
-        funRule: (val: any) => {
-          if (val) {
-            return val.replaceAll('T', ' ')
-          }
-          return val
-        },
-      },
-      {
-        prop: 'auditTime',
-        label: '审核时间',
-        width: '170px',
-        funRuleStarts: true,
-        funRule: (val: any) => {
-          if (val) {
-            return val.replaceAll('T', ' ')
-          }
-          return val
-        },
+    {
+      prop: 'auditTime',
+      label: '审核时间',
+      width: '170px',
+      funRuleStarts: true,
+      funRule: (val: any) => {
+        if (val) {
+          return val.replaceAll('T', ' ')
+        }
+        return val
       },
+    },
     ],
   })
   // 搜索按钮
@@ -481,7 +492,8 @@
         params[key] = searchFormList[key]
       }
     }
-    BaseService.postN('/settlew/api/issue/refund/page', params).then((res: any) => {
+    BaseService.postN('/settlew/api/issue/refund/page', params).then(
+      (res: any) => {
       if (res && res.statusCode === 0) {
         let bizContent = res.data
         let data = bizContent.result || [];