将月度季度单位考评分开；修改样式问题；配合后端改问题；

src/components/assessment/evaluationMonthPage.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="monthQuarter">
-        <div class="monthQuarterBtn">
+    <div class="evaluationMonth">
+        <div class="evaluationMonthBtn">
             <div class="collectSeach">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号：</span>
@@ -18,8 +18,8 @@
                 :showImport="false"
                 :showExport="false"
                 :showSave="false"
-                :showAdd="$utils.havePurview('monthQuarter:oneLevel:add')"
-                :showDelete="$utils.havePurview('monthQuarter:oneLevel:delete')"
+                :showAdd="$utils.havePurview('evaluationMonth:oneLevel:add')"
+                :showDelete="$utils.havePurview('evaluationMonth:oneLevel:delete')"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"
                 :disExport="true"
@@ -28,8 +28,8 @@
                 @handleExport="handleExport"
                 ></btns>
             </div>
-            <div class="monthQuarterTableData">
-                <el-table :data="monthQuarterData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
+            <div class="evaluationMonthTableData">
+                <el-table :data="evaluationMonthData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="organizationEvaluationCode" width="300" />
                     <el-table-column label="考评单位" width="330">
@@ -112,7 +112,7 @@
                                 :key="item.keyValue"
                                 :label="item.keyName"
                                 :value="item.keyValue"
-                                :disabled="item.keyValue === 'NDKP'">
+                                :disabled="item.keyValue === 'JDKP' || item.keyValue === 'NDKP'">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -172,7 +172,7 @@ export default {
             windframradio: {},
             deleteSelect: [],
             changeDateSelect: [],
-            monthQuarterData:[],
+            evaluationMonthData:[],
             page:{
                 pagesize: 12,
                 currentPage: 1,
@@ -231,13 +231,13 @@ export default {
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
-                checkCycle: 'YDKP,JDKP',
+                checkCycle: 'YDKP',
                 organizationEvaluationCode: that.rescode,
                 des: that.resDes
             }
             apiGetOrgEvaluationList(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.monthQuarterData = datas.data.records
+                    that.evaluationMonthData = datas.data.records
                     that.page.total = datas.data.total
                 }
             })
