wangxin hace 6 años
padre
commit
fcc24d86b5

+ 6 - 5
src/views/hlgaccount/modules/HlgAccountEditServiceRateModal.vue

@@ -1,6 +1,7 @@
 <template>
   <a-modal
     :title="title"
+    :width="modelStyle.width"
     :visible="visible"
     :bodyStyle="bodyStyle"
     :confirmLoading="confirmLoading"
@@ -46,11 +47,11 @@
           // height: (window.innerHeight * 0.62) + 'px',
           'overflow-y': 'auto'
         },
-        // modelStyle: {
-        //   width: '76%',
-        //   style: { top: '20px' },
-        //   fullScreen: false
-        // },
+        modelStyle: {
+          width: '50%',
+          style: { top: '20px' },
+          fullScreen: false
+        },
         visible: false,
         model: {},
         labelCol: {

+ 1 - 2
src/views/hlgaccount/modules/HlgAccountModal.vue

@@ -32,7 +32,6 @@
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
 
            <span slot="action" slot-scope="text, record">
@@ -184,7 +183,7 @@
       },
       handleDetail(record) {
         this.$refs.paymentDetailsModalForm.edit({ ...record, companyName: this.model.companyName })
-        this.$refs.paymentDetailsModalForm.title = '收支明细'
+        this.$refs.paymentDetailsModalForm.title =  this.model.companyName + ' ---- ' + record.subcontractorName
         this.$refs.paymentDetailsModalForm.disableSubmit = false
       }
     }

+ 7 - 9
src/views/hlgaccount/modules/HlgAccountPaymentDetailsModal.vue

@@ -12,12 +12,12 @@
     <a-spin :spinning="confirmLoading">
       <a-card :bordered="false">
         <!-- 查询区域 -->
-        <a-row :gutter="24">
-          <a-col style="font-size: 24px;">
-            {{companyName}} —— {{model.subcontractorName}}
-          </a-col>
-        </a-row>
-        <a-row style="margin-top: 15px">
+<!--        <a-row :gutter="24">-->
+<!--          <a-col style="font-size: 24px;">-->
+<!--            {{companyName}} —— {{model.subcontractorName}}-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+        <a-row>
           <a-button type="primary" @click="topUpRefund">充值退款</a-button>
         </a-row>
         <!-- 查询区域-END -->
@@ -39,7 +39,6 @@
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
                 <span slot="type" slot-scope="text,scope,index">
                   {{text?'收入':'支出'}}
@@ -74,8 +73,7 @@
       return {
         title: '',
         bodyStyle: {
-          paddingTop: '0',
-          paddingBottom: '20px',
+          padding: '0',
           height: (window.innerHeight * 0.62) + 'px',
           'overflow-y': 'auto'
         },

+ 8 - 7
src/views/hlgaccount/modules/HlgAccountRechargeModal.vue

@@ -2,6 +2,7 @@
   <a-modal
     :title="title"
     :visible="visible"
+    :width="modelStyle.width"
     :bodyStyle="bodyStyle"
     :confirmLoading="confirmLoading"
     okText="确定充值"
@@ -19,13 +20,13 @@
         </a-form-item>
 
         <a-form-item label="服务费率" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <span style="margin:0 30px">{{serviceRate}}%</span>
+          <span style="margin-left: 15px">{{serviceRate}}%</span>
 
           <a-button type="link" @click="handleEditServiceRateModal">编辑</a-button>
         </a-form-item>
         <a-form-item label=" " :colon="false" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row type="flex" align="middle">
-            <a-button type="link">服务费{{service_charge}}元,实际到账{{real_money}}元</a-button>
+            <div style="color: #1890ff">服务费{{service_charge}}元,实际到账{{real_money}}元</div>
           </a-row>
 
         </a-form-item>
@@ -64,11 +65,11 @@
           // height: (window.innerHeight * 0.62) + 'px',
           'overflow-y': 'auto'
         },
-        // modelStyle: {
-        //   width: '76%',
-        //   style: { top: '20px' },
-        //   fullScreen: false
-        // },
+        modelStyle: {
+          width: '50%',
+          style: { top: '20px' },
+          fullScreen: false
+        },
         serviceRate: 0,
         service_charge: '0.00',
         real_money: '0.00',

+ 1 - 3
src/views/hlgaccount/modules/HlgAccountRefundDetailsModal.vue

@@ -32,7 +32,6 @@
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
           </a-table>
         </div>
