开发页面

src/views/hlgpayment/modules/HlgPaymentCompanyListModal.vue

@@ -50,17 +50,6 @@
             :loading="loading"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
             @change="handleTableChange">
-            <span slot="serviceRate" slot-scope="text">
-              {{text}}%
-            </span>
-            <span slot="totalRefundAmount" slot-scope="text">
-              {{text || 0}}
-            </span>
-            <span slot="action" slot-scope="text, record ,index">
-                  <a @click="handleMoney(record,index)">退款</a>
-                  <a-divider type="vertical"/>
-                  <a @click="handleDetail(record)">退款明细</a>
-              </span>
           </a-table>
         </div>
       </a-card>
@@ -110,17 +99,6 @@
             title: '企业名称',
             align: 'left',
             dataIndex: 'generateTime'
-          },
-          {
-            title: '所在地',
-            align: 'left',
-            dataIndex: 'totalAmount'
-          },
-          {
-            title: '状态',
-            align: 'left',
-            dataIndex: 'serviceRate',
-            scopedSlots: { customRender: 'serviceRate' }
           }
         ],
         confirmLoading: false,
@@ -172,13 +150,13 @@
         //   this.loading = false
         // })
       },
-      close() {
-        this.$emit('ok')
+      close(data) {
+        this.$emit('ok', data)
         this.visible = false
       },
       handleOk() {
         if (this.selectionRows.length) {
-
+          this.close(this.selectionRows[0])
         } else {
           this.$message.warning('请选择企业')
         }
@@ -189,17 +167,6 @@
       },
       changeItem() {
         this.loadData()
-      },
-      handleMoney(record, index) {
-        this.$refs.refundModalForm.edit(record)
-        this.$refs.refundModalForm.changeIndex = index
-        this.$refs.refundModalForm.title = '退款'
-        this.$refs.refundModalForm.disableSubmit = false
-      },
-      handleDetail(record) {
-        this.$refs.refundDetailsModalForm.edit(record)
-        this.$refs.refundDetailsModalForm.title = '退款明细'
-        this.$refs.refundDetailsModalForm.disableSubmit = false
       }
     }
   }

src/views/hlgpayment/modules/HlgPaymentDetailModal.vue

