全所统计

src/views/packManagement/PackCompanyList.vue

@@ -44,7 +44,7 @@
           bordered
           rowKey="id"
           :columns="columns"
-          :scroll="{x: 1300}"
+          :scroll="{x: 1500}"
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -108,7 +108,6 @@ export default {
         }, {
           title: '企业名称',
           align: 'center',
-          width: 200,
           dataIndex: 'companyTemporaryName',
           scopedSlots: { customRender: 'projectName' }
         }, {
@@ -126,10 +125,12 @@ export default {
         }, {
           title: '打包费用总计',
           align: 'center',
+          width: 180,
           dataIndex: 'packChargeTotal'
         }, {
           title: '实际到账费用',
           align: 'center',
+          width: 180,
           dataIndex: 'receiptExpense'
         }, {
           title: '打包年份',

src/views/packManagement/PackProjectMaintenance.vue

@@ -135,6 +135,7 @@
       ref="batchInvoicingModal"
       :selected-data="selectedProject"
       :visible.sync="batchInvoicingVisible"
+      :pack-contact-id="companyDataById.packContactId"
       @ok="modalFormOk"></batch-invoicing-module>
 
     <!--    来款阶段-->

src/views/packManagement/modules/BatchInvoicingModule.vue

@@ -46,7 +46,27 @@
                 placeholder="请选择邮寄联系人"
                 v-decorator="['postContactId',validatorRules.postContactId]"
                 v-bind="$attrs"
-                :maxLength='50'></select-contacts>
+                :maxLength='50'
+                @change="postContactChange"></select-contacts>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row v-if="isFinancial">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="邮政编码" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
+              <a-input placeholder="请输入邮政编码"
+                       v-decorator="['postalCode', validatorRules.postalCode]"
+                       :maxLength='6'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+              <a class="search-postcode" href="https://www.youbianku.com" target="_blank">查询邮编</a>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="通讯地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入通讯地址"
+                       :maxLength='50'
+                       v-decorator="['contactAddress',validatorRules.contactAddress]"
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -88,6 +108,7 @@ import { money } from '../../../utils/validate'
 import { addZero } from '../../../utils/util'
 import { addPayBill } from '../../../api/incomePaymentsApi'
 import SelectContacts from '../../../components/company/SelectContacts'
+import { getContactsById } from '../../../api/api'
 
 export default {
   name: 'BatchInvoicingModule',
@@ -111,11 +132,16 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 打包联系人id
+    packContactId: {
+      type: String,
+      required: false,
+      default: ''
     }
   },
   watch: {
     visible(value) {
-      console.log(value)
       if (value) {
         this.open()
       }
@@ -198,7 +224,6 @@ export default {
       },
       inputInvoicingAmount: null, // 输入的开票金额
       sumAmountOwed: 0 // 总未开票金额
-      // selectedCompany: {} // 企业信息
     }
   },
   methods: {
@@ -276,6 +301,15 @@ export default {
         this.$set(this.dataSource, index, item)
       })
     },
+    /**
+     * 获取联系人信息
+     * @param value
+     */
+    postContactChange(value) {
+      getContactsById({id: value}).then(res => {
+        console.log(res)
+      })
+    },
     handleOk() {
       this.form.validateFields((err, values) => {
         if (!err) {