From 44f2a7fb89be47e1350bd41c81a9401b2ac4ab35 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 15 Jul 2022 17:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=8F=AC?=
 =?UTF-8?q?=E5=BC=80=E5=9C=B0=E7=82=B9=E5=A2=9E=E5=8A=A0=E8=85=BE=E8=AE=AF?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue            | 31 ++++++++++---------
 .../meetManage/meetingValidate.js             |  8 ++++-
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 73b1120..6299b9c 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -99,19 +99,19 @@
           <a-row>
             <a-col :xxl='8' :xl="12" :sm="24">
               <a-form-item label="召开地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-area-linkage
-                  type="cascader"
-                  placeholder="请选择省市"
-                  :has-error="hasError"
-                  @change="changeConvoke"
-                  v-decorator="['convokeLocale',validatorRules.convokeLocale]"
-                ></j-area-linkage>
+<!--                <j-area-linkage-->
+<!--                  type="cascader"-->
+<!--                  placeholder="请选择省市"-->
+<!--                  :has-error="hasError"-->
+<!--                  @change="changeConvoke"-->
+<!--                  v-decorator="['convokeLocale',validatorRules.convokeLocale]"-->
+<!--                ></j-area-linkage>-->
+                <a-input  placeholder="请输入召开地点/腾讯会议" v-decorator="['venue',validatorRules.venue]"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xxl='8' :xl="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入详细地址"
-                         class="address"
+                <a-input placeholder="请输入详细地址/腾讯会议号"
                          v-decorator="['address',validatorRules.address]"
                          @change="event => event.target.value = event.target.value.trim()"
                          :maxLength='50'
@@ -450,7 +450,7 @@ import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
 import JDate from '@comp/jero/JDate'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
-import JAreaLinkage from '@comp/jero/JAreaLinkagePca'
+// import JAreaLinkage from '@comp/jero/JAreaLinkagePca'
 import AreaPca from '@comp/_util/AreaPca'
 import moment from 'moment'
 import pick from 'lodash.pick'
@@ -470,7 +470,7 @@ export default {
     JUpload,
     JDate,
     SelectPrincipal,
-    JAreaLinkage,
+    // JAreaLinkage,
     PageHeaderTitle,
     JImageUpload
   },
@@ -705,7 +705,7 @@ export default {
       this.$nextTick(() => {
         // 加定时器是因为有可能赋值不成功
         setTimeout(() => {
-          this.form.setFieldsValue(pick(this.model, 'notice', 'hotelContactsList', 'hotelName', 'hotelAddress', 'paymentQrCode', 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone','meetingContactsList')), 200
+          this.form.setFieldsValue(pick(this.model,'venue', 'notice', 'hotelContactsList', 'hotelName', 'hotelAddress', 'paymentQrCode', 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone','meetingContactsList')), 200
         })
         // 如果是标协会议则回显 标协会议的字段
         if (this.meetingType === '2') {
@@ -749,6 +749,7 @@ export default {
     handleOk() {
       const that = this
       this.form.validateFields((err, values) => {
+        console.log(values)
         // 这是设置召开时间不选择的边框颜色为红色
         if (err && Object.prototype.hasOwnProperty.call(err, 'convokeLocale')) {
           this.hasError = true
@@ -762,8 +763,9 @@ export default {
           } else {
             httpurl = this.url.add
           }
-          let placeName = values.convokeLocale
-          const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
+          // let placeName = values.convokeLocale
+          //{venue: this.getPcaText(placeName)}
+          const formData = Object.assign(this.model, values)
           // 如果会议的费用为0 不能上传缴费凭证
           if (values.meetingCosts === '0.00') {
             delete formData.paymentQrCode
@@ -799,6 +801,7 @@ export default {
             formData.startSignInTime = this.newSignInTime[0]
             formData.endSignInTime = this.newSignInTime[1]
           }
+          formData.convokeLocale = '10001'
           console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js
index 00aad28..7f64870 100644
--- a/src/views/incomePayments/meetManage/meetingValidate.js
+++ b/src/views/incomePayments/meetManage/meetingValidate.js
@@ -41,9 +41,15 @@ export default {
     ],
     validateTrigger: ['change']
   },
+  venue: {
+    rules: [
+      {required: true, message: '请输入召开地点/腾讯会议'},
+    ],
+    validateTrigger: ['blur']
+  },
   address: {
     rules: [
-      {required: true, message: '请输入详细地址'},
+      {required: true, message: '请输入详细地址/腾讯会议号'},
     ],
     validateTrigger: ['blur']
   },