Kaynağa Gözat

1.修复提现金额校验问题
2.修复洗车设备信息无法编辑问题

zuy 7 ay önce
ebeveyn
işleme
52f9cf445a

+ 2 - 2
admin-web/src/views/admin/feedback/index.vue

@@ -98,7 +98,7 @@ const state = reactive({
   columns: [
     {
       label: '反馈标题', width:180,prop: 'title', query: true, type: "text", resizable: true,
-      render: (h: any, row: any) => {
+      render: (h: any, row: any,rowData:any) => {
         return h('div', null, [
           h('div', {
             style: {
@@ -106,7 +106,7 @@ const state = reactive({
               color: 'var(--el-color-primary-light-1)'
             },
             onClick: () => {
-              onRowClick('view', row)
+              onRowClick('view', rowData)
             }
           }, row)])
       }

+ 2 - 0
admin-web/src/views/admin/platform/deviceConfig/dialog.vue

@@ -77,6 +77,7 @@
           </el-input>
         </el-form-item>
 
+<!--实体类中无此属性
         <el-form-item label="是否安装了水流量传感器" prop="sensorWater" class="wd300">
           <ext-boolean
               v-model="state.ruleForm.sensorWater"
@@ -84,6 +85,7 @@
               clearable
               class="w100"/>
         </el-form-item>
+-->
 
         <el-form-item label="屏幕左下方文本" prop="userMessage1" class="wd300">
           <el-input

+ 2 - 2
admin-web/src/views/admin/platform/rate/index.vue

@@ -156,7 +156,7 @@ const state = reactive({
   columns: [
     {
       label: '费率名称', width: 180, prop: 'name', query: true, type: "text", resizable: true,
-      render: (h: any, row: any) => {
+      render: (h: any, row: any,rowData:any) => {
         return h('div', null, [
           h('div', {
             style: {
@@ -164,7 +164,7 @@ const state = reactive({
               color: 'var(--el-color-primary-light-1)'
             },
             onClick: () => {
-              handleRowClick('view', row)
+              handleRowClick('view', rowData)
             }
           }, row.name || row.title)])
       }

+ 5 - 3
admin-web/src/views/admin/station/account/index.vue

@@ -231,20 +231,22 @@ const loadData = (refresh: boolean = false) => {
 // 打开详情页弹窗
 const handleWithdrawApplyClick = ( row: any) => {
   Msg.confirm(`确认执行本操作吗?`,'提现申请').then(()=>{
-    Msg.prompt(`请输入提现金额(单位)`, '提现申请',
+    Msg.prompt(`请输入提现金额(单位:元)`, '提现申请',
         {
           draggable: true,
           type: 'primary',
         }
     ).then((res: any) => {
       let {value, action} = res;
+      console.log(res)
+      let v =value;
       if (action === 'confirm') {
-        if(!value|| !Number.isInteger(value)){
+        if(!(v != null && v !== '' && !Number.isNaN(Number(v)))){
           Msg.message("请输入有效的提现金额,否则无法发起本操作",'error')
           return
         }
         Msg.showLoading(`请等待`);
-        $body(`finance/applyWithdrawn`,{stationId:row.stationId,amount:Number(value)}).then(()=>{
+        $body(`finance/applyWithdrawn`,{stationId:row.stationId,amount:Number(value)*100}).then(()=>{
           Msg.message("提现已发起")
           Msg.hideLoading()
           loadData(true)

+ 4 - 3
admin-web/src/views/admin/station/device/index.vue

@@ -162,7 +162,7 @@ const state = reactive({
     {label: '更新时间', prop: 'updateTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDateTime(val)}},
     {
       label: '操作', prop: 'action', type: 'render', width: 180, align: 'center', fixed: 'right',
-      render: (h: any, row: any) => {
+      render: (h: any, row: any,rowData:any) => {
         return (
             h('div', null, [
               proxy.$auth('washDevice.modify') ?
@@ -171,7 +171,7 @@ const state = reactive({
                     text: true,
                     size: 'small',
                     onClick: () => {
-                      handleRowClick('edit', row)
+                      handleRowClick('edit', rowData)
                     }
                   }, () => '编辑') : '',
               proxy.$auth('washDevice.modify') ?
@@ -189,7 +189,7 @@ const state = reactive({
                     text: true,
                     size: 'small',
                     onClick: () => {
-                      handleRowDelete(row)
+                      handleRowDelete(rowData)
                     }
                   }, () => '删除') : '',
             ])
@@ -268,6 +268,7 @@ const handleRowConfigClick = (type: string, row: any) => {
 
 // 打开详情页弹窗
 const handleRowClick = (type: string, row: any) => {
+  debugger
   device_dialog_ref.value.open(type, row);
 };
 // 删除点击