From 3bde0d61cd9221663382e99a6080a2572841b75b Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 1 Apr 2022 15:10:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E9=82=AE=E5=AF=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F=E8=AE=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenditureContractDetail.vue             | 11 ++-
 .../modules/ExpenditureContractModule.vue     | 67 +++++++++++++++++++
 src/views/mailManagement/ContractMail.vue     |  7 +-
 .../WorkingGroupPaymentStatisticsDetail.vue   |  9 +--
 4 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index 3e3bb2a..e76ef6f 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -134,7 +134,7 @@
           </div>
           <a-empty v-else></a-empty>
         </div>
-<!--        <a-divider></a-divider>-->
+        <!--        <a-divider></a-divider>-->
 
         <!--      审核记录-->
         <!--        <div>-->
@@ -227,6 +227,15 @@ export default {
         }, {
           fieldName: 'signedContactsTemporaryName',
           title: '签订联系人'
+        }, {
+          fieldName: 'phone',
+          title: '联系电话'
+        }, {
+          fieldName: 'address',
+          title: '邮寄地址'
+        }, {
+          fieldName: 'postCode',
+          title: '邮编'
         }, {
           fieldName: 'opening_dictText',
           title: '是否开口'
diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index dd670b9..827bf63 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -46,6 +46,30 @@
                            @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
                 </a-form-item>
               </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: 0">
+                <a-form-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入联系电话"
+                           v-decorator="['phone',validatorRules.phone]"
+                           :maxLength='11'
+                           @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: 0">
+                <a-form-item label="邮寄地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入邮寄地址"
+                           v-decorator="['address',validatorRules.address]"
+                           :maxLength='50'
+                           @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: 0">
+                <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入邮编"
+                           v-decorator="['postCode',validatorRules.postCode]"
+                           :maxLength='6'
+                           @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                </a-form-item>
+              </a-col>
               <a-col :xxl="6" :xl="8" :sm="12">
                 <a-form-item label="是否开口" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-dict-select-tag v-decorator="['opening']"
@@ -269,6 +293,7 @@ import JDate from '../../../../components/tools/JDate'
 import JYearDate from '../../../../components/jero/JYearDate'
 import { money } from '../../../../utils/validate'
 import { addZero } from '../../../../utils/util'
+import { phoneReg, postcode } from '../../../../utils/validate'
 
 export default {
   name: 'ExpenditureContractModule',
@@ -321,6 +346,18 @@ export default {
           rules: [{ required: true, message: '请输入签订联系人' }],
           validateTrigger: 'blur'
         },
+        phone: {
+          rules: [{ required: true, validator: this.checkPhone }],
+          validateTrigger: 'blur'
+        },
+        address: {
+          rules: [{ required: true, message: '请输入邮寄地址' }],
+          validateTrigger: 'blur'
+        },
+        postCode: {
+          rules: [{ required: true, validator: this.checkPostCode }],
+          validateTrigger: 'blur'
+        },
         principalId: {
           rules: [{ required: true, message: '请选择负责人' }],
           validateTrigger: 'change'
@@ -517,6 +554,36 @@ export default {
         callback('请输入合同编号')
       }
     },
+    /**
+     * 电话号码校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkPhone(rules, value, callback) {
+      if (!value) {
+        callback('请输入联系电话')
+      }
+      if (phoneReg(value)) {
+        callback()
+      }
+      callback('请输入正确格式的联系电话')
+    },
+    /**
+     * 邮编校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkPostCode(rules, value, callback) {
+      if (!value) {
+        callback('请输入邮编')
+      }
+      if (postcode(value)) {
+        callback()
+      }
+      callback('请输入正确格式的邮编')
+    },
     // /**
     //  * 合同名称唯一性校验
     //  * @param rules
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index 93ddb05..5d9f011 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -65,7 +65,10 @@
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="25"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
@@ -221,7 +224,7 @@ export default {
       })
       window.open(routerUrl.href, '_blank')
     },
-    handleAdd (id) {
+    handleAdd(id) {
       let param = {
         id: id
       }
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
index de0a865..4614548 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
@@ -269,14 +269,7 @@ export default {
         }
       ],
       // 总计数据
-      footerDataSource: [
-        {
-          id: 1,
-          title: '总计',
-          allMoney: '500',
-          comeAllMoney: '600'
-        }
-      ],
+      footerDataSource: [],
       filters: {
         id: this.$route.query.workGroupId
       },