bug修改

src/components/ProjectDetailModal.vue

@@ -16,7 +16,7 @@
         </a-col>
         <a-col :span="12" class="detail-item">
           <label>应收金额：</label>
-          <span><j-ellipsis :value="basicInfo.receivableAmount" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="`${basicInfo.receivableAmount}元`" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
@@ -25,12 +25,6 @@
           <span><j-ellipsis :value="basicInfo.remarks" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
-      <a-row :gutter="24" v-if="basicInfo.files">
-        <a-col>
-          <label>资料：</label>
-          <span><preview-file :file-id="basicInfo.files"></preview-file></span>
-        </a-col>
-      </a-row>
       <!--      来款方式为合同的显示-->
       <a-row :gutter="24" v-if="!!basicInfo.contractNum">
         <a-col :span="12" class="detail-item">
@@ -52,6 +46,12 @@
           <span><preview-file :file-id="basicInfo.chargeNoticeId"></preview-file></span>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-if="basicInfo.files">
+        <a-col class="detail-item">
+          <label>资料：</label>
+          <span><preview-file :file-id="basicInfo.files"></preview-file></span>
+        </a-col>
+      </a-row>
     </section>
     <!-- 基本信息end-->
     <!-- 企业信息begin-->
@@ -122,9 +122,14 @@
     <!--到账信息begin-->
     <section class="payment-info">
       <h3 class="title">到账信息</h3>
-      <section class="payment-info-title">到账信息</section>
+      <div class="payment-info-box">
-      <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
+        <section class="payment-info-title">到账信息</section>
-        {{ item.paymentDate }}到账{{ item.amountReceived }}元
+        <template v-if="paymentInfoList && paymentInfoList.length > 0">
+          <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
+            {{ item.paymentDate }}到账{{ item.amountReceived }}元
+          </div>
+        </template>
+        <a-list v-else :data-source="[]"/>
       </div>
     </section>
     <!--到账信息end-->
