update 到账开票添加来款范围筛选

src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue

@@ -91,25 +91,25 @@
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
-                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应收：</a-col>
+                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应付：</a-col>
                 <a-col :sm="14" :xs="24">{{ item.accountsReceivableAmount }}</a-col>
               </a-row>
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
-                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应收时间：</a-col>
+                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应付时间：</a-col>
                 <a-col :sm="14" :xs="24">{{ item.accountsReceivableTime }}</a-col>
               </a-row>
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
-                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实收：</a-col>
+                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实付：</a-col>
                 <a-col :sm="14" :xs="24">{{ item.paidAmount }}</a-col>
               </a-row>
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
-                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实收时间：</a-col>
+                <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实付时间：</a-col>
                 <a-col :sm="14" :xs="24">{{ item.paidTime }}</a-col>
               </a-row>
             </a-col>
@@ -267,10 +267,10 @@ export default {
           title: '应付金额'
         }, {
           fieldName: 'amountReceived',
-          title: '已收金额'
+          title: '已付金额'
         }, {
           fieldName: 'amountReceived',
-          title: '未收金额'
+          title: '未付金额'
         }, {
           fieldName: 'accountStatus_dictText',
           title: '赊账状态'

src/views/contractManagement/revenueContract/RevenueContractList.vue

@@ -128,11 +128,17 @@
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
           </template>
 
           <template slot="nameText" slot-scope="text">
-            <j-ellipsis :value="text" :length="8"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
@@ -233,6 +239,13 @@ export default {
         //   width: 280,
         //   scopedSlots: { customRender: 'text' }
         // },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'principalName',
+          width: 120,
+          scopedSlots: { customRender: 'text' }
+        },
         {
           title: '签订单位',
           align: 'center',
@@ -404,4 +417,9 @@ export default {
   color: red !important;
 }
 
+.table-text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue

@@ -55,7 +55,10 @@
                  @change="handleTableChange"
                  class="j-table-force-nowrap">
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
           </template>
 
           <span slot="operation" class="action-span-cell" slot-scope="text, record">
@@ -77,7 +80,10 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, columnWidth: 80}"
             class="j-table-force-nowrap">
             <template slot="textRow" slot-scope="text">
-              <j-ellipsis :value="text" :length="12"></j-ellipsis>
+              <a-tooltip>
+                <template slot="title">{{ text }}</template>
+                <div class="table-text">{{ text }}</div>
+              </a-tooltip>
             </template>
 
             <span slot="action" class="action-span-cell" slot-scope="text, itemRecord">
@@ -193,7 +199,7 @@ export default {
         }
       ],
       dataSource: [],