@@ -1,220 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-        <a-form-item label="支付id" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number v-decorator="[ 'paymentId', validatorRules.paymentId]" placeholder="请输入支付id" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number v-decorator="[ 'userId', validatorRules.userId]" placeholder="请输入用户" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="账户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'userName', validatorRules.userName]" placeholder="请输入账户姓名"></a-input>
-        </a-form-item>
-
-        <a-form-item label="身份证号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'idcardNumber', validatorRules.idcardNumber]" placeholder="请输入身份证号"></a-input>
-        </a-form-item>
-
-        <a-form-item label="银行卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'cardNumber', validatorRules.cardNumber]" placeholder="请输入银行卡号"></a-input>
-        </a-form-item>
-
-        <a-form-item label="Y：开户行是招商银行 N：开户行是他行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'bnkflg', validatorRules.bnkflg]" placeholder="请输入Y：开户行是招商银行 N：开户行是他行"></a-input>
-        </a-form-item>
-
-        <a-form-item label="他行开户行（他行时必填）" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'eacbnk', validatorRules.eacbnk]" placeholder="请输入他行开户行（他行时必填）"></a-input>
-        </a-form-item>
-
-        <a-form-item label="他行开户地址（他行时必填）" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'rcveaa', validatorRules.rcveaa]" placeholder="请输入他行开户地址（他行时必填）"></a-input>
-        </a-form-item>
-
-        <a-form-item label="实付款金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number v-decorator="[ 'payment', validatorRules.payment]" placeholder="请输入实付款金额" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="付款时间（向银行提交付款按钮的时间）" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择付款时间（向银行提交付款按钮的时间）" v-decorator="[ 'paymentTime', validatorRules.paymentTime]" :trigger-change="true" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="付款者" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'paymentBy', validatorRules.paymentBy]" placeholder="请输入付款者"></a-input>
-        </a-form-item>
-
-        <a-form-item label="接口返回结果时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择接口返回结果时间" v-decorator="[ 'paymentResultTime', validatorRules.paymentResultTime]" :trigger-change="true" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择创建时间" v-decorator="[ 'createTime', validatorRules.createTime]" :trigger-change="true" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="创建者" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'createBy', validatorRules.createBy]" placeholder="请输入创建者"></a-input>
-        </a-form-item>
-
-        <a-form-item label="更新时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择更新时间" v-decorator="[ 'updateTime', validatorRules.updateTime]" :trigger-change="true" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="更新者" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'updateBy', validatorRules.updateBy]" placeholder="请输入更新者"></a-input>
-        </a-form-item>
-
-        <a-form-item label="数据权限" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'sysOrgCode', validatorRules.sysOrgCode]" placeholder="请输入数据权限"></a-input>
-        </a-form-item>
-
-        <a-form-item label="状态（0：待付款 1：付款中 2：付款成功 3：付款失败）" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number v-decorator="[ 'status', validatorRules.status]" placeholder="请输入状态（0：待付款 1：付款中 2：付款成功 3：付款失败）" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="是否补发（0：不是 1：是）" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number v-decorator="[ 'isSupplementPayment', validatorRules.isSupplementPayment]" placeholder="请输入是否补发（0：不是 1：是）" style="width: 100%"/>
-        </a-form-item>
-
-        <a-form-item label="付款失败原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'failureReason', validatorRules.failureReason]" placeholder="请输入付款失败原因"></a-input>
-        </a-form-item>
-
-        <a-form-item label="是否删除（0：未删除 1：已删除）" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'delFlag', validatorRules.delFlag]" placeholder="请输入是否删除（0：未删除 1：已删除）"></a-input>
-        </a-form-item>
-
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import JDate from '@/components/jeecg/JDate'
-
-  export default {
-    name: "HlgPaymentDetailModal",
-    components: {
-      JDate,
-    },
-    data () {
-      return {
-        form: this.$form.createForm(this),
-        title:"操作",
-        width:800,
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        validatorRules:{
-        paymentId:{rules: [{ required: true, message: '请输入支付id!' }]},
-        userId:{rules: [{ required: true, message: '请输入用户!' }]},
-        userName:{rules: [{ required: true, message: '请输入账户姓名!' }]},
-        idcardNumber:{rules: [{ required: true, message: '请输入身份证号!' }]},
-        cardNumber:{rules: [{ required: true, message: '请输入银行卡号!' }]},
-        bnkflg:{rules: [{ required: true, message: '请输入Y：开户行是招商银行 N：开户行是他行!' }]},
-        eacbnk:{},
-        rcveaa:{},
-        payment:{rules: [{ required: true, message: '请输入实付款金额!' }]},
-        paymentTime:{},
-        paymentBy:{},
-        paymentResultTime:{},
-        createTime:{rules: [{ required: true, message: '请输入创建时间!' }]},
-        createBy:{rules: [{ required: true, message: '请输入创建者!' }]},
-        updateTime:{rules: [{ required: true, message: '请输入更新时间!' }]},
-        updateBy:{rules: [{ required: true, message: '请输入更新者!' }]},
-        sysOrgCode:{},
-        status:{rules: [{ required: true, message: '请输入状态（0：待付款 1：付款中 2：付款成功 3：付款失败）!' }]},
-        isSupplementPayment:{rules: [{ required: true, message: '请输入是否补发（0：不是 1：是）!' }]},
-        failureReason:{},
-        delFlag:{rules: [{ required: true, message: '请输入是否删除（0：未删除 1：已删除）!' }]},
-        },
-        url: {
-          add: "/hlgpayment/hlgPaymentDetail/add",
-          edit: "/hlgpayment/hlgPaymentDetail/edit",
-        }
-
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'paymentId','userId','userName','idcardNumber','cardNumber','bnkflg','eacbnk','rcveaa','payment','paymentTime','paymentBy','paymentResultTime','createTime','createBy','updateTime','updateBy','sysOrgCode','status','isSupplementPayment','failureReason','delFlag'))
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            console.log("表单提交数据",formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }
-
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      popupCallback(row){
-        this.form.setFieldsValue(pick(row,'paymentId','userId','userName','idcardNumber','cardNumber','bnkflg','eacbnk','rcveaa','payment','paymentTime','paymentBy','paymentResultTime','createTime','createBy','updateTime','updateBy','sysOrgCode','status','isSupplementPayment','failureReason','delFlag'))
-      }
-
-    }
-  }
-</script>