@@ -57,8 +56,7 @@
       return {
         title: '退款明细',
         bodyStyle: {
-          paddingTop: '0',
-          paddingBottom: '20px',
+          padding: '0',
           height: (window.innerHeight * 0.62) + 'px',
           'overflow-y': 'auto'
         },

+ 23 - 21
src/views/hlgaccount/modules/HlgAccountRefundModal.vue

@@ -2,6 +2,7 @@
   <a-modal
     :title="title"
     :visible="visible"
+    :width="modelStyle.width"
     :bodyStyle="bodyStyle"
     :confirmLoading="confirmLoading"
     okText="确认退款"
@@ -24,15 +25,16 @@
         </a-form-item>
 
         <a-form-item label="服务费率" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <span style="margin:0 30px">{{serviceRate}}%</span>
+          <span style="margin-left: 15px">{{serviceRate}}%</span>
         </a-form-item>
         <a-form-item label="可见性" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag  v-decorator="['isDisplay', validatorRules.isDisplay]"  :type="'radio'" @change="editDisplay" :triggerChange="true" dictCode="is_display"/>
+          <j-dict-select-tag v-decorator="['isDisplay', validatorRules.isDisplay]" :type="'radio'" @change="editDisplay"
+                             :triggerChange="true" dictCode="is_display"/>
         </a-form-item>
 
         <a-form-item label=" " :colon="false" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row type="flex" align="middle">
-            <a-button type="link">服务费{{service_charge}}元,实际到账{{real_money}}元</a-button>
+            <div style="color: #1890ff">服务费{{service_charge}}元,实际到账{{real_money}}元</div>
           </a-row>
 
         </a-form-item>
@@ -65,16 +67,16 @@
       return {
         title: '退款',
         bodyStyle: {
-          paddingTop: '20px',
+          paddingTop: '30px',
           paddingBottom: '20px',
           // height: (window.innerHeight * 0.62) + 'px',
           'overflow-y': 'auto'
         },
-        // modelStyle: {
-        //   width: '76%',
-        //   style: { top: '20px' },
-        //   fullScreen: false
-        // },
+        modelStyle: {
+          width: '50%',
+          style: { top: '20px' },
+          fullScreen: false
+        },
         serviceRate: 0,
         service_charge: '0.00',
         real_money: '0.00',
@@ -103,7 +105,7 @@
               validator: this.checkMoney
             }]
           },
-          isDisplay:{ rules: [{ required: true, message: '请选择可见性!' }] },
+          isDisplay: { rules: [{ required: true, message: '请选择可见性!' }] }
         },
         confirmLoading: false,
         companyId: 0,
@@ -130,9 +132,9 @@
         this.subcontractorId = record.subcontractorId
         this.isDisplay = Number(record.isDisplay)
         this.id = record.id
-        // this.form.setFieldsValue({
-        //   isDisplay: record.isDisplay
-        // })
+        this.form.setFieldsValue({
+          isDisplay: record.isDisplay
+        })
         // this.loadData(1)
       },
       loadData(arg) {
@@ -170,8 +172,8 @@
           if (!err) {
             this.confirmLoading = true
             this.loading = true
-            let formData = Object.assign(this.model, values);
-            formData.id = this.id;
+            let formData = Object.assign(this.model, values)
+            formData.id = this.id
             putAction(this.url.refund, formData).then(data => {
               this.confirmLoading = false
               if (data.success) {
@@ -182,7 +184,7 @@
                   title: '退款失败',
                   content: data.message,
                   okText: '确定',
-                  centered:true
+                  centered: true
                 })
               }
               if (data.code === 510) {
@@ -213,15 +215,15 @@
         this.serviceRate = data
       },
       editDisplay(e) {
-        if(e!=null && e!=''){
-          this.form.setFieldsValue({ isDisplay:e})
+        if (e != null && e != '') {
+          this.form.setFieldsValue({ isDisplay: e })
         }
-        var isDisplay = this.form.getFieldValue('isDisplay');
-        this.model.isDisplay=isDisplay
+        var isDisplay = this.form.getFieldValue('isDisplay')
+        this.model.isDisplay = isDisplay
       },
       inputAll() {
         this.form.setFieldsValue({
-          refundAmount: this.model.totalAmount - this.model.totalRefundAmount
+          refundAmount: this.accSub(this.accSub(this.model.totalAmount, this.model.totalRefundAmount), this.model.totalRefundServiceFee)
         })
       }
     }

+ 1 - 3
src/views/hlgaccount/modules/HlgAccountTopUpRefundListModal.vue

@@ -32,7 +32,6 @@
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="serviceRate" slot-scope="text">
               {{text}}%
@@ -74,8 +73,7 @@
       return {
         title: '',
         bodyStyle: {
-          paddingTop: '0',
-          paddingBottom: '20px',
+          padding: '0',
           height: (window.innerHeight * 0.62) + 'px',
           'overflow-y': 'auto'
         },

+ 1 - 1
vue.config.js

@@ -59,7 +59,7 @@ module.exports = {
     port: 8091,
     proxy: {
       '/powerjob': {
-        target: 'http://127.0.0.1:8090', //请求本地 需要powerjob后台项目
+        target: 'http://192.168.1.102:8090', //请求本地 需要powerjob后台项目
         ws: false,
         changeOrigin: true
       },