@@ -285,12 +285,12 @@ export default {
                 } else {
                     if (!that.isSave) {
                         that.$message({
-                            message: '考评规则新增成功',
+                            message: '月度单位考评新增成功',
                             type: 'success'
                         });
                     } else {
                         that.$message({
-                            message: '考评规则修改成功',
+                            message: '月度单位考评修改成功',
                             type: 'success'
                         });
                     }
@@ -475,8 +475,8 @@ export default {
 </script>
 
 <style lang="less">
-.monthQuarter{
-    .monthQuarterBtn{
+.evaluationMonth{
+    .evaluationMonthBtn{
         .collectSeach{
                 display: flex;
                 padding: 24px 20px;
@@ -535,7 +535,7 @@ export default {
                 margin:0;
             }
         }
-        .monthQuarterTableData{
+        .evaluationMonthTableData{
             .el-table{
                 .el-table__body-wrapper{
                     height: 60vh !important;

src/components/assessment/evaluationQuarterPage.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="monthQuarter">
-        <div class="monthQuarterBtn">
+    <div class="evaluationQuarter">
+        <div class="evaluationQuarterBtn">
             <div class="collectSeach">
                 <div class="exceed">
                     <span class="exceedSpan">业务编号：</span>
@@ -18,8 +18,8 @@
                 :showImport="false"
                 :showExport="false"
                 :showSave="false"
-                :showAdd="$utils.havePurview('monthQuarter:oneLevel:add')"
-                :showDelete="$utils.havePurview('monthQuarter:oneLevel:delete')"
+                :showAdd="$utils.havePurview('evaluationQuarter:oneLevel:add')"
+                :showDelete="$utils.havePurview('evaluationQuarter:oneLevel:delete')"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"
                 :disExport="true"
@@ -28,8 +28,8 @@
                 @handleExport="handleExport"
                 ></btns>
             </div>
-            <div class="monthQuarterTableData">
-                <el-table :data="monthQuarterData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
+            <div class="evaluationQuarterTableData">
+                <el-table :data="evaluationQuarterData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="getDetail">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="业务编号" prop="organizationEvaluationCode" width="300" />
                     <el-table-column label="考评单位" width="330">
@@ -112,7 +112,7 @@
                                 :key="item.keyValue"
                                 :label="item.keyName"
                                 :value="item.keyValue"
-                                :disabled="item.keyValue === 'NDKP'">
+                                :disabled="item.keyValue === 'YDKP' || item.keyValue === 'NDKP'">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -134,8 +134,8 @@
                                 placeholder="请选择年份"
                                 />
                         </el-form-item>
-                        <el-form-item label="月份">
-                            <el-input-number v-model="ruleForm.month" :min="1" :max="12" />
+                        <el-form-item label="季度">
+                            <el-input-number v-model="ruleForm.month" :min="1" :max="4" />
                         </el-form-item>
                         <el-form-item label="描述" prop="desc">
                             <el-input v-model="ruleForm.desc" :rows="5" type="textarea" placeholder="请输入描述"></el-input>
@@ -172,7 +172,7 @@ export default {
             windframradio: {},
             deleteSelect: [],
             changeDateSelect: [],
-            monthQuarterData:[],
+            evaluationQuarterData:[],
             page:{
                 pagesize: 12,
                 currentPage: 1,
@@ -231,13 +231,13 @@ export default {
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
-                checkCycle: 'YDKP,JDKP',
+                checkCycle: 'JDKP',
                 organizationEvaluationCode: that.rescode,
                 des: that.resDes
             }
             apiGetOrgEvaluationList(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.monthQuarterData = datas.data.records
+                    that.evaluationQuarterData = datas.data.records
                     that.page.total = datas.data.total
                 }
             })
@@ -285,12 +285,12 @@ export default {
                 } else {
                     if (!that.isSave) {
                         that.$message({
-                            message: '考评规则新增成功',
+                            message: '季度单位考评新增成功',
                             type: 'success'
                         });
                     } else {
                         that.$message({
-                            message: '考评规则修改成功',
+                            message: '季度单位考评修改成功',
                             type: 'success'
                         });
                     }
@@ -475,8 +475,8 @@ export default {
 </script>
 
 <style lang="less">
-.monthQuarter{
-    .monthQuarterBtn{
+.evaluationQuarter{
+    .evaluationQuarterBtn{
         .collectSeach{
                 display: flex;
                 padding: 24px 20px;
@@ -535,7 +535,7 @@ export default {
                 margin:0;
             }
         }
-        .monthQuarterTableData{
+        .evaluationQuarterTableData{
             .el-table{
                 .el-table__body-wrapper{
                     height: 60vh !important;

src/components/assessment/evaluationStartFrom.vue

@@ -624,10 +624,10 @@ export default {
                     }
                     .detaTableBtns{
                         display: flex;
-                        width: 250px;
+                        width: 340px;
                         position: relative;
                         top: 32px;
-                        left: 85vw;
+                        left: 80vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;

src/components/assessment/monthQuarterFrom.vue

@@ -583,10 +583,10 @@ export default {
                     }
                     .detaTableBtns{
                         display: flex;
-                        width: 250px;
+                        width: 340px;
                         position: relative;
                         top: 32px;
-                        left: 85vw;
+                        left: 80vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;

src/components/taskCenter/taskCenterEvlFrom.vue

@@ -349,7 +349,7 @@ export default {
             }
             if (defKey === 'yddwkplc') {
                 apiGettaskmothAyearDetail(params).then(datas =>{
-                    that.getDataMsg('yddwkplc', datas)
+                    that.getDataMsg(defKey, datas)
                 })
             } else if(defKey === 'dwkpmbqd') {
                 apiGettaskevalStartDetail(params).then(datas =>{
@@ -387,11 +387,11 @@ export default {
                 }
             })
         },
-        getDataMsg(type, datas) {
+        getDataMsg(types, datas) {
             if (datas && datas.data) {
                 let item = datas.data
                 this.receiptMsg = {
-                    code: type === 'dwkpmbqd'?item.responsibilityCode:item.organizationEvaluationCode,
+                    code: types === 'dwkpmbqd'?item.responsibilityCode:item.organizationEvaluationCode,
                     des: item.des,
                     stage: item.stage,
                     creator: item.createBy,

src/utils/baseUrl.js

@@ -10,15 +10,15 @@ switch (process.env.NODE_ENV) {
     case 'development': 
         baseUrl.ROOT = "/api"  //开发环境url
         // baseUrl.URL = "http://10.65.59.67:28800"
-        // baseUrl.URL = "http://123.60.219.66:28800"
-        baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
+        baseUrl.URL = "http://192.168.2.10:28800"
+        // baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
         // baseUrl.URL = "http://10.65.78.81:28800"  // 正式环境
         break
  
     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 
 }