Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/DailyFeeedit.vue

@@ -31,6 +31,16 @@
                         <el-option v-for="(item,index) in nameset" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item v-if="ruleForm.type==104" label="关联团组:" prop="groupId" label-width="85px">
+                    <el-select v-model="ruleForm.groupId" filterable placeholder="请选择">
+                        <el-option
+                          v-for="item in grouplist"
+                          :key="item.id"
+                          :label="item.groupName"
+                          :value="item.id">
+                        </el-option>
+                      </el-select>
+                </el-form-item>
                 <el-form-item label="申请公司:" prop="company" label-width="85px">
                     <el-select :disabled="thesame" v-model="ruleForm.company" placeholder="请选择申请公司">
                         <el-option v-for="(item,index) in companyset" :key="index" :label="item.companyName" :value="item.id"></el-option>
@@ -93,6 +103,7 @@ export default {
         return{
             editid:'',
             userid:'',
+            grouplist:[],
             token:'',
             banned:true,
             bannedtype:true,
@@ -101,6 +112,7 @@ export default {
                 transferation:'',
                 identification: '',
                 type: '',
+                groupId:'',
                 name: '',
                 company: '',
                 desc:''
@@ -233,16 +245,34 @@ export default {
                     portType: 1,
                 }
             }).then(function (res) {
-                console.log(res)
                 if (res.data.code == 200) {
                     that.Transferlogo=res.data.data.feeMarkTypeData;
                     that.feeMarkSubTypeData=res.data.data.feeMarkSubTypeData;
                     that.typeset=res.data.data.feeTypeData;
                     that.feeSubTypeData=res.data.data.feeSubTypeData;
                     that.companyset=res.data.data.companyNameData;
+                    that.GetGroupNameList();
                 }
             })
         },
