对标功能问题修改，部门考评功能增加；

src/components/assessment/benchmarkingIndicBasicPage.vue

@@ -188,7 +188,7 @@ export default {
                         "FDLX400",
                         "FDLX200"
                     ],
-                    range: 'M',
+                    range: that.rangeVal,
                     dataType: '429668',
                     kj: 'JT',
                     startTime: that.resAnnual[0],

src/components/taskCenter/taskApplicationFrom.vue

@@ -15,9 +15,16 @@
                         </div>
                     </el-col>
                     <el-col :span="6">
-                        <div class="danjuMsg_data">
+                        <div class="danjuMsgSelect">
                             <span class="data_tit">申报级别:</span>
-                            <span>{{receiptMsg.declarationLevel}}级</span>
+                            <!-- <span>{{receiptMsg.declarationLevel}}级</span> -->
+                            <span v-if="receiptMsg.stage !== '已驳回'">{{receiptMsg.declarationLevel}}</span>
+                            <el-select v-model="receiptMsg.declarationLevel" placeholder="请选择申报级别"
+                                @change="changeDecLeave" v-else>
+                                <el-option v-for="item in ratingGradeOption" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报年度:</span>
@@ -33,9 +40,10 @@
                             <span class="data_tit">流程状态:</span>
                             <span>{{receiptMsg.stage}}</span>
                         </div>
-                        <div class="danjuMsg_data">
+                        <div class="danjuMsgSelect">
                             <span class="data_tit">申报月份:</span>
-                            <span>{{receiptMsg.month}}月</span>
+                            <span v-if="receiptMsg.stage !== '已驳回'">{{receiptMsg.month}}月</span>
+                            <el-date-picker v-else v-model="receiptMsg.month" @change="changeMonth" type="month" placeholder="选择月份" value-format="MM" />
                         </div>
                     </el-col>
                     <el-col :span="6">
@@ -47,7 +55,7 @@
                     <el-col :span="6">
                         <div class="danjuMsgSelect">
                             <span class="data_tit">评定等级:</span>
-                            <span v-if="ispersonDept !== 'true'">{{receiptMsg.ratingGrade}}</span>
+                            <span v-if="showChange(receiptMsg)">{{receiptMsg.ratingGrade}}</span>
                             <el-select v-model="receiptMsg.ratingGrade" placeholder="请选择评定等级"
                                 @change="changeratingGrade" v-else>
                                 <el-option v-for="item in ratingGradeOption" :key="item.value" :label="item.label"
@@ -59,7 +67,7 @@
                     <el-col :span="18">
                         <div class="danjuMsgSelect">
                             <span class="data_tit">申报简述:</span>
-                            <span v-if="ispersonDept !== 'true'">{{receiptMsg.des}}</span>
+                            <span v-if="showChange(receiptMsg)">{{receiptMsg.des}}</span>
                             <el-input v-model="receiptMsg.des" :rows="1" type="textarea" @blur="blurDes" v-else
                                 placeholder="请输入申报简述"></el-input>
                         </div>
@@ -232,6 +240,7 @@
         apiGetevaluationdeptadUpdate,
         apiGetevaluationdeptadDelete,
         apiPostIsdoAction,
+        apideptAdState,
         apideptAdmodify,
         apiPostevaluationdeptadDetailsHead,
         apiGetuserPageList,
@@ -391,6 +400,22 @@
             rowSituationClick(selection, row) {
                 this.changeSituationSelect = selection
             },
+            showChange(val) {
+                let show = true
+                if (val.stage !== '已驳回') {
+                    show = false
+                } else if(this.ispersonDept !== 'true') {
+                    show = false
+                }
+                return show
+            },
+            changeDecLeave(val) {
+                this.modeifyDetail('desLeave', val)
+            },
+            changeMonth(val) {
+                let value = val*1
+                this.modeifyDetail('month', value)
+            },
             changeratingGrade(val) {
                 this.modeifyDetail('level', val)
             },
@@ -405,8 +430,12 @@
                 }
                 if (type === 'level') {
                     params.ratingGrade = val
-                } else {
-                    params.des = val
+                } else if(type === 'des') {
+                    params.declarationReason = val
+                } else if (type === 'desLeave') {
+                    params.declarationLevel = val
+                } else if (type === 'month') {
+                    params.declarationMonth = val
                 }
                 apideptAdmodify(params).then(datas => {
                     if (datas.success) {
@@ -453,7 +482,7 @@
                             type: row.checkCycle === 'YDKP' ? '月度考评' : row.checkCycle === 'JDKP' ? '季度考评' :
                                 '年度考评',
                             year: row.annual,
-                            month: row.declarationMonth,
+                            month: row.declarationMonth.length > 1 ? row.declarationMonth : '0'+row.declarationMonth,
                             recStage: '有效'
                         }
                     }
@@ -736,6 +765,7 @@
                         actionCS = 'reject'
                     }
                     this.submitIsdoAction(actionCS)
+                    
                 }
             },
             submitIsdoAction(taskType, nodeSc) {
@@ -769,8 +799,22 @@
                                 message: datas.data.data,
                                 type: 'success'
                             })
-                            that.dialogVisible = false
-                            that.$emit('approveMsg', datas.data.isOk)
+                            let params = {
+                                id: that.instanceChild.bizKey,
+                                stage: '已驳回'
+                            }
+                            apideptAdState(params).then(values =>{
+                                if (values.success) {
+                                    that.dialogVisible = false
+                                    that.$emit('approveMsg', datas.data.isOk)
+                                } else {
+                                    that.$message({
+                                        message: values.message,
+                                        type: 'error'
+                                    });
+                                }
+                            })
+                            
                         } else {
                             that.$message({
                                 message: datas.data.msg,
@@ -948,6 +992,10 @@
                                     position: relative;
                                     top: -4px;
                                 }
+
+                                .el-date-editor--month{
+                                    width: 50%;
+                                }
                             }
                         }
 

src/utils/baseUrl.js

@@ -17,8 +17,8 @@ switch (process.env.NODE_ENV) {
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/"
-        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }