Merge remote-tracking branch 'origin/24年2月变更' into 24年2月变更

src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue

@@ -143,8 +143,10 @@ export default {
       this.meetingId = record.id
       // 会议资料与会议纪要的回显
       if (type === '1') {
+        this.title = '会议纪要'
         this.meetingFileIds = this.model.meetingMinute ? this.model.meetingMinute : ''
       } else if (type === '2') {
+        this.title = '上传文件'
         this.meetingFileIds = this.model.meetingData ? this.model.meetingData : ''
       }
       if (this.meetingFileIds && this.meetingFileIds !== '') {
@@ -338,6 +340,11 @@ export default {
     },
     // 导出zip
     handleExportZip () {
+      // 如果列表中没有数据，就提示
+      if (this.fileList.length === 0) {
+        this.$message.warning('暂无可导出文件')
+        return
+      }
       // 有勾选就导出勾选，没有勾选就导出所有
       const ids = this.selectedRowKeys.length ? this.selectedRowKeys.join(',') : this.fileList.map(item => item.id).join(',')
       downloadFileZip('sys/common/zipDownload', this.title + '.zip', {

src/views/packManagement/modules/BatchInvoicingModule.vue

@@ -70,6 +70,18 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="发票附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload
+                file-type-error-message="请上传发票附件"
+                :return-id="true"
+                v-decorator="['invoiceFileId', validatorRules.invoiceFileId]"
+                :trigger-change="true"
+              ></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
 
       <a-table
@@ -110,10 +122,11 @@ import {addPayBill} from '../../../api/incomePaymentsApi'
 import SelectContacts from '../../../components/company/SelectContacts'
 import {getContactsById} from '../../../api/api'
 import pick from 'lodash.pick'
+import JUpload from '@comp/jero/JUpload'
 
 export default {
   name: 'BatchInvoicingModule',
-  components: {JDate, SelectContacts},
+  components: {JUpload, JDate, SelectContacts},
   props: {
     // 选中的项目信息
     selectedData: {
@@ -261,6 +274,10 @@ export default {
         contactAddress: {
           rules: [{required: true, message: '请输入通讯地址'}],
           validateTrigger: 'blur'
+        },
+        invoiceFileId: {
+          rules: [{ required: true, message: '请上传发票附件' }],
+          validateTrigger: 'change'
         }
       },
       inputInvoicingAmount: null, // 输入的开票金额