@@ -403,6 +408,10 @@ h3.title::before {
 .payment-info {
   margin-bottom: 14px;
 
+  &-box {
+    border: 1px solid #ccc;
+  }
+
   &-title {
     text-align: center;
     font-size: 14px;
@@ -414,11 +423,12 @@ h3.title::before {
   }
 
   &-content {
+    border: 1px solid #ccc;
     color: #424242;
     //background: #efefef;
     padding: 5px;
     padding-left: 10px;
-    border: 1px solid #ccc;
+    //border: 1px solid #ccc;
     border-top: none;
   }
 

src/components/tools/StatusSlot.vue

@@ -156,7 +156,7 @@ export default {
       // 来款
       if (this.statusKey === 'paymentRecord') {
         if (item.paymentDate || item.amountReceived) {
-          result = `${ item.paymentDate }到账${ item.amountReceived }`
+          result = `${ item.paymentDate }到账${ item.amountReceived }元`
         }
       } else if (this.statusKey === 'bill') {
         if (item.billDate || item.billNo) {
@@ -179,7 +179,10 @@ export default {
 <style>
 /* 自定义tooltip下样式问题*/
 .status-tooltip .ant-tooltip-inner {
-  width: 16rem;
   white-space: pre-wrap !important;
 }
+
+.ant-tooltip {
+  max-width: 16rem;
+}
 </style>

src/mixins/JeroListMixin.js

@@ -24,7 +24,7 @@ export const JeroListMixin = {
       ipagination: {
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['10', '20', '30', '50'],
+        pageSizeOptions: ['10', '20', '30', '50', '100'],
         showTotal: (total, range) => {
           return range[0] + '-' + range[1] + ' 共' + total + '条'
         },
@@ -284,7 +284,7 @@ export const JeroListMixin = {
         param['selections'] = this.selectedRowKeys.join(',')
       }
       console.log('导出参数', param)
-      downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+      downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
     },
     /*
     *  下载模板
@@ -293,7 +293,7 @@ export const JeroListMixin = {
       if (!fileName || typeof fileName != 'string') {
         fileName = '模板文件'
       }
-      downloadFile(this.url.downTemplateUrl, fileName + '.xls')
+      downloadFile(this.url.downTemplateUrl, fileName + '.xlsx')
     },
     /* 导入 */
     handleImportExcel(info) {

src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue

@@ -256,7 +256,7 @@ export default {
         param['ids'] = this.selectedRowKeys.join(',')
       }
       console.log('导出参数', param)
-      downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+      downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
     },
     /**
      * 新增成员

src/views/dataNetworkDiskManagement/dataDownloadRecord/DataDownloadRecord.vue

@@ -264,7 +264,7 @@ export default {
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         param['ids'] = this.selectedRowKeys.join(',')
       }
-      downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+      downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
     },
     handleCancel() {
       this.visible = false

src/views/mailManagement/BillMail.vue

@@ -243,7 +243,7 @@ export default {
         param['ids'] = this.selectedRowKeys.join(',')
       }
       console.log('导出参数', param)
-      downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+      downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
     }
   }
 }

src/views/mailManagement/ContractMail.vue

@@ -237,7 +237,7 @@ export default {
         param['ids'] = this.selectedRowKeys.join(',')
       }
       console.log('导出参数', param)
-      downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+      downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
     }
   }
 }

src/views/packManagement/modules/BatchIncomePaymentModule.vue

@@ -192,6 +192,10 @@ export default {
       this.$forceUpdate()
     },
     handleOk() {
+      if (this.inputIncomingAmount > this.sumAmountOwed) {
+        this.$message.warn('来款金额大于当前欠款金额，输入有误！')
+        return
+      }
       if (this.confirmLoading) {
         return
       }
@@ -255,7 +259,7 @@ export default {
       e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()
       this.inputIncomingAmount = Number(e.target.value)
       if (this.inputIncomingAmount > this.sumAmountOwed) {
-        this.$message.warn('来款金额大于总欠款金额，请修改')
+        this.$message.warn('来款金额大于当前欠款金额，输入有误！')
         return
       }
       this.clearThisTimeAmount()

src/views/packManagement/modules/BatchInvoicingModule.vue

@@ -275,7 +275,7 @@ export default {
       e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()
       this.inputInvoicingAmount = Number(e.target.value)
       if (this.inputInvoicingAmount > this.sumAmountOwed) {
-        this.$message.warn('开票金额大于总未开票金额，请修改')
+        this.$message.warn('开票金额大于当前欠未开票金额，输入有误！')
         return
       }
       this.clearThisTimeAmount()
@@ -336,6 +336,10 @@ export default {
       })
     },
     handleOk() {
+      if (this.inputInvoicingAmount > this.sumAmountOwed) {
+        this.$message.warn('开票金额大于当前欠未开票金额，输入有误！')
+        return
+      }
       if (this.confirmLoading) {
         return
       }

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -423,7 +423,7 @@ export default {
         }
       }
       this.chargeWayType = record.chargeWay
-      this.pickChargeNoticeType(record.charge)
+      this.pickChargeNoticeType(record.charge, true)
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks'))
@@ -516,17 +516,21 @@ export default {
      * 匹配收费通知显隐
      * @param value
      */
-    pickChargeNoticeType(key) {
+    pickChargeNoticeType(key, isFirst) {
       this.chargeNoticeList.forEach(item => {
         if (item.type === 'chargeNoticeA' && key === 'a') {
           this.selectedChargeNotice = 'A'
-          this.model.receivableAmount = item.yearCharge
+          if (!isFirst)  {
-          this.model.chargeNoticeId = item.chargeNoticeId
+            this.model.receivableAmount = item.yearCharge
+            this.model.chargeNoticeId = item.chargeNoticeId
+          }
           this.model.chargeNoticeNo = item.value
         } else if (item.type === 'chargeNoticeB' && key === 'b') {
           this.selectedChargeNotice = 'B'
-          this.model.receivableAmount = item.yearCharge
+          if (!isFirst) {
-          this.model.chargeNoticeId = item.chargeNoticeId
+            this.model.receivableAmount = item.yearCharge
+            this.model.chargeNoticeId = item.chargeNoticeId
+          }
           this.model.chargeNoticeNo = item.value
         }
       })

src/views/system/DepartList.vue

@@ -429,7 +429,7 @@ export default {
         param['selections'] = this.checkedKeys.join(',')
       }
       console.log('导出参数', param)
-      downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
+      downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param)
     },
     nodeModalOk() {
       this.loadTree()

src/views/user/alteration/Alteration.vue

@@ -155,7 +155,7 @@ export default {
         },
         confirmPassword: {
           rules: [
-            { required: true, message: '请确认新密码!' },
+            { required: true, message: '请输入确认密码!' },
             { pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/,
               message: '密码由8位及以上数字、大小写字母和特殊符号组成！'
             },