+        //获取团组
+        GetGroupNameList() {
+            this.grouplist=[];
+            var url = "/api/Business/GetGroupNameList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data: {
+                    portType: 1,
+                }
+            }).then(function (res) {
+               that.grouplist=res.data.data;
+            })
+        },
         trans(){
             this.identificationset=[];
             this.ruleForm.identification='';
@@ -258,6 +288,11 @@ export default {
             }
         },
         typechange(){
+            if (this.ruleForm.type!=104) {
+                this.ruleForm.groupId=''
+            }
+            console.log(this.ruleForm.type);
+            console.log(this.ruleForm.groupId);
             this.nameset=[];
             this.ruleForm.name='';
             console.log(this.feeSubTypeData)
@@ -275,16 +310,6 @@ export default {
         AddDailyPayment(){
             var url = "/api/Financial/PostAddDailyPayment"
             var that = this
-            var data={
-                UserId:that.userid,
-                Instructions:that.ruleForm.desc,
-                SumPrice:that.SumPrice,
-                TransferTypeId:that.ruleForm.identification,
-                PriceTypeId:that.ruleForm.name,
-                CompanyId:that.ruleForm.company,
-                FeeContents:that.itemsArr
-            }
-            console.log(data)
             this.$axios({
                 method: 'post',
                 url: url,
@@ -327,6 +352,7 @@ export default {
                     Id:that.editid,
                     UserId:that.userid,
                     Instructions:that.ruleForm.desc,
+                    groupId:that.ruleForm.groupId==""?0:that.ruleForm.groupId,
                     SumPrice:that.SumPrice,
                     TransferTypeId:that.ruleForm.identification,
                     PriceTypeId:that.ruleForm.name,
@@ -384,7 +410,6 @@ export default {
         },1000,true),
         getPostSearchDailyPaymentInfo(){
             if(this.editid!=undefined){
-                console.log("jing")
                 this.fullscreenLoading=true;
                 var url = "/api/Financial/PostSearchDailyPaymentInfo"
                 var that = this
@@ -418,6 +443,7 @@ export default {
                             }
                             that.typechange()
                             that.ruleForm.name=res.data.data.priceTypeId;
+                            that.ruleForm.groupId=res.data.data.groupId;
                             that.fullscreenLoading=false;
                             
                             if(that.userid!=res.data.data.createUserId){
@@ -465,6 +491,10 @@ export default {
     .dailyedit-set{
         display: flex;
         justify-content: space-between;
+        flex-wrap: wrap;
+    }
+    .dailyedit-set .el-form-item{
+        width: 285px;
     }
     .items-li{
         border-bottom: 1px #DCDFE6 solid;

src/components/OP/EntryDetails.vue

@@ -35,7 +35,7 @@
                         </el-option>
                     </el-select>
                     <el-button @click="eptschedule(2)" type="primary">导出下拉所选表格</el-button>
-                    <el-button @click="setpermissionsbtn" type="primary">设置权限</el-button>
+                    <el-button v-if="isAssignPerm" @click="setpermissionsbtn" type="primary">设置权限</el-button>
                     <el-button @click="eptschedule(3)" type="primary">团组成员名单</el-button>
                 </div>
             </div>
@@ -612,6 +612,8 @@ export default {
             airJJC_Checked: false,//经济舱选择框
             airGWC_Checked: false,//公务舱选择框
             airTDC_Checked: false,//公务舱选择框
+            
+            isAssignPerm:false,
 
             userId: '',
             token: '',
@@ -1377,6 +1379,7 @@ export default {
                     remark:'',
                 },
             ]
+            this.isAssignPerm=false;
             var url = "/api/Groups/GetEnterExitCostInfobyDiId"
             var that = this
             this.$axios({
@@ -1395,6 +1398,7 @@ export default {
                     that.ID = res.data.data.id;
                     //汇率
                     that.currencys = res.data.data.currencys;
+                    that.isAssignPerm=res.data.data.isAssignPerm;
                     //权限
                     that.isSave=res.data.data.isSave;
                     that.isView=res.data.data.isView;

src/components/OP/EntryDetailsdraft.vue

@@ -47,7 +47,7 @@
                         </el-option>
                     </el-select>
                     <el-button @click="eptschedule(1)" type="primary">导出所选明细表</el-button>
-                    <el-button @click="setpermissionsbtn" type="primary">分配权限</el-button>
+                    <el-button v-if="isAssignPerm" @click="setpermissionsbtn" type="primary">分配权限</el-button>
                     <!-- <el-select style="width:202px" v-model="tablevalue" placeholder="请选择">
                         <el-option v-for="item in tablevalueoptions" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
@@ -615,6 +615,8 @@ export default {
             listvalueoptions: [],
             tablevalueoptions: [],
 
+            isAssignPerm:false,
+
             //是否计算Checkbox
             choiceOne: false,//境内费用(其他费用)选择框
             choiceTwo: false,//国际旅费合计选择框
@@ -1467,6 +1469,7 @@ export default {
                     remark:'',
                 },
             ]
+            this.isAssignPerm=false;
             var url = "/api/Groups/EnterExitCostDraftInfoById"
             var that = this
             this.$axios({
@@ -1485,6 +1488,7 @@ export default {
                     that.ID = res.data.data.id;
                     //汇率
                     that.currencys = res.data.data.currencys;
+                    that.isAssignPerm = res.data.data.isAssignPerm;
                     //权限
                     that.isSave=res.data.data.isSave;
                     that.isView=res.data.data.isView;
@@ -1610,6 +1614,8 @@ export default {
             this.airGWC_Checked = false//公务舱选择框
             this.storageid = 0
 
+            this.isAssignPerm=true;
+
             this.quarterageData = [
                 {
                     id: 0,

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
@@ -607,6 +608,7 @@
                 </div>
             </div>
             <div>
+                <el-button v-if="Auditauthority" @click="GoodsStorageExcelDownload" type="primary">入库记录导出</el-button>
                 <el-button v-if="Auditauthority" @click="inquireRecords" type="primary">领用记录</el-button>
                 <el-button v-if="Auditauthority" @click="GoodsReceiveLists" type="primary">审核</el-button>
                 <el-button v-if="Addpermission" @click="addbtnclick" type="primary">新增物品</el-button>
@@ -923,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++) {
@@ -978,6 +980,28 @@ export default {
                 }
             }
         },
+        //入库导出
+        GoodsStorageExcelDownload(){
+            var url = "/api/PersonnelModule/GoodsStorageExcelDownload"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '+ that.token 
+                },
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    window.open(res.data.data.url);
+                    that.$message({
+                        type: 'success',
+                        message: res.data.msg
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error("操作错误，联系信息部！");
+            });
+        },
         //获取列表
         GoodsList() {
             var url = "/api/PersonnelModule/GoodsList"
@@ -1044,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(){
@@ -1397,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]+',';
@@ -1436,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{
@@ -1480,6 +1509,7 @@ export default {
                     groupLabel:'',
                     typeLabel:'',
                     auditLabel:'',
+                    isExcelDownload:false,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {

src/components/Resource/PerformanceT.vue

@@ -49,7 +49,7 @@
                 class="demo-ruleForm">
                 <div class="allocation-form">
                     <el-form-item prop="assessmentSettingId" label="分配菜单">
-                        <el-select filterable clearable @change="caidanchange" v-model="allocationArgument.id"
+                        <el-select filterable clearable @change="caidanchange" v-model="allocationArgument.assessmentSettingId"
                             placeholder="请选择上级菜单">
                             <el-option v-for="(item,index) in parentmenuarr" :key="index" :label="item.name"
                                 :value="item.id"></el-option>
@@ -1008,6 +1008,7 @@ export default {
         //分配api
         AssessmentSettingOperationContent(){
             console.log(this.allocationArgument);
+            this.allocationArgument.id=0
             var url = "/api/PersonnelModule/AssessmentSettingOperationContent"
             var that = this
             this.$axios({

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"