Merge branch 'xuqiubangeng1026' of http://10.10.10.43:9090/income_payments/income_payments_client

src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue

@@ -89,7 +89,7 @@
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group v-decorator="['payMode',validatorRules.payMode]" @change="changePayMode">
                 <a-radio :value="1">汇款</a-radio>
-                <a-radio :value="2">线上缴费</a-radio>
+                <a-radio :value="2">现场缴费</a-radio>
                 <a-radio :value="3" disabled>打包</a-radio>
               </a-radio-group>
             </a-form-item>

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -128,7 +128,7 @@
           <a-row :gutter="24">
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="会议通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-upload :return-id="true" v-decorator="[ 'meetingFiles']"></j-upload>
+                <j-upload :return-id="true" v-decorator="[ 'meetingFiles',validatorRules.meetingFiles]"></j-upload>
               </a-form-item>
             </a-col>
           </a-row>

src/views/incomePayments/meetManage/OtherMeetingForm.vue

@@ -36,7 +36,7 @@
             <a-radio-group v-decorator="['payMode',validatorRules.payMode]" :disabled="isEditBool"
                            @change="changePayMode">
               <a-radio :value="1">汇款</a-radio>
-              <a-radio :value="2">线上缴费</a-radio>
+              <a-radio :value="2">现场缴费</a-radio>
               <a-radio :value="3">打包</a-radio>
             </a-radio-group>
           </a-form-item>

src/views/incomePayments/meetManage/meetingValidate.js

@@ -11,6 +11,12 @@ export default {
     ],
         validateTrigger:['change']
   },
+  meetingFiles:{
+    rules: [
+      { required: true, message: '请上传会议通知' },
+    ],
+    validateTrigger:['change']
+  },
   meetingContent:{
     rules: [
       { required: true, message: '请输入会议内容' },

src/views/projectManagement/CommitteeMeeting.vue

@@ -185,13 +185,13 @@ export default {
           align: 'center',
           dataIndex: 'meetingName',
           scopedSlots: {customRender: 'htmlSlot'},
-          width: 160,
+          width: 220,
         },
         {
           title: '会议类型',
           align: 'center',
           dataIndex: 'meetingType_dictText',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -205,7 +205,7 @@ export default {
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (
             <j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
         },
@@ -213,14 +213,14 @@ export default {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 260,
           customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
         },
         {
           title: '年份',
           align: 'center',
           dataIndex: 'particularYear',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -240,7 +240,7 @@ export default {
           title: '操作',
           align: 'center',
           fixed: 'right',
-          width: 160,
+          width: 180,
           scopedSlots: {customRender: 'action'}
         },
       ],

src/views/projectManagement/ConferenceMaintenance.vue

@@ -205,7 +205,7 @@ export default {
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (
             <j-ellipsis value={ record.startTime + '~' + record.endTime } length={ 20 }></j-ellipsis>)
         },
@@ -213,7 +213,7 @@ export default {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (
             <j-ellipsis value={ text + '/' + record.address } length={ 20 }></j-ellipsis>)
         },
@@ -221,7 +221,7 @@ export default {
           title: '年份',
           align: 'center',
           dataIndex: 'particularYear',
-          width: 100,
+          width: 120,
           scopedSlots: { customRender: 'text' }
         },
         {

src/views/projectManagement/InternationalSeminar.vue

@@ -170,14 +170,14 @@ export default {
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 200,
           customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
         },
         {
@@ -185,7 +185,7 @@ export default {
           align: 'center',
           dataIndex: 'particularYear',
           scopedSlots: {customRender: 'text'},
-          width: 100,
+          width: 120,
         },
         {
           title: '创建时间',

src/views/projectManagement/OtherMeeting.vue

@@ -86,7 +86,8 @@
           @change="handleTableChange">
 
           <template slot="htmlSlot" slot-scope="text,record">
-            <div class="primary-color" @click="toAttendance(record)">{{ text }}</div>
+            <j-ellipsis v-if="text" class="primary-color" @click="toAttendance(record)" :value="text" :length="20"></j-ellipsis>
+            <span v-else></span>
           </template>
 
           <template slot="text" slot-scope="text">
@@ -147,13 +148,13 @@ name: 'OtherMeeting',
           align: 'center',
           dataIndex: 'meetingName',
           scopedSlots: {customRender: 'htmlSlot'},
-          width: 160,
+          width: 220,
         },
         {
           title: '会议类型',
           align: 'center',
           dataIndex: 'meetingType_dictText',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -167,21 +168,21 @@ name: 'OtherMeeting',
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
-          width: 160,
+          width: 220,
           customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' +  record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
-          width: 160,
+          width: 240,
           customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
         },
         {
           title: '年份',
           align: 'center',
           dataIndex: 'particularYear',
-          width: 100,
+          width: 120,
           scopedSlots: {customRender: 'text'}
         },
         {
@@ -194,7 +195,7 @@ name: 'OtherMeeting',
           title: '操作',
           align: 'center',
           fixed: 'right',
-          width: 160,
+          width: 180,
           scopedSlots: {customRender: 'action'}
         },
       ],