src/views/hlgpayment/modules/HlgPaymentErrorModal.vue

@@ -0,0 +1,94 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    okText="继续付款"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item label=" " :colon="false" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          张一、张二、张三、张四、张五等11人本月累计收款超出第一级税率。
+        </a-form-item>
+        <a-form-item label=" " :colon="false" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-button type="link" @click="checkList">查看名单</a-button>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+    <HlgPaymentErrorPeopleListModal ref="errorPeopleListModal"></HlgPaymentErrorPeopleListModal>
+  </a-modal>
+</template>
+
+<script>
+
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import JDate from '@/components/jeecg/JDate'
+  import HlgPaymentErrorPeopleListModal from './HlgPaymentErrorPeopleListModal'
+
+  export default {
+    name: 'HlgPaymentErrorModal',
+    components: {
+      JDate,
+      HlgPaymentErrorPeopleListModal
+    },
+    data() {
+      return {
+        form: this.$form.createForm(this),
+        title: '操作',
+        width: 800,
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 }
+        },
+
+        confirmLoading: false,
+        list: [],
+        url: {
+          add: '/hlgpayment/hlgPaymentDetail/add',
+          edit: '/hlgpayment/hlgPaymentDetail/edit'
+        }
+
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        this.$emit('ok')
+        this.visible = false
+      },
+      handleCancel() {
+        this.close()
+      },
+      checkList() {
+        this.$refs.errorPeopleListModal.edit({ list: this.list })
+        this.$refs.errorPeopleListModal.title = '查看名单'
+        this.$refs.errorPeopleListModal.disableSubmit = false
+      }
+    }
+  }
+</script>

src/views/hlgpayment/modules/HlgPaymentErrorPeopleListModal.vue

