LiFei 3 rokov pred
rodič
commit
8c2eb49fb7

+ 54 - 12
src/views/hlwinvoice/modules/HlwInvoiceModal.vue

@@ -12,35 +12,67 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
-        <a-form-item label="付款企业" :labelCol="labelCol" :wrapperCol="wrapperCol">
+
+        <a-form-item label="已选" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.totalNum}}个
+        </a-form-item>
+
+        <a-form-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              {{model.companyName}}
         </a-form-item>
 
+        <a-form-item label="开票内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.invoiceCategoryName}}
+        </a-form-item>
+
         <a-form-item label="服务商" :labelCol="labelCol" :wrapperCol="wrapperCol">
           {{model.subcontractorName}}
         </a-form-item>
 
         <template v-if="model.isThroughPlatform==1">
-          <a-form-item label="开票单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            {{model.cpName}}
+          <a-form-item label="服务费率" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{model.companyCpServiceRate}}%
           </a-form-item>
         <a-form-item label="开票金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          ¥{{model.serviceAmount}}元
+          ¥{{model.serviceAmount}}元(创客佣金:¥{{model.companyCpAmount}}元+服务费:¥{{model.companyCpServiceFee}}元)
         </a-form-item>
         </template>
         <template v-else>
-          <a-form-item label="开票单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            {{model.subcontractorName}}
+          <a-form-item label="服务费率" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{model.serviceRate}}%
           </a-form-item>
           <a-form-item label="开票金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            ¥{{model.totalPayment}}
+            ¥{{model.totalPayment}}(创客佣金:¥{{model.amount}}元+服务费:¥{{model.serviceFee}}元)
           </a-form-item>
         </template>
-        <a-form-item label="已选数据" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          {{model.totalNum}}条
+
+        <a-form-item label="发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.hlwCompanyInvoiceInformation.invoiceTitle}}
+        </a-form-item>
+
+        <a-form-item label="纳税人识别号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.hlwCompanyInvoiceInformation.dutyParagraph}}
         </a-form-item>
 
+        <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.hlwCompanyInvoiceInformation.accountBank}}
+        </a-form-item>
+
+        <a-form-item label="开户账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.hlwCompanyInvoiceInformation.account}}
+        </a-form-item>
+
+        <a-form-item label="注册地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.hlwCompanyInvoiceInformation.registerAddress}}
+        </a-form-item>
+
+        <a-form-item label="注册电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          {{model.hlwCompanyInvoiceInformation.registerPhone}}
+        </a-form-item>
 
+        <a-form-item label="票种选择" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+          <j-dict-select-tag type="list" v-decorator="[ 'invoiceType', validatorRules.invoiceType]"    :trigger-change="true"  dictCode="invoice_type" placeholder="请选择票种" />
+        </a-form-item>
 
       </a-form>
     </a-spin>
@@ -73,7 +105,7 @@
         title:"操作",
         width:800,
         visible: false,
-        model: {},
+        model: {hlwCompanyInvoiceInformation:{}},
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -84,6 +116,11 @@
         },
         confirmLoading: false,
         validatorRules: {
+          invoiceType:{
+            rules: [
+              { required: true, message: '请选择票种!'},
+            ]
+          },
         },
         url: {
           add: "/wisdom/hlwInvoice/add",
@@ -130,8 +167,13 @@
             let method = '';
             httpurl+=this.url.add;
             method = 'post';
-            let formData = {}
-            formData.idsList = this.model.paymentIdList;
+            let formData = Object.assign(this.model, values);
+            formData.invoiceTitle=this.model.hlwCompanyInvoiceInformation.invoiceTitle
+            formData.dutyParagraph=this.model.hlwCompanyInvoiceInformation.dutyParagraph
+            formData.accountBank=this.model.hlwCompanyInvoiceInformation.accountBank
+            formData.account=this.model.hlwCompanyInvoiceInformation.account
+            formData.registerAddress=this.model.hlwCompanyInvoiceInformation.registerAddress
+            formData.registerPhone=this.model.hlwCompanyInvoiceInformation.registerPhone
             console.log("表单提交数据",formData)
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){