فهرست منبع

单位年度考评页面新增指标考核打分页面,前端增加导出功能,修改启动服务及其参数;通告管理页面新增多个通告同时发布,同时取消功能,通告管理修改功能优化功能,修改bug;配合后端修改问题;

SunZehao 1 سال پیش
والد
کامیت
14e0ef0562

BIN
src/assets/btnIcon/cancel.png


BIN
src/assets/btnIcon/cancelW.png


BIN
src/assets/btnIcon/fabuW.png


+ 2 - 2
src/components/assessment/evaluationYearPage.vue

@@ -301,10 +301,10 @@ export default {
         agetdeptresponsibility(row) {
             let that = this
             let par = {
-                defKey: "dwkpmbxd",
+                defKey: "nddwkplc",
                 businessKey: row.id,
                 action: "start",
-                opinion: "年度单位考评",
+                opinion: "年度单位考评流程",
                 iamCode: window.localStorage.getItem('code')
             }
             apiGetdoAction(par).then(datas =>{

+ 12 - 8
src/components/assessment/monthQuarterFrom.vue

@@ -136,12 +136,11 @@
                             <el-table-column label="单位名称" prop="organizationShortName" width="300">
                                 <template #default="scope">
                                     <el-select v-model="scope.row.organizationShortName" placeholder="请选择单位名称"
-                                    :disabled="!scope.row.showInput"
-                                     @change="changeOrgZa">
+                                    :disabled="!scope.row.showInput">
                                         <el-option
                                         v-for="item in orgruleData"
                                         :key="item.id"
-                                        :label="item.shortName"
+                                        :label="item.organizationShortName"
                                         :value="item.id">
                                         </el-option>
                                     </el-select>
@@ -175,13 +174,14 @@
                             </el-table-column>
                             <el-table-column label="业务属性" prop="sectionName">
                                 <template #default="scope">
-                                    <el-select v-model="scope.row.sectionName" placeholder="请选择业务阶段"
+                                    <el-select v-model="scope.row.sectionName" 
                                     :disabled="!scope.row.showInput"
-                                     @change="(val)=>changeIndic(val, scope.row)">
+                                    @change="(val)=>changeIndic(val, scope.row)"
+                                     placeholder="请选择业务属性">
                                         <el-option
-                                        v-for="item in sectionNameArr"
+                                        v-for="item in moduleData"
                                         :key="item.id"
-                                        :label="item.secName"
+                                        :label="item.sectionName"
                                         :value="item.id">
                                         </el-option>
                                     </el-select>
@@ -309,6 +309,10 @@ export default {
                 total: 0
             },
             moduleData: [],
+            indicItemoptions: [],
+            deptNameArr: [],
+            stageData: [],
+            indicatorTypeData: [],
             moduleNameSa: '',
             compNameSa: '',
             deptNameSa: '',
@@ -393,7 +397,7 @@ export default {
             })
         },
         seachDeptAEval() {
-            if (this.activeName = 'first') {
+            if (this.activeName === 'first') {
                 this.pageLeft = {
                     pagesize: 15,
                     currentPage: 1,

+ 54 - 0
src/components/elbuttonS.vue

@@ -61,16 +61,62 @@
             <span>{{reportFormsName}}</span>
             </el-button>
         </el-col>
+        <el-col :span="1.5" v-if="showRelease">
+            <el-button
+            type="success"
+            size="mini"
+            @click="handleRelease"
+            >
+            <img :src="fabu" style="margin-right: 10px">
+            <span>{{releaseName}}</span>
+            </el-button>
+        </el-col>
+        <el-col :span="1.5" v-if="showCancelRelease">
+            <el-button
+            type="info"
+            size="mini"
+            @click="handleCancelRelease"
+            >
+            <img :src="cancel" style="margin-right: 10px">
+            <span>{{cancelRelease}}</span>
+            </el-button>
+        </el-col>
     </el-row>
 </template>
 
 <script>
+import fabu from '../assets/btnIcon/fabu.png'
+import cancel from '../assets/btnIcon/cancel.png'
 import addW from '../assets/btnIcon/addW.png'
 import editW from '../assets/btnIcon/editW.png'
 import deleteW from '../assets/btnIcon/deleteW.png'
 import report from '../assets/btnIcon/report.png'
 export default {
     props: {
+        showRelease: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        releaseName: {
+            type: String,
+            default: () => {
+                return '发布';
+            },
+        },
+        showCancelRelease: {
+            type: Boolean,
+            default: () => {
+                return false;
+            },
+        },
+        cancelRelease: {
+            type: String,
+            default: () => {
+                return '取消发布';
+            },
+        },
         showAdd: {
             type: Boolean,
             default: () => {
@@ -176,6 +222,8 @@ export default {
     },
     data() {
         return {
+            fabu: fabu,
+            cancel: cancel,
             addW: addW,
             editW: editW,
             deleteW: deleteW,
@@ -201,6 +249,12 @@ export default {
         handleReport() {
             this.$emit('handleReport')
         },
+        handleRelease() {
+            this.$emit('handleRelease')
+        },
+        handleCancelRelease() {
+            this.$emit('handleCancelRelease')
+        }
     }
 }
 </script>

+ 43 - 11
src/components/notification/notificationMangePage.vue

@@ -6,6 +6,8 @@
                     <btns
                     :showImport="false"
                     :showExport="false"
+                    :showRelease="true"
+                    :showCancelRelease="true"
                     :addName="'新建通告'"
                     :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                     :disDelete="changeDateSelect.length === 0"
@@ -14,6 +16,8 @@
                     @handleAdd="handleAdd"
                     @handleEdit="handleEdit"
                     @handleDelete="handleDelete"
+                    @handleRelease="handleRelease"
+                    @handleCancelRelease="handleCancelRelease"
                     ></btns>
                 </div>
                 <div style="display: flex;">
@@ -67,7 +71,8 @@
                     <el-table-column label="发布时间" prop="createTime" />
                     <el-table-column label="发布" width="80" align="center">
                         <template #default="scope">
-                            <img :src="fabuW" style="cursor:pointer" @click="changeStatus(scope.row)">
+                            <img :src="cancelW" style="cursor:pointer" v-if="scope.row.releaseState === '已发布'" @click="changeStatus(scope.row, '未发布')">
+                            <img :src="fabuW" style="cursor:pointer" v-else @click="changeStatus(scope.row, '已发布')">
                         </template>
                     </el-table-column>
                     <el-table-column label="修改" width="80" align="center">
@@ -250,7 +255,8 @@
 <script>
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
-import fabuW from '../../assets/btnIcon/fabu.png'
+import fabuW from '../../assets/btnIcon/fabuW.png'
+import cancelW from '../../assets/btnIcon/cancelW.png'
 import editW from '../../assets/btnIcon/edit.png'
 import deleteW from '../../assets/btnIcon/delete.png'
 import fileW from '../../assets/btnIcon/fileW.png'
@@ -280,6 +286,7 @@ export default {
             departData: [],
             sendToData: [],
             fabuW: fabuW,
+            cancelW: cancelW,
             editW: editW,
             deleteW: deleteW,
             draft: draft,
@@ -379,11 +386,34 @@ export default {
             }
         },
         //修改状态
-        changeStatus(row) {
+        changeStatus(row, type) {
             let that = this
             let params = {
-                id: row.id,
-                releaseState: '已发布'
+                ids: row.id,
+                releaseState: type
+            }
+            apiPostevaluationdeptnoticeModifiedState(params).then(datas =>{
+                if (datas.success) {
+                    that.getevalunotificationList()
+                }
+            })
+        },
+        handleRelease() {
+            this.changeDataRelease('已发布')
+        },
+        handleCancelRelease() {
+            this.changeDataRelease('未发布')
+        },
+        //多个数据发布或取消发布
+        changeDataRelease(type) {
+            let that = this
+            let idsArr = []
+            that.changeDateSelect.forEach(item =>{
+                idsArr.push(item.id)
+            })
+            let params = {
+                ids: idsArr.join(','),
+                releaseState: type
             }
             apiPostevaluationdeptnoticeModifiedState(params).then(datas =>{
                 if (datas.success) {
@@ -409,10 +439,10 @@ export default {
                 sendTo: that.ruleForm.sendTo,
                 sendToContent: that.ruleForm.sendToContent.join(','),
                 releaseState: type === '草稿'? '草稿': type === '发布'?'已发布':'未发布',
-                // releaseDept: that.userMes.deptId,
-                // releaseDeptName: that.userMes.deptName,
-                // releasePeople: that.userMes.id,
-                // releasePeopleName: that.userMes.name
+                releaseDept: that.userMes.deptId,
+                releaseDeptName: that.userMes.deptName,
+                releasePeople: that.userMes.id,
+                releasePeopleName: that.userMes.name
             }
             const formData = new FormData()
             if (that.filesList.length>0) {
@@ -506,8 +536,10 @@ export default {
                 releaseDept: this.evalradio.releaseDept,
                 releasePeople: this.evalradio.releasePeople
             }
-            let filesArr = this.evalradio.noticeAnnex.split(',')
-            this.filesListEdit = filesArr
+            if (this.evalradio.noticeAnnex !== '') {
+                let filesArr = this.evalradio.noticeAnnex.split(',')
+                this.filesListEdit = filesArr
+            }
             // filesArr.forEach(item =>{
             //     let str = item.substring(item.lastIndexOf('/')+1, item.length)
             //     this.filesListEdit.push(str)