任务系统修改

src/components/OP/EntryDetails.vue

@@ -3218,9 +3218,9 @@ export default {
                     that.TotalExpenses.TravellingExpensesJJ=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
                     that.TotalExpenses.TravellingExpensesGW=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
                     that.TotalExpenses.TravellingExpensesTD=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
+                    that.TotalExpenses.twoItemRemark=res.data.data.label;
                     that.TransportationVisible=false;
                     that.$message.success(res.data.msg);
-
                 }else {
                     that.$message.error(res.data.msg);
                 }

src/components/OP/SpecialPerformance.vue

@@ -15,7 +15,7 @@
                     </el-select>
                 </div>
             </div>
-             <el-button @click="CompanyDailyKpiSave" size="small" type="primary">保存</el-button>
+             <el-button :disabled="!isOp" @click="CompanyDailyKpiSave" size="small" type="primary">保存</el-button>
         </div>
         <div class="SPerformance-Search-table">
             <el-table :data="tableData" border style="width: 100%">
@@ -28,12 +28,12 @@
                 </el-table-column>
                 <el-table-column prop="name" label="工作是否失误" width="100">
                     <template slot-scope="scope">
-                        <el-checkbox v-model="scope.row.isMistake"></el-checkbox>
+                        <el-checkbox :disabled="!isOp" v-model="scope.row.isMistake"></el-checkbox>
                     </template>
                 </el-table-column>
                 <el-table-column prop="address" label="失误原因描述">
                     <template slot-scope="scope">
-                        <el-input style="width:100%" v-model="scope.row.mistakeReason" type="textarea" :rows="2" placeholder="请输入内容"></el-input>
+                        <el-input :disabled="!isOp" style="width:100%" v-model="scope.row.mistakeReason" type="textarea" :rows="2" placeholder="请输入内容"></el-input>
                     </template>
                 </el-table-column>
             </el-table>
@@ -50,12 +50,13 @@ export default {
             options:[],
             tableData: [],
             SPLoading:false,
+            isOp:false,
         }
     },
     methods: {
         //获取人员名单
         CompanyDailyKpiInit() {
-            var url = "/api/PersonnelModule/CompanyDailyKpiInit";
+            var url = "/api/PersonnelModule/CompanyDailyKpiInit/"+this.userId;
             var that = this;
             this.$axios({
                 method: 'get',
@@ -64,8 +65,10 @@ export default {
                     Authorization: 'Bearer '
                 }
             }).then(function (res) {
+                that.options=[];
                 if (res.data.code == 200) {
-                    that.options=res.data.data;
+                    that.options=res.data.data.userInfos;
+                    that.isOp=res.data.data.isOp;
                     if(that.value==''){
                         that.value=that.options[0].id;
                     }

src/components/OP/performanceanalysis.vue

@@ -291,11 +291,7 @@ export default {
                 this.$message.error('请选择月份！');
                 return
             }
-            //下面是整月逻辑
-            // var new_year = this.months.getFullYear()
-            // var month = this.months.getMonth();
-            // var new_month = month + 1;
-            if (val.depName=='市场部') {
+            if (val.depName=='市场部'&&val.jobName!='文案专员') {
                 this.AiPerformanceAnalysis_JobMarketingFileDown(this.datetime(this.months[0]),this.datetime(this.months[1]),val);
                 // this.AiPerformanceAnalysis_JobMarketingFileDown(new_year,new_month,val);
                 return
@@ -605,6 +601,31 @@ export default {
                 }
             })
         },
+        //固定任务
+        AiPerformanceAnalysis_OtherDepartment(val){
+            var url = "/api/PersonnelModule/AiPerformanceAnalysis_OtherDepartment?userId="+val.id+"&start="+this.datetime(this.months[0])+"&end="+this.datetime(this.months[1])+"&createUserId="+this.userId
+            var that = this
+            this.$axios({
+                method: 'get',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    that.performanLoading=false;
+                    that.AIVisible=true;
+                    if (that.$marked && typeof that.$marked === 'function') {
+                        that.marktext = that.$marked(res.data.data.answer+that.texehr);
+                        that.marktexts = that.$marked(res.data.data.kaoqinAnswer);
+                    }
+                    that.AiPerformanceAnalysis_UserList();
+                }else{
+                    that.performanLoading=false;
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         //生成市场部绩效
         MarketingDepartment(val,text){
             var new_year = this.months[0].getFullYear()
@@ -655,10 +676,26 @@ export default {
         //获取chutuan
         AiPerformanceAnalysis_GroupStatistics(val,text){
             this.bumensb=val.depName;
+            var Fixedpersonnelarr=['文案专员','总经理助理','商邀文案'];
             if(this.months==''){
                 this.$message.error('请选择月份！');
                 return
             }
+            if(Fixedpersonnelarr.includes(val.jobName)){
+                this.bumensb='';
+                this.performanLoading=true;
+                if(text=='查看'){
+                    if (val.hasPerformanceData==false) {
+                        this.performanLoading=false;
+                        this.$message.error('该用户尚未生成AI绩效分析，请先生成！');
+                        return
+                    }
+                    this.AiPerformanceAnalysis_Query(val)
+                }else{
+                    this.AiPerformanceAnalysis_OtherDepartment(val);
+                }
+                return
+            }
             if (val.depName=='市场部') {
                 this.performanLoading=true;
                 this.MarketingDepartment(val,text);

src/components/system/TaskList.vue

@@ -55,7 +55,7 @@
                             </el-select>
                         </el-form-item> -->
                     </div>
-                    <el-button size="medium" @click="handleView" type="primary">新增任务</el-button>
+                    <el-button :disabled="!isAddPerm" size="medium" @click="handleView" type="primary">新增任务</el-button>
                 </el-form>
             </div>
             <div class="tasklist-title">任务列表</div>
@@ -447,6 +447,7 @@ export default {
             },
             taskUserId:-1,
             taskUserIdArr:[],
+            isAddPerm:false,
         }
     },
     methods: {
@@ -618,6 +619,7 @@ export default {
                 if(res.data.code==200){
                     that.tasknamelist=res.data.data.taskNameInfos;
                     that.taskUserIdArr=res.data.data.executeTaskUserInfos;
+                    that.isAddPerm=res.data.data.operationPerm.isAddPerm;
                     that.taskUserIdArr.unshift({id:-1,name:'全部'});
                     that.PostTaskAllocationPage();
                 }else{