@@ -0,0 +1,162 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="modelStyle.width"
+    :visible="visible"
+    :bodyStyle="bodyStyle"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    :maskClosable="false"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-card :bordered="false">
+        <!-- 查询区域 -->
+
+        <!-- 查询区域-END -->
+
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+
+        </div>
+
+        <!-- table区域-begin -->
+        <div>
+
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading">
+          </a-table>
+        </div>
+      </a-card>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import JDate from '@/components/jeecg/JDate'
+
+  export default {
+    name: 'HlgPaymentErrorPeopleListModal',
+    mixins: [JeecgListMixin],
+    components: {
+      JDate
+
+    },
+    data() {
+      return {
+        title: '',
+        bodyStyle: {
+          padding: '0',
+          height: (window.innerHeight * 0.62) + 'px',
+          'overflow-y': 'auto'
+        },
+        modelStyle: {
+          width: '76%',
+          style: { top: '10px' },
+          fullScreen: false
+        },
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 }
+        },
+        // 表头
+        columns: [
+          {
+            title: '姓名',
+            align: 'left',
+            dataIndex: 'generateTime'
+          },
+          {
+            title: '手机号',
+            align: 'left',
+            dataIndex: 'generateTime'
+          },
+          {
+            title: '身份证号',
+            align: 'left',
+            dataIndex: 'generateTime'
+          },
+          {
+            title: '实付金额',
+            align: 'left',
+            dataIndex: 'generateTime'
+          },
+        ],
+        confirmLoading: false,
+        dataSource: [],
+        companyName: '',
+        companyId: 0,
+        accountId: 0,
+        url: {
+          list: '/hlgaccount/hlgAccountDetail/refundList'
+        }
+
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.model = Object.assign({}, record)
+        this.companyId = record.companyId
+        this.visible = true
+        this.companyName = record.companyName
+        this.accountId = record.id
+        // this.loadData(1)
+      },
+      loadData(arg) {
+        // if (!this.url.list) {
+        //   this.$message.error('请设置url.list属性!')
+        //   return
+        // }
+        // //加载数据 若传入参数1则加载第一页的内容
+        // if (arg === 1) {
+        //   this.ipagination.current = 1
+        // }
+        // var params = this.getQueryParams()//查询条件
+        // params.accountId = this.id
+        // params.type = 0
+        // this.loading = true
+        // getAction(this.url.list, params).then((res) => {
+        //   if (res.success) {
+        //     this.dataSource = res.result.records
+        //     this.ipagination.total = res.result.total
+        //   }
+        //   if (res.code === 510) {
+        //     this.$message.warning(res.message)
+        //   }
+        //   this.loading = false
+        // })
+      },
+      close(data) {
+        this.$emit('ok', data)
+        this.visible = false
+      },
+      handleOk() {
+        this.close()
+      },
+      handleCancel() {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/hlgpayment/modules/HlgPaymentImportModal.vue

@@ -11,15 +11,15 @@
       <a-form :form="form">
 
         <a-form-item label="付款企业" :labelCol="labelCol" :wrapperCol="wrapperCol">
-<!--          <a-input-search placeholder="请选择付款企业" v-decorator="[ 'company_name', validatorRules.company_name]" disabled-->
-<!--                          @search="onSearch">-->
-<!--            <a-button slot="enterButton">选择</a-button>-->
-<!--          </a-input-search>-->
-<!--          <j-select-user-by-dep v-model="userRealName"></j-select-user-by-dep>-->
+          <!--          <a-input-search placeholder="请选择付款企业" v-decorator="[ 'company_name', validatorRules.company_name]" disabled-->
+          <!--                          @search="onSearch">-->
+          <!--            <a-button slot="enterButton">选择</a-button>-->
+          <!--          </a-input-search>-->
+          <!--          <j-select-user-by-dep v-model="userRealName"></j-select-user-by-dep>-->
         </a-form-item>
 
         <a-form-item label="服务商" :labelCol="labelCol" :wrapperCol="wrapperCol">
-<!--          <j-dict-select-tag v-model="formData.user" placeholder="请选择用户" dictCode="sys_user,realname,id"/>-->
+          <!--          <j-dict-select-tag v-model="formData.user" placeholder="请选择用户" dictCode="sys_user,realname,id"/>-->
         </a-form-item>
 
         <a-form-item label="账户余额" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -27,25 +27,31 @@
         </a-form-item>
 
         <a-form-item label="付款明细" :labelCol="labelCol" :wrapperCol="wrapperCol">
-
-          <a-upload
-            v-decorator="[
+          <a-row type="flex" justify="center" align="middle">
+            <a-col>
+              <a-upload
+                v-decorator="[
           'upload',
         ]"
-            name="logo"
-            :customRequest="normFile"
-            list-type="picture"
-          >
-            <a-button>
-              <a-icon type="upload"/>
-              请选择上传付款明细
-            </a-button>
-          </a-upload>
+                name="logo"
+                :customRequest="normFile"
+                list-type="picture"
+              >
+                <a-button>
+                  <a-icon type="upload"/>
+                  请选择上传付款明细
+                </a-button>
+              </a-upload>
+            </a-col>
+            <a-col>
+              <a download="">下载模版</a>
+            </a-col>
+          </a-row>
         </a-form-item>
 
       </a-form>
     </a-spin>
