FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zyx.net
2022-10-14 13:44:19 +08:00
parent 77f6fec7b2 cb3cca0028
commit cbdcec3e22
3 changed files with 21 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+1
View File
@@ -2640,6 +2640,7 @@
planForm.planStatus = '4'
planForm.reviseStatus = this.form.reviseStatus
planForm.standCode = this.form.DTQBBHBUSS
planForm.standId = res.data
planForm.processType = "buss1";
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
_this: this
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+14 -2
View File
@@ -8,7 +8,6 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" v-if="approvalFlag" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<div class="headerTabsItem" v-else :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
@@ -258,6 +257,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
import establish from "process/creatProcess/qbzxdjhgk/component/establish";
import delay from "process/creatProcess/qbzxdjhgk/component/delay";
import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
import axios from "axios";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process";
export default {
@@ -509,6 +509,15 @@ export default {
})
}
},
addLog(qbzxdFrom){
let json = Object.assign(qbzxdFrom);
this.$http.post("esRevisePlanLog/log/addLog", {
json: JSON.stringify(json)
}, {
_this: this
}, res => {
});
},
//流程提交
handleSubmit() {
if(!this.$refs["childForm"].qbfsForm.type){
@@ -548,7 +557,8 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
if (this.bpnId !== '') {
this.addLog(qbzxdFrom)
if (this.bpnId !== '' && this.bpnId !== undefined) {
let taskId = {
id: this.bpnId
}
@@ -556,6 +566,7 @@ export default {
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
@@ -588,6 +599,7 @@ export default {
if (res.success) {
this.$message.success(res.message);
this.isSubmit = false;
this.addLog(qbzxdFrom)
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+6 -81
View File
@@ -108,7 +108,7 @@
<el-table-column
label="企标编号">
<template slot-scope="scope">
<a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standCode }}</a>
<a v-if="scope.row.standNumber" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -179,13 +179,13 @@
</el-table-column>
<el-table-column
align="center"
prop="unitName"
prop="actualTime"
width="150"
label="实际标准发布时间">
</el-table-column>
<el-table-column
align="center"
prop="unitName"
prop="score"
label="质量评分">
</el-table-column>
<el-table-column
@@ -951,84 +951,10 @@
},
// 点击查看
handlePreview(item,fs) {
// const mj = item.attrInfoMap.QBMJ
// if (mj === 'GXNX7D6H59') {
// // C1所有人都可查看
// let routeUrl = this.$router.resolve({
// name: 'OtherBussStandardDetails',
// params: {
// id: item.id,
// pageType: 'BUSINESS_STAND'
// }
// })
// window.open(routeUrl.href, '_blank')
// } else if (mj === 'JLAPYG7YCT') {
// // C2只能让起草部门人员即填写中的相关部门/涉及会签部门人员可看
// // （起草部门、相关部门、会签部门，部门下所有人员）
// const attrInfoMap = item.attrInfoMap || {}
// const xgbm = attrInfoMap.XGBM || '' // 相关部门
// const qcbm = attrInfoMap.ZRBM || '' // 起草部门
// const xghqbm = attrInfoMap.XHQBM || '' // 相关会签部门
// const bm = [xgbm, qcbm, xghqbm].join(',') // 全部部门 字符串拼接
// const currentUserInfo = this.userInfo
// const currentBm = [currentUserInfo.orgId, currentUserInfo.pOrgId] // 当前用户的部门和科室
// const inBm = currentBm.some(item => {
// return bm.indexOf(item) > -1
// })
// // 如果当前用户的部门和科室不在全部部门里 就不允许查看
// if (!inBm) {
// this.$message.warning('当前用户无权限查看此详情')
// return false
// }
// let routeUrl = this.$router.resolve({
// name: 'OtherBussStandardDetails',
// params: {
// id: item.id,
// pageType: 'BUSINESS_STAND'
// }
// })
// window.open(routeUrl.href, '_blank')
// } else if (mj === 'ACF675Z88W') {
// // C3采取单独授权查看（当前实现只能主起草人、其他起草人看即可，后续的授权4月份开发）
// const attrInfoMap = item.attrInfoMap || {}
// const zyqcr = attrInfoMap.ZYQCR || '' // 主要起草人
// const qtqcr = attrInfoMap.QTQCR || '' // 主要起草人
// const qcr = [zyqcr, qtqcr].join(',') // 全部起草人 字符串拼接
// const userInfo = this.userInfo
// const currentId = userInfo.userId // 当前用户的id
// // 如果当前用户的部门和科室不在全部部门里 就不允许查看
// if (!(qcr.indexOf(currentId) > -1)) {
// // this.$message.warning('当前用户无权限查看此详情')
// this.$http.get('lawss/sarBussionessStand/selectPerson', {
// qbid: item.id
// }, {
// _this: this
// }, res => {
// if (res.data === "1") {
// // 为1有权限
// let routeUrl = this.$router.resolve({
// name: 'OtherBussStandardDetails',
// params: {
// id: item.id,
// pageType: 'BUSINESS_STAND'
// }
// })
// window.open(routeUrl.href, '_blank')
// } else {
// this.$message.warning('当前用户无权限查看此详情')
// return false
// }
// }, e => {
// return false
//
// })
//
// }
// }
let routeUrl = this.$router.resolve({
name: 'OtherBussStandardDetails',
params: {
id: fs ? (fs === 'fs' ? item.standId:item.id) : item.id,
id: item.standId,
pageType: 'BUSINESS_STAND'
}
})
@@ -1370,9 +1296,8 @@
},
// 更新事件
relateEvent (item) {
this.$http.get('lawss/sarUpdLog/getLogList', {
sarId: item.id,
sarType: 'FOREIGN_LAWS'
this.$http.get('esRevisePlanLog/log/queryLogsByPlanId', {
planId: item.id,
}, {
_this: this
}, res => {