02121640

src/components/OP/EntryDetailsdraft.vue

@@ -85,7 +85,8 @@
                                 v-model="DomesticFees.visafeesDescription"></el-input>
                             <span class="redzhu">{{ visabeizhu }}</span>
                         </div>
-                        <el-button v-if="getvisafeebtn" @click="Getnewvisafee" type="primary"
+                        <span v-if="!getvisafeebtn" class="redzhu">请先录入出入境费用明细-草稿!</span>
+                        <el-button v-if="getvisafeebtn&&isSave" @click="Getnewvisafee" type="primary"
                             size="mini">获取最新签证费用</el-button>
                     </div>
                     <div class="Entrydraft-li-inif">
@@ -876,8 +877,34 @@ export default {
             })
         },
         //获取签证标注
-        GetEnterExitCostCorrelationTips(val) {
+        EnterExitCostDraftVisaTips(){
             this.getvisafeebtn = false;
+            var url = "/api/Groups/EnterExitCostDraftVisaTips"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    draftId:37
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.visainfo = res.data.data;
+                    if (that.DomesticFees.visafees != res.data.data.totalAmt && res.data.data.totalAmt != 0) {
+                        that.getvisafeebtn = true;
+                    }
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //获取签证标注
+        GetEnterExitCostCorrelationTips(val) {
+            
             if (val == 1) {
                 this.TotalExpenses.EconomyClass = 0;
                 this.TotalExpenses.BusinessClass = 0;
@@ -897,6 +924,7 @@ export default {
                     }
                 }).then(function (res) {
                     if (res.data.code == 200) {
+                        that.currencyss = res.data.data.reteInfos;
                         // that.TotalExpenses.EconomyClass = res.data.data.airData.jjcCurrentRate;
                         // that.TotalExpenses.BusinessClass = res.data.data.airData.gwcCurrentRate;
                         // that.DomesticFees.visafees = res.data.data.visaData.feeTotal;
@@ -920,6 +948,7 @@ export default {
                     }
                 }).then(function (res) {
                     if (res.data.code == 200) {
+                        
                     //     that.TicketJudgment = res.data.data.airData;
                     //     that.visainfo = res.data.data.visaData;
                         that.currencyss = res.data.data.reteInfos;
@@ -1552,9 +1581,11 @@ export default {
                     // that.GetNationalTravelFeeData();
                     that.fullscreenLoading = false;
                     that.GetEnterExitCostCorrelationTips(2);
+                    that.EnterExitCostDraftVisaTips();
                 } else {
                     that.fullscreenLoading = false;
                     that.GetEnterExitCostCorrelationTips(1);
+                    that.EnterExitCostDraftVisaTips();
                     that.$message.warning(res.data.msg);
                 }
             })
@@ -2066,6 +2097,19 @@ export default {
                     remark:'',
                 },
             ]
+
+            //汇率赋值
+            for (let at = 0; at < this.currencys.length; at++) {
+                for (let rt = 0; rt < this.currencyss.length; rt++) {
+                    if (this.currencys[at].currencyCode == this.currencyss[rt].currCode) {
+                        this.currencys[at].rate = this.currencyss[rt].rate
+                    }
+                }
+            }
+
+            this.getvisafeebtn=false;
+            // this.EnterExitCostDraftVisaTips();
+            
         },
         //下拉
         handNodeClick(data, node, e) {
@@ -3013,9 +3057,9 @@ export default {
             this.cubtn = false;
         },
         Getnewvisafee() {
-            this.DomesticFees.visafees = this.visainfo.feeTotal;
+            this.DomesticFees.visafees = this.visainfo.totalAmt;
             this.DomesticFees.visafeesDescription = this.visainfo.remark;
-            this.getvisafeebtn = false;
+            // this.getvisafeebtn = false;
         },
         //导出到收款账单
         NationalTravelFeeImportReceivables() {

src/components/Resource/PerformanceT.vue

@@ -50,7 +50,7 @@
                 <div class="allocation-form">
                     <el-form-item prop="assessmentSettingId" label="分配菜单">
                         <el-select filterable clearable @change="caidanchange" v-model="allocationArgument.assessmentSettingId"
-                            placeholder="请选择上级菜单">
+                            placeholder="请选择分配菜单">
                             <el-option v-for="(item,index) in parentmenuarr" :key="index" :label="item.name"
                                 :value="item.id"></el-option>
                         </el-select>
@@ -166,24 +166,24 @@
                                 <div class="pf-twoname" v-for="(itemchildren,indexsss) in item.children"
                                     :key="indexsss">
                                     <div @click="itemclick(itemchildren)" style="width: 150px;border-right: 1px solid #ebeef5;">
-                                        <div>{{itemchildren.name}}</div>
+                                        <div>{{itemchildren.name+5}}</div>
                                         <div>{{'('+itemchildren.assessmentProportion_Percentage+'%)'}}</div>
                                     </div>
-                                    <div class="pf-zb">{{ itemchildren.assessmentProportion_Percentage+"%" }}</div>
+                                    <div @click="goalclick(itemchildren)" class="pf-zb">{{ itemchildren.assessmentProportionChi*100+"%" }}</div>
                                     <div @click="goalclick(itemchildren)" style="width: 100px;border-right: 1px solid #ebeef5;">
                                         {{itemchildren.targetValue}}</div>
-                                    <div style="width: 380px;padding: 10px;border-right: 1px solid #ebeef5;">{{
+                                    <div @click="itemclick(itemchildren)" style="width: 380px;padding: 10px;border-right: 1px solid #ebeef5;">{{
                                         itemchildren.assessmentStandard }}</div>
                                     <div style="width: 250px;border-right: 1px solid #ebeef5;">
                                         <el-input style="width:98%" type="textarea" :rows="4" placeholder="请输入内容" v-model="itemchildren.status">
                                         </el-input>
                                     </div>
                                     <div style="width: 80px;border-right: 1px solid #ebeef5;">
-                                        <el-input-number style="width: 50px;" size="mini" :controls="false"
+                                        <el-input-number  style="width: 50px;" size="mini" :controls="false"
                                             v-model="itemchildren.selfAssessment"></el-input-number>
                                     </div>
                                     <div style="width: 80px;border-right: 1px solid #ebeef5;">
-                                        <el-input-number style="width: 50px;" size="mini" :controls="false"
+                                        <el-input-number :disabled="!isLeader" style="width: 50px;" size="mini" :controls="false"
                                             v-model="itemchildren.higherUpAssessment"></el-input-number>
                                     </div>
                                     <div style="width: 80px;border-right: 1px solid #ebeef5;">
@@ -216,6 +216,7 @@ export default {
             token:'',
             monthdate:'',
             userId:'',
+            isLeader:false,//是否为上级
             tablelist:[],
             tabletitle:[
                 {
@@ -836,6 +837,7 @@ export default {
                 }
             }
            this.allocationArgument.id=val.contentId;
+           this.allocationArgument.assessmentProportionChi=val.assessmentProportionChi;
            this.allocationArgument.assessmentSettingId=val.id;
            this.allocationArgument.targetValue=val.targetValue;
            this.allocationArgument.jobId=val.jobId;
@@ -894,7 +896,7 @@ export default {
         },
         //获取数据
         GetPerformanceList(){
-            var url = "/api/PersonnelModule/GetPerformanceList?userid="+this.value+"&date="+this.datetime(this.monthdate)
+            var url = "/api/PersonnelModule/GetPerformanceList?userid="+this.value+"&date="+this.datetime(this.monthdate)+"&loginUser="+this.userId
             var that = this
             this.$axios({
                 method: 'get',
@@ -904,7 +906,8 @@ export default {
                 },
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    that.tablelist=res.data.data;
+                    that.tablelist=res.data.data.root;
+                    that.isLeader=res.data.data.isLeader;
                     // for(let i=0;i<that.immobilizationarr.length;i++){
                     //     that.tablelist.push(that.immobilizationarr[i])
                     // }
@@ -1071,6 +1074,7 @@ export default {
                 data:{
                     createUserId:that.userId,
                     assessmenData:date,
+                    assessmenUserId:that.value,
                     data:data
                 }
             }).then(function (res) {
@@ -1095,13 +1099,26 @@ export default {
                 for(let e=0;e<this.tablelist[y].children.length;e++){
                     for (let s = 0; s < this.tablelist[y].children[e].children.length; s++) {
                         console.log(this.tablelist[y].children[e].children[s]);
-                        itemdata.push({
-                            assessmentContentSettingId:this.tablelist[y].children[e].children[s].contentId,
-                            selfAssessment:this.tablelist[y].children[e].children[s].selfAssessment,
-                            higherUpAssessment:this.tablelist[y].children[e].children[s].higherUpAssessment,
-                            leadersId:0,
-                            status:this.tablelist[y].children[e].children[s].status,
-                        })
+                        // console.log(this.isLeader);
+                        if (this.isLeader) {
+                            itemdata.push({
+                                assessmentContentSettingId:this.tablelist[y].children[e].children[s].contentId,
+                                selfAssessment:this.tablelist[y].children[e].children[s].selfAssessment,
+                                higherUpAssessment:this.tablelist[y].children[e].children[s].higherUpAssessment,
+                                leadersId:0,
+                                status:this.tablelist[y].children[e].children[s].status,
+                            })
+                        }else{
+                            if(this.tablelist[y].children[e].children[s].higherUpConfig!=1&&this.isLeader){
+                                itemdata.push({
+                                    assessmentContentSettingId:this.tablelist[y].children[e].children[s].contentId,
+                                    selfAssessment:this.tablelist[y].children[e].children[s].selfAssessment,
+                                    higherUpAssessment:this.tablelist[y].children[e].children[s].higherUpAssessment,
+                                    leadersId:0,
+                                    status:this.tablelist[y].children[e].children[s].status,
+                                })
+                            }
+                        }
                     }
                 }
             }
@@ -1166,6 +1183,7 @@ export default {
 </script>
 <style>
 .PerformanceT-all {
+    width: 1599px;
     background-color: #fff;
     padding: 10px;
     box-shadow: 0 0 5px #0005;