-    <HlgPaymentCompanyListModal ref="CompanyList"></HlgPaymentCompanyListModal>
+    <HlgPaymentCompanyListModal ref="CompanyList" @ok="getCompany"></HlgPaymentCompanyListModal>
   </a-modal>
 </template>
 
@@ -117,15 +123,11 @@
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            this.$error({
-              title: '导入失败',
-              content: '单次付款明细不能超过999条',
-              okText: '确定'
-            })
-          }
 
+          }
         })
       },
+
       onSearch() {
         this.$refs.CompanyList.add()
         this.$refs.CompanyList.title = '企业列表'
@@ -144,6 +146,31 @@
       },
       normFile(info) {
         console.log(info)
+        if (info.test) {
+          this.$error({
+            title: '导入失败',
+            content: '单次付款明细不能超过999条',
+            okText: '确定'
+          })
+        }
+
+        if (info.test2) {
+          this.$confirm({
+            title: '提示',
+            content: '您的公司在2019.11.10支付过相同人数相同金额的付款单，是否要继续导入？',
+            okText: '继续导入',
+            onOk: () => {
+              //do something
+            },
+            onCancel: () => {
+              this.$destroyAll()
+            }
+          })
+        }
+
+      },
+      getCompany(data) {
+        console.log(data)
       }
 
 

src/views/hlgpayment/modules/HlgPaymentRechargeModal.vue

@@ -1,17 +1,162 @@
 
 
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
 
+        <a-form-item label=" " :colon="false"  :labelCol="labelCol" :wrapperCol="wrapperCol">
+          请使用企业对公账户打款到以下账户：
+        </a-form-item>
+        <div class="ant-alert ant-alert-info">
 
-<template>
+          <a-form-item label="公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            樟树市慧灵工XXXXX有限公司
+          </a-form-item>
 
+          <a-form-item label="银行卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            622848043312345676
+          </a-form-item>
+          <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            中国银行新区宝龙支行
+          </a-form-item>
+        </div>
+
+      </a-form>
+    </a-spin>
+    <HlgPaymentCompanyListModal ref="CompanyList" @ok="getCompany"></HlgPaymentCompanyListModal>
+  </a-modal>
 </template>
 
 <script>
+
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import JDate from '@/components/jeecg/JDate'
+  import HlgPaymentCompanyListModal from './HlgPaymentCompanyListModal'
+
   export default {
-    name: 'HlgPaymentRechargeModal'
+    name: 'HlgPaymentRechargeModal',
+    components: {
+      JDate,
+      HlgPaymentCompanyListModal
+    },
+    data() {
+      return {
+        fileList: [],
+        form: this.$form.createForm(this),
+        title: '操作',
+        width: 800,
+        visible: false,
+        is_show: true,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 }
+        },
+
+        confirmLoading: false,
+        validatorRules: {
+          company_name: { rules: [{ required: true, message: '请输入账户姓名!' }] },
+          idcardNumber: { rules: [{ required: true, message: '请输入身份证号!' }] },
+          cardNumber: { rules: [{ required: true, message: '请输入银行卡号!' }] },
+          bnkflg: { rules: [{ required: true, validator: this.checkBnkflg }] }
+          // eacbnk: { rules: [{ required: is_show, message: '请输入他行开户行!' }] },
+          // rcveaa: { rules: [{ required: is_show, message: '请输入他行开户地址!' }] }
+        },
+        url: {
+          add: '/hlgpayment/hlgPaymentDetail/add',
+          edit: '/hlgpayment/hlgPaymentDetail/edit'
+        }
+
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+      },
+      close() {
+        this.$emit('close')
+        this.$destroyAll()
+        this.visible = false
+      },
+      handleOk() {
+        const that = this
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+
+          }
+        })
+      },
+
+      onSearch() {
+        this.$refs.CompanyList.add()
+        this.$refs.CompanyList.title = '企业列表'
+        this.$refs.CompanyList.disableSubmit = false
+      },
+      handleChange(value) {
+        console.log(value)
+      },
+      handleCancel() {
+        this.close()
+      },
+      beforeUpload(file) {
+        this.fileList = [...this.fileList, file]
+        console.log(this.fileList)
+        return false
+      },
+      normFile(info) {
+        console.log(info)
+        if (info.test) {
+          this.$error({
+            title: '导入失败',
+            content: '单次付款明细不能超过999条',
+            okText: '确定'
+          })
+        }
+
+        if (info.test2) {
+          this.$confirm({
+            title: '提示',
+            content: '您的公司在2019.11.10支付过相同人数相同金额的付款单，是否要继续导入？',
+            okText: '继续导入',
+            onOk: () => {
+              //do something
+            },
+            onCancel:()=>{
+              this.$destroyAll()
+            }
+          })
+        }
+
+      },
+      getCompany(data) {
+        console.log(data)
+      }
+
+
+    }
   }
 </script>
