02081545

src/components/OP/OpInvitationOfficialActivities.vue

@@ -426,6 +426,7 @@ var namewy = (rule, value, callback) => {
     })
     callback();
 }
+import { debounce } from '../../store/statice'
 export default {
     data() {
         return {
@@ -869,7 +870,7 @@ export default {
             })
         },
         //点击保存事件
-        addBtn() { 
+        addBtn:debounce(function () { 
             if (this.uploadFiles.length === 0) {
                 return this.$message.warning('请选取文件后再上传');
             }
@@ -920,7 +921,7 @@ export default {
                 })
             }
             // 此时必填完成，做保存后的业务操作
-        },
+        },1000),
         DecreasePaymentsChange(val) {
             var that = this
             for (let index = 0; index < this.delegationInfoList.length; index++) {

src/components/OP/SuppliesInventory.vue

@@ -4,7 +4,7 @@
             <div class="ReceiptRecord-search">
                 <div class="ReceiptRecord-search-li">
                     <label style="margin-left: 0px;">关联团组:</label>
-                    <el-select multiple collapse-tags filterable style="width: 300px;" size="small" v-model="groupID" placeholder="请选择">
+                    <el-select multiple collapse-tags filterable style="width: 235px;" size="small" v-model="groupID" placeholder="请选择">
                         <el-option
                             :style="item.id==0||item.id==-1?'color:#67c23a;':''"
                             v-for="item in groupNameData"
@@ -66,7 +66,8 @@
                     :picker-options="pickerOptionss">
                     </el-date-picker>
                 </div>
-                <el-button style="margin-left: 10px;" @click="RecordsGoodsReceiveList" size="small" type="primary">查询</el-button>
+                <el-button style="margin-left: 10px;" @click="RecordsGoodsReceiveList(false)" size="small" type="primary">查询</el-button>
+                <el-button style="margin-left: 10px;" @click="RecordsGoodsReceiveList(true)" size="small" type="primary">导出</el-button>
             </div>
             <div class="ReceiptRecord-table">
                 <el-table
@@ -924,16 +925,16 @@ export default {
                     that.AddMaterialTypearr=res.data.data.goodsTypeData;
                     that.userNameData=res.data.data.userNameData;
                     that.groupNameData=res.data.data.groupNameData;
-                    that.groupNameData.unshift(
-                        {
-                            id:0,
-                            groupName:"其他物资(公司内部物资)"
-                        },
-                        {
-                            id:-1,
-                            groupName:"拜访客户所使用的物资"
-                        }
-                    )
+                    // that.groupNameData.unshift(
+                    //     {
+                    //         id:0,
+                    //         groupName:"其他物资(公司内部物资)"
+                    //     },
+                    //     {
+                    //         id:-1,
+                    //         groupName:"拜访客户所使用的物资"
+                    //     }
+                    // )
                     // that.MaterialType=that.MaterialTypearr[0].id;
                     that.MaterialTypechange();
                     for (let k = 0; k < that.MaterialTypearr.length; k++) {
@@ -1067,11 +1068,11 @@ export default {
         RSAuditSizeChange(val) {
             this.RSAuditcurrentPage=1;
             this.RSAuditpagesize=val;
-            this.RecordsGoodsReceiveList();
+            this.RecordsGoodsReceiveList(false);
         },
         RSAuditCurrentChange(val) {
             this.RSAuditcurrentPage=val;
-            this.RecordsGoodsReceiveList();
+            this.RecordsGoodsReceiveList(false);
         },
         //新增按钮
         addbtnclick(){
@@ -1420,10 +1421,10 @@ export default {
         //查询领用记录
         inquireRecords(){
             this.ReceiptRecord=true;
-            this.RecordsGoodsReceiveList();
+            this.RecordsGoodsReceiveList(false);
         },
         //领用记录
-        RecordsGoodsReceiveList(){
+        RecordsGoodsReceiveList(isExcelDownload){
             let groupID="";
             for(let g=0;g<this.groupID.length;g++){
                 groupID+=this.groupID[g]+',';
@@ -1459,10 +1460,15 @@ export default {
                     groupLabel:groupID,
                     typeLabel:RSAuditTypes,
                     auditLabel:that.RSAuditStatus+"",
+                    isExcelDownload:isExcelDownload,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
                     let Datalist=res.data;
+                    if (isExcelDownload==true) {
+                        window.open(Datalist.data.url)
+                        return
+                    }
                     that.RSAuditData=Datalist.data;
                     that.RSAuditcount=Datalist.count;
                 }else{
@@ -1503,6 +1509,7 @@ export default {
                     groupLabel:'',
                     typeLabel:'',
                     auditLabel:'',
+                    isExcelDownload:false,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {

src/components/statistics/enterpriseProfit.vue

@@ -35,6 +35,15 @@
                 prop="teamName"
                 label="团组名称"
                 >
+                <template slot-scope="scope">
+                    <el-popover
+                    placement="top"
+                    width="300"
+                    trigger="hover">
+                        {{scope.row.feeCountTipsLabel}}
+                        <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.teamName}}</span>
+                    </el-popover>
+                </template>
                 </el-table-column>
                 <el-table-column
                 prop="visitDate"