Merge remote-tracking branch 'origin/master'

src/views/hwsupervise/HwTaxPaymentDetailsList.vue

@@ -0,0 +1,199 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="modelStyle.width"
+    :bodyStyle="bodyStyle"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+
+
+      <a-card :bordered="false">
+        <!-- table区域-begin -->
+        <div>
+
+          <a-table
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+
+
+
+          </a-table>
+        </div>
+
+
+
+      </a-card>
+
+  </a-modal>
+</template>
+<script>
+
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
+
+
+
+
+
+  export default {
+    name: 'HwTaxPaymentDetailsList',
+    mixins: [JeecgListMixin],
+    components: {
+
+
+    },
+    data() {
+      return {
+        description: '业务明细页面',
+        headers: {},
+        fileList: [],
+        form: this.$form.createForm(this),
+        title: '操作',
+        bodyStyle: {
+          padding: '0',
+          height: (window.innerHeight * 0.66) + 'px',
+          'overflow-y': 'auto'
+        },
+        modelStyle: {
+          width: '80%',
+          style: { top: '20px' },
+          fullScreen: false
+        },
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 }
+        },
+        accept: '.pdf',
+        confirmLoading: false,
+        validatorRules: {},
+        // 表头
+        columns: [
+          {
+            title: '需求名称',
+            align: 'center',
+            dataIndex: 'requirementName'
+          },
+          {
+            title: '到款时间',
+            align: 'center',
+            dataIndex: 'paymentResultTime'
+          },
+          {
+            title: '收入金额',
+            align: 'center',
+            dataIndex: 'netPayment'
+          },
+          {
+            title: '纳税金额',
+            align: 'center',
+            dataIndex: 'taxFee'
+
+          },
+          {
+            title: '收款银行',
+            align: 'center',
+            dataIndex: 'eacbnk'
+          },
+          {
+            title: '银行账号',
+            align: 'center',
+            dataIndex: 'cardNumber'
+          },
+          {
+            title: '电子凭证',
+            align: 'center',
+            dataIndex: 'electronicCertificate'
+          },
+          {
+            title: '流水号',
+            align: 'center',
+            dataIndex: 'transactionNo'
+          },
+          {
+            title: '用户合同',
+            align: 'center',
+            dataIndex: 'workContract'
+          }
+
+        ],
+        url: {
+          list: '/hwpayment/hwPaymentDetail/taxPaymentDetailList',
+        },
+        dictOptions: {}
+      }
+    },
+
+
+    computed: {},
+    methods: {
+      close() {
+        this.visible = false
+      },
+      edit(taxPaymentId,userId) {
+        this.form.resetFields()
+        this.visible = true
+        this.loadData(taxPaymentId,userId)
+
+      },
+      handleOk() {
+        this.close()
+        this.visible = false
+      },
+      handleCancel() {
+        this.close()
+      },
+
+
+
+      loadData(taxPaymentId,userId) {
+        if (!this.url.list) {
+          this.$message.error('请设置url.list属性!')
+          return
+        }
+        var params ={}//查询条件
+        params.taxPaymentId = taxPaymentId
+        params.userId = userId
+        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
+        })
+      },
+
+
+
+
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
+<style lang="scss" scoped>
+
+</style>

src/views/hwsupervise/HwTaxPaymentList.vue

@@ -28,18 +28,19 @@
             @change="handleTableChange">
 
             <span slot="action1" slot-scope="text, record">
-
+                 <a @click="viewTaxPayment(record)" >查看</a>
             </span>
 
             <span slot="action" slot-scope="text, record">
-
+                  <a @click="viewTaxPaymentDetail(record)" >业务明细</a>
             </span>
 
           </a-table>
         </div>
 
 
-
+      <hw-picture-modal ref="hwViewPictureForm" @ok="modalFormOk"></hw-picture-modal>
+        <hw-tax-payment-details-list ref="hwTaxPaymentDetailForm" @ok="modalFormOk"></hw-tax-payment-details-list>
       </a-card>
 
   </a-modal>
@@ -48,6 +49,8 @@
 
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
+  import HwPictureModal from '../tools/HwPictureModal'
+  import HwTaxPaymentDetailsList from './HwTaxPaymentDetailsList'
 
 
 
@@ -56,6 +59,8 @@
     name: 'HwTaxPaymentList',
     mixins: [JeecgListMixin],
     components: {
+      HwTaxPaymentDetailsList,
+      HwPictureModal
 
     },
     data() {
@@ -125,6 +130,7 @@
         ],
         url: {
           list: '/hwsupervise/hwTaxPayment/list',
+          imgerver: window._CONFIG['imgDomainOssURL']
         },
         dictOptions: {}
       }
@@ -134,7 +140,6 @@
     computed: {},
     methods: {
       close() {
-        this.$emit('ok')
         this.visible = false
       },
       edit(record) {
@@ -145,7 +150,7 @@
 
       },
       handleOk() {
-        this.$emit('ok')
+        this.close()
         this.visible = false
       },
       handleCancel() {
@@ -176,7 +181,31 @@
         })
       },
 
+      viewTaxPayment(record){
+        var taxPaymentReceipt=record.taxPaymentReceipt;
+
+        console.log(1111,taxPaymentReceipt)
 
+        var idcard = [];
+        if(taxPaymentReceipt){
+          if( taxPaymentReceipt.indexOf("http")!=-1){
+            idcard.push(taxPaymentReceipt)
+          }else{
+            idcard.push(this.url.imgerver +taxPaymentReceipt)
+          }
+          this.$refs.hwViewPictureForm.edit(idcard);
+          this.$refs.hwViewPictureForm.title = '完税凭证'
+          this.$refs.hwViewPictureForm.disableSubmit = false
+        }else{
+          this.$message.warning('未上传')
+        }
+      },
+
+      viewTaxPaymentDetail(record){
+        this.$refs.hwTaxPaymentDetailForm.edit(record.id,this.model.id);
+        this.$refs.hwTaxPaymentDetailForm.title = '业务明细'
+        this.$refs.hwTaxPaymentDetailForm.disableSubmit = false
+      }