-      expandedRowKeys: [], // 展开数据的id
+      expandedRowKeys: [] // 展开数据的id
     }
   },
   methods: {
@@ -339,4 +345,10 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+.table-text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -18,6 +18,21 @@
                 <select-principal placeholder="请选择负责人" v-model="queryParam.principalId"></select-principal>
               </a-form-item>
             </a-col>
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+              <a-form-item label="来款范围" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input
+                  placeholder="请输入来款范围"
+                  v-model="queryParam.startAmount"
+                  class="query-group-cust"
+                  @change="checkMoney('start')"></a-input>
+                <span class="query-group-split-cust"></span>
+                <a-input
+                  placeholder="请输入来款范围"
+                  v-model="queryParam.endAmount"
+                  class="query-group-cust"
+                  @change="checkMoney('end')"></a-input>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入项目名称" v-model="queryParam.chargeProject" :maxLength='50'></a-input>
@@ -198,7 +213,7 @@ export default {
     ProjectDetailModal,
     BatchInvoicingModule,
     AuditProofModule,
-    AuditModal,
+    AuditModal
   },
   mixins: [JeroListMixin],
   data() {
@@ -282,7 +297,7 @@ export default {
           width: 80,
           dataIndex: 'needInvoice',
           scopedSlots: { customRender: 'status-pack' }
-        },{
+        }, {
           title: '到账',
           align: 'center',
           width: 70,
@@ -322,9 +337,9 @@ export default {
       selectedProject: [],
       batchInvoicingVisible: false,
       selectedCompany: {}, // 选中项目的企业信息
-      mailContactsId: null ,// 项目邮寄联系人id
+      mailContactsId: null,// 项目邮寄联系人id
-      meetingType:undefined, // 会议项目的会议类型
+      meetingType: undefined, // 会议项目的会议类型
-      situationId:undefined // 参会人id
+      situationId: undefined // 参会人id
 
     }
   },
@@ -345,7 +360,7 @@ export default {
     invoicing(record) {
       // 标协会员项目必须先到账后开票
       if ((Number(record.projectType) === 5 || Number(record.projectType) === 6) && record.paymentStatus !== 'completed') {
-        this.$message.warn(`标协${Number(record.projectType) === 5 ? '会员' : '证书'}项目必须先审核通过才可开票。`)
+        this.$message.warn(`标协${ Number(record.projectType) === 5 ? '会员' : '证书' }项目必须先审核通过才可开票。`)
         return
       }
       this.mailContactsId = record.mailContactsId
@@ -450,6 +465,52 @@ export default {
         return
       }
     },
+    /**
+     * 搜索金额校验
+     * @param type 起始范围--start，终止范围--end
+     */
+    checkMoney(type) {
+      if (type === 'start') {
+        this.queryParam.startAmount = this.queryParam.startAmount.replace(/[^0-9.]/g, '')
+        let pointIndex = this.queryParam.startAmount.indexOf('.')
+        // 包含小数点，保留小数点后两位
+        if (pointIndex > -1) {
+          this.queryParam.startAmount = this.queryParam.startAmount.substr(0, pointIndex + 3)
+          // 截取整数部分
+          let str = this.queryParam.startAmount.slice(0, pointIndex)
+          // 整数部分大于十位则去掉十位之后的整数部门，并将小数部分拼接
+          if (str.length > 10) {
+            str = str.substr(0, 10)
+            this.queryParam.startAmount = str + this.queryParam.startAmount.substr(pointIndex, 3)
+          }
+        }
+        // 不包含小数点且输入数字超过十位保留前十位数据
+        if (pointIndex === -1 && this.queryParam.startAmount.length > 10) {
+          this.queryParam.startAmount = this.queryParam.startAmount.substr(0, 10)
+        }
+        return
+      }
+      if (type === 'end') {
+        this.queryParam.endAmount = this.queryParam.endAmount.replace(/[^0-9.]/g, '')
+        let pointIndex = this.queryParam.endAmount.indexOf('.')
+        // 包含小数点，保留小数点后两位
+        if (pointIndex > -1) {
+          this.queryParam.endAmount = this.queryParam.endAmount.substr(0, pointIndex + 3)
+          // 截取整数部分
+          let str = this.queryParam.endAmount.slice(0, pointIndex)
+          // 整数部分大于十位则去掉十位之后的整数部门，并将小数部分拼接
+          if (str.length > 10) {
+            str = str.substr(0, 10)
+            this.queryParam.endAmount = str + this.queryParam.endAmount.substr(pointIndex, 3)
+          }
+        }
+        // 不包含小数点且输入数字超过十位保留前十位数据
+        if (pointIndex === -1 && this.queryParam.endAmount.length > 10) {
+          this.queryParam.endAmount = this.queryParam.endAmount.substr(0, 10)
+        }
+        return
+      }
+    }
   }
 }
 </script>

src/views/packManagement/PackProjectMaintenance.vue

@@ -101,7 +101,10 @@
 
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
           </template>
 
           <!--        打包、需要发票、到账、开票、邮寄状态-->
@@ -316,13 +319,13 @@ export default {
         }, {
           title: '企业联系人',
           align: 'center',
-          width: 280,
+          width: 100,
           dataIndex: 'contactsTemporaryName',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '联系人电话',
           align: 'center',
-          width: 160,
+          width: 100,
           dataIndex: 'phone',
           scopedSlots: { customRender: 'text' }
         }, {
@@ -601,4 +604,10 @@ export default {
   background-color: #F2F2F2;
   margin: 15px 0px;
 }
+
+.table-text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -140,7 +140,10 @@
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
@@ -268,7 +271,7 @@ export default {
         }, {
           title: '企业联系人',
           align: 'center',
-          width: 280,
+          width: 120,
           dataIndex: 'contactsTemporaryNameOne',
           scopedSlots: { customRender: 'text' }
         }, {
@@ -547,4 +550,9 @@ export default {
   }
 }
 
+.table-text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>