流程接口修改，增加上传文件前提示词

package.json

@@ -41,8 +41,6 @@
     "eslint-plugin-vue": "^8.0.3",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
-    "node-sass": "^7.0.1",
-    "sass-loader": "^13.0.0",
     "vuex": "^4.0.2"
   },
   "eslintConfig": {

src/api/api.js

@@ -30,8 +30,8 @@ export function apiGetModel(url, params) {
 //获取菜单数据
 export function apiGetMenuData() {
     return httpRequest({
-        url: 'menu/menuList?parentId=10105', // 测试
-        // url: 'menu/menuList?parentId=6802', // 生产
+        // url: 'menu/menuList?parentId=10105', // 测试
+        url: 'menu/menuList?parentId=6802', // 生产
         method: 'post'
     })
 }
@@ -404,14 +404,21 @@ export function apiPostevaluationrevisionDelete(params) {
 }
 
 
-//  获取审批人
+//  获取审批人--月度
 export function apiGetobtainApprovalLeader(params) {
     return httpRequest({
         url: `evaluation-dept-ad/obtainApprovalLeader/${params.id}`,
         method: 'get'
     })
 }
-//添加审批领导
+//  获取审批人--年度
+export function apiGetobtainApprovalYearLeader(params) {
+    return httpRequest({
+        url: `evaluation-dept-allocation/getDepartmentLeader/${params.id}`,
+        method: 'get'
+    })
+}
+//添加审批领导--month
 export function apiGetaddApprovalLeader(params) {
     return httpRequest({
         url: 'evaluation-dept-ad/addApprovalLeader',
@@ -419,6 +426,14 @@ export function apiGetaddApprovalLeader(params) {
         params: params
     })
 }
+//添加审批领导--year
+export function apiGetaddApprovalYearLeader(params) {
+    return httpRequest({
+        url: 'evaluation-dept-process/addProcessPersonal',
+        method: 'post',
+        params: params
+    })
+}
 //查询审批领导--给出提示
 export function apiGetprocessInformation(params) {
     return httpRequest({

src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -308,6 +308,7 @@ export default {
         handleImport() {
             this.$refs.importPage.upload.title = "本部部门业绩指标考核信息导入"
             this.$refs.importPage.id = this.rowMsg.id
+            this.$refs.importPage.year = this.rowMsg.appraisalYear
             this.$refs.importPage.upload.open = true
             this.$refs.importPage.upload.url = '/evaluation-dept-assessment/import'
         },

src/components/assessment/evaluationDeptBusinessPage.vue

@@ -40,7 +40,7 @@
                         <template #default="scope">
                             <div style="display:flex">
                                 <p class="indicitem" v-if="scope.row.stage === '流程未启动'"
-                                    @click="agetdeptresponsibility(scope.row)">启动</p>
+                                    @click="getLeaderData(scope.row)">启动</p>
                                 <!-- <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p> -->
                                 <p style="font-size: 12px;margin-right: 20px;" v-else-if="scope.row.stage === '流程已结束'">
                                     已结束</p>
@@ -84,6 +84,30 @@
                     </el-table>
                 </div>
             </el-dialog>
+            <el-dialog title="流程启动" v-model="activeVisible" width="600px" :close-on-click-modal="false">
+                <div class="periodFrom">
+                    <el-form ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
+                        <el-form-item label="审批领导">
+                            <el-select v-model="activeLeaderName" placeholder="请选择审批领导">
+                                <el-option
+                                v-for="item in leaderArr"
+                                :key="item.no"
+                                :label="item.name"
+                                :value="item.no">
+                                <span style="float: left;display:inline-block;width:100px">{{ item.name }}</span>
+                                <span style="float: right;color: #909399;font-size: 13px;" >{{ item.no }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="activeVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="agetdeptresponsibility()">启 动</el-button>
+                    </span>
+                </template>
+            </el-dialog>
         </div>
         <business-from-list ref="businessFromDetail"></business-from-list>
         <business-table ref="businessTable"></business-table>
@@ -104,7 +128,9 @@
         apideptModifyassessmentState,
         apiGetworkflowgetOpinion,
         apiGetevaluationgenerateReport,
-        apiGetevaluationdownloadReport
+        apiGetevaluationdownloadReport,
+        apiGetobtainApprovalYearLeader,
+        apiGetaddApprovalYearLeader
     } from '../../api/api'
     export default {
         components: {
@@ -115,6 +141,10 @@
         },
         data() {
             return {
+                activeVisible: false,
+                leaderArr: [],
+                activeLeaderName: '',   
+                activeRowObj: {},   
                 evaluationBusinessData: [],
                 page: {
                     pagesize: 12,
@@ -155,39 +185,69 @@
             businessTableFn() {
                 this.$refs.businessTable.init(this.departData)
             },
-            agetdeptresponsibility(row) {
+            getLeaderData(row) {
+                this.activeRowObj = row
+                this.leaderArr = []
                 let that = this
-                let par = {
-                    defKey: "bbbmyjzbkh",
-                    businessKey: row.id,
-                    action: "start",
-                    opinion: "本部部门业绩指标考核",
-                    iamCode: window.localStorage.getItem('code')
+                this.activeVisible = true
+                let params = {
+                    id: row.deptId
                 }
-                apiGetdoAction(par).then(datas => {
+                apiGetobtainApprovalYearLeader(params).then(datas =>{
                     if (datas && datas.data) {
-                        if (!datas.data.isOk) {
-                            that.$message({
-                                message: datas.data.msg,
-                                type: 'error'
-                            });
-                        } else {
-                            let params = {
-                                id: row.id,
-                                stage: '流程已开始'
+                        that.leaderArr = datas.data
+                        if (datas.data.length>0) {
+                            that.activeLeaderName = datas.data[0].no
+                        }
+                    }
+                })
+            },
+            agetdeptresponsibility() {
+                setTimeout(() =>{
+                    let that = this
+                    let row = this.activeRowObj
+                    let pars = {
+                        id: row.id,
+                        employeeNo: that.activeLeaderName,
+                        businessType: "ASS"
+                    }
+                    apiGetaddApprovalYearLeader(pars).then(val =>{
+                        if (val && val.data) {
+                            that.activeVisible = false
+                            let par = {
+                                defKey: "bbbmyjzbkh",
+                                businessKey: row.id,
+                                action: "start",
+                                opinion: "本部部门业绩指标考核",
+                                iamCode: window.localStorage.getItem('code')
                             }
-                            apideptModifyassessmentState(params).then(values => {
-                                if (values.success) {
-                                    that.getevaluBusinessList()
-                                } else {
-                                    that.$message({
-                                        message: values.message,
-                                        type: 'error'
-                                    });
+                            apiGetdoAction(par).then(datas => {
+                                if (datas && datas.data) {
+                                    if (!datas.data.isOk) {
+                                        that.$message({
+                                            message: datas.data.msg,
+                                            type: 'error'
+                                        });
+                                    } else {
+                                        let params = {
+                                            id: row.id,
+                                            stage: '流程已开始'
+                                        }
+                                        apideptModifyassessmentState(params).then(values => {
+                                            if (values.success) {
+                                                that.getevaluBusinessList()
+                                            } else {
+                                                that.$message({
+                                                    message: values.message,
+                                                    type: 'error'
+                                                });
+                                            }
+                                        })
+                                    }
                                 }
                             })
                         }
-                    }
+                    })
                 })
             },
             //明细

src/components/assessment/evaluationDeptStartPage.vue

@@ -59,7 +59,7 @@
                         <template #default="scope">
                             <div style="display:flex">
                                 <p class="indicitem" v-if="scope.row.stage === '流程未启动'"
-                                    @click="agetdeptresponsibility(scope.row)">启动</p>
+                                    @click="getLeaderData(scope.row)">启动</p>
                                 <!-- <p class="indicitem" v-else @click="getDetail(scope.row)">详情</p> -->
                                 <p style="font-size: 12px;margin-right: 20px;" v-else-if="scope.row.stage === '流程已结束'">
                                     已结束</p>
@@ -147,6 +147,30 @@
                     </el-table>
                 </div>
             </el-dialog>
+            <el-dialog title="流程启动" v-model="activeVisible" width="600px" :close-on-click-modal="false">
+                <div class="periodFrom">
+                    <el-form ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
+                        <el-form-item label="审批领导">
+                            <el-select v-model="activeLeaderName" placeholder="请选择审批领导">
+                                <el-option
+                                v-for="item in leaderArr"
+                                :key="item.no"
+                                :label="item.name"
+                                :value="item.no">
+                                <span style="float: left;display:inline-block;width:100px">{{ item.name }}</span>
+                                <span style="float: right;color: #909399;font-size: 13px;" >{{ item.no }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="activeVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="agetdeptresponsibility()">启 动</el-button>
+                    </span>
+                </template>
+            </el-dialog>
         </div>
         <!-- @approveMsg="approveMsg" -->
         <start-from-list ref="startFromDetail"></start-from-list>
@@ -171,7 +195,9 @@
         apideptModifyState,
         apiGetdatadictionaryList,
         apiPostevaluationdeptplanDelete,
-        apiGetevaluationdeptplanverifyDept
+        apiGetevaluationdeptplanverifyDept,
+        apiGetobtainApprovalYearLeader,
+        apiGetaddApprovalYearLeader
     } from '../../api/api'
     export default {
         components: {
@@ -184,6 +210,10 @@
             return {
                 dialogVisible: false,
                 statesVisible: false,
+                activeVisible: false,
+                leaderArr: [],
+                activeLeaderName: '',   
+                activeRowObj: {},             
                 title: '',
                 iframeURL: '',
                 windframradio: {},
@@ -406,40 +436,71 @@
                     }
                 })
             },
-            agetdeptresponsibility(row) {
+            getLeaderData(row) {
+                this.activeRowObj = row
+                this.leaderArr = []
                 let that = this
-                let par = {
-                    defKey: "bbbmyjzbjh",
-                    businessKey: row.id,
-                    action: "start",
-                    opinion: "本部部门业绩指标计划启动",
-                    iamCode: window.localStorage.getItem('code')
+                this.activeVisible = true
+                let params = {
+                    id: row.deptId
                 }
-                apiGetdoAction(par).then(datas => {
+                apiGetobtainApprovalYearLeader(params).then(datas =>{
                     if (datas && datas.data) {
-                        if (!datas.data.isOk) {
-                            that.$message({
-                                message: datas.data.msg,
-                                type: 'error'
-                            });
-                        } else {
-                            let params = {
-                                id: row.id,
-                                stage: '流程已开始'
+                        that.leaderArr = datas.data
+                        if (datas.data.length>0) {
+                            that.activeLeaderName = datas.data[0].no
+                        }
+                    }
+                })
+            },
+            agetdeptresponsibility() {
+                setTimeout(() =>{
+                    let that = this
+                    let row = this.activeRowObj
+                    let pars = {
+                        id: row.id,
+                        employeeNo: that.activeLeaderName,
+                        businessType: "PLAN"
+                    }
+                    apiGetaddApprovalYearLeader(pars).then(val =>{
+                        if (val && val.data) {
+                            that.activeVisible = false
+                            let par = {
+                                defKey: "bbbmyjzbjh",
+                                businessKey: row.id,
+                                action: "start",
+                                opinion: "本部部门业绩指标计划启动",
+                                iamCode: window.localStorage.getItem('code')
                             }
-                            apideptModifyState(params).then(values => {
-                                if (values.success) {
-                                    that.getevaluStartList()
-                                } else {
-                                    that.$message({
-                                        message: values.message,
-                                        type: 'error'
-                                    });
+                            apiGetdoAction(par).then(datas => {
+                                if (datas && datas.data) {
+                                    if (!datas.data.isOk) {
+                                        that.$message({
+                                            message: datas.data.msg,
+                                            type: 'error'
+                                        });
+                                    } else {
+                                        let params = {
+                                            id: row.id,
+                                            stage: '流程已开始'
+                                        }
+                                        apideptModifyState(params).then(values => {
+                                            if (values.success) {
+                                                that.getevaluStartList()
+                                            } else {
+                                                that.$message({
+                                                    message: values.message,
+                                                    type: 'error'
+                                                });
+                                            }
+                                        })
+                                    }
                                 }
                             })
                         }
-                    }
+                    })
                 })
+                
             },
             clickDes(row, column, cell, event) {
                 if (row.stage === '流程已结束') {

src/components/importPage/importDailog.vue

@@ -10,6 +10,7 @@
             <template #tip>
                 <div class="el-upload__tip text-center">
                     <span style="display:inline-block;margin-top:10px">仅允许导入xls、xlsx格式文件。</span>
+                    <span style="display:inline-block;margin-top:10px;color:red">严禁在本系统处理，传输国家秘密，“内部”和核心商密！请确认！</span>
                     <el-link type="primary" v-if="upload.showModel" :underline="false"
                         style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
                 </div>

src/components/notification/notificationMangePage.vue

@@ -157,6 +157,9 @@
                                         <div class="el-upload__tip">
                                             最多上传3个文件
                                         </div>
+                                        <div style="color:red">
+                                            严禁在本系统处理，传输国家秘密，“内部”和核心商密！请确认！
+                                        </div>
                                     </template>
                                 </el-upload>
                             </div>

src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -388,9 +388,8 @@
             },
             handleImport() {
                 this.$refs.importPage.upload.title = "本部部门业绩指标考核信息导入"
-                this.$refs.importPage.upload.data = {
-                    id: this.importId
-                }
+                this.$refs.importPage.id = this.importId
+                this.$refs.importPage.year = this.receiptMsg.year
                 this.$refs.importPage.upload.open = true
                 this.$refs.importPage.upload.url = '/evaluation-dept-assessment/import'
             },

src/utils/baseUrl.js

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