-
 <style scoped>
-
+  @import '~@assets/less/common.less'
 </style>

src/views/hlgpayment/modules/HlgPaymentReviewModal.vue

@@ -29,8 +29,8 @@
             :autosize="{ minRows: 2, maxRows: 6 }"
           />
         </a-form-item>
-
-
+        <HlgPaymentRechargeModal ref="RechargeModel"></HlgPaymentRechargeModal>
+        <HlgPaymentErrorModal ref="errorModal" @ok="handleReviewAgain"></HlgPaymentErrorModal>
       </a-form>
     </a-spin>
   </a-modal>
@@ -41,11 +41,15 @@
   import { httpAction } from '@/api/manage'
   import pick from 'lodash.pick'
   import JDate from '@/components/jeecg/JDate'
+  import HlgPaymentRechargeModal from './HlgPaymentRechargeModal'
+  import HlgPaymentErrorModal from './HlgPaymentErrorModal'
 
   export default {
     name: 'HlgPaymentReviewModal',
     components: {
-      JDate
+      JDate,
+      HlgPaymentRechargeModal,
+      HlgPaymentErrorModal
     },
     data() {
       return {
@@ -66,7 +70,7 @@
         confirmLoading: false,
         validatorRules: {
           paymentId: { rules: [{ required: true, message: '请输入支付id!' }] },
-          userId: { rules: [{ required: true, message: '请输入用户!' }] },
+          userId: { rules: [{ required: true, message: '请输入用户!' }] }
         },
         url: {
           add: '/hlgpayment/hlgPaymentDetail/add',
@@ -96,20 +100,31 @@
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            this.$error({
-              title: '失败',
-              content: '余额不足，请充值',
-              okText: '确定',
-              centered: true,
-              onOk: () => {
-                this.$info({
-                  title: '我要充值',
+            if (values.success) {
+
+            } else {
+              if (values.success) {
+                this.$error({
+                  title: '失败',
                   content: '余额不足，请充值',
                   okText: '确定',
                   centered: true,
+                  onOk: () => {
+                    this.$refs.RechargeModel.edit(this.model)
+                    this.$refs.RechargeModel.title = '我要充值'
+                    this.$refs.RechargeModel.disableSubmit = false
+                  }
                 })
               }
-            })
+              if (values.success) {
+                this.$refs.errorModal.edit(this.model)
+                this.$refs.errorModal.title = '提示'
+                this.$refs.errorModal.disableSubmit = false
+
+              }
+
+            }
+
             // that.confirmLoading = true;
             // let httpurl = '';
             // let method = '';
@@ -142,6 +157,9 @@
       },
       handleChange(value) {
         console.log(value)
+      },
+      handleReviewAgain() {
+        // do something
       }
     }
   }

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
       },